activemodel-validators 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3e3d6ba7a3262bbbe57a2c20e90a9a9bfcb19be
-  data.tar.gz: 6ad2eb5ae67287dacc7b1c684dc70d2533dabcf9
+  metadata.gz: cdecd79a81ab24c7e838e1ee0e8983bfaf901b07
+  data.tar.gz: 67a9b577cbc12f1c29fc624527ef4a193bfd05fd
 SHA512:
-  metadata.gz: 840f7dff2d3b512b2f5b4471901c7ba2ddd42f4d2520d3e47a38779286c3bf9e4ec1a4e2ae0e460cec056747d45f07733c91135f3da3b27711af57677c430cc4
-  data.tar.gz: 45e68afce515e74156fdf6ddd2643905e556c578149a8ec2d4efad8d0fab3eb11e861f3943ecb7b221bf84f2d8c6aa99f729e6dadcdd3ce097b88da813c9107e
+  metadata.gz: 5c9bb9ef4739163b3c22ac664d3856208112996fc80ca8a684b6d7f9b5479c52f5d8f9c15f1dfc8bb76a2565a8ad8abde745c284055e30ebecaa184096ab5ae3
+  data.tar.gz: e428717cf8afffd6f87c2d377d364bfed90aed8c26f2a4de8a896e461e25e49229b806df5f48899d34cde1597313c75ec46338bf3a60c93c6de865040588558f

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 = "2.0.0"
   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,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-validators
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tyler Rick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-25 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
@@ -91,6 +91,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
@@ -104,17 +105,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.2.2
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Some reusable ActiveModel validations