activemodel-validators 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09e9d34a28a1db45b7ff83d9c3fb77e92625a333
-  data.tar.gz: d42c29a1b6138e1302bba11d9a1c89a8f4eb8e37
+  metadata.gz: a3e3d6ba7a3262bbbe57a2c20e90a9a9bfcb19be
+  data.tar.gz: 6ad2eb5ae67287dacc7b1c684dc70d2533dabcf9
 SHA512:
-  metadata.gz: 852cc4d4c762f37c00ae02cea0fb5dd5970301e1ce114f9b2e47473e1deaa01396e1eb734f4b96ac8edc5113953cad4c108d7facebac4d464d6fad97910abd3f
-  data.tar.gz: 447e539fb66b6451c13962167e96b6d73a25337a48630493b4fbb9a216204523a07b5df109b1545023188b4d48cbb420bb6f8befcc0356c88e6f8692fded844b
+  metadata.gz: 840f7dff2d3b512b2f5b4471901c7ba2ddd42f4d2520d3e47a38779286c3bf9e4ec1a4e2ae0e460cec056747d45f07733c91135f3da3b27711af57677c430cc4
+  data.tar.gz: 45e68afce515e74156fdf6ddd2643905e556c578149a8ec2d4efad8d0fab3eb11e861f3943ecb7b221bf84f2d8c6aa99f729e6dadcdd3ce097b88da813c9107e

data/Readme.md

@@ -10,11 +10,14 @@ Example Usage
 class Thing < ActiveRecord::Base
   validates :birthdate, greater_than: { value: Date.new(1900), message: 'must be later than 1900' }
   validates :birthdate, less_than:    { value: Time.zone.now.years_ago(1).to_date+1, message: 'must be at least 1 year ago' }
-  validates :end_date,  greater_than: {attr: :begin_date, operator_text: 'later than'}
+  validates :end_date,  greater_than: { attr: :begin_date, operator_text: 'later than' }
 
-  # shortcut for        greater_than: { value: 1, operator: :>=, operator_text: 'at least' }
+  # shortcut for        greater_than: { value: 1, operator: :>= }
   validates :how_many_pies, at_least: { value: 1 }
 
+  # shortcut for less_or_greater_than: { attr: :how_many_people, operator: :== }
+  validates :how_many_gifts, equal_to: { attr: :how_many_people }
+
   # Because presence: true doesn't work for boolean attributes!
   validates :is_18_or_older, boolean_presence: true
 

data/lib/activemodel-validators/equal_to_validator.rb

@@ -0,0 +1,16 @@
+require 'activemodel-validators/less_or_greater_than_validator'
+
+module ActiveModel
+  module Validations
+    class EqualToValidator < LessOrGreaterThanValidator
+    protected
+      def default_operator
+        :==
+      end
+
+      def allowed_operators
+        [:==]
+      end
+    end
+  end
+end

data/lib/activemodel-validators/less_or_greater_than_validator.rb

@@ -17,6 +17,10 @@ module ActiveModel
         raise NotImplementedError, 'must be defined in subclass'
       end
 
+      def allowed_operators
+        [:<, :<=, :>, :>=, :==]
+      end
+
       def operator
         options[:operator] || default_operator
       end
@@ -24,7 +28,7 @@ module ActiveModel
       # Defaults to the standard mathematical name for these operators, but you're free to override with
       # something that makes more sense ('later than' might make more sense for dates, for example)
       def operator_text
-        options[:operator_text] || 
+        options[:operator_text] ||
         {
           :<  => 'less than',
           :<= => 'less than or equal to',
@@ -49,9 +53,19 @@ module ActiveModel
         !!options[:attr]
       end
 
+      def human_attr_name
+        return unless options[:attr]
+        if defined?(ActiveRecord::Base)
+          ActiveRecord::Base.human_attribute_name(options[:attr])
+        else
+          options[:attr]
+        end
+      end
+
       def message_key
         comparing_to_attr? ? :less_or_greater_than_attr : :less_or_greater_than
       end
+
     public
 
       def validate_each(record, attribute, value)
@@ -63,7 +77,7 @@ module ActiveModel
                               value:         value,
                               operator:      operator,
                               operator_text: operator_text,
-                              attr_name:     options[:attr],
+                              attr_name:     human_attr_name,
                               other_value:   other_value,
                             )
           )

data/lib/activemodel-validators/version.rb

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

data/spec/less_or_greater_than_validator_spec.rb

@@ -10,4 +10,7 @@ describe Response do
 
   it { should_not allow_value(0).for(:how_many_pies).  with_message('must be at least 1') }
   it { should     allow_value(1).for(:how_many_pies) }
+
+  it { subject.how_many_people = 5
+       should_not allow_value(0).for(:how_many_gifts).  with_message('must be equal to How many people (5)') }
 end

data/spec/support/models/response.rb

@@ -1,8 +1,9 @@
-class Response < Struct.new(:how_many_people, :how_many_pies)
+class Response < Struct.new(:how_many_people, :how_many_gifts, :how_many_pies)
   #extend  ActiveModel::Naming
   #include ActiveModel::Conversion
   include ActiveModel::Validations
 
   validates :how_many_people, greater_than: { value: 1, operator: :>= }, allow_blank: true
+  validates :how_many_gifts,  equal_to:     {attr: :how_many_people},    allow_blank: true
   validates :how_many_pies,   at_least:     { value: 1 },                allow_blank: true
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-validators
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tyler Rick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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,
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Rakefile
 - Readme.md
@@ -75,6 +75,7 @@ files:
 - lib/activemodel-validators/blank_validator.rb
 - lib/activemodel-validators/boolean_presence_validator.rb
 - lib/activemodel-validators/date_validator.rb
+- lib/activemodel-validators/equal_to_validator.rb
 - lib/activemodel-validators/greater_than_validator.rb
 - lib/activemodel-validators/less_or_greater_than_validator.rb
 - lib/activemodel-validators/less_than_validator.rb
@@ -103,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: activemodel-validators
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Some reusable ActiveModel validations