registry 0.6.3.1 → 0.6.3.2

raw patch · 7 files changed

+8/−92 lines, 7 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• registry.cabal +1/−3
• src/Data/Registry/Internal/Dot.hs +1/−1
• src/Data/Registry/Internal/Dynamic.hs +3/−3
• src/Data/Registry/Internal/Reflection.hs +2/−2
• test/Test/Data/Registry/Internal/DynamicSpec.hs +1/−1
• test/Test/Tutorial/DatabaseLogger.hs +0/−46
• test/Test/Tutorial/DatabaseLoggerExample.hs +0/−36

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           registry-version:        0.6.3.1+version:        0.6.3.2 synopsis:       data structure for assembling components description:    This library provides a "Registry" which is a data structure containing a list of functions and values representing dependencies in a directed acyclic graph. A `make` function can then be used to create a value of a specific type out of the registry.                 You can start with the [README](https://github.com/etorreborre/registry/blob/master/README.md) for a full description of the library.@@ -104,8 +104,6 @@       Test.Data.Registry.THSpec       Test.Tasty.Extensions       Test.Tutorial.Application-      Test.Tutorial.DatabaseLogger-      Test.Tutorial.DatabaseLoggerExample       Test.Tutorial.Exercise1       Test.Tutorial.Exercise2       Test.Tutorial.Exercise3

@@ -130,7 +130,7 @@ -- | Don't show the counter if there showValueCounter :: ValueCounter -> Text showValueCounter Nothing = ""-showValueCounter (Just n) = "-" <> show n+showValueCounter (Just n) = "-" <> P.show n  -- | We need to process the node descriptions --     - we add quotes arountd the text

@@ -23,7 +23,7 @@     else       Left $         "the function "-          <> show (dynTypeRep (funDyn function))+          <> P.show (dynTypeRep (funDyn function))           <> " cannot be applied to an empty list of parameters" applyFunction function values =   do@@ -59,7 +59,7 @@ applyFunctionDyn f [] =   Left $     "the function "-      <> show (dynTypeRep f)+      <> P.show (dynTypeRep f)       <> " cannot be applied to an empty list of parameters" applyFunctionDyn f [i] = applyOneParam f i applyFunctionDyn f (i : is) = do@@ -69,7 +69,7 @@ -- | Apply just one dynamic parameter to a dynamic function applyOneParam :: Dynamic -> Dynamic -> Either Text Dynamic applyOneParam f i =-  maybe (Left $ "failed to apply " <> show i <> " to : " <> show f) Right (dynApply f i)+  maybe (Left $ "failed to apply " <> P.show i <> " to : " <> P.show f) Right (dynApply f i)  -- | If Dynamic is a function collect all its input types collectInputTypes :: Function -> [SomeTypeRep]

@@ -73,11 +73,11 @@   case splitTyConApp a of     (con, []) -> showType con     (con, [arg]) -> showType con <> " " <> showSingleType arg-    (con, args) -> showType con <> " " <> show (fmap showSingleType args)+    (con, args) -> showType con <> " " <> P.show (fmap showSingleType args)   where     showType x =       let typeWithModuleName = showWithModuleName x-       in if mustShowModuleName typeWithModuleName then typeWithModuleName else show x+       in if mustShowModuleName typeWithModuleName then typeWithModuleName else P.show x  -- | Return true if the module name can be shown mustShowModuleName :: Text -> Bool

@@ -28,7 +28,7 @@ test_applyFunction = test "we can apply a list of dynamic values to a dynamic function" $ do   (fromDynamic @Int . valueDyn <$> applyFunction (createFunction T.length) [createValue ("hello" :: Text)]) === Right (Just 5) -  let add1 (i :: Int) (j :: Int) = show (i + j) :: Text+  let add1 (i :: Int) (j :: Int) = P.show (i + j) :: Text   (fromDynamic @Text . valueDyn <$> applyFunction (createFunction add1) [createValue (1 :: Int), createValue (2 :: Int)]) === Right (Just "3")    -- no value is returned when an input parameter is incorrect

@@ -1,46 +0,0 @@-{-# LANGUAGE RecordWildCards #-}-{-# LANGUAGE StrictData #-}-{-# LANGUAGE OverloadedStrings #-}--module Test.Tutorial.DatabaseLogger where--import Protolude hiding (log)---- | A Logger interface-data Logger = Logger-  { log :: Text -> Severity -> IO ()-  }--data Severity = Info | Error | Fatal-  deriving (Eq, Ord, Show)---- | The production implementation-newLogger :: Logger-newLogger = Logger (\t s -> print ("[" <> show s <> "] " <> t))---- | 2 different ways to limit the severity for a Logger-limitSeverity :: Severity -> Logger -> Logger-limitSeverity at (Logger p) =-  Logger (\t s ->-    if s >= at then p t s-    else pure ())--newLimitedLogger :: Severity -> Logger-newLimitedLogger at = limitSeverity at newLogger---- | This Logger doesn't log anything-noLogger :: Logger-noLogger = Logger (\_ _ -> pure ())---- | A database interface-data Database = Database-  { executeQuery :: Text -> IO ()-  }---- | A production database using a Logger-newDatabase :: Logger -> Database-newDatabase logger = Database {..} where-  executeQuery :: Text -> IO ()-  executeQuery q = do-    log logger ("executing query " <> q) Info-    print "do it"

@@ -1,36 +0,0 @@-{-# LANGUAGE DataKinds #-}-{-# LANGUAGE PartialTypeSignatures #-}-{-# OPTIONS_GHC -fno-warn-partial-type-signatures #-}--module Test.Tutorial.DatabaseLoggerExample where--import Data.Registry-import Test.Tutorial.DatabaseLogger--prodRegistry =-     fun newDatabase-  <: fun newLogger--prodDatabase = make @Database prodRegistry---- Don't log anything for those tests-testRegistry1 =-     fun noLogger-  <: prodRegistry--testDatabase1 = make @Database testRegistry1---- Only log some messages for those tests-testRegistry2 =-  tweak @Logger (limitSeverity Info) prodRegistry--testDatabase2 = make @Database testRegistry2---- Only log some messages for those tests--- Specify the severity as a separate value-testRegistry3 =-     fun newLimitedLogger-  <: val Info-  <: prodRegistry--testDatabase3 = make @Database testRegistry3