Merge pull request #819 from haskell/qof-bug

Fix bug in FromJSON QuarterOfYear instance

Author: phadej

Data/Aeson/Types/FromJSON.hs

@@ -2130,11 +2130,11 @@ instance FromJSON QuarterOfYear where
 
 parseQuarterOfYear :: T.Text -> Parser QuarterOfYear
 parseQuarterOfYear t = case T.toLower t of
-    "q1"  -> return Q1
-    "q2"  -> return Q2
-    "q3"  -> return Q3
-    "e4 " -> return Q4
-    _     -> fail "Ivalid quarter of year"
+    "q1" -> return Q1
+    "q2" -> return Q2
+    "q3" -> return Q3
+    "q4" -> return Q4
+    _    -> fail "Invalid quarter of year"
 
 instance FromJSONKey QuarterOfYear where
     fromJSONKey = FromJSONKeyTextParser parseQuarterOfYear

aeson.cabal

@@ -1,5 +1,5 @@
 name:            aeson
-version:         1.5.5.0
+version:         1.5.5.1
 license:         BSD3
 license-file:    LICENSE
 category:        Text, Web, JSON
@@ -235,7 +235,7 @@ test-suite aeson-tests
     unordered-containers,
     uuid-types,
     vector,
-    quickcheck-instances >= 0.3.24 && <0.4
+    quickcheck-instances >= 0.3.25.2 && <0.4
 
   if flag(bytestring-builder)
     build-depends: bytestring >= 0.9 && < 0.10.4,

changelog.md

@@ -1,5 +1,8 @@
 For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/changelog.md](https://github.com/bos/aeson/blob/master/changelog.md).
 
+### 1.5.5.1
+* Fix a bug in `FromJSON QuarterOfYear` instance.
+
 ### 1.5.5.0
 * Add instances for `Month`, `Quarter` and `QuarterOfYear` (from `time-1.11`), thanks to Oleg Grenrus.