Skip to content

Commit cb371f2

Browse files
authored
Merge pull request #4 from purescript-node/bump
Prepare for 2.0 release
2 parents 6841c2f + e27c9d9 commit cb371f2

File tree

9 files changed

+76
-30
lines changed

9 files changed

+76
-30
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/.*
22
!/.gitignore
3+
!/.jscsrc
4+
!/.jshintrc
35
!/.travis.yml
46
/bower_components/
57
/node_modules/

.jscsrc

+17
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

+19
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+
"node": true
19+
}

.travis.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ node_js: 6
55
install:
66
- npm install -g bower
77
- npm install
8-
- bower install
8+
- bower install --production
99
script:
1010
- npm run -s build
11+
after_success:
12+
- >-
13+
test $TRAVIS_TAG &&
14+
echo $GITHUB_TOKEN | pulp login &&
15+
echo y | pulp publish --no-push

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# purescript-node-url
22

3-
[![Latest release](http://img.shields.io/bower/v/purescript-node-url.svg)](https://github.com/purescript-node/purescript-node-url/releases)
3+
[![Latest release](http://img.shields.io/github/release/purescript-node/purescript-node-url.svg)](https://github.com/purescript-node/purescript-node-url/releases)
44
[![Build Status](https://travis-ci.org/purescript-node/purescript-node-url.svg?branch=master)](https://travis-ci.org/purescript-node/purescript-node-url)
55

66
A wrapper for Node's `URL` and `QueryString` APIs

bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"url": "git://github.com/purescript-node/purescript-node-url.git"
1313
},
1414
"devDependencies": {
15-
"purescript-console": "^1.0.0"
15+
"purescript-console": "^2.0.0"
1616
},
1717
"dependencies": {
18-
"purescript-nullable": "^1.0.0"
18+
"purescript-nullable": "^2.0.0"
1919
}
2020
}

package.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +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",
6+
"test": "pulp test"
67
},
78
"devDependencies": {
8-
"pulp": "^9.0.0",
9+
"jscs": "^3.0.7",
10+
"jshint": "^2.9.4",
11+
"pulp": "^9.0.1",
912
"purescript-psa": "^0.3.9",
10-
"purescript": "^0.9.1",
11-
"rimraf": "^2.5.0"
13+
"purescript": "^0.10.1",
14+
"rimraf": "^2.5.4"
1215
}
1316
}

src/Node/URL.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
"use strict";
22

3-
var url = require('url');
4-
var queryString = require('querystring');
3+
var url = require("url");
4+
var queryString = require("querystring");
55

66
exports.parse = url.parse;
77

88
exports.format = url.format;
99

10-
exports.resolve = function(from) {
11-
return function(to) {
12-
return url.resolve(from, to);
13-
}
10+
exports.resolve = function (from) {
11+
return function (to) {
12+
return url.resolve(from, to);
13+
};
1414
};
1515

1616
exports.parseQueryString = queryString.parse;

src/Node/URL.purs

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
-- | This module defines bindings to the Node URL and Query String APIs.
22

33
module Node.URL where
4-
4+
55
import Data.Nullable
6-
6+
77
-- | A query object is a JavaScript object whose values are strings or arrays of strings.
88
-- |
99
-- | It is intended that the user coerce values of this type to/from some trusted representation via
1010
-- | e.g. `Data.Foreign` or `Unsafe.Coerce`..
1111
data Query
12-
12+
1313
-- | A URL object.
1414
-- |
15-
-- | All fields are nullable, and will be missing if the URL string passed to
15+
-- | All fields are nullable, and will be missing if the URL string passed to
1616
-- | `parse` did not contain the appropriate URL part.
17-
type URL =
17+
type URL =
1818
{ protocol :: Nullable String
19-
, slashes :: Nullable Boolean
20-
, host :: Nullable String
21-
, auth :: Nullable String
19+
, slashes :: Nullable Boolean
20+
, host :: Nullable String
21+
, auth :: Nullable String
2222
, hostname :: Nullable String
23-
, port :: Nullable String
23+
, port :: Nullable String
2424
, pathname :: Nullable String
25-
, search :: Nullable String
26-
, path :: Nullable String
27-
, query :: Nullable String
28-
, hash :: Nullable String
25+
, search :: Nullable String
26+
, path :: Nullable String
27+
, query :: Nullable String
28+
, hash :: Nullable String
2929
}
30-
30+
3131
-- | Parse a URL string into a URL object.
3232
foreign import parse :: String -> URL
33-
33+
3434
-- | Format a URL object as a URL string.
3535
foreign import format :: URL -> String
3636

@@ -41,4 +41,4 @@ foreign import resolve :: String -> String -> String
4141
foreign import parseQueryString :: String -> Query
4242

4343
-- | Convert a query string to an object.
44-
foreign import toQueryString :: Query -> String
44+
foreign import toQueryString :: Query -> String

0 commit comments

Comments
 (0)