judge 1.3.0 → 1.4.0

data/.travis.yml

@@ -5,6 +5,10 @@ rvm:
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+  - "git clone git://github.com/n1k0/casperjs.git"
+  - "cd casperjs"
+  - "git checkout tags/0.6.5"
+  - "sudo ln -sf `pwd`/bin/casperjs /usr/local/bin/casperjs"
 
 script: "bundle exec rake"
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new("spec")
 
 load "jasmine/tasks/jasmine.rake"
-load "lib/tasks/js_tests.rake"
+load "lib/tasks/js.rake"
 
 desc "Run all tests"
-task :default => ["spec", "jasmine:phantom"]
+task :default => ["spec", "jasmine:headless"]

data/lib/generators/judge/templates/judge.js

@@ -1,4 +1,4 @@
-// Judge 1.3.0
+// Judge 1.4.0
 // (c) 2011–2012 Joe Corcoran
 // http://raw.github.com/joecorcoran/judge/master/LICENSE.txt
 // This is the JavaScript part of Judge, a client-side validation gem for Rails 3.
@@ -13,7 +13,7 @@
   // The judge namespace.
   var judge = {};
 
-  judge.VERSION = '1.3.0';
+  judge.VERSION = '1.4.0';
 
   // A judge.Watcher is a DOM element wrapper that judge uses to store validation info and instance methods.
   judge.Watcher = function (element) {
@@ -245,9 +245,9 @@
 
       // Shortcut for `judge.validate(judge.store.getDOM(key));`.
       // Returns null if no stored elements are found for the given key.
-      validate: function(key) {
+      validate: function(key, callback) {
         var elements = judge.store.getDOM(key);
-        return (key && !_(elements).isNull()) ? judge.validate(elements) : null;
+        return (key && !_(elements).isNull()) ? judge.validate(elements, callback) : null;
       },
 
       // Wipes the entire store object, or wipes all watchers stored against 

data/lib/judge/version.rb

@@ -1,3 +1,3 @@
 module Judge
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/tasks/{js_tests.rake → js.rake}

@@ -1,25 +1,29 @@
 namespace :jasmine do
-  task :require_phantom_js do
+  task :require_phantom do
     sh "which phantomjs" do |ok, res|
       fail 'Cannot find phantomjs on $PATH' unless ok
     end
   end
 
+  task :require_casper do
+    sh "which casperjs" do |ok, res|
+      fail 'Cannot find casperjs on $PATH' unless ok
+    end
+  end
+
   desc "Run continuous integration tests headlessly with phantom.js"
-  task :phantom => ['jasmine:require', 'jasmine:require_phantom_js'] do
+  task :headless => ['jasmine:require', 'jasmine:require_phantom', 'jasmine:require_casper'] do
     support_dir = File.expand_path('../../spec/javascripts/support', File.dirname(__FILE__))
     config_overrides = File.join(support_dir, 'jasmine_config.rb')
     require config_overrides if File.exists?(config_overrides)
-    phantom_js_runner = File.join(support_dir, 'phantomRunner.js')
-
+    
+    test_runner = File.join(support_dir, 'runner.js')
     config = Jasmine::Config.new
-
-    # start the Jasmine server and wait up to 10 seconds for it to be running:
     config.start_jasmine_server
 
     jasmine_url = "#{config.jasmine_host}:#{config.jasmine_server_port}"
     puts "Running tests against #{jasmine_url}"
-    sh "phantomjs #{phantom_js_runner} #{jasmine_url}" do |ok, res|
+    sh "casperjs #{test_runner} #{jasmine_url}" do |ok, res|
       fail "jasmine suite failed" unless ok
     end
   end

data/spec/javascripts/JudgeSpec.js

@@ -448,6 +448,13 @@ describe('judge', function() {
         expect(_(results).first().element).toEqual(element);
       });
 
+      it('calls callback correct number of times', function() {
+        judge.store.save('mykey', document.getElementsByTagName('textarea'));
+        var callback = jasmine.createSpy();
+        judge.store.validate('mykey', callback);
+        expect(callback.callCount).toBe(4);
+      });
+
       it('returns null if no elements found', function() {
         var results = judge.store.validate('mykey');
         expect(results).toBe(null);

data/spec/javascripts/support/runner.js

@@ -0,0 +1,51 @@
+var casper    = require('casper').create(),
+    path      = casper.cli.args[0],
+    colorizer = require('colorizer').create(),
+    data;
+
+casper
+  .start(path)
+  .then(function() {
+    this.waitForSelector('.finished-at', function() {
+      data = this.evaluate(readResults);
+    });
+  })
+  .run(function() {
+    this.echo(fmtTitle(data.desc, data.status));
+    if (data.messages.length > 0) {
+      this.echo(data.messages.join('\n\n') + '\n', colorType(data.status));
+    }
+    this.exit(data.status);
+  });
+
+var readResults = function() {
+  var desc   = document.querySelector('.runner .description').innerHTML,
+      msgs   = [],
+      status = 0;
+  if (document.querySelector('.runner.failed')) {
+    var f = document.querySelectorAll('.spec.failed');
+    for (var i = 0, l = f.length; i < l; i += 1) {
+      var msg = '  ' + (i + 1) + '. '
+                + f[i].querySelector('.description').title
+                + ' (' + f[i].querySelector('.messages .resultMessage').innerHTML + ')';
+      msgs.push(msg);
+    };
+    status = 1;
+  };
+  return { desc: desc, messages: msgs, status: status };
+};
+
+var fmtTitle = function(string, status) {
+  var fail = (status === 1);
+  string = colorizer.format(string, {
+    fg: (fail ? 'red' : 'green'),
+    bold: true,
+    underscore: !!fail
+  });
+  string = '\n' + string + '\n';
+  return string;
+};
+
+var colorType = function(status) {
+  return (status === 1) ? 'WARNING' : 'INFO';
+};

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judge
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2151893720 !ruby/object:Gem::Requirement
+  requirement: &2151873000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *2151893720
+  version_requirements: *2151873000
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151891300 !ruby/object:Gem::Requirement
+  requirement: &2151872120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *2151891300
+  version_requirements: *2151872120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151890360 !ruby/object:Gem::Requirement
+  requirement: &2151871360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *2151890360
+  version_requirements: *2151871360
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2151888920 !ruby/object:Gem::Requirement
+  requirement: &2151870580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2151888920
+  version_requirements: *2151870580
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2151886400 !ruby/object:Gem::Requirement
+  requirement: &2151869300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2151886400
+  version_requirements: *2151869300
 description: Validate Rails 3 forms on the client side, cleanly
 email: joe@tribesports.com
 executables: []
@@ -90,7 +90,7 @@ files:
 - lib/judge/validator.rb
 - lib/judge/validator_collection.rb
 - lib/judge/version.rb
-- lib/tasks/js_tests.rake
+- lib/tasks/js.rake
 - spec/factories.rb
 - spec/form_builder_spec.rb
 - spec/html_spec.rb
@@ -104,7 +104,7 @@ files:
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
-- spec/javascripts/support/phantomRunner.js
+- spec/javascripts/support/runner.js
 - spec/message_collection_spec.rb
 - spec/setup.rb
 - spec/spec_helper.rb
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -115448070476336005
+      hash: -196777786245842786
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -115448070476336005
+      hash: -196777786245842786
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -154,7 +154,7 @@ test_files:
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
-- spec/javascripts/support/phantomRunner.js
+- spec/javascripts/support/runner.js
 - spec/message_collection_spec.rb
 - spec/setup.rb
 - spec/spec_helper.rb

data/spec/javascripts/support/phantomRunner.js

@@ -1,28 +0,0 @@
-var page = new WebPage();
-page.open(phantom.args[0], function(status) {
-  if (status !== 'success') {
-    console.log('Cannot open Jasmine server page');
-    phantom.exit();
-  } else {
-    window.setTimeout(function () {
-      var result = page.evaluate(function() {
-        var desc = document.querySelector('.runner .description').innerHTML;
-        if (document.querySelector('.runner.failed')) {
-          var failed   = document.querySelectorAll('.spec.failed'),
-              failMsgs = [],
-              output   = '';
-          for (var i = 0, l = failed.length; i < l; i += 1) {
-            var msg = '  - ' + failed[i].querySelector('.description').title + ' (' + failed[i].querySelector('.messages .resultMessage').innerHTML + ')';
-            failMsgs.push(msg);
-          };
-          output = '\n' + failMsgs.length + ' specs failed:\n\n' + failMsgs.join('\n') + '\n\n' + desc;
-          return { msg:output, code:1 };
-        } else {
-          return { msg:desc, code:0 };
-        };
-      });
-      console.log(result.msg);
-      phantom.exit(result.code);
-    }, 400);
-  };
-});