From b912e451f7e918131437570a7ddac6a2691a386e Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Wed, 15 Jun 2016 04:15:41 +0530 Subject: [PATCH] Fixes broken doctest. By replacing Text.Show.Pretty generated string representation used in the doctest with a handwritten one. --- ringo/ringo.cabal | 3 +-- ringo/src/Ringo.hs | 43 +++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/ringo/ringo.cabal b/ringo/ringo.cabal index 175918e..00c67e0 100644 --- a/ringo/ringo.cabal +++ b/ringo/ringo.cabal @@ -45,8 +45,7 @@ test-suite ringo-test if impl(ghc >= 7.10) build-depends: base , ringo - , pretty-show >=1.6 && <1.7 - , doctest >=0.9 && <0.12 + , doctest >=0.9 && <0.12 else buildable: False default-language: Haskell2010 diff --git a/ringo/src/Ringo.hs b/ringo/src/Ringo.hs index 4a270a4..66b685f 100644 --- a/ringo/src/Ringo.hs +++ b/ringo/src/Ringo.hs @@ -29,7 +29,7 @@ import qualified Ringo.Validator as V -- >>> import qualified Data.Map as Map -- >>> import qualified Data.Text as Text -- >>> import Data.List (nub) --- >>> import Text.Show.Pretty +-- >>> import Data.Monoid ((<>)) -- >>> :{ --let sessionEventsTable = -- Table { tableName = "session_events" @@ -198,27 +198,26 @@ extractDimensionTables env = flip runReader env . E.extractDimensionTables -- | -- --- >>> putStrLn . ppShow $ extractDependencies env sessionFact --- fromList --- [ ( "dim_geo" , [ "session_events" ] ) --- , ( "dim_user_agent" , [ "session_events" ] ) --- , ( "fact_session_by_minute" --- , [ "session_events" , "dim_user_agent" , "dim_geo" ] --- ) --- ] --- >>> putStrLn . ppShow $ extractDependencies env pageViewFact --- fromList --- [ ( "dim_page_type" , [ "page_view_events" ] ) --- , ( "fact_page_view_by_minute" --- , [ "page_view_events" --- , "session_events" --- , "dim_page_type" --- , "referrers" --- , "dim_user_agent" --- , "dim_geo" --- ] --- ) --- ] +-- >>> let depsToStr = map ((\(k, vs) -> Text.unpack $ k <> ":\n - " <> Text.intercalate "\n - " vs)) . Map.toList +-- >>> mapM_ putStrLn . depsToStr $ extractDependencies env sessionFact +-- dim_geo: +-- - session_events +-- dim_user_agent: +-- - session_events +-- fact_session_by_minute: +-- - session_events +-- - dim_user_agent +-- - dim_geo +-- >>> mapM_ putStrLn . depsToStr $ extractDependencies env pageViewFact +-- dim_page_type: +-- - page_view_events +-- fact_page_view_by_minute: +-- - page_view_events +-- - session_events +-- - dim_page_type +-- - referrers +-- - dim_user_agent +-- - dim_geo extractDependencies :: Env -> Fact -> Dependencies extractDependencies env = flip runReader env . E.extractDependencies