Merge pull request #14 from ethul/topic/fix-decode-json-maybe

Resolves issue #13
purescript-contrib · Apr 17, 2015 · e883e54 · e883e54
2 parents 09b6003 + c68d8b8
commit e883e54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - 0.10
 env:
-  - TAG=v0.6.3
+  - TAG=v0.6.7
 install:
   - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
   - sudo tar zxvf $HOME/purescript.tar.gz -C /usr/local/bin purescript/psc{,i,-docs,-make} --strip-components=1

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # PureScript-Argonaut
 
-[![Build Status](https://travis-ci.org/joneshf/purescript-argonaut.svg)](https://travis-ci.org/joneshf/purescript-argonaut)
+[![Build Status](https://travis-ci.org/purescript-contrib/purescript-argonaut.svg)](https://travis-ci.org/purescript-contrib/purescript-argonaut)
 
 This is an implementation of [Argonaut][argonaut] for the PureScript language.
 

diff --git a/src/Data/Argonaut/Decode.purs b/src/Data/Argonaut/Decode.purs
@@ -48,7 +48,7 @@ module Data.Argonaut.Decode
     decodeJson :: Json -> Either String a
 
   instance decodeJsonMaybe :: (DecodeJson a) => DecodeJson (Maybe a) where
-    decodeJson j = decodeJson j <|> pure Nothing
+    decodeJson j = (Just <$> decodeJson j) <|> pure Nothing
 
   instance decodeJsonTuple :: (DecodeJson a, DecodeJson b) => DecodeJson (Tuple a b) where
     decodeJson j = decodeJson j >>= f where