From 8026ab50967ab22906e7063f9e6dbcc018ea7b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Mon, 28 May 2018 15:59:24 +0200 Subject: [PATCH 1/7] need charAt that isn't exported from Data.String any more --- src/Data/Argonaut/Decode/Class.purs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Data/Argonaut/Decode/Class.purs b/src/Data/Argonaut/Decode/Class.purs index b60895c..01f9c45 100644 --- a/src/Data/Argonaut/Decode/Class.purs +++ b/src/Data/Argonaut/Decode/Class.purs @@ -12,7 +12,7 @@ import Data.Int (fromNumber) import Data.List (List(..), (:), fromFoldable) import Data.Map as M import Data.Maybe (maybe, Maybe(..)) -import Data.String (charAt) +import Data.String.Data.String.CodeUnits (charAt) import Data.Traversable (traverse) import Data.Tuple (Tuple(..)) import Foreign.Object as FO From 54f7e4b8d50233419cc6dc7d0eec9883fb46b5ce Mon Sep 17 00:00:00 2001 From: Carsten Date: Mon, 28 May 2018 16:03:17 +0200 Subject: [PATCH 2/7] fix --- src/Data/Argonaut/Decode/Class.purs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Data/Argonaut/Decode/Class.purs b/src/Data/Argonaut/Decode/Class.purs index 01f9c45..9f8412b 100644 --- a/src/Data/Argonaut/Decode/Class.purs +++ b/src/Data/Argonaut/Decode/Class.purs @@ -12,7 +12,7 @@ import Data.Int (fromNumber) import Data.List (List(..), (:), fromFoldable) import Data.Map as M import Data.Maybe (maybe, Maybe(..)) -import Data.String.Data.String.CodeUnits (charAt) +import Data.String.CodeUnits (charAt) import Data.Traversable (traverse) import Data.Tuple (Tuple(..)) import Foreign.Object as FO From fb150d0cb2c4780e3146942d509785e91983c7fd Mon Sep 17 00:00:00 2001 From: Carsten Date: Mon, 28 May 2018 16:04:25 +0200 Subject: [PATCH 3/7] singleton in different module --- src/Data/Argonaut/Encode/Class.purs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Data/Argonaut/Encode/Class.purs b/src/Data/Argonaut/Encode/Class.purs index 7d2f16e..6d59470 100644 --- a/src/Data/Argonaut/Encode/Class.purs +++ b/src/Data/Argonaut/Encode/Class.purs @@ -8,7 +8,7 @@ import Data.Int (toNumber) import Data.List (List(..), (:), toUnfoldable) import Data.Map as M import Data.Maybe (Maybe(..)) -import Data.String (singleton) +import Data.String.CodeUnits (singleton) import Data.Tuple (Tuple(..)) import Foreign.Object as FO From 17d4509159621dff72932b20f7537219a437c5b3 Mon Sep 17 00:00:00 2001 From: Carsten Koenig Date: Tue, 29 May 2018 06:11:28 +0200 Subject: [PATCH 4/7] fixed bower dependencies --- bower.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 638a0d7..2fe4531 100644 --- a/bower.json +++ b/bower.json @@ -22,12 +22,12 @@ }, "license": "MIT", "dependencies": { - "purescript-argonaut-core": "#compiler/0.12", - "purescript-integers": "#compiler/0.12", - "purescript-maybe": "#compiler/0.12", - "purescript-foreign-object": "#compiler/0.12" + "purescript-argonaut-core": "^4.0.0", + "purescript-integers": "^4.0.0", + "purescript-maybe": "^4.0.0", + "purescript-foreign-object": "^1.0.0" }, "devDependencies": { "purescript-strongcheck": "#compiler/0.12" } -} +} \ No newline at end of file From bda797910997df85edd6c85afea2bd1e500c2e25 Mon Sep 17 00:00:00 2001 From: Carsten Koenig Date: Tue, 29 May 2018 06:27:24 +0200 Subject: [PATCH 5/7] changed Char to CodePoint --- src/Data/Argonaut/Decode/Class.purs | 7 ++++--- src/Data/Argonaut/Encode/Class.purs | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Data/Argonaut/Decode/Class.purs b/src/Data/Argonaut/Decode/Class.purs index 9f8412b..d6edec1 100644 --- a/src/Data/Argonaut/Decode/Class.purs +++ b/src/Data/Argonaut/Decode/Class.purs @@ -12,7 +12,8 @@ import Data.Int (fromNumber) import Data.List (List(..), (:), fromFoldable) import Data.Map as M import Data.Maybe (maybe, Maybe(..)) -import Data.String.CodeUnits (charAt) +import Data.String (CodePoint) +import Data.String.CodePoints (codePointAt) import Data.Traversable (traverse) import Data.Tuple (Tuple(..)) import Foreign.Object as FO @@ -63,10 +64,10 @@ instance decodeJsonString :: DecodeJson String where instance decodeJsonJson :: DecodeJson Json where decodeJson = Right -instance decodeJsonChar :: DecodeJson Char where +instance decodeJsonChar :: DecodeJson CodePoint where decodeJson j = maybe (Left $ "Expected character but found: " <> stringify j) Right - =<< charAt 0 <$> decodeJson j + =<< codePointAt 0 <$> decodeJson j instance decodeForeignObject :: DecodeJson a => DecodeJson (FO.Object a) where decodeJson diff --git a/src/Data/Argonaut/Encode/Class.purs b/src/Data/Argonaut/Encode/Class.purs index 6d59470..a8eec14 100644 --- a/src/Data/Argonaut/Encode/Class.purs +++ b/src/Data/Argonaut/Encode/Class.purs @@ -8,7 +8,7 @@ import Data.Int (toNumber) import Data.List (List(..), (:), toUnfoldable) import Data.Map as M import Data.Maybe (Maybe(..)) -import Data.String.CodeUnits (singleton) +import Data.String.CodePoints (CodePoint, codePointFromChar, singleton) import Data.Tuple (Tuple(..)) import Foreign.Object as FO @@ -48,9 +48,12 @@ instance encodeJsonJString :: EncodeJson String where instance encodeJsonJson :: EncodeJson Json where encodeJson = identity -instance encodeJsonChar :: EncodeJson Char where +instance encodeJsonCodePoint :: EncodeJson CodePoint where encodeJson = encodeJson <<< singleton +instance encodeJsonChar :: EncodeJson Char where + encodeJson = encodeJson <<< codePointFromChar + instance encodeJsonArray :: EncodeJson a => EncodeJson (Array a) where encodeJson json = fromArray (encodeJson <$> json) From b532010acfb4ba439e72d62ae8d1b4258f3e2028 Mon Sep 17 00:00:00 2001 From: Carsten Koenig Date: Tue, 29 May 2018 06:39:36 +0200 Subject: [PATCH 6/7] fetch latest purs for travis --- .travis.yml | 17 +++++++++++------ package.json | 5 ++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e30c22..a3c2cac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,22 @@ + language: node_js -dist: trusty sudo: required -node_js: stable +dist: trusty +node_js: 8 +env: + - PATH=$HOME/purescript:$PATH install: + - TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p') + - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz + - tar -xvf $HOME/purescript.tar.gz -C $HOME/ + - chmod a+x $HOME/purescript - npm install -g bower - npm install script: - - bower install --production - - npm run -s build - bower install - - npm -s test + - pulp test after_success: - >- test $TRAVIS_TAG && echo $GITHUB_TOKEN | pulp login && - echo y | pulp publish --no-push + echo y | pulp publish --no-push \ No newline at end of file diff --git a/package.json b/package.json index 7f64eea..824132e 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,8 @@ "test": "pulp test" }, "devDependencies": { - "pulp": "^12.0.1", + "pulp": "^12.2.0", "purescript-psa": "^0.6.0", - "purescript": "^0.11.1", "rimraf": "^2.6.1" } -} +} \ No newline at end of file From 95ab916d660eed2aeb04d57c75667d1a66528de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Tue, 29 May 2018 16:35:30 +0200 Subject: [PATCH 7/7] refactor for review --- src/Data/Argonaut/Decode/Class.purs | 3 +-- src/Data/Argonaut/Encode/Class.purs | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Data/Argonaut/Decode/Class.purs b/src/Data/Argonaut/Decode/Class.purs index d6edec1..7dac424 100644 --- a/src/Data/Argonaut/Decode/Class.purs +++ b/src/Data/Argonaut/Decode/Class.purs @@ -12,8 +12,7 @@ import Data.Int (fromNumber) import Data.List (List(..), (:), fromFoldable) import Data.Map as M import Data.Maybe (maybe, Maybe(..)) -import Data.String (CodePoint) -import Data.String.CodePoints (codePointAt) +import Data.String (CodePoint, codePointAt) import Data.Traversable (traverse) import Data.Tuple (Tuple(..)) import Foreign.Object as FO diff --git a/src/Data/Argonaut/Encode/Class.purs b/src/Data/Argonaut/Encode/Class.purs index a8eec14..ba8fb4d 100644 --- a/src/Data/Argonaut/Encode/Class.purs +++ b/src/Data/Argonaut/Encode/Class.purs @@ -8,7 +8,9 @@ import Data.Int (toNumber) import Data.List (List(..), (:), toUnfoldable) import Data.Map as M import Data.Maybe (Maybe(..)) -import Data.String.CodePoints (CodePoint, codePointFromChar, singleton) +import Data.String (CodePoint) +import Data.String.CodePoints as CP +import Data.String.CodeUnits as CU import Data.Tuple (Tuple(..)) import Foreign.Object as FO @@ -49,10 +51,10 @@ instance encodeJsonJson :: EncodeJson Json where encodeJson = identity instance encodeJsonCodePoint :: EncodeJson CodePoint where - encodeJson = encodeJson <<< singleton + encodeJson = encodeJson <<< CP.singleton instance encodeJsonChar :: EncodeJson Char where - encodeJson = encodeJson <<< codePointFromChar + encodeJson = encodeJson <<< CU.singleton instance encodeJsonArray :: EncodeJson a => EncodeJson (Array a) where encodeJson json = fromArray (encodeJson <$> json)