Grunt 0.4 and Node 0.10 compatibility

.jshintrc

@@ -0,0 +1,15 @@
+{
+  "curly":   true,
+  "eqeqeq":  true,
+  "immed":   true,
+  "latedef": true,
+  "newcap":  true,
+  "noarg":   true,
+  "sub":     true,
+  "undef":   true,
+  "boss":    true,
+  "eqnull":  true,
+  "node":    true,
+  "strict":  true,
+  "es5":     true
+}

.travis.yml

@@ -1,11 +1,12 @@
 language: "node_js"
 node_js:
-  - 0.6
   - 0.8
+  - 0.10
 notifications:
   email:
     on_success: change
     on_failure: change
+before_install:
+  - npm install -g grunt-cli --production
 before_script:
-  - npm install -g grunt@"0.3.x" --production
   - npm run-script build

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.0
+
+* removed `node 0.6` compat
+* added `node 0.10` compat
+* switched to `grunt 0.4`
+
 ## 1.1.2
 
 Subtle fixes and new non-breaking methods.

Gruntfile.js

@@ -0,0 +1,28 @@
+"use strict";
+
+module.exports = function (grunt) {
+  // Project configuration.
+  grunt.initConfig({
+    jshint:   {
+      all: ['grunt.js', 'lib/**/*.js', 'test/**/*.js'],
+      options: {
+	jshintrc: '.jshintrc'
+      }
+    },
+    watch:  {
+      files: '<config:lint.files>',
+      tasks: 'lint'
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+
+  grunt.registerTask('default', 'jshint');
+
+  // Custom Task to build files
+  grunt.registerTask('update',
+    'Update ruleset from publicsuffix.org dataset.',
+    require(__dirname + '/lib/grunt/update.js')(grunt)
+  );
+};

lib/exports/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-/*jshint node:true strict: true */
-
 /*
  * Default list of exporters
  */

lib/exports/legacy-json.js

@@ -1,7 +1,5 @@
 "use strict";
 
-/*jshint node:true strict: true */
-
 var Rule = require(__dirname + '/../rule.js');
 
 function legacyJSONExport(xlds){

lib/exports/standard-json.js

@@ -1,7 +1,5 @@
 "use strict";
 
-/*jshint node:true strict: true */
-
 var Rule = require(__dirname + '/../rule.js');
 
 function standardJSONExport(xlds){

lib/grunt/update.js

@@ -1,12 +1,11 @@
 "use strict";
 
-/*jshint node:true strict: true */
-
 var request = require('request');
 var parser = require(__dirname + '/../parsers/publicsuffix-org.js');
 
 module.exports = function(grunt){
-  var _ = grunt.utils._;
+  var _ = grunt.util._;
+  var async = grunt.util.async;
 
   /**
    *
@@ -50,7 +49,7 @@ module.exports = function(grunt){
       }
 
       tlds = parser.parse(body);
-      queue = grunt.utils.async.queue(function(exportTask, callback){
+      queue = async.queue(function(exportTask, callback){
         var task_result = exportTask(tlds);
         var filename = task_result[0];
         var data = task_result[1];

lib/parsers/publicsuffix-org.js

@@ -1,7 +1,5 @@
 "use strict";
 
-/*jshint node:true strict: true */
-
 function PublicSuffixOrgParser(){
 
 }

lib/rule.js

@@ -1,7 +1,5 @@
 "use strict";
 
-/*jshint node:true strict: true */
-
 function Rule (data){
   data = data || {};
 

lib/tld.js

@@ -1,7 +1,5 @@
 "use strict";
 
-/*jshint node:true strict: true */
-
 var Rule = require(__dirname + '/rule.js');
 
 /**
@@ -11,7 +9,7 @@ var Rule = require(__dirname + '/rule.js');
  * See README.md for more explainations on how to use this stuff.
  */
 function tld () {
-  /*jshint validthis: true */
+  /* jshint validthis: true */
   this.rules = [];
 }
 

package.json

@@ -2,7 +2,7 @@
   "author": "Oncle Tom <thomas@oncle-tom.net> (http://case.oncle-tom.net)",
   "name": "tldjs",
   "description": "Handful API to do stuff with domain names and URIs: validity, public etc.",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "homepage": "https://github.com/oncletom/tld.js",
   "repository": {
     "type": "git",
@@ -18,17 +18,26 @@
     "prepublish": "grunt update"
   },
   "engines": {
-    "node": "0.6.x || 0.8.x"
-  },
-  "dependencies": {
+    "node": "0.8.x || 0.10.x"
   },
+  "dependencies": {},
   "devDependencies": {
     "request": "~2.12.0",
+    "grunt": "~0.4.1",
     "mocha": "~1.7.4",
-    "expect.js": "~0.2.0"
+    "expect.js": "~0.2.0",
+    "grunt-contrib-watch": "~0.3.1",
+    "grunt-contrib-jshint": "~0.4.3"
   },
   "keywords": [
-    "tld", "sld", "domain", "travis", "uri", "url", "domain name",
-    "subdomain", "public suffix"
+    "tld",
+    "sld",
+    "domain",
+    "travis",
+    "uri",
+    "url",
+    "domain name",
+    "subdomain",
+    "public suffix"
   ]
 }

test/publicsuffix.js

@@ -1,7 +1,6 @@
 "use strict";
 
-/*jshint node:true strict: true */
-/*global suite:true test:true setup:true */
+/* global suite, test, setup */
 
 var tld = require('../index.js');
 var expect = require('expect.js');

test/rule.js

@@ -1,7 +1,6 @@
 "use strict";
 
-/*jshint node:true strict: true */
-/*global suite:true test:true suiteSetup:true */
+/* global suite, test, suiteSetup */
 
 var Rule = require(__dirname + '/../lib/rule.js');
 var expect = require('expect.js');

test/tld.js

@@ -1,7 +1,6 @@
 "use strict";
 
-/*jshint node:true strict: true */
-/*global suite:true test:true */
+/* global suite, test */
 
 var tld = require('../index.js');
 var expect = require('expect.js');