activemodel-validators 1.2.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a3e3d6ba7a3262bbbe57a2c20e90a9a9bfcb19be
-  data.tar.gz: 6ad2eb5ae67287dacc7b1c684dc70d2533dabcf9
+SHA256:
+  metadata.gz: 961ba5817f1275b85ef77cd36078274940be5a204d283215f22c282873b6fc25
+  data.tar.gz: a4ba63270f369593bb3bf295b2a1db59ee5073b62d20d6ab4baa22a9787ca17e
 SHA512:
-  metadata.gz: 840f7dff2d3b512b2f5b4471901c7ba2ddd42f4d2520d3e47a38779286c3bf9e4ec1a4e2ae0e460cec056747d45f07733c91135f3da3b27711af57677c430cc4
-  data.tar.gz: 45e68afce515e74156fdf6ddd2643905e556c578149a8ec2d4efad8d0fab3eb11e861f3943ecb7b221bf84f2d8c6aa99f729e6dadcdd3ce097b88da813c9107e
+  metadata.gz: ecf522be4a8849c91c4f99010452884ff966e7e459fe286d3f40103159a26e2d8de1c7c7af138fcba502c49fa55665d37a0a47f20136c04e6077bd7863adf35a
+  data.tar.gz: c9e13fba3fce4ce0bed10092d60add8dba4fa2dcd3deb83f0e0aaeb2ecf6e2bc164ff498b87ca2f5b267c75138bc7b5f8495f81bb6daded210e31e812241a583

data/Readme.md

@@ -1,7 +1,7 @@
 ActiveModel Validators
 =======================
 
-A collection of Rails 3 ActiveModel Validators
+A collection of Rails ActiveModel Validators
 
 Example Usage
 -------------
@@ -35,7 +35,6 @@ class Thing < ActiveRecord::Base
   validates :end_date, date: {required: true}
   validates :graduation_year,       year: true
 
-  validates :phone,                 phone: true
   validates :address_postal_code,   postal_code: true
   validates :address_state,         address_state: true
 end
@@ -59,7 +58,6 @@ Documentation
 * [DateValidator](activemodel-validators/blob/master/lib/activemodel-validators/date_validator.rb)
 * [YearValidator](activemodel-validators/blob/master/lib/activemodel-validators/year_validator.rb)
 
-* [PhoneValidator](activemodel-validators/blob/master/lib/activemodel-validators/phone_validator.rb)
 * [PostalCodeValidator](activemodel-validators/blob/master/lib/activemodel-validators/postal_code_validator.rb)
 * [AddressStateValidator](activemodel-validators/blob/master/lib/activemodel-validators/address_state_validator.rb)
 
@@ -117,6 +115,8 @@ Other collections not worth taking a look at:
 Specialized validators that stand on their own:
 -----------------------------------------------
 
+* https://github.com/daddyz/phonelib (`phone: true`)
+* https://github.com/perfectline/validates_url
 * https://github.com/balexand/email_validator 
 
 

data/config/locales/en.yml

@@ -15,4 +15,3 @@ en:
 
       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/less_or_greater_than_validator.rb

@@ -73,7 +73,7 @@ module ActiveModel
         return if value.blank? or other_value.blank?
         unless value.send(operator, other_value)
           record.errors.add(attribute, message_key,
-                            options.merge(
+                            **options.merge(
                               value:         value,
                               operator:      operator,
                               operator_text: operator_text,

data/lib/activemodel-validators/sum_of_validator.rb

@@ -1,23 +1,27 @@
-class SumOfValidator < ActiveModel::EachValidator
-  def check_validity!
-    unless options[:attr_names]
-      raise ArgumentError, "must supply :attr_names option"
-    end
-  end
+module ActiveModel
+  module Validations
+    class SumOfValidator < ActiveModel::EachValidator
+      def check_validity!
+        unless options[:attr_names]
+          raise ArgumentError, "must supply :attr_names option"
+        end
+      end
 
-  def validate_each(record, attribute, value)
-    addends = options[:attr_names].map {|_| record[_] }
-    return if value.blank? || addends.any?(&:blank?)
-    sum = addends.sum
-    unless value == sum
-      record.errors.add(attribute, options[:message] || :sum_of,
-                        options.merge(
-                          attr_names: options[:attr_names].to_sentence,
-                          addends: addends.join(' + '),
-                          sum: sum,
-                          value: value,
-                        )
-      )
+      def validate_each(record, attribute, value)
+        addends = options[:attr_names].map {|_| record[_] }
+        return if value.blank?
+        sum = addends.reject(&:blank?).sum
+        unless value == sum
+          record.errors.add(attribute, options[:message] || :sum_of,
+                            options.merge(
+                              attr_names: options[:attr_names].to_sentence,
+                              addends: addends.join(' + '),
+                              sum: sum,
+                              value: value,
+                            )
+          )
+        end
+      end
     end
   end
 end

data/lib/activemodel-validators/version.rb

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

data/spec/sum_of_validator_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+      ActiveModel::Validations::SumOfValidator
+class ActiveModel::Validations::SumOfValidator
+
+  class TestModel < Struct.new(:group_1_count, :group_2_count, :total_count)
+    include ActiveModel::Validations
+
+    validates :total_count, sum_of: {attr_names: [:group_1_count, :group_2_count] }
+  end
+
+  describe TestModel do
+    before { subject.group_1_count = 1 }
+    before { subject.group_2_count = 2 }
+    before { subject.total_count   = 3 }
+
+    context 'when group_1_count + group_2_count == total_count' do
+      before { subject.valid? }
+      its('errors.messages') { should == {} }
+    end
+
+    context 'when group_1_count + group_2_count != total_count' do
+      before { subject.group_2_count = 1 }
+      before { subject.valid? }
+      its('errors.messages') { should == {total_count: ["must be the sum of group_1_count and group_2_count (2) but was 3"]} }
+    end
+
+    context 'when total_count is blank' do
+      before { subject.total_count = '' }
+      before { subject.valid? }
+      its('errors.messages') { should == {} }
+    end
+
+    context 'when group_1_count and group_2_count are blank' do
+      before { subject.group_1_count = nil }
+      before { subject.group_2_count = '' }
+      before { subject.valid? }
+      its('errors.messages') { should == {total_count: ["must be the sum of group_1_count and group_2_count (0) but was 3"]} }
+    end
+
+    context 'when group_2_count is blank' do
+      before { subject.group_2_count = '' }
+      before { subject.valid? }
+      its('errors.messages') { should == {total_count: ["must be the sum of group_1_count and group_2_count (1) but was 3"]} }
+    end
+
+    context 'when group_1_count is a string and group_2_count is a fixnum' do
+      before { subject.group_1_count = '1' }
+      before { subject.group_2_count =  2 }
+      it { expect { subject.valid? }.to raise_exception 'no implicit conversion of Fixnum into String' }
+    end
+
+    context 'when group_1_count is a fixnum and group_2_count is a string' do
+      before { subject.group_1_count =  1 }
+      before { subject.group_2_count = '2' }
+      it { expect { subject.valid? }.to raise_exception "String can't be coerced into Fixnum" }
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-validators
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tyler Rick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -80,7 +80,6 @@ files:
 - lib/activemodel-validators/less_or_greater_than_validator.rb
 - lib/activemodel-validators/less_than_validator.rb
 - lib/activemodel-validators/multiple_of_validator.rb
-- lib/activemodel-validators/phone_validator.rb
 - lib/activemodel-validators/postal_code_validator.rb
 - lib/activemodel-validators/rails.rb
 - lib/activemodel-validators/restrict_to_validator.rb
@@ -91,6 +90,7 @@ files:
 - spec/date_validator_spec.rb
 - spec/less_or_greater_than_validator_spec.rb
 - spec/spec_helper.rb
+- spec/sum_of_validator_spec.rb
 - spec/support/active_record.rb
 - spec/support/models/response.rb
 - spec/support/models/user.rb
@@ -113,8 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: activemodel-validators
-rubygems_version: 2.2.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Some reusable ActiveModel validations

data/lib/activemodel-validators/phone_validator.rb

@@ -1,8 +0,0 @@
-class PhoneValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    return if value.blank?
-    unless value.to_s.gsub(/[\s-]+/, '').length >= 10
-      record.errors.add attribute, :must_have_at_least_10_digits
-    end
-  end
-end