Skip to content

Commit d9d0376

Browse files
garybgaryb
authored
Merge pull request #9 from purescript-contrib/bump
Prepare for 2.0 release
2 parents 714c409 + 076133e commit d9d0376

File tree

9 files changed

+72
-34
lines changed

9 files changed

+72
-34
lines changed

‎.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/.*
22
!/.gitignore
3+
!/.jscsrc
4+
!/.jshintrc
35
!/.travis.yml
4-
bower_components/
5-
node_modules/
6-
output/
7-
dist/
8-
npm-debug.log
6+
/bower_components/
7+
/node_modules/
8+
/output/

‎.jscsrc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"preset": "grunt",
3+
"disallowSpacesInFunctionExpression": null,
4+
"requireSpacesInFunctionExpression": {
5+
"beforeOpeningRoundBrace": true,
6+
"beforeOpeningCurlyBrace": true
7+
},
8+
"disallowSpacesInAnonymousFunctionExpression": null,
9+
"requireSpacesInAnonymousFunctionExpression": {
10+
"beforeOpeningRoundBrace": true,
11+
"beforeOpeningCurlyBrace": true
12+
},
13+
"disallowSpacesInsideObjectBrackets": null,
14+
"requireSpacesInsideObjectBrackets": "all",
15+
"validateQuoteMarks": "\"",
16+
"requireCurlyBraces": null
17+
}

‎.jshintrc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"bitwise": true,
3+
"eqeqeq": true,
4+
"forin": true,
5+
"freeze": true,
6+
"funcscope": true,
7+
"futurehostile": true,
8+
"strict": "global",
9+
"latedef": true,
10+
"noarg": true,
11+
"nocomma": true,
12+
"nonew": true,
13+
"notypeof": true,
14+
"singleGroups": true,
15+
"undef": true,
16+
"unused": true,
17+
"eqnull": true,
18+
"predef": ["exports"]
19+
}

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# purescript-argonaut-traversals
22

3-
[![Latest release](http://img.shields.io/bower/v/purescript-argonaut-traversals.svg)](https://github.com/slamdata/purescript-argonaut-traversals/releases)
3+
[![Latest release](http://img.shields.io/github/release/purescript-contrib/purescript-argonaut-traversals.svg)](https://github.com/purescript-contrib/purescript-argonaut-traversals/releases)
44
[![Build Status](https://travis-ci.org/purescript-contrib/purescript-argonaut-traversals.svg?branch=master)](https://travis-ci.org/purescript-contrib/purescript-argonaut-traversals)
5-
[![Dependency Status](https://www.versioneye.com/user/projects/563a94661d47d40020000914/badge.svg?style=flat)](https://www.versioneye.com/user/projects/563a94661d47d40020000914)
65
[![Maintainer: slamdata](https://img.shields.io/badge/maintainer-slamdata-lightgrey.svg)](http://github.com/slamdata)
76

87
Prisms, traversals, and zipper for the Argonaut `Json` type.

‎bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
},
2222
"license": "MIT",
2323
"dependencies": {
24-
"purescript-argonaut-codecs": "^1.0.0",
25-
"purescript-profunctor-lenses": "^1.0.0"
24+
"purescript-argonaut-codecs": "^2.0.0",
25+
"purescript-profunctor-lenses": "^2.0.0"
2626
},
2727
"devDependencies": {
28-
"purescript-strongcheck": "^1.1.1"
28+
"purescript-strongcheck": "^2.0.0"
2929
}
3030
}

‎package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
"private": true,
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
5-
"build": "pulp build --censor-lib --strict",
5+
"build": "jshint src && jscs src && pulp build --censor-lib --strict",
66
"test": "pulp test"
77
},
88
"devDependencies": {
9+
"jscs": "^3.0.7",
10+
"jshint": "^2.9.3",
911
"pulp": "^9.0.1",
10-
"purescript": "^0.9.1",
11-
"purescript-psa": "^0.3.8",
12-
"rimraf": "^2.4.4"
12+
"purescript-psa": "^0.3.9",
13+
"purescript": "^0.10.1",
14+
"rimraf": "^2.5.4"
1315
}
1416
}

‎src/Data/Argonaut/Prisms.purs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
module Data.Argonaut.Prisms where
22

33
import Data.Argonaut.Core
4-
import Data.Lens (PrismP, prism')
4+
import Data.Lens (Prism', prism')
55

6-
_Null :: PrismP Json JNull
6+
_Null :: Prism' Json JNull
77
_Null = prism' fromNull toNull
88

9-
_Boolean :: PrismP Json JBoolean
9+
_Boolean :: Prism' Json JBoolean
1010
_Boolean = prism' fromBoolean toBoolean
1111

12-
_Number :: PrismP Json JNumber
12+
_Number :: Prism' Json JNumber
1313
_Number = prism' fromNumber toNumber
1414

15-
_String :: PrismP Json JString
15+
_String :: Prism' Json JString
1616
_String = prism' fromString toString
1717

18-
_Array :: PrismP Json JArray
18+
_Array :: Prism' Json JArray
1919
_Array = prism' fromArray toArray
2020

21-
_Object :: PrismP Json JObject
21+
_Object :: Prism' Json JObject
2222
_Object = prism' fromObject toObject

‎src/Data/Argonaut/Traversals.purs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ module Data.Argonaut.Traversals where
22

33
import Prelude ((<<<), id)
44
import Data.Argonaut.Core
5-
import Data.Lens (TraversalP, filtered)
5+
import Data.Lens (Traversal', filtered)
66

7-
_JsonNull :: TraversalP Json Json
7+
_JsonNull :: Traversal' Json Json
88
_JsonNull = id <<< filtered isNull
99

10-
_JsonBoolean :: TraversalP Json Json
10+
_JsonBoolean :: Traversal' Json Json
1111
_JsonBoolean = id <<< filtered isBoolean
1212

13-
_JsonNumber :: TraversalP Json Json
13+
_JsonNumber :: Traversal' Json Json
1414
_JsonNumber = id <<< filtered isNumber
1515

16-
_JsonString :: TraversalP Json Json
16+
_JsonString :: Traversal' Json Json
1717
_JsonString = id <<< filtered isString
1818

19-
_JsonArray :: TraversalP Json Json
19+
_JsonArray :: Traversal' Json Json
2020
_JsonArray = id <<< filtered isArray
2121

22-
_JsonObject :: TraversalP Json Json
22+
_JsonObject :: Traversal' Json Json
2323
_JsonObject = id <<< filtered isObject

‎test/Test/Main.purs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@ module Test.Main where
22

33
import Prelude
44

5-
import Data.Argonaut.JCursor (JCursor(..))
6-
import Data.Argonaut.Encode (encodeJson)
5+
import Control.Monad.Eff.Console (log)
6+
77
import Data.Argonaut.Decode (decodeJson)
8+
import Data.Argonaut.Encode (encodeJson)
9+
import Data.Argonaut.JCursor (JCursor(..))
10+
import Data.Either (Either(..))
11+
812
import Test.StrongCheck (SC, Result, quickCheck', (<?>))
913
import Test.StrongCheck.Arbitrary (class Arbitrary, arbitrary)
1014
import Test.StrongCheck.Gen (chooseInt)
1115

12-
import Control.Monad.Eff.Console (log)
13-
import Data.Either (Either(..))
14-
1516
newtype TestJCursor = TestJCursor JCursor
1617

1718
runTestJCursor :: TestJCursor -> JCursor
1819
runTestJCursor (TestJCursor cursor) = cursor
1920

2021
instance arbJCursor :: Arbitrary TestJCursor where
2122
arbitrary = do
22-
i <- chooseInt 0.0 2.0
23+
i <- chooseInt 0 2
2324
TestJCursor <$> case i of
2425
1 -> JField <$> arbitrary <*> (runTestJCursor <$> arbitrary)
2526
2 -> JIndex <$> arbitrary <*> (runTestJCursor <$> arbitrary)

0 commit comments

Comments
 (0)