activemodel-validators 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 795554ae591fe014e540d898361f2a4aaa2a588a
-  data.tar.gz: c33cdc6d6417a0dfddec20ed28b0f3c43032b3eb
+  metadata.gz: 09e9d34a28a1db45b7ff83d9c3fb77e92625a333
+  data.tar.gz: d42c29a1b6138e1302bba11d9a1c89a8f4eb8e37
 SHA512:
-  metadata.gz: b3e2e2d049271ea0b24acfce842c5db974f11ff81203faed628c688823ec30d8b5113b8f973b288482a29a82fa271aee6011406d884fe462592c5b2606cbd794
-  data.tar.gz: e307cc4d0699d8d541bbb0c7a8b021f765c005023c5840222ad9e8b98d7c1679ca400d238c4c87f5109b13624883d4e948d9e9fa87cc0e3e4d3a702474017d85
+  metadata.gz: 852cc4d4c762f37c00ae02cea0fb5dd5970301e1ce114f9b2e47473e1deaa01396e1eb734f4b96ac8edc5113953cad4c108d7facebac4d464d6fad97910abd3f
+  data.tar.gz: 447e539fb66b6451c13962167e96b6d73a25337a48630493b4fbb9a216204523a07b5df109b1545023188b4d48cbb420bb6f8befcc0356c88e6f8692fded844b

data/Readme.md

@@ -20,6 +20,7 @@ class Thing < ActiveRecord::Base
 
   validates :model,  restrict_to: {allowed_options: ['Model A', 'Model B']}, allow_blank: true
 
+  validates_with AtLeastOnePresentValidator, at_least_one_of: [:home_phone, :work_phone]
   validates_with AtLeastOnePresentValidator, at_least_one_of: [:parent_1_home_phone, :parent_1_work_phone, :parent_1_mobile_phone], message: :at_least_one_phone_parent_1
 
   validates :option_b, blank: {message: :must_be_blank_if_option_a}, if: :option_a?

data/activemodel-validators.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "activemodel"
+  s.add_development_dependency "activerecord"
+  s.add_development_dependency "sqlite3"
 
   # For config/locales
   #s.add_runtime_dependency "railties"

data/config/locales/en.yml

@@ -10,3 +10,9 @@ en:
       sum_of_with_addends: "must be the sum of %{attr_names} (%{addends} = %{sum}) but was %{value}"
 
       must_be_blank: "must be blank"
+
+      at_least_one_field_must_be_present: "at least 1 of these fields must be present: %{attr_names_list}"
+
+      year_invalid:                 "is not a valid year (must be a number between %{min} and %{max})"
+      date_invalid:                 "is not a valid date (must be in %{expected_format} format)"
+      must_have_at_least_10_digits: "must have at least 10 digits"

data/lib/activemodel-validators/at_least_one_present_validator.rb

@@ -5,7 +5,8 @@ module ActiveModel
         attr_names = options[:at_least_one_of]
         #puts %(attr_names=#{attr_names.inspect})
         unless attr_names.map {|attr_name| record[attr_name]}.any?(&:present?)
-          record.errors.add :base, options[:message] || "at least 1 of these fields must be present: #{attr_names.to_sentence(last_word_connector: ', or ')}"
+          record.errors.add :base, options[:message] || :at_least_one_field_must_be_present,
+            attr_names_list: attr_names.to_sentence(two_words_connector: ' or ', last_word_connector: ', or ')
         end
       end
     end

data/lib/activemodel-validators/date_validator.rb

@@ -8,7 +8,8 @@ module ActiveModel
         raw_value ||= value
 
         if raw_value.present? and !value.is_a?(Date)
-          record.errors.add attr_name, :date_invalid
+          record.errors.add attr_name, :date_invalid,
+            expected_format: expected_format
           return # don't want it to show *both* errors (:date_invalid and :blank)
         end
 
@@ -17,6 +18,15 @@ module ActiveModel
           record.errors.add attr_name, message
         end
       end
+
+    private
+      # Note that the format given here only affects the error message that you show your users. It
+      # is up to you to actually change your model to understand or convert from values supplied by
+      # users in a particular format.
+      # Some formats that ActiveRecord already understands include 'yyyy-mm-dd' and 'dd/mm/yyyy'.
+      def expected_format
+        options[:expected_format] || 'yyyy-mm-dd'
+      end
     end
   end
 end

data/lib/activemodel-validators/phone_validator.rb

@@ -2,7 +2,7 @@ class PhoneValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return if value.blank?
     unless value.to_s.gsub(/[\s-]+/, '').length >= 10
-      record.errors[attribute] << "must have at least 10 digits"
+      record.errors.add attribute, :must_have_at_least_10_digits
     end
   end
 end

data/lib/activemodel-validators/version.rb

@@ -1,5 +1,5 @@
 module Activemodel
   module Validators
-    Version = "1.0.0"
+    Version = "1.1.0"
   end
 end

data/lib/activemodel-validators/year_validator.rb

@@ -1,8 +1,21 @@
-class YearValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    return if value.blank?
-    unless ((min=1700) .. (max=2200)).include? value
-      record.errors.add attribute, :year_invalid, min: min, max: max
+module ActiveModel
+  module Validations
+    class YearValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if value.blank?
+        unless (min .. max).include? value
+          record.errors.add attribute, :year_invalid, min: min, max: max
+        end
+      end
+
+    private
+      def min
+        options[:min] || 1700
+      end
+
+      def max
+        options[:max] || 2200
+      end
     end
   end
 end

data/spec/at_least_one_present_validator_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+      ActiveModel::Validations::AtLeastOnePresentValidator
+class ActiveModel::Validations::AtLeastOnePresentValidator
+
+  class TestModel < Struct.new(:home_phone, :work_phone)
+    include ActiveModel::Validations
+
+    validates_with AtLeastOnePresentValidator, at_least_one_of: [:home_phone, :work_phone]
+  end
+
+  describe TestModel do
+
+    context 'when we supply none of the required fields' do
+      before { subject.valid? }
+      its('errors.messages') { should == {base: ["at least 1 of these fields must be present: home_phone or work_phone"]} }
+    end
+
+    context 'when we only have home_phone' do
+      before { subject.home_phone = '555-555-5555' }
+      before { subject.valid? }
+      its('errors.messages') { should == {} }
+    end
+
+  end
+
+end

data/spec/date_validator_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ::User, 'ActiveModel::Validations::DateValidator' do
+
+  shared_examples_for 'should not allow invalid dates' do |
+    attr_name: nil,
+    message: "is not a valid date (must be in yyyy-mm-dd format)"
+  |
+    it { should_not allow_value('non-date').  for(attr_name).with_message(message) }
+    it { should     allow_value('2013-01-01').for(attr_name) }
+    it { should     allow_value('30/12/2013').for(attr_name) }
+  end
+
+  describe 'date: true' do
+    it { should     allow_value(nil).for(:optional_date) }
+    it { should     allow_value(''). for(:optional_date) }
+    it_behaves_like 'should not allow invalid dates', attr_name: :optional_date
+  end
+
+  describe "date: {expected_format: 'dd/mm/yyyy'}" do
+    it { should     allow_value(nil).for(:custom_format_date) }
+    it { should     allow_value(''). for(:custom_format_date) }
+    it_behaves_like 'should not allow invalid dates', attr_name: :custom_format_date,
+      message: "is not a valid date (must be in dd/mm/yyyy format)"
+  end
+
+  describe 'date: {required: true}' do
+    it { should_not allow_value(nil).for(:end_date).with_message("can't be blank") }
+    it { should_not allow_value(''). for(:end_date).with_message("can't be blank") }
+    it_behaves_like 'should not allow invalid dates', attr_name: :end_date
+  end
+
+end

data/spec/support/active_record.rb

@@ -0,0 +1,5 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection \
+  adapter: "sqlite3",
+  database: ":memory:"

data/spec/support/models/user.rb

@@ -1,3 +1,11 @@
-class User < Struct.new(:name, :age)
-  include ActiveModel::Validations
+ActiveRecord::Migration.create_table :users do |t|
+  t.date :optional_date
+  t.date :end_date
+  t.date :custom_format_date
+end
+
+class User < ActiveRecord::Base
+  validates :optional_date, date: true
+  validates :custom_format_date, date: {expected_format: 'dd/mm/yyyy'}
+  validates :end_date, date: {required: true}
 end

data/spec/year_validator_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+      ActiveModel::Validations::YearValidator
+class ActiveModel::Validations::YearValidator
+
+  class TestModel < Struct.new(:graduation_year, :ancient_person_birth_year)
+    include ActiveModel::Validations
+
+    validates :graduation_year, year: true
+    validates :ancient_person_birth_year, year: {min: 1000, max: 2000}
+  end
+
+  describe TestModel do
+
+    it { should_not allow_value(1699).for(:graduation_year).with_message('is not a valid year (must be a number between 1700 and 2200)') }
+    it { should     allow_value(1700).for(:graduation_year) }
+    it { should     allow_value(2200).for(:graduation_year) }
+    it { should_not allow_value(2201).for(:graduation_year).with_message('is not a valid year (must be a number between 1700 and 2200)') }
+
+    it { should_not allow_value( 999).for(:ancient_person_birth_year).with_message('is not a valid year (must be a number between 1000 and 2000)') }
+    it { should     allow_value(1000).for(:ancient_person_birth_year) }
+    it { should     allow_value(2000).for(:ancient_person_birth_year) }
+    it { should_not allow_value(2001).for(:ancient_person_birth_year).with_message('is not a valid year (must be a number between 1000 and 2000)') }
+
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-validators
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tyler Rick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,6 +24,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Some reusable ActiveModel validations, including greater_than, boolean_presence,
   and at_least_one_present '
 email:
@@ -58,10 +86,14 @@ files:
 - lib/activemodel-validators/sum_of_validator.rb
 - lib/activemodel-validators/version.rb
 - lib/activemodel-validators/year_validator.rb
+- spec/at_least_one_present_validator_spec.rb
+- spec/date_validator_spec.rb
 - spec/less_or_greater_than_validator_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_record.rb
 - spec/support/models/response.rb
 - spec/support/models/user.rb
+- spec/year_validator_spec.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -81,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activemodel-validators
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Some reusable ActiveModel validations
 test_files: []
-has_rdoc: