Integrated browserify to create a distribution suitable for in-browse use

.gitignore

@@ -1 +1,2 @@
 /node_modules/
+sparqlparserhelper.bf.js

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "sparqlparserhelper",
-  "main": "sparqlparserhelper.js",
+  "main": "dist/sparqlparserhelper.min.js",
   "version": "1.0.1",
   "homepage": "https://github.com/sindicetech/sparqlparserhelper",
   "authors": [

browser.js

@@ -0,0 +1,3 @@
+(function(){
+    window.SparqlParserHelper = require('./sparqlparserhelper');
+})();

package.json

@@ -4,7 +4,10 @@
   "description": "Small utility lib",
   "main": "sparqlparser.js",
   "scripts": {
-    "test": "mocha tests.js"
+    "test": "mocha tests.js",
+    "browserify": "browserify browser.js -o sparqlparserhelper.bf.js",
+    "build": "jsmin sparqlparserhelper.bf.js > dist/sparqlparserhelper.min.js",
+    "prebuild": "npm run browserify"
   },
   "repository": {
     "type": "git",
@@ -21,9 +24,8 @@
   },
   "homepage": "https://github.com/sindicetech/sparqlparserhelper",
   "devDependencies": {
-    "expect.js": "~0.3.1",
-    "mocha": "^2.2.5",
-    "nodeunit": "^0.9.1"
+    "browserify": "^10.2.4",
+    "jsmin": "^1.0.1"
   },
   "dependencies": {
     "lodash": "^3.9.3",

sparqlparserhelper.js

@@ -1,21 +1,19 @@
 (function() {
 
-  var _ = require('lodash');
+  var _ = require('underscore');
   var antlr4 = require('antlr4');
   var SparqlLexer = require('./lib/SparqlLexer.js');
   var SparqlParser = require('./lib/SparqlParser.js');
   var SparqlParserListener = require('./lib/SparqlParserListener');
 
-  'use strict';
-
   function SparqlParserHelper () {}
 
   SparqlParserHelper.prototype = (function(){
 
     //
     // PRIVATE methods
     //
-    VariableNamePrinter = function(query) {
+    var VariableNamePrinter = function(query) {
       SparqlParserListener.SparqlParserListener.call(this); // inherit default listener
       this.selectRegister = [];
       this.whereRegister = [];
@@ -65,27 +63,16 @@
         var printer = new VariableNamePrinter(query);
         antlr4.tree.ParseTreeWalker.DEFAULT.walk(printer, tree);
 
-        var varFromSelect = _.unique(printer.selectRegister);
+        var varFromSelect = _.uniq(printer.selectRegister);
         if (varFromSelect.length > 0) {
           return varFromSelect;
         }
-        return _.unique(printer.whereRegister)
+        return _.uniq(printer.whereRegister)
       }
     }
 
   })();
 
-  // Make it to work in node and browser and AMD style
-  if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
-    module.exports = new SparqlParserHelper();
-  } else {
-    if (typeof define === 'function' && define.amd) {
-      define([], function () {
-        return new SparqlParserHelper();
-      });
-    } else {
-      window.sparqlParserHelper = new SparqlParserHelper();
-    }
-  }
+  module.exports = SparqlParserHelper;
 
 })();

tests.js

@@ -1,13 +1,13 @@
-var sparqlParserHelper = require('./sparqlparserhelper.js');
+var SparqlParserHelper = require('./sparqlparserhelper.js');
 var expect = require('expect.js');
 
 describe('Testing queries', function () {
   it('simple query', function () {
-
-  var input = "SELECT * WHERE {?s <http://ddd.com> <http://ddd.com/rr>. \n ?x ?y ?z. \n ?x ?y ?z}";
-  var expected = ['?s', '?x', '?y', '?z']
-  var actual = sparqlParserHelper.getVariables(input);
+    var helper = new SparqlParserHelper();
+    var input = "SELECT * WHERE {?s <http://ddd.com> <http://ddd.com/rr>. \n ?x ?y ?z. \n ?x ?y ?z}";
+    var expected = ['?s', '?x', '?y', '?z']
+    var actual = helper.getVariables(input);
 
-  expect(actual).to.eql(expected);
+    expect(actual).to.eql(expected);
   });
-});
+});