jslint_on_rails 1.0.4 → 1.0.5

data/Changelog.markdown

@@ -1,3 +1,8 @@
+Version 1.0.5 (08.01.2011)
+
+* options passed on the command line to JSLint are joined with "&" to fix the "predef" option
+* load YAJL module explicitly (in some environments it may not be loaded automatically)
+
 Version 1.0.4 (05.12.2010)
 
 * bundler should be able to load the gem without :require

data/README.markdown

@@ -31,7 +31,7 @@ In Rails 2 and in other frameworks JSLint on Rails can't be loaded automatically
 bit more work. The procedure in this case is:
 
 * install the gem in your application using whatever technique is recommended for your framework (e.g. using bundler,
-or just plain old `gem install jslint_on_rails`)
+or by installing the gem manually with `gem install jslint_on_rails` and loading it with `require 'jslint'`)
 * in your Rakefile, add a line to load the JSLint tasks:
 
         require 'jslint/tasks'

data/lib/jslint/lint.rb

@@ -34,7 +34,7 @@ module JSLint
     def run
       check_java
       Utils.xputs "Running JSLint:\n\n"
-      arguments = "#{JSLINT_FILE} #{option_string} #{@file_list.join(' ')}"
+      arguments = "#{JSLINT_FILE} #{option_string.inspect} #{@file_list.join(' ')}"
       success = call_java_with_status(RHINO_JAR_FILE, RHINO_JAR_CLASS, arguments)
       raise LintCheckFailure, "JSLint test failed." unless success
     end
@@ -51,7 +51,7 @@ module JSLint
     end
 
     def option_string
-      @config.map { |k, v| "#{k}=#{v.inspect}" }.join(',')
+      @config.map { |k, v| "#{k}=#{v.inspect}" }.join('&')
     end
 
     def check_java

data/lib/jslint/utils.rb

@@ -1,8 +1,9 @@
 require 'fileutils'
+require 'yaml'
 
 module JSLint
 
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
   DEFAULT_CONFIG_FILE = File.expand_path(File.dirname(__FILE__) + "/config/jslint.yml")
 
   class << self

data/lib/jslint/vendor/jslint.js

@@ -1,5 +1,5 @@
 // jslint.js
-// 2010-11-27
+// 2010-12-21
 
 /*
 Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
@@ -36,8 +36,11 @@ SOFTWARE.
     JavaScript text, or HTML text, or a JSON text, or a CSS text.
 
     The second parameter is an optional object of options which control the
-    operation of JSLINT. Most of the options are booleans: They are all are
-    optional and have a default value of false.
+    operation of JSLINT. Most of the options are booleans: They are all
+    optional and have a default value of false. One of the options, predef,
+    can be an array of names, which will be used to declare global variables,
+    or an object whose keys are used as global names, with a boolean value
+    that determines if they are assignable.
 
     If it checks out, JSLINT returns true. Otherwise, it returns false.
 
@@ -186,31 +189,31 @@ SOFTWARE.
     darksalmon, darkseagreen, darkslateblue, darkslategray, darkturquoise,
     darkviolet, data, datalist, dd, debug, decodeURI, decodeURIComponent,
     deeppink, deepskyblue, defaultStatus, defineClass, del, deserialize,
-    details, devel, dfn, dialog, dimension, dimgray, dir, direction,
-    display, div, dl, document, dodgerblue, dt, edition, else, em, embed,
-    embossed, empty, "empty-cells", encodeURI, encodeURIComponent,
-    entityify, eqeqeq, errors, es5, escape, eval, event, evidence, evil, ex,
-    exception, exec, exps, fieldset, figure, filesystem, firebrick, first,
-    float, floor, floralwhite, focus, focusWidget, font, "font-family",
-    "font-size", "font-size-adjust", "font-stretch", "font-style",
-    "font-variant", "font-weight", footer, forestgreen, forin, form,
-    fragment, frame, frames, frameset, from, fromCharCode, fuchsia, fud,
-    funct, function, functions, g, gainsboro, gc, getComputedStyle,
-    ghostwhite, global, globals, gold, goldenrod, gray, graytext, green,
-    greenyellow, h1, h2, h3, h4, h5, h6, handheld, hasOwnProperty, head,
-    header, height, help, hgroup, highlight, highlighttext, history,
-    honeydew, hotpink, hr, "hta:application", html, i, iTunes, id,
-    identifier, iframe, img, immed, implieds, in, inactiveborder,
-    inactivecaption, inactivecaptiontext, include, indent, indexOf,
-    indianred, indigo, infobackground, infotext, init, input, ins, isAlpha,
-    isApplicationRunning, isDigit, isFinite, isNaN, ivory, join, jslint,
-    json, kbd, keygen, khaki, konfabulatorVersion, label, labelled, lang,
-    last, lavender, lavenderblush, lawngreen, laxbreak, lbp, led, left,
-    legend, lemonchiffon, length, "letter-spacing", li, lib, lightblue,
-    lightcoral, lightcyan, lightgoldenrodyellow, lightgreen, lightpink,
-    lightsalmon, lightseagreen, lightskyblue, lightslategray,
-    lightsteelblue, lightyellow, lime, limegreen, line, "line-height",
-    linen, link, "list-style", "list-style-image", "list-style-position",
+    details, devel, dfn, dialog, dimgray, dir, direction, display, div, dl,
+    document, dodgerblue, dt, edition, else, em, embed, embossed, empty,
+    "empty-cells", encodeURI, encodeURIComponent, entityify, eqeqeq, errors,
+    es5, escape, eval, event, evidence, evil, ex, exception, exec, exps,
+    fieldset, figure, filesystem, firebrick, first, float, floor,
+    floralwhite, focus, focusWidget, font, "font-family", "font-size",
+    "font-size-adjust", "font-stretch", "font-style", "font-variant",
+    "font-weight", footer, forestgreen, forin, form, fragment, frame,
+    frames, frameset, from, fromCharCode, fuchsia, fud, funct, function,
+    functions, g, gainsboro, gc, getComputedStyle, ghostwhite, global,
+    globals, gold, goldenrod, gray, graytext, green, greenyellow, h1, h2,
+    h3, h4, h5, h6, handheld, hasOwnProperty, head, header, height, help,
+    hgroup, highlight, highlighttext, history, honeydew, hotpink, hr,
+    "hta:application", html, i, iTunes, id, identifier, iframe, img, immed,
+    implieds, in, inactiveborder, inactivecaption, inactivecaptiontext,
+    include, indent, indexOf, indianred, indigo, infobackground, infotext,
+    init, input, ins, isAlpha, isApplicationRunning, isArray, isDigit,
+    isFinite, isNaN, ivory, join, jslint, json, kbd, keygen, keys, khaki,
+    konfabulatorVersion, label, labelled, lang, last, lavender,
+    lavenderblush, lawngreen, laxbreak, lbp, led, left, legend,
+    lemonchiffon, length, "letter-spacing", li, lib, lightblue, lightcoral,
+    lightcyan, lightgoldenrodyellow, lightgreen, lightpink, lightsalmon,
+    lightseagreen, lightskyblue, lightslategray, lightsteelblue,
+    lightyellow, lime, limegreen, line, "line-height", linen, link,
+    "list-style", "list-style-image", "list-style-position",
     "list-style-type", load, loadClass, location, log, m, magenta, map,
     margin, "margin-bottom", "margin-left", "margin-right", "margin-top",
     mark, "marker-offset", maroon, match, "max-height", "max-width", maxerr,
@@ -256,12 +259,12 @@ SOFTWARE.
 */
 
 // We build the application inside a function so that we produce only a single
-// global variable. The function will be invoked, its return value is the JSLINT
-// application itself.
-
-"use strict";
+// global variable. That function will be invoked immediately, and its return
+// value is the JSLINT function itself.
 
 var JSLINT = (function () {
+    "use strict";
+
     var adsafe_id,      // The widget's ADsafe id.
         adsafe_may,     // The widget may load approved scripts.
         adsafe_went,    // ADSAFE.go has been called.
@@ -286,7 +289,7 @@ var JSLINT = (function () {
             '%': true
         },
 
-// These are members that should not be permitted in the safe subset.
+// These are property names that should not be permitted in the safe subset.
 
         banned = {              // the member names that ADsafe prohibits.
             'arguments'     : true,
@@ -929,7 +932,7 @@ var JSLINT = (function () {
         xmode,
         xquote,
 
-// Regular expressions. Some of these are ridiculously long.
+// Regular expressions. Some of these are stupidly long.
 
 // unsafe comment or string
         ax = /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i,
@@ -967,7 +970,24 @@ var JSLINT = (function () {
             styleproperty: ssx
         };
 
-    function F() {}
+
+    function F() {}     // Used by Object.create
+
+    function is_own(object, name) {
+
+// The object.hasOwnProperty method fails when the property under consideration
+// is named 'hasOwnProperty'. So we have to use this more convoluted form.
+
+        return Object.prototype.hasOwnProperty.call(object, name);
+    }
+
+// Provide critical ES5 functions to ES3.
+
+    if (typeof Array.isArray !== 'function') {
+        Array.isArray = function (o) {
+            return Object.prototype.toString.apply(o) === '[object Array]';
+        };
+    }
 
     if (typeof Object.create !== 'function') {
         Object.create = function (o) {
@@ -976,47 +996,53 @@ var JSLINT = (function () {
         };
     }
 
-
-    function is_own(object, name) {
-        return Object.prototype.hasOwnProperty.call(object, name);
-    }
-
-
-    function combine(t, o) {
-        var n;
-        for (n in o) {
-            if (is_own(o, n)) {
-                t[n] = o[n];
+    if (typeof Object.keys !== 'function') {
+        Object.keys = function (o) {
+            var a = [], k;
+            for (k in o) {
+                if (is_own(o, k)) {
+                    a.push(k);
+                }
             }
-        }
+            return a;
+        };
     }
 
-    String.prototype.entityify = function () {
-        return this
-            .replace(/&/g, '&amp;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;');
-    };
-
-    String.prototype.isAlpha = function () {
-        return (this >= 'a' && this <= 'z\uffff') ||
-            (this >= 'A' && this <= 'Z\uffff');
-    };
+// Non standard methods
 
+    if (typeof String.prototype.entityify !== 'function') {
+        String.prototype.entityify = function () {
+            return this
+                .replace(/&/g, '&amp;')
+                .replace(/</g, '&lt;')
+                .replace(/>/g, '&gt;');
+        };
+    }
 
-    String.prototype.isDigit = function () {
-        return (this >= '0' && this <= '9');
-    };
+    if (typeof String.prototype.isAlpha !== 'function') {
+        String.prototype.isAlpha = function () {
+            return (this >= 'a' && this <= 'z\uffff') ||
+                (this >= 'A' && this <= 'Z\uffff');
+        };
+    }
 
+    if (typeof String.prototype.isDigit !== 'function') {
+        String.prototype.isDigit = function () {
+            return (this >= '0' && this <= '9');
+        };
+    }
 
-    String.prototype.supplant = function (o) {
-        return this.replace(/\{([^{}]*)\}/g, function (a, b) {
-            var r = o[b];
-            return typeof r === 'string' || typeof r === 'number' ? r : a;
-        });
-    };
+    if (typeof String.prototype.supplant !== 'function') {
+        String.prototype.supplant = function (o) {
+            return this.replace(/\{([^{}]*)\}/g, function (a, b) {
+                var r = o[b];
+                return typeof r === 'string' || typeof r === 'number' ? r : a;
+            });
+        };
+    }
 
-    String.prototype.name = function () {
+    if (typeof String.prototype.name !== 'function') {
+        String.prototype.name = function () {
 
 // If the string looks like an identifier, then we can return it as is.
 // If the string contains no control characters, no quote characters, and no
@@ -1024,22 +1050,32 @@ var JSLINT = (function () {
 // Otherwise we must also replace the offending characters with safe
 // sequences.
 
-        if (ix.test(this)) {
-            return this;
-        }
-        if (nx.test(this)) {
-            return '"' + this.replace(nxg, function (a) {
-                var c = escapes[a];
-                if (c) {
-                    return c;
-                }
-                return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
-            }) + '"';
-        }
-        return '"' + this + '"';
-    };
+            if (ix.test(this)) {
+                return this;
+            }
+            if (nx.test(this)) {
+                return '"' + this.replace(nxg, function (a) {
+                    var c = escapes[a];
+                    if (c) {
+                        return c;
+                    }
+                    return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
+                }) + '"';
+            }
+            return '"' + this + '"';
+        };
+    }
 
 
+    function combine(t, o) {
+        var n;
+        for (n in o) {
+            if (is_own(o, n)) {
+                t[n] = o[n];
+            }
+        }
+    }
+
     function assume() {
         if (!option.safe) {
             if (option.rhino) {
@@ -1125,7 +1161,7 @@ var JSLINT = (function () {
 
 
 
-// lexical analysis
+// lexical analysis and token construction
 
     var lex = (function lex() {
         var character, from, line, s;
@@ -1338,10 +1374,14 @@ var JSLINT = (function () {
                                         character + j);
                                     break;
                                 case '\\':
-                                case '\'':
                                 case '"':
                                 case '/':
                                     break;
+                                case '\'':
+                                    if (jsonmode) {
+                                        warningAt("Avoid \\'.", line, character);
+                                    }
+                                    break;
                                 case 'b':
                                     c = '\b';
                                     break;
@@ -1361,6 +1401,9 @@ var JSLINT = (function () {
                                     esc(4);
                                     break;
                                 case 'v':
+                                    if (jsonmode) {
+                                        warningAt("Avoid \\v.", line, character);
+                                    }
                                     c = '\v';
                                     break;
                                 case 'x':
@@ -1398,21 +1441,6 @@ var JSLINT = (function () {
                             }
                         }
                     }
-//                     t = match(rx[xmode] || tx);
-//                     if (!t) {
-//                         if (xmode === 'html') {
-//                             return it('(error)', s.charAt(0));
-//                         } else {
-//                             t = '';
-//                             c = '';
-//                             while (s && s < '!') {
-//                                 s = s.substr(1);
-//                             }
-//                             if (s) {
-//                                 errorAt("Unexpected '{a}'.",
-//                                         line, character, s.substr(0, 1));
-//                             }
-//                         }
                     t = match(rx[xmode] || tx);
                     if (!t) {
                         t = '';
@@ -1463,8 +1491,7 @@ var JSLINT = (function () {
                             }
                             if (t.substr(t.length - 1) === '.') {
                                 warningAt(
-        "A trailing decimal point can be confused with a dot '{a}'.",
-                                        line, character, t);
+"A trailing decimal point can be confused with a dot '{a}'.", line, character, t);
                             }
                             return it('(number)', t);
                         }
@@ -1937,6 +1964,7 @@ klass:                                  do {
             obj = predefined;
             break;
         default:
+            error("What?");
         }
         t = lex.token();
 loop:   for (;;) {
@@ -2087,10 +2115,10 @@ loop:   for (;;) {
 
 
 // This is the heart of JSLINT, the Pratt parser. In addition to parsing, it
-// is looking for ad hoc lint patterns. We add to Pratt's model .fud, which is
-// like nud except that it is only used on the first token of a statement.
-// Having .fud makes it much easier to define JavaScript. I retained Pratt's
-// nomenclature.
+// is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is
+// like .nud except that it is only used on the first token of a statement.
+// Having .fud makes it much easier to define statement-oriented languages like
+// JavaScript. I retained Pratt's nomenclature.
 
 // .nud     Null denotation
 // .fud     First null denotation
@@ -2098,9 +2126,9 @@ loop:   for (;;) {
 //  lbp     Left binding power
 //  rbp     Right binding power
 
-// They are key to the parsing method called Top Down Operator Precedence.
+// They are elements of the parsing method called Top Down Operator Precedence.
 
-    function parse(rbp, initial) {
+    function expression(rbp, initial) {
         var left;
         if (nexttoken.id === '(end)') {
             error("Unexpected early end of program.", token);
@@ -2175,7 +2203,6 @@ loop:   for (;;) {
         }
     }
 
-
     function nonadjacent(left, right) {
         if (option.white) {
             left = left || token;
@@ -2202,6 +2229,16 @@ loop:   for (;;) {
         }
     }
 
+    function step_in() {
+        var old_indent = indent;
+        if (prevtoken.line !== token.line) {
+            indent = token.from;
+        }
+        return function step_out() {
+            return (indent = old_indent);
+        };
+    }
+
     function indentation(bias) {
         var i;
         if (option.white && nexttoken.id !== '(end)') {
@@ -2284,7 +2321,7 @@ loop:   for (;;) {
         var x = symbol(s, 150);
         reserveName(x);
         x.nud = (typeof f === 'function') ? f : function () {
-            this.right = parse(150);
+            this.right = expression(150);
             this.arity = 'unary';
             if (this.id === '++' || this.id === '--') {
                 if (option.plusplus) {
@@ -2337,7 +2374,7 @@ loop:   for (;;) {
                 return f(left, this);
             } else {
                 this.left = left;
-                this.right = parse(p);
+                this.right = expression(p);
                 return this;
             }
         };
@@ -2350,7 +2387,7 @@ loop:   for (;;) {
         x.led = function (left) {
             nobreaknonadjacent(prevtoken, token);
             nonadjacent(token, nexttoken);
-            var right = parse(100);
+            var right = expression(100);
             if ((left && left.id === 'NaN') || (right && right.id === 'NaN')) {
                 warning("Use the isNaN function to compare with NaN.", this);
             } else if (f) {
@@ -2406,13 +2443,13 @@ loop:   for (;;) {
                     if (!left.left || left.left.value === 'arguments') {
                         warning('Bad assignment.', that);
                     }
-                    that.right = parse(19);
+                    that.right = expression(19);
                     return that;
                 } else if (left.identifier && !left.reserved) {
                     if (funct[left.value] === 'exception') {
                         warning("Do not assign to the exception parameter.", left);
                     }
-                    that.right = parse(19);
+                    that.right = expression(19);
                     return that;
                 }
                 if (left === syntax['function']) {
@@ -2434,7 +2471,7 @@ loop:   for (;;) {
                 warning("Unexpected use of '{a}'.", this, this.id);
             }
             this.left = left;
-            this.right = parse(p);
+            this.right = expression(p);
             return this;
         };
         return x;
@@ -2452,7 +2489,7 @@ loop:   for (;;) {
             if (left) {
                 if (left.id === '.' || left.id === '[' ||
                         (left.identifier && !left.reserved)) {
-                    parse(19);
+                    expression(19);
                     return that;
                 }
                 if (left === syntax['function']) {
@@ -2570,7 +2607,7 @@ loop:   for (;;) {
         if (!noindent) {
             indentation();
         }
-        r = parse(0, true);
+        r = expression(0, true);
 
 // Look for the final semicolon.
 
@@ -2604,6 +2641,9 @@ loop:   for (;;) {
 
     function use_strict() {
         if (nexttoken.value === 'use strict') {
+            if (strict_mode) {
+                warning("Unnecessary \"use strict\".");
+            }
             advance();
             advance(';');
             strict_mode = true;
@@ -2618,12 +2658,12 @@ loop:   for (;;) {
 
     function statements(begin) {
         var a = [], f, p;
-        if (begin && !use_strict() && option.strict) {
-            warning('Missing "use strict" statement.', nexttoken);
-        }
         if (option.adsafe) {
             switch (begin) {
             case 'script':
+
+// JSLint is also the static analizer for ADsafe. See www.ADsafe.org.
+
                 if (!adsafe_may) {
                     if (nexttoken.value !== 'ADSAFE' ||
                             peek(0).id !== '.' ||
@@ -2660,7 +2700,7 @@ loop:   for (;;) {
                     advance('(');
                     advance('(string)');
                     comma();
-                    f = parse(0);
+                    f = expression(0);
                     if (f.id !== 'function') {
                         error('The second argument to lib must be a function.', f);
                     }
@@ -2691,7 +2731,7 @@ loop:   for (;;) {
 
 
     function block(f) {
-        var a, b = inblock, old_indent = indent, s = scope, t;
+        var a, b = inblock, old_indent = indent, m = strict_mode, s = scope, t;
         inblock = f;
         scope = Object.create(scope);
         nonadjacent(token, nexttoken);
@@ -2703,10 +2743,12 @@ loop:   for (;;) {
                 while (!f && nexttoken.from > indent) {
                     indent += option.indent;
                 }
-                if (!f) {
-                    use_strict();
+                if (!f && !use_strict() && !m && option.strict &&
+                        funct['(context)']['(global)']) {
+                    warning("Missing \"use strict\" statement.");
                 }
                 a = statements();
+                strict_mode = m;
                 indent -= option.indent;
                 indentation();
             }
@@ -2757,7 +2799,6 @@ loop:   for (;;) {
 
 // CSS parsing.
 
-
     function cssName() {
         if (nexttoken.identifier) {
             advance();
@@ -3779,6 +3820,7 @@ loop:   for (;;) {
                 if (adsafe_went) {
                     error("ADsafe script violation.", token);
                 }
+                use_strict();
                 statements('script');
             }
             xmode = 'html';
@@ -3924,6 +3966,7 @@ loop:   for (;;) {
                         wmode = option.white;
                         option.white = false;
                         advance(q);
+                        use_strict();
                         statements('on');
                         option.white = wmode;
                         if (nexttoken.id !== q) {
@@ -4245,9 +4288,9 @@ loop:   for (;;) {
     bitwiseassignop('>>>=', 'assignshiftrightunsigned', 20);
     infix('?', function (left, that) {
         that.left = left;
-        that.right = parse(10);
+        that.right = expression(10);
         advance(':');
-        that['else'] = parse(10);
+        that['else'] = expression(10);
         if (option.statinexp) {
           that.exps = that.right.exps && that['else'].exps;
         }
@@ -4256,7 +4299,7 @@ loop:   for (;;) {
 
     infix('||', function(left, that) {
       that.left = left;
-      that.right = parse(40);
+      that.right = expression(40);
       if (option.statinexp) {
         that.exps = that.right.exps;
       }
@@ -4265,7 +4308,7 @@ loop:   for (;;) {
 
     infix('&&', function(left, that) {
       that.left = left;
-      that.right = parse(50);
+      that.right = expression(50);
       if (option.statinexp) {
         that.exps = that.right.exps;
       }
@@ -4313,7 +4356,7 @@ loop:   for (;;) {
     infix('in', 'in', 120);
     infix('instanceof', 'instanceof', 120);
     infix('+', function (left, that) {
-        var right = parse(130);
+        var right = expression(130);
         if (left && right && left.id === '(string)' && right.id === '(string)') {
             left.value += right.value;
             left.character = right.character;
@@ -4329,28 +4372,28 @@ loop:   for (;;) {
     prefix('+', 'num');
     prefix('+++', function () {
         warning("Confusing pluses.");
-        this.right = parse(150);
+        this.right = expression(150);
         this.arity = 'unary';
         return this;
     });
     infix('+++', function (left) {
         warning("Confusing pluses.");
         this.left = left;
-        this.right = parse(130);
+        this.right = expression(130);
         return this;
     }, 130);
     infix('-', 'sub', 130);
     prefix('-', 'neg');
     prefix('---', function () {
         warning("Confusing minuses.");
-        this.right = parse(150);
+        this.right = expression(150);
         this.arity = 'unary';
         return this;
     });
     infix('---', function (left) {
         warning("Confusing minuses.");
         this.left = left;
-        this.right = parse(130);
+        this.right = expression(130);
         return this;
     }, 130);
     infix('*', 'mult', 140);
@@ -4365,7 +4408,7 @@ loop:   for (;;) {
     prefix('--', 'predec');
     syntax['--'].exps = true;
     prefix('delete', function () {
-        var p = parse(0);
+        var p = expression(0);
         if (!p || (p.id !== '.' && p.id !== '[')) {
             warning("Variables should not be deleted.");
         }
@@ -4378,11 +4421,11 @@ loop:   for (;;) {
         if (option.bitwise) {
             warning("Unexpected '{a}'.", this, '~');
         }
-        parse(150);
+        expression(150);
         return this;
     });
     prefix('!', function () {
-        this.right = parse(150);
+        this.right = expression(150);
         this.arity = 'unary';
         if (bang[this.right.id] === true) {
             warning("Confusing use of '{a}'.", this, '!');
@@ -4391,7 +4434,7 @@ loop:   for (;;) {
     });
     prefix('typeof', 'typeof');
     prefix('new', function () {
-        var c = parse(155), i;
+        var c = expression(155), i;
         if (c && c.id !== 'function') {
             if (c.identifier) {
                 c['new'] = true;
@@ -4406,21 +4449,6 @@ loop:   for (;;) {
                         advance('(');
                         if (nexttoken.id === ')') {
                             warning("Use the array literal notation [].", token);
-                        } else {
-                            i = parse(0);
-                            c.dimension = i;
-                            if ((i.id === '(number)' && /[.+\-Ee]/.test(i.value)) ||
-                                    (i.id === '-' && !i.right) ||
-                                    i.id === '(string)' || i.id === '[' ||
-                                    i.id === '{' || i.id === 'true' ||
-                                    i.id === 'false' ||
-                                    i.id === 'null' || i.id === 'undefined' ||
-                                    i.id === 'Infinity') {
-                                warning("Use the array literal notation [].", token);
-                            }
-                            if (nexttoken.id !== ')') {
-                                error("Use the array literal notation [].", token);
-                            }
                         }
                         advance(')');
                     }
@@ -4570,7 +4598,7 @@ loop:   for (;;) {
         }
         if (nexttoken.id !== ')') {
             for (;;) {
-                p[p.length] = parse(10);
+                p[p.length] = expression(10);
                 n += 1;
                 if (nexttoken.id !== ',') {
                     break;
@@ -4610,7 +4638,7 @@ loop:   for (;;) {
         if (nexttoken.id === 'function') {
             nexttoken.immed = true;
         }
-        var v = parse(0);
+        var v = expression(0);
         advance(')', this);
         nospace(prevtoken, token);
         if (option.immed && v.id === 'function') {
@@ -4629,7 +4657,7 @@ loop:   for (;;) {
     infix('[', function (left, that) {
         nobreak(prevtoken, token);
         nospace();
-        var e = parse(0), s;
+        var e = expression(0), s;
         if (e && e.type === '(string)') {
             if (option.safe && banned[e.value] === true) {
                 warning("ADsafe restricted word '{a}'.", that, e.value);
@@ -4661,7 +4689,7 @@ loop:   for (;;) {
     }, 160, true);
 
     prefix('[', function () {
-        var b = token.line !== nexttoken.line;
+        var step_out = step_in(), b = token.line !== nexttoken.line;
         this.first = [];
         if (b) {
             indent += option.indent;
@@ -4680,7 +4708,7 @@ loop:   for (;;) {
             if (b && token.line !== nexttoken.line) {
                 indentation();
             }
-            this.first.push(parse(10));
+            this.first.push(expression(10));
             if (nexttoken.id === ',') {
                 comma();
                 if (nexttoken.id === ']' && !option.es5) {
@@ -4696,6 +4724,7 @@ loop:   for (;;) {
             indentation();
         }
         advance(']', this);
+        step_out();
         return this;
     }, 160);
 
@@ -4775,7 +4804,7 @@ loop:   for (;;) {
 
     (function (x) {
         x.nud = function () {
-            var b, f, i, j, p, seen = {}, t;
+            var step_out = step_in(), b, f, i, j, p, seen = {}, t;
             b = token.line !== nexttoken.line;
             if (b) {
                 indent += option.indent;
@@ -4831,7 +4860,7 @@ loop:   for (;;) {
                     }
                     advance(':');
                     nonadjacent(token, nexttoken);
-                    parse(10);
+                    expression(10);
                 }
                 if (seen[i] === true) {
                     warning("Duplicate member '{a}'.", nexttoken, i);
@@ -4854,6 +4883,7 @@ loop:   for (;;) {
                 indentation();
             }
             advance('}', this);
+            step_out();
             return this;
         };
         x.fud = function () {
@@ -4867,14 +4897,14 @@ loop:   for (;;) {
 // JavaScript does not have block scope. It only has function scope. So,
 // declaring a variable in a block can have unexpected consequences.
 
-        var id, name, value;
+        var id, name, value, v = token;
 
         if (funct['(onevar)'] && option.onevar) {
             warning("Too many var statements.");
         } else if (!funct['(global)']) {
             funct['(onevar)'] = true;
         }
-        this.first = [];
+        v.first = [];
         for (;;) {
             nonadjacent(token, nexttoken);
             id = identifier();
@@ -4886,7 +4916,7 @@ loop:   for (;;) {
                 break;
             }
             name = token;
-            this.first.push(token);
+            v.first.push(token);
             if (nexttoken.id === '=') {
                 nonadjacent(token, nexttoken);
                 advance('=');
@@ -4898,7 +4928,7 @@ loop:   for (;;) {
                     error("Variable {a} was not declared correctly.",
                             nexttoken, nexttoken.value);
                 }
-                value = parse(0);
+                value = expression(0);
                 name.first = value;
             }
             if (nexttoken.id !== ',') {
@@ -4906,7 +4936,7 @@ loop:   for (;;) {
             }
             comma();
         }
-        return this;
+        return v;
     };
 
 
@@ -4916,7 +4946,7 @@ loop:   for (;;) {
     blockstmt('function', function () {
         if (inblock) {
             warning(
-"Function statements cannot be placed in blocks. Use a function expression or move the statement to the top of the outer function.", token);
+"Function statements should not be placed in blocks. Use a function expression or move the statement to the top of the outer function.", token);
 
         }
         var i = identifier();
@@ -4931,7 +4961,7 @@ loop:   for (;;) {
     });
 
     prefix('function', function () {
-        var i = optionalidentifier();
+        var step_out = step_in(), i = optionalidentifier();
         if (i) {
             adjacent(token, nexttoken);
         } else {
@@ -4941,6 +4971,7 @@ loop:   for (;;) {
         if (funct['(loopage)']) {
             warning("Don't make functions within a loop.");
         }
+        step_out();
         return this;
     });
 
@@ -4949,11 +4980,11 @@ loop:   for (;;) {
         advance('(');
         nonadjacent(this, t);
         nospace();
-        parse(20);
+        expression(20);
         if (nexttoken.id === '=') {
             warning("Expected a conditional expression and instead saw an assignment.");
             advance('=');
-            parse(20);
+            expression(20);
         }
         advance(')', t);
         nospace(prevtoken, token);
@@ -5013,11 +5044,11 @@ loop:   for (;;) {
         advance('(');
         nonadjacent(this, t);
         nospace();
-        parse(20);
+        expression(20);
         if (nexttoken.id === '=') {
             warning("Expected a conditional expression and instead saw an assignment.");
             advance('=');
-            parse(20);
+            expression(20);
         }
         advance(')', t);
         nospace(prevtoken, token);
@@ -5036,7 +5067,7 @@ loop:   for (;;) {
         advance('(');
         nonadjacent(this, t);
         nospace();
-        this.condition = parse(20);
+        this.condition = expression(20);
         advance(')', t);
         nospace(prevtoken, token);
         nonadjacent(token, nexttoken);
@@ -5063,7 +5094,7 @@ loop:   for (;;) {
                 }
                 indentation(-option.indent);
                 advance('case');
-                this.cases.push(parse(20));
+                this.cases.push(expression(20));
                 g = true;
                 advance(':');
                 funct['(verb)'] = 'case';
@@ -5136,11 +5167,11 @@ loop:   for (;;) {
             nonadjacent(token, t);
             advance('(');
             nospace();
-            parse(20);
+            expression(20);
             if (nexttoken.id === '=') {
                 warning("Expected a conditional expression and instead saw an assignment.");
                 advance('=');
-                parse(20);
+                expression(20);
             }
             advance(')', t);
             nospace(prevtoken, token);
@@ -5177,7 +5208,7 @@ loop:   for (;;) {
                 advance();
             }
             advance('in');
-            parse(20);
+            expression(20);
             advance(')', t);
             s = block(true);
             if (!f && (s.length > 1 || typeof s[0] !== 'object' ||
@@ -5194,7 +5225,7 @@ loop:   for (;;) {
                     varstatement();
                 } else {
                     for (;;) {
-                        parse(0, 'for');
+                        expression(0, 'for');
                         if (nexttoken.id !== ',') {
                             break;
                         }
@@ -5205,11 +5236,11 @@ loop:   for (;;) {
             nolinebreak(token);
             advance(';');
             if (nexttoken.id !== ';') {
-                parse(20);
+                expression(20);
                 if (nexttoken.id === '=') {
                     warning("Expected a conditional expression and instead saw an assignment.");
                     advance('=');
-                    parse(20);
+                    expression(20);
                 }
             }
             nolinebreak(token);
@@ -5220,7 +5251,7 @@ loop:   for (;;) {
             }
             if (nexttoken.id !== ')') {
                 for (;;) {
-                    parse(0, 'for');
+                    expression(0, 'for');
                     if (nexttoken.id !== ',') {
                         break;
                     }
@@ -5290,7 +5321,7 @@ loop:   for (;;) {
         }
         if (nexttoken.id !== ';' && !nexttoken.reach) {
             nonadjacent(token, nexttoken);
-            this.first = parse(20);
+            this.first = expression(20);
         }
         reachable('return');
         return this;
@@ -5300,7 +5331,7 @@ loop:   for (;;) {
     stmt('throw', function () {
         nolinebreak(this);
         nonadjacent(token, nexttoken);
-        this.first = parse(20);
+        this.first = expression(20);
         reachable('throw');
         return this;
     }).exps = true;
@@ -5425,14 +5456,21 @@ loop:   for (;;) {
 // The actual JSLINT function itself.
 
     var itself = function (s, o) {
-        var a, i;
+        var a, i, k;
         JSLINT.errors = [];
         predefined = Object.create(standard);
         if (o) {
             a = o.predef;
-            if (a instanceof Array) {
-                for (i = 0; i < a.length; i += 1) {
-                    predefined[a[i]] = true;
+            if (a) {
+                if (Array.isArray(a)) {
+                    for (i = 0; i < a.length; i += 1) {
+                        predefined[a[i]] = true;
+                    }
+                } else if (typeof a === 'object') {
+                    k = Object.keys(a);
+                    for (i = 0; i < k.length; i += 1) {
+                        predefined[k[i]] = !!a[k];
+                    }
                 }
             }
             if (o.adsafe) {
@@ -5454,7 +5492,6 @@ loop:   for (;;) {
                 o.eqeqeq  =
                 o.nomen   =
                 o.safe    =
-                o.strict  =
                 o.undef   = true;
 
                 predefined.Date =
@@ -5558,6 +5595,10 @@ loop:   for (;;) {
                         error("Expected '{a}' and instead saw '{b}'.",
                             nexttoken, '<div>', nexttoken.value);
                     }
+                    if (nexttoken.value === 'use strict') {
+                        warning("Use the function form of \"use strict\".");
+                        use_strict();
+                    }
                     statements('lib');
                 }
             }
@@ -5574,20 +5615,6 @@ loop:   for (;;) {
         return JSLINT.errors.length === 0;
     };
 
-    function is_array(o) {
-        return Object.prototype.toString.apply(o) === '[object Array]';
-    }
-
-    function to_array(o) {
-        var a = [], k;
-        for (k in o) {
-            if (is_own(o, k)) {
-                a.push(k);
-            }
-        }
-        return a;
-    }
-
 
 // Data summary.
 
@@ -5619,7 +5646,7 @@ loop:   for (;;) {
             data.urls = urls;
         }
 
-        globals = to_array(scope);
+        globals = Object.keys(scope);
         if (globals.length > 0) {
             data.globals = globals;
         }
@@ -5636,7 +5663,7 @@ loop:   for (;;) {
                     if (v === 'unction') {
                         v = 'unused';
                     }
-                    if (is_array(fu[v])) {
+                    if (Array.isArray(fu[v])) {
                         fu[v].push(n);
                         if (v === 'unused') {
                             unused.push({
@@ -5696,7 +5723,6 @@ loop:   for (;;) {
             }
         }
 
-
         if (data.errors || data.implieds || data.unused) {
             err = true;
             o.push('<div id=errors><i>Error:</i>');
@@ -5774,7 +5800,7 @@ loop:   for (;;) {
             }
 
             if (data.member) {
-                a = to_array(data.member);
+                a = Object.keys(data.member);
                 if (a.length) {
                     a = a.sort();
                     m = '<br><pre id=members>/*members ';
@@ -5805,7 +5831,7 @@ loop:   for (;;) {
     };
     itself.jslint = itself;
 
-    itself.edition = '2010-11-27';
+    itself.edition = '2010-12-21';
 
     return itself;
 
@@ -5828,7 +5854,7 @@ loop:   for (;;) {
     }
 
     // parse options from a comma-separated string into a hash
-    var optionFields = args[0].split(",");
+    var optionFields = args[0].split("&");
     var options = {};
     for (var i = 0; i < optionFields.length; i++) {
         var equalsSignIndex = optionFields[i].lastIndexOf("=");
@@ -5838,6 +5864,9 @@ loop:   for (;;) {
             options[key] = eval(value);
         }
     }
+    if (options.predef) {
+      options.predef = options.predef.split(",");
+    }
 
     var totalErrors = 0;
 

data/spec/lint_spec.rb

@@ -70,7 +70,7 @@ describe JSLint::Lint do
     end.should_not raise_error(JSLint::NoJavaException)
   end
 
-  it "should pass comma-separated option string to JSLint" do
+  it "should pass an ampersand-separated option string to JSLint" do
     lint = JSLint::Lint.new
     lint.instance_variable_set("@config", { 'debug' => true, 'semicolons' => false, 'linelength' => 120 })
     setup_java(lint)
@@ -81,9 +81,9 @@ describe JSLint::Lint do
       with(an_instance_of(String), an_instance_of(String), an_instance_of(String)).
       and_return { |a, b, c| param_string = c; true }
     lint.run
-    param_string.should =~ /semicolons=false/
-    param_string.should =~ /linelength=120/
-    param_string.should =~ /debug=true/
+
+    option_string = param_string.split(/\s+/).detect { |p| p =~ /linelength/ }
+    eval(option_string).split('&').sort.should == ['debug=true', 'linelength=120', 'semicolons=false']
   end
 
   it "should pass space-separated list of files to JSLint" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jslint_on_rails
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Jakub Suder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 +01:00
+date: 2011-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: []