jslint_on_rails 1.0.6 → 1.0.7

data/Changelog.markdown

@@ -1,3 +1,7 @@
+Version 1.0.7 (12.09.2011)
+
+* fixed problem with local options from one file being applied to all subsequent files
+
 Version 1.0.6 (19.02.2011)
 
 * escape $ in predef line to prevent Bash for interpreting it

data/lib/jslint/utils.rb

@@ -3,7 +3,7 @@ require 'yaml'
 
 module JSLint
 
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
   DEFAULT_CONFIG_FILE = File.expand_path(File.dirname(__FILE__) + "/config/jslint.yml")
 
   class << self

data/lib/jslint/vendor/jslint.js

@@ -5877,19 +5877,28 @@ loop:   for (;;) {
         var input = readFile(args[f]);
         if (!input) {
             print("Error: couldn't open file.");
-        } else if (!JSLINT(input, options)) {
-            print(pluralize(JSLINT.errors.length, "error") + ":\n");
-            totalErrors += JSLINT.errors.length;
-            for (var i = 0; i < JSLINT.errors.length; i += 1) {
-                var e = JSLINT.errors[i];
-                if (e) {
-                    print('Lint at line ' + e.line + ' character ' + e.character + ': ' + e.reason);
-                    print((e.evidence || '').replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
-                    print('');
+        } else {
+            var optionsCopy = {};
+            for (var key in options) {
+                if (options.hasOwnProperty(key)) {
+                    optionsCopy[key] = options[key];
                 }
             }
-        } else {
-            print("OK");
+
+            if (!JSLINT(input, optionsCopy)) {
+                print(pluralize(JSLINT.errors.length, "error") + ":\n");
+                totalErrors += JSLINT.errors.length;
+                for (var i = 0; i < JSLINT.errors.length; i += 1) {
+                    var e = JSLINT.errors[i];
+                    if (e) {
+                        print('Lint at line ' + e.line + ' character ' + e.character + ': ' + e.reason);
+                        print((e.evidence || '').replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
+                        print('');
+                    }
+                }
+            } else {
+                print("OK");
+            }
         }
     }
 

data/spec/jslint_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe 'jslint.js' do
+  before :all do
+    File.open(JSLint::DEFAULT_CONFIG_FILE, "w") { |f| f.write "color: red\nsize: 5\nshape: circle\n" }
+    File.open("custom_config.yml", "w") { |f| f.write "color: blue\nsize: 7\nborder: 2\n" }
+    File.open("other_config.yml", "w") { |f| f.write "color: green\nborder: 0\nshape: square" }
+    JSLint.config_path = "custom_config.yml"
+  end
+
+  describe "options in comments" do
+    before do
+      FakeFS.deactivate!
+      create_file 'spec-config.yml', 'evil: false'
+      create_file 'first.js', "
+        /*jslint evil: true*/
+        eval('alert(\"muahahahaha\")');
+      "
+      create_file 'second.js', "
+        // I shouldn't be able to do that
+        eval('alert(\"muahahahaha\")');
+      "
+    end
+
+    it "should not apply local options from one file to all subsequent files" do
+      lint = JSLint::Lint.new(:paths => ["first.js", "second.js"], :config => 'spec-config.yml')
+
+      # silence stdout from jslint
+      lint.instance_eval do
+        def system(command)
+          `#{command}`
+          $? == 0
+        end
+      end
+
+      expect { lint.run }.to raise_error(JSLint::LintCheckFailure)
+    end
+
+    after do
+      File.delete('first.js')
+      File.delete('second.js')
+      File.delete('spec-config.yml')
+      FakeFS.activate!
+    end
+  end
+end

data/spec/lint_spec.rb

@@ -7,9 +7,9 @@ describe JSLint::Lint do
   end
 
   before :all do
-    File.open(JSLint::DEFAULT_CONFIG_FILE, "w") { |f| f.write "color: red\nsize: 5\nshape: circle\n" }
-    File.open("custom_config.yml", "w") { |f| f.write "color: blue\nsize: 7\nborder: 2\n" }
-    File.open("other_config.yml", "w") { |f| f.write "color: green\nborder: 0\nshape: square" }
+    create_config 'color' => 'red', 'size' => 5, 'shape' => 'circle'
+    create_file 'custom_config.yml', 'color' => 'blue', 'size' => 7, 'border' => 2
+    create_file 'other_config.yml', 'color' => 'green', 'border' => 0, 'shape' => 'square'
     JSLint.config_path = "custom_config.yml"
   end
 
@@ -28,23 +28,22 @@ describe JSLint::Lint do
   end
 
   it "should convert predef to string if it's an array" do
-    File.open("predef.yml", "w") { |f| f.write "predef:\n  - a\n  - b\n  - c" }
+    create_file 'predef.yml', 'predef' => ['a', 'b', 'c']
 
     lint = JSLint::Lint.new :config_path => 'predef.yml'
     lint.config['predef'].should == "a,b,c"
   end
 
   it "should accept predef as string" do
-    File.open("predef.yml", "w") { |f| f.write "predef: d,e,f" }
+    create_file 'predef.yml', 'predef' => 'd,e,f'
 
     lint = JSLint::Lint.new :config_path => 'predef.yml'
     lint.config['predef'].should == "d,e,f"
   end
 
   it "should not pass paths and exclude_paths options to real JSLint" do
-    File.open("test.yml", "w") do |f|
-      f.write(YAML.dump({ 'paths' => ['a', 'b'], 'exclude_paths' => ['c'], 'debug' => 'true' }))
-    end
+    create_file 'test.yml', 'paths' => ['a', 'b'], 'exclude_paths' => ['c'], 'debug' => 'true'
+
     lint = JSLint::Lint.new :config_path => 'test.yml'
     lint.config['debug'].should == 'true'
     lint.config['paths'].should be_nil
@@ -130,7 +129,7 @@ describe JSLint::Lint do
 
     before :all do
       @files = ['test/app.js', 'test/lib.js', 'test/utils.js', 'test/vendor/jquery.js', 'test/vendor/proto.js']
-      @files.each { |fn| File.open(fn, "w") { |f| f.write("alert()") }}
+      @files.each { |fn| create_file(fn, "alert()") }
       @files = @files.map { |fn| File.expand_path(fn) }
     end
 
@@ -150,7 +149,7 @@ describe JSLint::Lint do
       lint = JSLint::Lint.new :paths => ['test/**/*.js', 'test/**/a*.js', 'test/**/p*.js']
       lint.file_list.should == @files
 
-      File.open("new.yml", "w") { |f| f.write(YAML.dump({ 'paths' => ['test/vendor/*.js'] })) }
+      create_file 'new.yml', 'paths' => ['test/vendor/*.js']
 
       lint = JSLint::Lint.new :config_path => 'new.yml', :exclude_paths => ['**/proto.js']
       lint.file_list.should == [@files[3]]
@@ -167,8 +166,8 @@ describe JSLint::Lint do
     end
 
     it "should ignore empty files" do
-      File.open("test/empty.js", "w") { |f| f.write("") }
-      File.open("test/full.js", "w") { |f| f.write("qqq") }
+      create_file 'test/empty.js', ''
+      create_file 'test/full.js', 'qqq'
 
       lint = JSLint::Lint.new :paths => ['test/*.js']
       lint.file_list.should_not include(File.expand_path("test/empty.js"))

data/spec/railtie_spec.rb

@@ -3,7 +3,7 @@ require 'jslint/railtie'
 
 describe JSLint::Railtie do
   before :all do
-    File.open(JSLint::DEFAULT_CONFIG_FILE, "w") { |f| f.write "foo" }
+    create_config 'example config'
     JSLint.config_path = "custom_config.yml"
   end
 
@@ -16,11 +16,11 @@ describe JSLint::Railtie do
       JSLint::Railtie.create_example_config
 
       File.exist?(JSLint.config_path).should be_true
-      File.read(JSLint.config_path).should == "foo"
+      File.read(JSLint.config_path).should == 'example config'
     end
 
     it "should not do anything if config already exists" do
-      File.open(JSLint.config_path, "w") { |f| f.write "bar" }
+      create_file(JSLint.config_path, "bar")
 
       JSLint::Railtie.create_example_config
 

data/spec/spec_helper.rb

@@ -19,3 +19,26 @@ module FileUtils
     cp(*args)
   end
 end
+
+module FakeFS
+  class File
+    def self.identical?(file1, file2)
+      File.expand_path(file1) == File.expand_path(file2)
+    end
+  end
+end
+
+module SpecHelper
+  def create_file(filename, contents)
+    contents = YAML.dump(contents) + "\n" unless contents.is_a?(String)
+    File.open(filename, "w") { |f| f.print(contents) }
+  end
+
+  def create_config(data)
+    create_file(JSLint::DEFAULT_CONFIG_FILE, data)
+  end
+end
+
+RSpec.configure do |config|
+  config.include SpecHelper
+end

data/spec/utils_spec.rb

@@ -5,7 +5,7 @@ describe JSLint::Utils do
   JSU = JSLint::Utils
 
   before :all do
-    File.open(JSLint::DEFAULT_CONFIG_FILE, "w") { |f| f.puts "default config file" }
+    create_config "default config file"
   end
 
   it "should have a config_path setting" do
@@ -37,7 +37,7 @@ describe JSLint::Utils do
   describe "load_config_file" do
   
     before :all do
-      File.open("sample.yml", "w") { |f| f.puts("framework: rails") }
+      create_file 'sample.yml', 'framework: rails'
       Dir.mkdir("tmp")
     end
   
@@ -103,7 +103,7 @@ describe JSLint::Utils do
 
     it "should not overwrite the file if it exists" do
       JSLint.config_path = "newfile2.yml"
-      File.open("newfile2.yml", "w") { |f| f.write("qwe") }
+      create_file 'newfile2.yml', 'qwe'
       FileUtils.should_not_receive(:copy)
       JSLint::Utils.copy_config_file
     end
@@ -117,7 +117,7 @@ describe JSLint::Utils do
 
     it "should remove the file if it's identical to default one" do
       JSLint.config_path = "newfile3.yml"
-      File.open("newfile3.yml", "w") { |f| f.puts("default config file") }
+      create_file 'newfile3.yml', 'default config file'
       File.exists?("newfile3.yml").should be_true
       JSLint::Utils.remove_config_file
       File.exists?("newfile3.yml").should be_false
@@ -125,7 +125,7 @@ describe JSLint::Utils do
 
     it "should not remove the file if it's not identical to default one" do
       JSLint.config_path = "newfile4.yml"
-      File.open("newfile4.yml", "w") { |f| f.puts("something's changed") }
+      create_file 'newfile4.yml', "something's changed"
       File.exists?("newfile4.yml").should be_true
       JSLint::Utils.remove_config_file
       File.exists?("newfile4.yml").should be_true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jslint_on_rails
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Jakub Suder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 +01:00
+date: 2011-09-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -46,6 +46,7 @@ files:
 - lib/jslint/vendor/test.jar
 - lib/jslint.rb
 - lib/jslint_on_rails.rb
+- spec/jslint_spec.rb
 - spec/lint_spec.rb
 - spec/railtie_spec.rb
 - spec/spec_helper.rb