packages feed

data-object-yaml 0.3.3.1 → 0.3.3.2

raw patch · 5 files changed

+30/−5 lines, 5 filessetup-changedPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

- Data.Object.Yaml: instance (Monad m) => Monad (PErrorT m)
- Data.Object.Yaml: instance (MonadIO m) => MonadIO (PErrorT m)
+ Data.Object.Yaml: instance Monad m => Monad (PErrorT m)
+ Data.Object.Yaml: instance MonadIO m => MonadIO (PErrorT m)
- Data.Object.Yaml: class (Eq a) => IsYamlScalar a
+ Data.Object.Yaml: class Eq a => IsYamlScalar a
- Data.Object.Yaml: fromYamlObject :: (IsYamlScalar k) => (IsYamlScalar v) => YamlObject -> Object k v
+ Data.Object.Yaml: fromYamlObject :: IsYamlScalar k => IsYamlScalar v => YamlObject -> Object k v
- Data.Object.Yaml: fromYamlScalar :: (IsYamlScalar a) => YamlScalar -> a
+ Data.Object.Yaml: fromYamlScalar :: IsYamlScalar a => YamlScalar -> a
- Data.Object.Yaml: toYamlObject :: (IsYamlScalar k) => (IsYamlScalar v) => Object k v -> YamlObject
+ Data.Object.Yaml: toYamlObject :: IsYamlScalar k => IsYamlScalar v => Object k v -> YamlObject
- Data.Object.Yaml: toYamlScalar :: (IsYamlScalar a) => a -> YamlScalar
+ Data.Object.Yaml: toYamlScalar :: IsYamlScalar a => a -> YamlScalar

Files

Data/Object/Yaml.hs view
@@ -89,8 +89,8 @@ mergeAssocLists [] b = b mergeAssocLists a ((bk, bv):bs) =     case lookup bk a of-      Nothing -> mergeAssocLists ((bk, bv) : a) bs-      Just _  -> mergeAssocLists a bs+      Nothing -> (bk, bv) : mergeAssocLists a bs+      Just av -> (bk, av) : mergeAssocLists (filter (\(x, _) -> x /= bk) a) bs  toYamlObject :: IsYamlScalar k              => IsYamlScalar v
− Setup.hs 
@@ -1,2 +0,0 @@-import Distribution.Simple-main = defaultMain
+ Setup.lhs view
@@ -0,0 +1,11 @@+#!/usr/bin/env runhaskell++> module Main where+> import Distribution.Simple+> import System.Cmd (system)++> main :: IO ()+> main = defaultMainWithHooks (simpleUserHooks { runTests = runTests' })++> runTests' :: a -> b -> c -> d -> IO ()+> runTests' _ _ _ _ = system "runhaskell -DTEST runtests.hs" >> return ()
data-object-yaml.cabal view
@@ -1,5 +1,5 @@ name:            data-object-yaml-version:         0.3.3.1+version:         0.3.3.2 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>, Anton Ageev <antage@gmail.com>
runtests.hs view
@@ -54,6 +54,7 @@     , testCase "encode/decode file" caseEncodeDecodeFile     , testCase "encode/decode strings" caseEncodeDecodeStrings     , testCase "decode invalid file" caseDecodeInvalid+    , testCase "encode/decode in order" caseInOrder     ]  caseEncodeDecode :: Assertion@@ -159,3 +160,18 @@     mappingKey res "k1" @?= Scalar (mkStrScalar "1")     mappingKey res "k2" @?= Scalar (mkStrScalar "2")     mappingKey res "k3" @?= Scalar (mkStrScalar "4")++inOrderData :: String+inOrderData = "'Fatal': 'Unknown variable \"bar\"'\n'Date': '2001-11-23 15:03:17 -5'\n'User': 'ed'\n'Stack':\n- 'line': '23'\n  'file': 'TopClass.py'\n  'code': 'x = MoreObject(\"345\\n\")\n\n'\n- 'line': '58'\n  'file': 'MoreClass.py'\n  'code': 'foo = bar'\n"++inOrderData2 :: String+inOrderData2 =+       "'a': '1'\n'b': '2'\n'd': '4'\n'c': '3'\n"+    ++ "'g': '1'\n'n': '2'\n'q': '4'\n'f': '3'\n"+    ++ "'z': '1'\n'y': '2'\n'x': '4'\n'w': '3'\n"++caseInOrder :: Assertion+caseInOrder = do+    Just (Mapping ((x, _):_)) <- return $ decodeYaml inOrderData+    x @?= mkScalar "Fatal"+    fmap (B8.unpack . encode) (decodeYaml inOrderData2) @?= Just inOrderData2