Merge branch '#2-currencies-from-adt'

chordify · Mar 10, 2018 · eca59c3 · eca59c3
2 parents 8ca4ee0 + 4248756
commit eca59c3
Show file tree

Hide file tree

Showing 6 changed files with 417 additions and 944 deletions.
diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml
@@ -1,6 +1,8 @@
 ---
 columns: 100
 language_extensions:
+  - BangPatterns
+  - DefaultSignatures
   - DataKinds
   - DeriveDataTypeable
   - DeriveFunctor

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,17 @@
 # Changelog
 
+## v3.0.0.0 (2018-03-13)
+
+- Review Currency strictness
+- Add deepseq's NFData instance for Currency & Alpha
+- Manually write Show & Read instance for Alpha (compile-time & performance gain)
+- Remove currency constructors in favor of helper `fromAlpha` 
+- Add property tests to verify various instances 
+
+
 ## v2.0.0.0 (2017-09-11)
 
-Remove Swagger instances. It would be better to push them upstream to the swagger2 repository.
+- Remove Swagger instances. It would be better to push them upstream to the swagger2 repository.
 
 
 ## v1.0.0.0 (2017-08-29)

diff --git a/currency-codes.cabal b/currency-codes.cabal
@@ -1,11 +1,11 @@
 name:                currency-codes
-version:             2.0.0.0
+version:             3.0.0.0
 synopsis:            ISO-4217 Currency Codes
 description:         ISO-4217 Currency Codes
 license:             MIT
 license-file:        LICENSE
 author:              Chordify
-maintainer:          Matthias Benkort <matthias@chordify.net>
+maintainer:          Matthias Benkort <matthias[email protected]>
 copyright:           (c) 2017 Chordify
 category:            Data
 build-type:          Simple
@@ -15,30 +15,69 @@ extra-source-files:  README.md
                      CHANGELOG.md
                      stack.yaml
                      Setup.hs
+                     .stylish-haskell.yaml
 cabal-version:       >=1.10
 
 library
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:         -Wall
-  default-extensions:  DataKinds
-                     , DeriveDataTypeable
-                     , DeriveFunctor
-                     , DeriveGeneric
-                     , ExistentialQuantification
-                     , FlexibleContexts
-                     , GADTs
-                     , GeneralizedNewtypeDeriving
-                     , MultiParamTypeClasses
-                     , OverloadedStrings
-                     , RecordWildCards
-                     , ScopedTypeVariables
-                     , TupleSections
-                     , TypeOperators
+  default-extensions:    BangPatterns
+                       , DefaultSignatures
+                       , DataKinds
+                       , DeriveDataTypeable
+                       , DeriveFunctor
+                       , DeriveGeneric
+                       , ExistentialQuantification
+                       , FlexibleContexts
+                       , GADTs
+                       , GeneralizedNewtypeDeriving
+                       , MultiParamTypeClasses
+                       , OverloadedStrings
+                       , RecordWildCards
+                       , ScopedTypeVariables
+                       , TupleSections
+                       , TypeOperators
+
   build-depends:       base >= 4 && < 5
                      , aeson >= 0.7.0.0
                      , bson >= 0.2.0
+                     , deepseq
                      , random >= 1.0.0.0
                      , safe >= 0.2
                      , text >= 1.0.0.0
+
   exposed-modules:     Data.Currency
+
+
+test-suite currency-codes-test
+  hs-source-dirs:      test
+  main-is:             Spec.hs
+  type:                exitcode-stdio-1.0
+  default-language:    Haskell2010
+  ghc-options:         -Wall
+  default-extensions:    BangPatterns
+                       , DefaultSignatures
+                       , DataKinds
+                       , DeriveDataTypeable
+                       , DeriveFunctor
+                       , DeriveGeneric
+                       , ExistentialQuantification
+                       , FlexibleContexts
+                       , GADTs
+                       , GeneralizedNewtypeDeriving
+                       , MultiParamTypeClasses
+                       , OverloadedStrings
+                       , RecordWildCards
+                       , ScopedTypeVariables
+                       , TupleSections
+                       , TypeOperators
+
+  build-depends:       base
+                     , currency-codes
+                     , QuickCheck
+                     , aeson
+                     , bson
+                     , hspec
+
+  other-modules:       Data.CurrencySpec