judge 0.2.0 → 0.3.0

data/.travis.yml

@@ -1,13 +1,7 @@
 rvm:
   - 1.9.2
 
-script: "bundle exec rake test:helpers"
-
-#before_script:
-#  - "sudo apt-get install qt4-qmake"
-#  - "git clone git://github.com/ariya/phantomjs.git && cd phantomjs"
-#  - "git checkout 1.2"
-#  - "qmake-qt4 && make"
+script: "bundle exec rake test:form"
 
 notifications:
   recipients:

data/README.md

@@ -3,8 +3,6 @@ judge
 
 Client-side form validation in Rails 3.
 
-[![Build status](http://travis-ci.org/joecorcoran/judge.png)](http://travis-ci.org/joecorcoran/judge)
-
 Usage
 -----
 

data/Rakefile

@@ -37,7 +37,7 @@ Rake::RDocTask.new do |rdoc|
 end
 
 namespace :test do
-  Rake::TestTask.new(:helpers) do |test|
+  Rake::TestTask.new(:form) do |test|
     test.libs << 'lib' << 'test'
     test.pattern = 'test/**/*_test.rb'
     test.verbose = true
@@ -47,5 +47,5 @@ namespace :test do
   task :js => ["jasmine:phantom"]
 
   desc "Run all tests"
-  task :all => [:helpers, :js]
+  task :all => [:form, :js]
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/judge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{judge}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Corcoran"]
-  s.date = %q{2011-07-21}
+  s.date = %q{2011-07-25}
   s.description = %q{Validate forms in-place using your model validations}
   s.email = %q{joe@tribesports.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,8 @@ Gem::Specification.new do |s|
     "lib/generators/judge/templates/judge.js",
     "lib/generators/judge/templates/underscore.js",
     "lib/judge.rb",
-    "lib/judge/helpers.rb",
+    "lib/judge/form.rb",
+    "lib/judge/utils.rb",
     "lib/tasks/js_tests.rake",
     "spec/javascripts/JudgeSpec.js",
     "spec/javascripts/fixtures/form.html",
@@ -48,6 +49,10 @@ Gem::Specification.new do |s|
     "test/dummy/app/controllers/application_controller.rb",
     "test/dummy/app/controllers/foos_controller.rb",
     "test/dummy/app/helpers/application_helper.rb",
+    "test/dummy/app/models/city.rb",
+    "test/dummy/app/models/continent.rb",
+    "test/dummy/app/models/country.rb",
+    "test/dummy/app/models/fake.rb",
     "test/dummy/app/models/foo.rb",
     "test/dummy/app/views/foos/new.html.erb",
     "test/dummy/app/views/layouts/application.html.erb",
@@ -68,6 +73,9 @@ Gem::Specification.new do |s|
     "test/dummy/config/routes.rb",
     "test/dummy/db/development.sqlite3",
     "test/dummy/db/migrate/20110624115516_create_foos.rb",
+    "test/dummy/db/migrate/20110724201117_create_fake_collections.rb",
+    "test/dummy/db/migrate/20110724201548_rename_fake_collection_to_fake.rb",
+    "test/dummy/db/migrate/20110725082530_create_continent_country_and_city_tables.rb",
     "test/dummy/db/schema.rb",
     "test/dummy/db/test.sqlite3",
     "test/dummy/log/development.log",
@@ -99,6 +107,10 @@ Gem::Specification.new do |s|
     "test/dummy/app/controllers/application_controller.rb",
     "test/dummy/app/controllers/foos_controller.rb",
     "test/dummy/app/helpers/application_helper.rb",
+    "test/dummy/app/models/city.rb",
+    "test/dummy/app/models/continent.rb",
+    "test/dummy/app/models/country.rb",
+    "test/dummy/app/models/fake.rb",
     "test/dummy/app/models/foo.rb",
     "test/dummy/config/application.rb",
     "test/dummy/config/boot.rb",
@@ -113,6 +125,9 @@ Gem::Specification.new do |s|
     "test/dummy/config/initializers/session_store.rb",
     "test/dummy/config/routes.rb",
     "test/dummy/db/migrate/20110624115516_create_foos.rb",
+    "test/dummy/db/migrate/20110724201117_create_fake_collections.rb",
+    "test/dummy/db/migrate/20110724201548_rename_fake_collection_to_fake.rb",
+    "test/dummy/db/migrate/20110725082530_create_continent_country_and_city_tables.rb",
     "test/dummy/db/schema.rb",
     "test/judge_test.rb",
     "test/test_helper.rb"

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

@@ -23,10 +23,10 @@ judge.Watcher = function (element) {
     throw new TypeError('[judge] Cannot construct new Watcher for object of this type');
   }
   if (element.getAttribute('data-validate') === null) {
-    throw new ReferenceError('[judge] Cannot construct new Watcher for this element, please use judge helpers in your view');
+    throw new ReferenceError('[judge] Cannot construct new Watcher for this element, please use judge form builder methods in your view');
   }
   if (element.form.getAttribute('data-error-messages') === null) {
-    throw new ReferenceError('[judge] Element parent form was not created using judge helper, please amend');
+    throw new ReferenceError('[judge] Element parent form was not created using judge form helper, please amend');
   }
 
 
@@ -151,6 +151,25 @@ judge.Watcher.prototype.validates = function() {
             if (withoutReg.test(value)) { msgs.push(options.message || instance.defaultMessages.invalid); }
           }
           return msgs.length ? { valid:false, messages:msgs } : { valid:true };
+        },
+
+        acceptance: function(options) {
+          if (instance.element.checked === true) {
+            return { valid:true };
+          } else {
+            return { valid:false, messages:[options.message || instance.defaultMessages.accepted] };
+          }
+        },
+
+        confirmation: function(options) {
+          var id       = instance.element.getAttribute('id'),
+              confId   = id + '_confirmation',
+              confElem = document.getElementById(confId);
+          if (instance.element.value === confElem.value) {
+            return { valid:true };
+          } else {
+            return { valid:false, messages:[options.message || instance.defaultMessages.confirmation] };
+          }
         }
       };
   return _.extend(methods, extendedMethods);

data/lib/judge.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/judge/helpers'
+require File.dirname(__FILE__) + '/judge/utils'
+require File.dirname(__FILE__) + '/judge/form'
 
-::ActionView::Helpers::FormBuilder.send(:include, Judge::FieldHelpers)
-::ActionView::Helpers::FormHelper.send(:include, Judge::FormHelpers)
+::ActionView::Helpers::FormBuilder.send(:include, Judge::FormBuilder)
+::ActionView::Helpers::FormHelper.send(:include, Judge::FormHelper)

data/lib/judge/form.rb

@@ -0,0 +1,56 @@
+module Judge
+
+  module FormBuilder
+
+    include ActionView::Helpers::TagHelper
+    
+    %w{text_field text_area}.each do |type|
+      helper = <<-END
+        def validated_#{type}(method, options = {})
+          options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(options)
+          @template.#{type}(self.object_name, method, options)
+        end
+      END
+      class_eval helper, __FILE__, __LINE__
+    end
+
+    def validated_radio_button(method, tag_value, options = {})
+      options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(options)
+      @template.radio_button(@object_name, method, tag_value, objectify_options(options))
+    end
+    
+
+    def validated_check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
+      options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(options)
+      @template.check_box(self.object_name, method, objectify_options(options), checked_value, unchecked_value)
+    end
+
+    def validated_select(method, choices, options = {}, html_options = {})
+      html_options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(html_options)
+      @template.select(self.object_name, method, choices, objectify_options(options), @default_options.merge(html_options))
+    end
+
+    def validated_collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
+      html_options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(html_options)
+      @template.collection_select(self.object_name, method, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options))
+    end
+
+    def validated_grouped_collection_select(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+      html_options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(html_options)
+      @template.grouped_collection_select(self.object_name, method, collection, group_method, group_label_method, option_key_method, option_value_method, objectify_options(options), @default_options.merge(html_options))
+    end
+    
+  end
+
+  module FormHelper
+  
+    def validated_form_for(record_or_name_or_array, *args, &proc)
+      options = args.extract_options!
+      options[:html] ||= {}
+      options[:html]["data-error-messages"] = I18n.t("errors.messages").to_json
+      form_for(record_or_name_or_array, *(args << options), &proc)
+    end
+
+  end
+
+end

data/lib/judge/utils.rb

@@ -0,0 +1,13 @@
+module Judge
+  module Utils
+
+    def self.jsonify_validators(object, method)
+      object
+        .class
+        .validators_on(method)
+        .collect{ |v| { :kind => v.kind.to_s, :options => v.options } }
+        .to_json
+    end
+
+  end
+end

data/spec/javascripts/JudgeSpec.js

@@ -504,6 +504,60 @@ describe('judge', function() {
 
     });
 
+    describe('acceptance', function() {
+
+      var j;
+
+      beforeEach(function() {
+        j = new judge.Watcher(document.getElementById('foo_six'));
+      });
+
+      it('validates when element is checked', function() {
+        j.element.checked = true;
+        expect(j.validate().valid).toEqual(true);        
+      });
+
+      it('invalidates when element is not checked', function() {
+        expect(j.validate().valid).toEqual(false);
+      });
+
+      it('invalidates with custom message when present', function() {
+        _(j.validators).first().options.message = 'must be ticked';
+        expect(j.validate().messages).toContain('must be ticked');
+      });
+
+    });
+
+    describe('confirmation', function() {
+      
+      var j, c;
+
+      beforeEach(function() {
+        j = new judge.Watcher(document.getElementById('foo_seven'));
+        c = document.getElementById('foo_seven_confirmation');
+      });
+
+      it('validates when confirmed', function() {
+        j.element.value = 'password';
+        c.value = 'password';
+        expect(j.validate().valid).toEqual(true);
+      });
+
+      it('invalidates when not confirmed', function() {
+        j.element.value = 'password';
+        c.value = 'wrongpassword';
+        expect(j.validate().valid).toEqual(false);
+      });
+
+      it('invalidates with custom message when present', function() {
+        _(j.validators).first().options.message = 'must be same';
+        j.element.value = 'password';
+        c.value = 'wrongpassword';
+        expect(j.validate().messages).toContain('must be same');
+      });
+
+    });
+
   });
 
   describe('utils', function() {

data/spec/javascripts/fixtures/form.html

@@ -44,6 +44,15 @@
     <label for="foo_five_wo">Five</label><br /> 
     <input data-validate="[{&quot;kind&quot;:&quot;format&quot;,&quot;options&quot;:{&quot;without&quot;:&quot;(?-mix:[A-Za-z]+)&quot;}}]" id="foo_five_wo" name="foo[five_wo]" size="30" type="text" /> 
   </div> 
+  <div class="field"> 
+    <label for="foo_six">Six</label><br /> 
+    <input data-validate="[{&quot;kind&quot;:&quot;acceptance&quot;,&quot;options&quot;:{&quot;accept&quot;:&quot;1&quot;,&quot;allow_nil&quot;:&quot;true&quot;}}]" id="foo_six" name="foo[six]" type="checkbox" /> 
+  </div>
+  <div class="field"> 
+    <label for="foo_seven">Six</label><br /> 
+    <input data-validate="[{&quot;kind&quot;:&quot;confirmation&quot;,&quot;options&quot;:{}}]" id="foo_seven" name="foo[seven]" type="text" />
+  </div>
+  <input id="foo_seven_confirmation" name="foo[seven_confirmation]" type="text" />
   <div class="actions"> 
     <input id="foo_submit" name="commit" type="submit" value="Create Foo" /> 
   </div> 

data/test/dummy/app/controllers/foos_controller.rb

@@ -1,5 +1,11 @@
 class FoosController < ApplicationController
   def new
     @foo = Foo.new
+
+    continent = Continent.new(:id => 1, :name => "Europe")
+    country = Country.new(:id => 1, :name => "Germany")
+    country.cities << City.new(:id => 1, :name => "Hamburg")
+    continent.countries << country
+    @continents = [continent]
   end
 end

data/test/dummy/app/models/city.rb

@@ -0,0 +1,5 @@
+class City < ActiveRecord::Base
+  belongs_to :country
+end
+
+

data/test/dummy/app/models/continent.rb

@@ -0,0 +1,4 @@
+class Continent < ActiveRecord::Base
+  has_many :countries
+end
+

data/test/dummy/app/models/country.rb

@@ -0,0 +1,6 @@
+class Country < ActiveRecord::Base
+  belongs_to :continent
+  has_many :cities
+end
+
+

data/test/dummy/app/models/fake.rb

@@ -0,0 +1,2 @@
+class Fake < ActiveRecord::Base
+end

data/test/dummy/app/models/foo.rb

@@ -6,6 +6,8 @@ class Foo < ActiveRecord::Base
   validates :four, :numericality => { :only_integer => true, :odd => true, :less_than_or_equal_to => 7 },
                    :exclusion => { :in => [3,12] }
   validates :five, :format => { :without => /[A-Za-z]+/ }
+  validates :six, :acceptance => true
+  validates :seven, :confirmation => true
 
 end
 

data/test/dummy/app/views/foos/new.html.erb

@@ -15,15 +15,15 @@
 
   <div class="field">
     <%= f.label :one %><br />
-    <%= f.validated_text_field :one %>
+    <%= f.validated_select :one, [["hello", "HELLO"],["goodbye", "GOODBYE"]] %>
   </div>
   <div class="field">
     <%= f.label :two %><br />
-    <%= f.validated_text_field :two %>
+    <%= f.validated_radio_button :two, "FOOBAR" %>
   </div>
   <div class="field">
     <%= f.label :three %><br />
-    <%= f.validated_text_field :three %>
+    <%= f.validated_collection_select :three, [Fake.new(:text => "Dave", :value => 24), Fake.new(:text => "Alice", :value => 30)], :value, :text %>
   </div>
   <div class="field">
     <%= f.label :four %><br />
@@ -31,7 +31,15 @@
   </div>
   <div class="field">
     <%= f.label :five %><br />
-    <%= f.validated_text_area :five %>
+    <%= f.validated_grouped_collection_select :five, @continents, :countries, :name, :id, :name %>
+  </div>
+  <div class="field">
+    <%= f.label :six %><br />
+    <%= f.validated_check_box :six %>
+  </div>
+  <div class="field">
+    <%= f.label :seven %><br />
+    <%= f.validated_text_field :seven %>
   </div>
   <div class="actions">
     <%= f.submit %>

data/test/dummy/db/migrate/20110724201117_create_fake_collections.rb

@@ -0,0 +1,14 @@
+class CreateFakeCollections < ActiveRecord::Migration
+  def self.up
+    create_table :fake_collections do |t|
+      t.string :value
+      t.string :text
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :fake_collections
+  end
+end

data/test/dummy/db/migrate/20110724201548_rename_fake_collection_to_fake.rb

@@ -0,0 +1,9 @@
+class RenameFakeCollectionToFake < ActiveRecord::Migration
+  def self.up
+    rename_table :fake_collections, :fakes
+  end
+
+  def self.down
+    rename_table :fakes, :fake_collections
+  end
+end

data/test/dummy/db/migrate/20110725082530_create_continent_country_and_city_tables.rb

@@ -0,0 +1,24 @@
+class CreateContinentCountryAndCityTables < ActiveRecord::Migration
+  def self.up
+    create_table :continents do |t|
+      t.integer :id
+      t.string :name
+    end
+    create_table :countries do |t|
+      t.integer :id
+      t.integer :continent_id
+      t.string :name
+    end
+    create_table :cities do |t|
+      t.integer :id
+      t.integer :country_id
+      t.string :name
+    end
+  end
+
+  def self.down
+    drop_table :continents
+    drop_table :countries
+    drop_table :cities
+  end
+end

data/test/dummy/db/schema.rb

@@ -10,7 +10,28 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110624115516) do
+ActiveRecord::Schema.define(:version => 20110725082530) do
+
+  create_table "cities", :force => true do |t|
+    t.integer "country_id"
+    t.string  "name"
+  end
+
+  create_table "continents", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "countries", :force => true do |t|
+    t.integer "continent_id"
+    t.string  "name"
+  end
+
+  create_table "fakes", :force => true do |t|
+    t.string   "value"
+    t.string   "text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "foos", :force => true do |t|
     t.string   "one"

data/test/dummy/log/development.log

@@ -57,3 +57,217 @@ Migrating to CreateFoos (20110624115516)
  WHERE type = 'table' AND NOT name = 'sqlite_sequence'
   SQL (0.1ms)  SELECT version FROM "schema_migrations"
   SQL (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110624115516')
+  SQL (0.5ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+Migrating to CreateFoos (20110624115516)
+Migrating to CreateFakeCollections (20110724201117)
+  SQL (0.0ms)  select sqlite_version(*)
+  SQL (0.5ms)  CREATE TABLE "fake_collections" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "value" varchar(255), "text" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110724201117')
+  SQL (0.3ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  PRAGMA index_list("fake_collections")
+  SQL (0.0ms)  PRAGMA index_list("foos")
+  SQL (0.5ms)  select sqlite_version(*)
+  SQL (0.3ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  PRAGMA index_list("fake_collections")
+  SQL (0.0ms)  PRAGMA index_list("foos")
+  SQL (0.2ms)  select sqlite_version(*)
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.7ms)  CREATE TABLE "fake_collections" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "value" varchar(255), "text" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.3ms)  CREATE TABLE "foos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "one" varchar(255), "two" varchar(255), "three" varchar(255), "four" varchar(255), "five" varchar(255), "six" varchar(255), "seven" varchar(255), "eight" varchar(255), "nine" varchar(255), "ten" varchar(255), "eleven" varchar(255), "twelve" varchar(255), "thirteen" varchar(255), "fourteen" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.0ms)  PRAGMA index_list("schema_migrations")
+  SQL (27.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT version FROM "schema_migrations"
+  SQL (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110724201117')
+  SQL (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110624115516')
+  SQL (0.6ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.3ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+Migrating to CreateFoos (20110624115516)
+Migrating to CreateFakeCollections (20110724201117)
+Migrating to RenameFakeCollectionToFake (20110724201548)
+  SQL (0.1ms)  select sqlite_version(*)
+  SQL (16.0ms)  ALTER TABLE "fake_collections" RENAME TO "fakes"
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110724201548')
+  SQL (0.3ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  PRAGMA index_list("fakes")
+  SQL (0.1ms)  PRAGMA index_list("foos")
+  SQL (0.4ms)  select sqlite_version(*)
+  SQL (0.2ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  PRAGMA index_list("fakes")
+  SQL (0.0ms)  PRAGMA index_list("foos")
+  SQL (0.2ms)  select sqlite_version(*)
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.8ms)  CREATE TABLE "fakes" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "value" varchar(255), "text" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.8ms)  CREATE TABLE "foos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "one" varchar(255), "two" varchar(255), "three" varchar(255), "four" varchar(255), "five" varchar(255), "six" varchar(255), "seven" varchar(255), "eight" varchar(255), "nine" varchar(255), "ten" varchar(255), "eleven" varchar(255), "twelve" varchar(255), "thirteen" varchar(255), "fourteen" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.2ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.0ms)  PRAGMA index_list("schema_migrations")
+  SQL (1.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.2ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT version FROM "schema_migrations"
+  SQL (1.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110724201548')
+  SQL (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110624115516')
+  SQL (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110724201117')
+  SQL (0.5ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+Migrating to CreateFoos (20110624115516)
+Migrating to CreateFakeCollections (20110724201117)
+Migrating to RenameFakeCollectionToFake (20110724201548)
+Migrating to CreateContinentCountryAndCityTables (20110725082530)
+  SQL (0.1ms)  select sqlite_version(*)
+  SQL (0.5ms)  CREATE TABLE "continents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+  SQL (0.1ms)  CREATE TABLE "countries" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "continent_id" integer, "name" varchar(255)) 
+  SQL (0.1ms)  CREATE TABLE "cities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "country_id" integer, "name" varchar(255)) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110725082530')
+  SQL (0.3ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  PRAGMA index_list("cities")
+  SQL (0.0ms)  PRAGMA index_list("continents")
+  SQL (0.0ms)  PRAGMA index_list("countries")
+  SQL (0.0ms)  PRAGMA index_list("fakes")
+  SQL (0.0ms)  PRAGMA index_list("foos")
+  SQL (0.5ms)  select sqlite_version(*)
+  SQL (0.2ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  PRAGMA index_list("cities")
+  SQL (0.0ms)  PRAGMA index_list("continents")
+  SQL (0.0ms)  PRAGMA index_list("countries")
+  SQL (0.0ms)  PRAGMA index_list("fakes")
+  SQL (0.0ms)  PRAGMA index_list("foos")
+  SQL (0.2ms)  select sqlite_version(*)
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (1.9ms)  CREATE TABLE "cities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "country_id" integer, "name" varchar(255)) 
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (1.4ms)  CREATE TABLE "continents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (1.7ms)  CREATE TABLE "countries" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "continent_id" integer, "name" varchar(255)) 
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (1.5ms)  CREATE TABLE "fakes" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "value" varchar(255), "text" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.2ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (1.9ms)  CREATE TABLE "foos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "one" varchar(255), "two" varchar(255), "three" varchar(255), "four" varchar(255), "five" varchar(255), "six" varchar(255), "seven" varchar(255), "eight" varchar(255), "nine" varchar(255), "ten" varchar(255), "eleven" varchar(255), "twelve" varchar(255), "thirteen" varchar(255), "fourteen" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (1.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.0ms)  PRAGMA index_list("schema_migrations")
+  SQL (1.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)  SELECT version FROM "schema_migrations"
+  SQL (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110725082530')
+  SQL (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110624115516')
+  SQL (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110724201117')
+  SQL (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110724201548')

data/test/judge_test.rb

@@ -15,11 +15,11 @@ class JudgeTest < ActionController::TestCase
     setup { get :new }
 
     should "include presence validation in data attribute" do
-      assert_equal "presence", validators_from("input#foo_one").first["kind"]
+      assert_equal "presence", validators_from("select#foo_one").first["kind"]
     end
 
     should "include length (within range) validation in data attribute" do
-      validators = validators_from("input#foo_two")
+      validators = validators_from("input#foo_two_foobar")
       assert_equal "length", validators.first["kind"]
       assert_equal Fixnum, validators.first["options"]["minimum"].class
       assert_equal Fixnum, validators.first["options"]["maximum"].class
@@ -27,12 +27,12 @@ class JudgeTest < ActionController::TestCase
     end
 
     should "include allow_blank validation in data attribute" do
-      validators = validators_from("input#foo_two")
+      validators = validators_from("input#foo_two_foobar")
       assert validators.first["options"]["allow_blank"]
     end
 
     should "include exclusion validation in data atribute" do
-      validators = validators_from("input#foo_three")
+      validators = validators_from("select#foo_three")
       assert_equal "exclusion", validators.first["kind"]
       assert_equal Array, validators.first["options"]["in"].class
     end
@@ -53,10 +53,21 @@ class JudgeTest < ActionController::TestCase
     end
 
     should "include format validator in data attribute" do
-      validator = validators_from("textarea#foo_five").first
+      validator = validators_from("select#foo_five").first
       assert_equal "format", validator["kind"]
       assert_match /\(.+\:.+\)/, validator["options"]["without"]
     end
+
+    should "include acceptance validator in data attribute" do
+      validator = validators_from("input#foo_six").first
+      assert_equal "acceptance", validator["kind"]
+      assert validator["options"]["accept"]
+    end
+
+    should "include confirmation validator in data attribute" do
+      validator = validators_from("input#foo_seven").first
+      assert_equal "confirmation", validator["kind"]
+    end
   end
 
   def validators_from(input_selector)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Joe Corcoran
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 +01:00
+date: 2011-07-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -161,7 +161,8 @@ files:
 - lib/generators/judge/templates/judge.js
 - lib/generators/judge/templates/underscore.js
 - lib/judge.rb
-- lib/judge/helpers.rb
+- lib/judge/form.rb
+- lib/judge/utils.rb
 - lib/tasks/js_tests.rake
 - spec/javascripts/JudgeSpec.js
 - spec/javascripts/fixtures/form.html
@@ -178,6 +179,10 @@ files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/foos_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/city.rb
+- test/dummy/app/models/continent.rb
+- test/dummy/app/models/country.rb
+- test/dummy/app/models/fake.rb
 - test/dummy/app/models/foo.rb
 - test/dummy/app/views/foos/new.html.erb
 - test/dummy/app/views/layouts/application.html.erb
@@ -198,6 +203,9 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20110624115516_create_foos.rb
+- test/dummy/db/migrate/20110724201117_create_fake_collections.rb
+- test/dummy/db/migrate/20110724201548_rename_fake_collection_to_fake.rb
+- test/dummy/db/migrate/20110725082530_create_continent_country_and_city_tables.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
@@ -231,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1767971986953238841
+      hash: 2587494504961944285
       segments: 
       - 0
       version: "0"
@@ -256,6 +264,10 @@ test_files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/foos_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/city.rb
+- test/dummy/app/models/continent.rb
+- test/dummy/app/models/country.rb
+- test/dummy/app/models/fake.rb
 - test/dummy/app/models/foo.rb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -270,6 +282,9 @@ test_files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20110624115516_create_foos.rb
+- test/dummy/db/migrate/20110724201117_create_fake_collections.rb
+- test/dummy/db/migrate/20110724201548_rename_fake_collection_to_fake.rb
+- test/dummy/db/migrate/20110725082530_create_continent_country_and_city_tables.rb
 - test/dummy/db/schema.rb
 - test/judge_test.rb
 - test/test_helper.rb

data/lib/judge/helpers.rb

@@ -1,31 +0,0 @@
-module Judge
-
-  module FieldHelpers
-
-    include ActionView::Helpers::TagHelper
-    
-    %w{text_field text_area}.each do |type|
-      helper = <<-END
-        def validated_#{type}(method, options = {})
-          validators = self.object.class.validators_on(method).collect{ |v| { :kind => v.kind.to_s, :options => v.options } }
-          options = { "data-validate" => validators.to_json }.merge(options)
-          @template.#{type}(self.object_name, method, options)
-        end
-      END
-      class_eval helper, __FILE__, __LINE__
-    end
-
-  end
-
-  module FormHelpers
-  
-    def validated_form_for(record_or_name_or_array, *args, &proc)
-      options = args.extract_options!
-      options[:html] ||= {}
-      options[:html]["data-error-messages"] = I18n.t("errors.messages").to_json
-      form_for(record_or_name_or_array, *(args << options), &proc)
-    end
-
-  end
-
-end