yaml 0.8.20 → 0.8.21

raw patch · 4 files changed

+42/−9 lines, 4 files

Files

• ChangeLog.md +4/−0
• Data/Yaml/Internal.hs +18/−6
• test/Data/YamlSpec.hs +19/−2
• yaml.cabal +1/−1

@@ -1,3 +1,7 @@+## 0.8.21++* Decode empty inputs as Null [#101](https://github.com/snoyberg/yaml/pull/101)+ ## 0.8.20  * Upgrade to libyaml 0.1.7

@@ -133,12 +133,24 @@  parse :: C.Sink Event Parse Value parse = do-    requireEvent EventStreamStart-    requireEvent EventDocumentStart-    res <- parseO-    requireEvent EventDocumentEnd-    requireEvent EventStreamEnd-    return res+    streamStart <- CL.head+    case streamStart of+        Nothing ->+            -- empty string input+            return Null+        Just EventStreamStart -> do+            documentStart <- CL.head+            case documentStart of+                Just EventStreamEnd ->+                    -- empty file input, comment only string/file input+                    return Null+                Just EventDocumentStart -> do+                    res <- parseO+                    requireEvent EventDocumentEnd+                    requireEvent EventStreamEnd+                    return res+                _ -> liftIO $ throwIO $ UnexpectedEvent documentStart Nothing+        _ -> liftIO $ throwIO $ UnexpectedEvent streamStart Nothing  parseScalar :: ByteString -> Anchor -> Style -> Tag             -> C.Sink Event Parse Text

@@ -95,7 +95,11 @@         it "parses when all uppercase" caseUppercaseBool         it "parses when titlecase" caseTitlecaseBool     describe "empty input" $ do-        it "doesn't crash" caseEmptyInput+        it "parses as Null" caseEmptyInput+        it "parses as Null from file" caseEmptyInputFile+    describe "comment only input" $ do+        it "parses as Null" caseCommentOnlyInput+        it "parses as Null from file" caseCommentOnlyInputFile     describe "alias stripping" $ do         it "works" caseStripAlias     describe "nulls" $ do@@ -457,7 +461,20 @@ caseTitlecaseBool = D.decode "foo: No\nbar: Yes\nbaz: True" @?= obj  caseEmptyInput :: Assertion-caseEmptyInput = D.decode B8.empty @?= (Nothing :: Maybe D.Value)+caseEmptyInput = D.decodeEither B8.empty @?= Right D.Null++caseEmptyInputFile :: Assertion+caseEmptyInputFile = do+    out <- D.decodeFileEither "test/resources/empty.yaml"+    either (Left . D.prettyPrintParseException) Right out @?= Right D.Null++caseCommentOnlyInput :: Assertion+caseCommentOnlyInput = D.decodeEither "# comment\n" @?= Right D.Null++caseCommentOnlyInputFile :: Assertion+caseCommentOnlyInputFile = do+    out <- D.decodeFileEither "test/resources/empty2.yaml"+    either (Left . D.prettyPrintParseException) Right out @?= Right D.Null  checkNull :: T.Text -> Spec checkNull x =

@@ -1,5 +1,5 @@ name:            yaml-version:         0.8.20+version:         0.8.21 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>, Anton Ageev <antage@gmail.com>,Kirill Simonov