judge 1.4.0 → 1.5.0

data/spec/message_collection_spec.rb

@@ -1,83 +1,72 @@
-require "spec_helper"
+require "support/spec_helper"
 
 describe Judge::MessageCollection do
 
-  before(:each) do
-    @user = FactoryGirl.build(:user)
-  end
-
-  it "has hash of messages in messages attr" do
-    amv = User.validators_on(:name).first
-    message_collection = Judge::MessageCollection.new(@user, :name, amv)
-    message_collection.messages.should be_a Hash
-  end
+  let(:user) { FactoryGirl.build(:user) }
 
   it "has to_hash method which returns messages hash" do
     amv = User.validators_on(:name).first
-    message_collection = Judge::MessageCollection.new(@user, :name, amv)
+    message_collection = Judge::MessageCollection.new(user, :name, amv)
     message_collection.should respond_to :to_hash
     message_collection.to_hash.should be_a Hash
   end
 
-  describe "#generate_base!" do
+  describe "base messages" do
     it "adds correct base message to messages hash" do
       amv = User.validators_on(:name).first
-      message_collection = Judge::MessageCollection.new(@user, :name, amv, :generate => false)
-      message_collection.to_hash.should be_empty
-      message_collection.send(:generate_base!)
-      message_collection.to_hash[:blank].should be_a String
+      messages = Judge::MessageCollection.new(user, :name, amv).to_hash
+      messages[:blank].should eql "Name must not be blank"
     end
   end
 
-  describe "#generate_options!" do
+  describe "options messages" do
     it "adds 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)
-      message_collection.to_hash.should be_empty
-      message_collection.send(:generate_options!)
-      message_collection.to_hash[:too_long].should be_a String
+      messages = Judge::MessageCollection.new(user, :username, amv).to_hash
+      messages[:too_long].should eql "Username is too long (must be less than 10 characters)"
     end
 
     it "adds 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)
-      message_collection.to_hash.should be_empty
-      message_collection.send(:generate_options!)
-      message_collection.to_hash[:greater_than].should be_a String
+      messages = Judge::MessageCollection.new(user, :age, amv).to_hash
+      messages[:greater_than].should eql "Age must be greater than 13"
     end
 
     it "adds 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!)
-      message_collection.to_hash.should be_empty
+      messages = Judge::MessageCollection.new(user, :name, amv).to_hash
+      messages[:too_long].should be_nil
+      messages[:greater_than].should be_nil
     end
   end
 
-  describe "#generate_blank!" do
+  describe "blank messages" do
     it "adds blank message to messages hash if applicable" do
       amv = User.validators_on(:username).first
-      message_collection = Judge::MessageCollection.new(@user, :username, amv, :generate => false)
-      message_collection.to_hash.should be_empty
-      message_collection.send(:generate_blank!)
-      message_collection.to_hash[:blank].should be_a String
+      messages = Judge::MessageCollection.new(user, :username, amv).to_hash
+      messages[:blank].should eql "Username must not be blank"
     end
 
     it "does 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!)
-      message_collection.to_hash.should be_empty
+      messages = Judge::MessageCollection.new(user, :country, amv).to_hash
+      messages[:blank].should be_nil
     end
   end
 
-  describe "#generate_integer!" do
+  describe "integer messages" do
     it "adds 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)
-      message_collection.to_hash.should be_empty
-      message_collection.send(:generate_integer!)
-      message_collection.to_hash[:not_an_integer].should be_a String
+      messages = Judge::MessageCollection.new(user, :age, amv).to_hash
+      messages[:not_an_integer].should eql "Age must be an integer"
+    end
+  end
+
+  describe "custom messages" do
+    it "adds custom messages to messages hash if declared inside EachValidator" do
+      amv = User.validators_on(:city).first
+      messages = Judge::MessageCollection.new(user, :city, amv).to_hash
+      messages[:not_valid_city].should eql "City must be an approved city"
     end
   end
 

data/spec/setup.rb

@@ -1,4 +1,4 @@
-# setup fake ActiveRecord class for tests
+# setup ActiveRecord classes for tests
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Schema.define(:version => 1) do
   create_table :users do |t|
@@ -14,6 +14,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer :team_id
     t.string :time_zone
     t.integer :discipline_id
+    t.string :city
   end
   create_table :teams do |t|
     t.string :name
@@ -46,6 +47,7 @@ class User < ActiveRecord::Base
   validates :team_id,       :presence => true
   validates :time_zone,     :presence => true
   validates :discipline_id, :presence => true
+  validates :city,          :city => true
 end
 
 class Team < ActiveRecord::Base; end
@@ -62,6 +64,9 @@ class Discipline < ActiveRecord::Base
   belongs_to :user
 end
 
+# i18n locale file
+I18n.load_path << File.expand_path("spec/support/locale/en.yml")
+
 # hack to stop #url_for error
 module ActionDispatch::Routing::PolymorphicRoutes
   def polymorphic_path(record_or_hash_or_array, options = {})

data/spec/support/locale/en.yml

@@ -0,0 +1,18 @@
+en:
+  activerecord:
+    errors:
+      models:
+        user:
+          attributes:
+            city:
+              not_valid_city: "%{attribute} must be an approved city"
+  errors:
+    attributes:
+      city:
+        not_valid_city: "This is never reached"
+
+    messages:
+      not_an_integer: "%{attribute} must be an integer"
+      blank: "%{attribute} must not be blank"
+      greater_than: "%{attribute} must be greater than %{count}"
+      too_long: "%{attribute} is too long (must be less than %{count} characters)"

data/spec/support/setup.rb

@@ -0,0 +1,72 @@
+# 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
+    t.string :foo
+  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
+  validates :foo,           :foo => 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/spec/{spec_helper.rb → support/spec_helper.rb}

@@ -4,9 +4,9 @@ require "action_view"
 require "judge"
 require "rspec"
 require "factory_girl"
+require "support/validators/city_validator"
 require "setup"
-
-require_relative "factories"
+require "support/factories"
 
 RSpec.configure do |config|
   config.color_enabled = true

data/spec/support/validators/city_validator.rb

@@ -0,0 +1,9 @@
+class CityValidator < ActiveModel::EachValidator
+  declare_messages :not_valid_city
+
+  def validate_each(record, attribute, value)
+    unless ["London", "New York City"].include? value
+      record.errors.add :attribute, :not_valid_city
+    end
+  end
+end

data/spec/validator_collection_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "support/spec_helper"
 
 describe Judge::ValidatorCollection do
   

data/spec/validator_spec.rb

@@ -1,15 +1,11 @@
-require "spec_helper"
+require "support/spec_helper"
 
 describe Judge::Validator do
   
   before(:each) do
     user = FactoryGirl.build(:user)
     amv = User.validators_on(:name).first 
-    @validator = Judge::Validator.new(amv, :name, Judge::MessageCollection.new(user, :name, amv))
-  end
-
-  it "has an original validator in validator attr" do
-    @validator.active_model_validator.should be_a ActiveModel::Validations::PresenceValidator
+    @validator = Judge::Validator.new(user, :name, amv)
   end
 
   it "has correct kind attr" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judge
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2151873000 !ruby/object:Gem::Requirement
+  requirement: &2168506340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *2151873000
+  version_requirements: *2168506340
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151872120 !ruby/object:Gem::Requirement
+  requirement: &2168505620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *2151872120
+  version_requirements: *2168505620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151871360 !ruby/object:Gem::Requirement
+  requirement: &2168504460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *2151871360
+  version_requirements: *2168504460
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &2151870580 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &2168503260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *2151870580
+  version_requirements: *2168503260
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2151869300 !ruby/object:Gem::Requirement
+  requirement: &2168501980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2151869300
+  version_requirements: *2168501980
 description: Validate Rails 3 forms on the client side, cleanly
 email: joe@tribesports.com
 executables: []
@@ -84,14 +84,16 @@ files:
 - lib/generators/judge/templates/judge.js
 - lib/generators/judge/templates/underscore.js
 - lib/judge.rb
+- lib/judge/each_validator.rb
 - lib/judge/form_builder.rb
 - lib/judge/html.rb
 - lib/judge/message_collection.rb
+- lib/judge/message_config.rb
 - lib/judge/validator.rb
 - lib/judge/validator_collection.rb
 - lib/judge/version.rb
 - lib/tasks/js.rake
-- spec/factories.rb
+- spec/each_validator_spec.rb
 - spec/form_builder_spec.rb
 - spec/html_spec.rb
 - spec/javascripts/JudgeSpec.js
@@ -107,7 +109,11 @@ files:
 - spec/javascripts/support/runner.js
 - spec/message_collection_spec.rb
 - spec/setup.rb
-- spec/spec_helper.rb
+- spec/support/factories.rb
+- spec/support/locale/en.yml
+- spec/support/setup.rb
+- spec/support/spec_helper.rb
+- spec/support/validators/city_validator.rb
 - spec/validator_collection_spec.rb
 - spec/validator_spec.rb
 homepage: http://github.com/joecorcoran/judge
@@ -124,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -196777786245842786
+      hash: -172077303514846172
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -196777786245842786
+      hash: -172077303514846172
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -141,7 +147,7 @@ signing_key:
 specification_version: 3
 summary: Simple client side ActiveModel::Validators
 test_files:
-- spec/factories.rb
+- spec/each_validator_spec.rb
 - spec/form_builder_spec.rb
 - spec/html_spec.rb
 - spec/javascripts/JudgeSpec.js
@@ -157,6 +163,10 @@ test_files:
 - spec/javascripts/support/runner.js
 - spec/message_collection_spec.rb
 - spec/setup.rb
-- spec/spec_helper.rb
+- spec/support/factories.rb
+- spec/support/locale/en.yml
+- spec/support/setup.rb
+- spec/support/spec_helper.rb
+- spec/support/validators/city_validator.rb
 - spec/validator_collection_spec.rb
 - spec/validator_spec.rb