Merge pull request #42 from davezuch/master

Update to latest codecs API

Author: thomashoneyman

README.md

@@ -11,7 +11,7 @@ Go to [purescript-argonaut-core/README.md](https://github.com/purescript-contrib
 This library bundles together the following:
 
 - [purescript-argonaut-core](https://github.com/purescript-contrib/purescript-argonaut-core) - basic parsing, printing, folding and types for `Json`
-- [purescript-argonaut-codecs](https://github.com/purescript-contrib/purescript-argonaut-codecs) - `EncodeJson` and `DecodeJson` classes, their instances
+- [purescript-argonaut-codecs](https://github.com/purescript-contrib/purescript-argonaut-codecs) - `EncodeJson` and `DecodeJson` classes, their instances, and helper functions
 - [purescript-argonaut-traversals](https://github.com/purescript-contrib/purescript-argonaut-traversals) - `JCursor`, prisms and traversals for `Json`
 
 ## Contributing

bower.json

@@ -11,9 +11,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "purescript-argonaut-codecs": "^4.0.0",
+    "purescript-argonaut-codecs": "^5.0.0",
     "purescript-argonaut-core": "^4.0.0",
-    "purescript-argonaut-traversals": "^4.0.0"
+    "purescript-argonaut-traversals": "^6.0.0"
   },
   "devDependencies": {
     "purescript-console": "^4.0.0",

examples/Examples/Data/Argonaut/Record.purs

@@ -2,32 +2,36 @@ module Examples.Data.Argonaut.Record where
 
 import Prelude
 
-import Data.Argonaut (class EncodeJson, class DecodeJson, Json, encodeJson, fromArray, decodeJson, jsonEmptyObject, (~>), (:=), (.?))
+import Data.Argonaut (class EncodeJson, class DecodeJson, Json, encodeJson, fromArray, decodeJson, jsonEmptyObject, (~>), (~>?), (:=), (:=?), (.:), (.:?), (.!=))
 import Data.Either (Either)
+import Data.Maybe (Maybe)
 import Data.Traversable (traverse)
 
 newtype BlogPost = BlogPost
   { id :: Int
   , title :: String
-  , categories :: String
   , content :: String
+  , publishDate :: Maybe String
+  , categories :: String
   }
 
 instance decodeJsonBlogPost :: DecodeJson BlogPost where
   decodeJson json = do
     obj <- decodeJson json
-    id <- obj .? "id"
-    title <- obj .? "title"
-    categories <- obj .? "categories"
-    content <- obj .? "content"
-    pure $ BlogPost { id, title, categories, content }
+    id <- obj .: "id"
+    title <- obj .: "title"
+    content <- obj .: "content"
+    publishDate <- obj .:? "publish_date"
+    categories <- obj .:? "categories" .!= ""
+    pure $ BlogPost { id, title, content, publishDate, categories }
 
 instance encodeJsonBlogPost :: EncodeJson BlogPost where
   encodeJson (BlogPost post)
      = "id" := post.id
     ~> "title" := post.title
-    ~> "categories" := post.categories
     ~> "content" := post.content
+    ~> "publish_date" :=? post.publishDate
+    ~>? "categories" := post.categories
     ~> jsonEmptyObject
 
 type BlogPostArray = Array BlogPost

package-lock.json

@@ -8,10 +8,11 @@ module Data.Argonaut
   , module Data.Argonaut.Traversals
   ) where
 
+
 import Data.Argonaut.Core (Json, caseJson, caseJsonArray, caseJsonBoolean, caseJsonNull, caseJsonNumber, caseJsonObject, caseJsonString, fromArray, fromBoolean, fromNumber, fromObject, fromString, isArray, isBoolean, isNull, isNumber, isObject, isString, jsonEmptyArray, jsonEmptyObject, jsonEmptyString, jsonFalse, jsonNull, jsonSingletonArray, jsonSingletonObject, jsonTrue, jsonZero, stringify, toArray, toBoolean, toNull, toNumber, toObject, toString)
-import Data.Argonaut.Decode (class DecodeJson, decodeJson, defaultField, getField, getFieldOptional, (.?), (.?=), (.??))
-import Data.Argonaut.Encode (class EncodeJson, assoc, encodeJson, extend, (:=), (~>))
-import Data.Argonaut.JCursor (JCursor(..), JsonPrim(..), cursorGet, cursorSet, downField, downIndex, fail, fromPrims, inferEmpty, insideOut, primBool, primNull, primNum, primStr, primToJson, runJsonPrim, toPrims)
-import Data.Argonaut.Parser (jsonParser)
-import Data.Argonaut.Prisms (_Array, _Boolean, _Null, _Number, _Object, _String)
-import Data.Argonaut.Traversals (_JsonArray, _JsonBoolean, _JsonNull, _JsonNumber, _JsonObject, _JsonString)
+import Data.Argonaut.Decode (class DecodeJson, decodeJson, defaultField, defaultFieldDeprecated, getField, getFieldDeprecated, getFieldOptional, getFieldOptional', getFieldOptionalDeprecated, (.!=), (.:), (.:!), (.:?), (.?), (.?=), (.??)) 
+import Data.Argonaut.Encode (class EncodeJson, assoc, assocOptional, encodeJson, extend, extendOptional, (:=), (:=?), (~>), (~>?)) 
+import Data.Argonaut.JCursor (JCursor(..), JsonPrim(..), cursorGet, cursorSet, downField, downIndex, fail, fromPrims, inferEmpty, insideOut, primBool, primNull, primNum, primStr, primToJson, print, runJsonPrim, toPrims)
+import Data.Argonaut.Parser (jsonParser) 
+import Data.Argonaut.Prisms (_Array, _Boolean, _Null, _Number, _Object, _String) 
+import Data.Argonaut.Traversals (_JsonArray, _JsonBoolean, _JsonNull, _JsonNumber, _JsonObject, _JsonString)