judge 0.5.0 → 1.0.0

data/test/factories.rb

@@ -0,0 +1,23 @@
+FactoryGirl.define do
+  factory :user do
+    dob { Time.new(2011,11,5, 17,00,00) }
+  end
+
+  factory :team do
+    sequence(:name) {|n| "Team #{n}" }
+  end
+
+  factory :category do
+    sequence(:name) {|n| "Category #{n}" }
+  end
+
+  factory :sport do
+    sequence(:name) {|n| "Sport #{n}" }
+    category
+  end
+
+  factory :discipline do
+    sequence(:name) {|n| "Discipline #{n}" }
+    sport
+  end
+end

data/test/setup.rb

@@ -0,0 +1,70 @@
+# setup fake ActiveRecord class for tests
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :users do |t|
+    t.string :name
+    t.string :username
+    t.string :country
+    t.integer :age
+    t.text :bio
+    t.string :password
+    t.boolean :accepted
+    t.text :gender
+    t.date :dob
+    t.integer :team_id
+    t.string :time_zone
+    t.integer :discipline_id
+  end
+  create_table :teams do |t|
+    t.string :name
+  end
+  create_table :categories do |t|
+    t.string :name
+  end
+  create_table :sports do |t|
+    t.string :name
+    t.integer :category_id
+  end
+  create_table :disciplines do |t|
+    t.string :name
+    t.integer :sport_id
+  end
+end
+
+class User < ActiveRecord::Base
+  belongs_to :team
+
+  validates :name,          :presence => true
+  validates :username,      :length => { :maximum => 10 }
+  validates :country,       :format => { :with => /[A-Za-z]/, :allow_blank => true }
+  validates :age,           :numericality => { :only_integer => true, :greater_than => 13 }
+  validates :bio,           :presence => true
+  validates :password,      :format => { :with => /.+/ }, :confirmation => true
+  validates :accepted,      :acceptance => true
+  validates :gender,        :inclusion => { :in => ["male", "female", "other", "withheld"] }
+  validates :dob,           :presence => true
+  validates :team_id,       :presence => true
+  validates :time_zone,     :presence => true
+  validates :discipline_id, :presence => true
+end
+
+class Team < ActiveRecord::Base; end
+
+class Category < ActiveRecord::Base
+  has_many :sports
+end
+class Sport < ActiveRecord::Base
+  belongs_to :category
+  has_many :disciplines
+end
+class Discipline < ActiveRecord::Base
+  belongs_to :sport
+  belongs_to :user
+end
+
+# hack to stop #url_for error
+module ActionDispatch::Routing::PolymorphicRoutes
+  def polymorphic_path(record_or_hash_or_array, options = {})
+    ""
+  end
+end

data/test/test_form_builder.rb

@@ -0,0 +1,69 @@
+require "action_view/test_case"
+require "html/document"
+require "expected_elements"
+
+class JudgeFormBuilderTest < ActionView::TestCase
+
+  include ExpectedElements
+
+  def test_text_field
+    assert_dom_equal expected_text_field, builder.text_field(:name, :validate => true)
+  end
+
+  def test_text_area
+    assert_dom_equal expected_text_area, builder.text_area(:bio, :validate => true)
+  end
+
+  def test_password_field
+    assert_dom_equal expected_password_field, builder.password_field(:password, :validate => true)
+  end
+
+  def test_check_box
+    assert_dom_equal expected_check_box, builder.password_field(:accepted, :validate => true)
+  end
+
+  def test_radio_button
+    assert_dom_equal expected_radio_button, builder.radio_button(:gender, "female", :validate => true)
+  end
+
+  def test_select
+    assert_dom_equal expected_select, builder.select(:country, [["US", "US"], ["GB", "GB"]], :validate => true)
+  end
+
+  def test_collection_select
+    assert_dom_equal expected_collection_select, builder.collection_select(:team_id, FactoryGirl.create_list(:team, 5), :id, :name, :validate => true)
+  end
+
+  def test_grouped_collection_select
+    assert_dom_equal expected_grouped_collection_select, builder.grouped_collection_select(:discipline_id, categories, :sports, :name, :id, :name, :validate => true)
+  end
+
+  def test_date_select
+    assert_dom_equal expected_date_select, builder.date_select(:dob, :validate => true, :minute_step => 30)
+  end
+
+  def test_datetime_select
+    assert_dom_equal expected_datetime_select, builder.datetime_select(:dob, :validate => true, :minute_step => 30)
+  end
+
+  def test_time_select
+    assert_dom_equal expected_time_select, builder.time_select(:dob, :validate => true, :minute_step => 30)
+  end
+
+  def test_time_zone_select
+    assert builder.time_zone_select(:time_zone, ActiveSupport::TimeZone.us_zones, :include_blank => true, :validate => true), "time zone select not present"
+  end
+
+  def builder
+    Judge::FormBuilder.new(:user, FactoryGirl.build(:user), self, {}, nil)
+  end
+
+  def categories
+    category = FactoryGirl.build(:category)
+    sport = FactoryGirl.build(:sport)
+    sport.disciplines << FactoryGirl.build_list(:discipline, 3)
+    category.sports << sport
+    [category]
+  end
+
+end

data/test/test_helper.rb

@@ -1,23 +1,11 @@
-require "rubygems"
-require "bundler"
-require "shoulda"
-require "action_view"
-require "active_support"
-require "nokogiri"
-require "json"
+require "bundler/setup"
 
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+# require stuff
+%w{active_record action_view shoulda factory_girl}.each do |x|
+  require x
 end
 
-ENV["RAILS_ENV"] = "test"
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require "judge"
-require "dummy/config/environment"
-require "rails/test_help"
+# require judge and test setup files
+%w{judge setup factories}.each do |x|
+  require x
+end

data/test/test_message_collection.rb

@@ -0,0 +1,84 @@
+class JudgeMessageCollectionTest < Test::Unit::TestCase
+
+  context "Judge::MessageCollection" do
+    setup do
+      @user = FactoryGirl.build(:user)
+    end
+
+    should "have hash of messages in messages attr" do
+      amv = User.validators_on(:name).first
+      message_collection = Judge::MessageCollection.new(@user, :name, amv)
+      assert_kind_of Hash, message_collection.messages
+    end
+
+    should "have to_hash method which returns messages hash" do
+      amv = User.validators_on(:name).first
+      message_collection = Judge::MessageCollection.new(@user, :name, amv)
+      assert_respond_to message_collection, :to_hash
+      assert_kind_of Hash, message_collection.to_hash
+    end
+
+    context "#generate_base!" do
+      should "add correct base message to messages hash" do
+        amv = User.validators_on(:name).first
+        message_collection = Judge::MessageCollection.new(@user, :name, amv, :generate => false)
+        assert_equal 0, message_collection.to_hash.length
+        message_collection.send(:generate_base!)
+        assert message_collection.to_hash[:blank]
+      end
+    end
+
+    context "#generate_options!" do
+      should "add correct optional messages to messages hash when present (length)" do
+        amv = User.validators_on(:username).first
+        message_collection = Judge::MessageCollection.new(@user, :username, amv, :generate => false)
+        assert_equal 0, message_collection.to_hash.length
+        message_collection.send(:generate_options!)
+        assert message_collection.to_hash[:too_long]
+      end
+
+      should "add correct optional messages to messages hash when present (numericality)" do
+        amv = User.validators_on(:age).first
+        message_collection = Judge::MessageCollection.new(@user, :age, amv, :generate => false)
+        assert_equal 0, message_collection.to_hash.length
+        message_collection.send(:generate_options!)
+        assert message_collection.to_hash[:greater_than]
+      end
+
+      should "add nothing to messages hash when optional messages not present" do
+        amv = User.validators_on(:name).first
+        message_collection = Judge::MessageCollection.new(@user, :name, amv, :generate => false)
+        message_collection.send(:generate_options!)
+        assert_equal 0, message_collection.to_hash.length
+      end
+    end
+
+    context "#generate_blank!" do
+      should "add blank message to messages hash if applicable" do
+        amv = User.validators_on(:username).first
+        message_collection = Judge::MessageCollection.new(@user, :username, amv, :generate => false)
+        assert_equal 0, message_collection.to_hash.length
+        message_collection.send(:generate_blank!)
+        assert message_collection.to_hash[:blank]
+      end
+
+      should "not add blank message to messages hash if allow_blank is true" do
+        amv = User.validators_on(:country).first
+        message_collection = Judge::MessageCollection.new(@user, :country, amv, :generate => false)
+        message_collection.send(:generate_blank!)
+        assert_equal 0, message_collection.to_hash.length
+      end
+    end
+
+    context "#generate_integer!" do
+      should "add not_an_integer message to messages hash if only_integer is true" do
+        amv = User.validators_on(:age).first
+        message_collection = Judge::MessageCollection.new(@user, :age, amv, :generate => false)
+        assert_equal 0, message_collection.to_hash.length
+        message_collection.send(:generate_integer!)
+        assert message_collection.to_hash[:not_an_integer]
+      end
+    end
+  end
+
+end

data/test/test_validator.rb

@@ -0,0 +1,37 @@
+class JudgeValidatorTest < Test::Unit::TestCase
+  
+  context "Judge::Validator" do
+    setup do
+      user = FactoryGirl.build(:user)
+      amv = User.validators_on(:name).first 
+      @validator = Judge::Validator.new(amv, :name, Judge::MessageCollection.new(user, :name, amv))
+    end
+
+    should "have an original validator in validator attr" do
+      assert_instance_of ActiveModel::Validations::PresenceValidator, @validator.active_model_validator
+    end
+
+    should "have correct kind attr" do
+      assert_equal :presence, @validator.kind
+    end
+
+    should "have hash in options attr" do
+      assert_kind_of Hash, @validator.options
+    end
+
+    should "have Judge::MessageCollection in messages attr" do
+      assert_instance_of Judge::MessageCollection, @validator.messages
+    end
+
+    context "to_hash" do
+      should "convert to hash with correct properties" do
+        hash = @validator.to_hash
+        assert_kind_of Hash, hash
+        assert_kind_of Symbol, hash[:kind]
+        assert_kind_of Hash, hash[:options]
+        assert_kind_of Hash, hash[:messages]
+      end
+    end
+  end
+  
+end

data/test/test_validator_collection.rb

@@ -0,0 +1,19 @@
+class JudgeValidatorCollection < Test::Unit::TestCase
+  
+  context "Judge::ValidatorCollection" do
+    setup do
+      user = FactoryGirl.build(:user)
+      @validator_collection = Judge::ValidatorCollection.new(user, :name)
+    end
+
+    should "contain validators" do
+      assert_kind_of Array, @validator_collection.validators
+      assert_instance_of Judge::Validator, @validator_collection.validators.first
+    end
+
+    should "convert to json correctly" do
+      assert_kind_of String, @validator_collection.to_json
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judge
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,34 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-13 00:00:00.000000000 +00:00
+date: 2011-11-14 00:00:00.000000000 +00:00
 default_executable: 
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2168570340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.18
-  type: :development
-  prerelease: false
-  version_requirements: *2168570340
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2168569740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *2168569740
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2168569100 !ruby/object:Gem::Requirement
+  requirement: &2157289920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +22,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2168569100
+  version_requirements: *2157289920
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168568460 !ruby/object:Gem::Requirement
+  requirement: &2157289420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +33,10 @@ dependencies:
         version: 3.0.10
   type: :development
   prerelease: false
-  version_requirements: *2168568460
+  version_requirements: *2157289420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2168567820 !ruby/object:Gem::Requirement
+  requirement: &2157288960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +44,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *2168567820
+  version_requirements: *2157288960
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2168531380 !ruby/object:Gem::Requirement
+  requirement: &2157288500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,55 +55,41 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2168531380
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &2168530420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.7
-  type: :development
-  prerelease: false
-  version_requirements: *2168530420
+  version_requirements: *2157288500
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2168529340 !ruby/object:Gem::Requirement
+  name: factory_girl
+  requirement: &2157309780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *2168529340
-description: Validate forms in-place using your model validations
+  version_requirements: *2157309780
+description: Validate forms on the client side, cleanly
 email: joe@tribesports.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- .document
+- .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
-- docs/docco.css
-- docs/judge.html
 - judge.gemspec
 - lib/generators/judge/judge_generator.rb
 - lib/generators/judge/templates/json2.js
 - lib/generators/judge/templates/judge.js
 - lib/generators/judge/templates/underscore.js
 - lib/judge.rb
-- lib/judge/form.rb
-- lib/judge/utils.rb
+- lib/judge/form_builder.rb
+- lib/judge/message_collection.rb
+- lib/judge/validator.rb
+- lib/judge/validator_collection.rb
+- lib/judge/version.rb
 - lib/tasks/js_tests.rake
 - spec/javascripts/JudgeSpec.js
 - spec/javascripts/fixtures/form.html
@@ -138,56 +102,14 @@ files:
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/support/phantomRunner.js
-- test/dummy/Gemfile
-- test/dummy/Gemfile.lock
-- test/dummy/Rakefile
-- 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
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/locales/en.yml
-- 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/server.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/javascripts/application.js
-- test/dummy/public/javascripts/controls.js
-- test/dummy/public/javascripts/dragdrop.js
-- test/dummy/public/javascripts/effects.js
-- test/dummy/public/javascripts/prototype.js
-- test/dummy/public/javascripts/rails.js
-- test/dummy/public/stylesheets/.gitkeep
-- test/dummy/script/rails
-- test/judge_test.rb
+- test/expected_elements.rb
+- test/factories.rb
+- test/setup.rb
+- test/test_form_builder.rb
 - test/test_helper.rb
+- test/test_message_collection.rb
+- test/test_validator.rb
+- test/test_validator_collection.rb
 has_rdoc: true
 homepage: http://github.com/joecorcoran/judge
 licenses:
@@ -202,9 +124,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 780299096256091398
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -216,34 +135,24 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Simple client-side ActiveModel::Validators
+summary: Simple client side ActiveModel::Validators
 test_files:
+- spec/javascripts/JudgeSpec.js
+- spec/javascripts/fixtures/form.html
+- spec/javascripts/helpers/customMatchers.js
+- spec/javascripts/helpers/jasmine-jquery.js
+- spec/javascripts/helpers/jquery-1.5.1.min.js
+- spec/javascripts/helpers/json2.js
+- spec/javascripts/helpers/underscore.js
+- spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
-- 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
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- 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
+- spec/javascripts/support/phantomRunner.js
+- test/expected_elements.rb
+- test/factories.rb
+- test/setup.rb
+- test/test_form_builder.rb
 - test/test_helper.rb
+- test/test_message_collection.rb
+- test/test_validator.rb
+- test/test_validator_collection.rb