rails_validations 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddd6882125ca697433e2c84a1abe00d27915a047
-  data.tar.gz: c5989625d5445cc3c945dacca0508af06326bc34
+  metadata.gz: a12b5368bba78e7aab87a70d991dba1dd11c8547
+  data.tar.gz: 95efbaabfe4fb4621617a36917f369cfdc54340e
 SHA512:
-  metadata.gz: ec30b335a30fe9d5edcb557305aba2801d7311482ae6524beed630a6c4b0a26ee445211cf911b217663d316807c73fe537468a27b7dc54e14433106e1d763ffd
-  data.tar.gz: 28d39fdf01a7018dd1497b02188016bb350fb85655c1c773695b6d673f016f5f7098b749970a5c81e2b37ccd49ddf9685f31c82a5da0ff8c901f47dbe12fe6fa
+  metadata.gz: f489d4415e90345fb2c52b5258eb8caa31a12a07198fb760b5b1d4d494d3280dd749393b49940d7429ff7e4d734c1ac8c6db96f097791f139d01ea577a817c87
+  data.tar.gz: 49dc62c80cdae17e1721ee82616765abe7314707bcc81d3b1124be526ee5ef39e3cb9ffb4608e8cc4eb51806541e7a13a95fcf2419e730b958e8e2eadcffaa3e

data/README.markdown

@@ -96,6 +96,10 @@ Currently implemented countries:
 
 ChangeLog
 =========
+Version 1.1.4, 2014-12-28
+-------------------------
+- Bugfix for Date validator when comparing to other columns that are a String.
+
 
 Version 1.1.3, 2014-12-03
 -------------------------

data/lib/validators/date_validator.rb

@@ -27,24 +27,25 @@ class DateValidator < ActiveModel::EachValidator
   }.freeze
 
 
-  def validate_each record, attribute, raw_value
+  def value_to_date raw_value
     # TODO: Do we need to do anything with timezones? Figure it out (rails has
     # ActiveSupport::TimeWithZone)...
-    value = if raw_value.is_a? Fixnum
-              time.at(raw_value).to_date
-            elsif raw_value.respond_to? :to_date
-              begin
-                raw_value.to_date
-              rescue ArgumentError
-                false
-              end
-            else
-              false
-            end
+    if raw_value.is_a? Fixnum
+      time.at(raw_value).to_date
+    elsif raw_value.respond_to? :to_date
+      begin
+        raw_value.to_date
+      rescue ArgumentError
+        false
+      end
+    else
+      false
+    end
+  end
+
 
-            #elsif raw_value.is_a?(Symbol) || raw_value.is_a?(String)
-            #  # Assume another (date) attribute
-            #  record.send(raw_value).to_date
+  def validate_each record, attribute, raw_value
+    value = value_to_date raw_value
 
     unless value
       record.errors.add attribute, I18n.t('rails_validations.date.invalid')
@@ -59,7 +60,7 @@ class DateValidator < ActiveModel::EachValidator
                          raw_option_value.call record
                        end
                      elsif raw_option_value.is_a? Symbol
-                       record.send raw_option_value
+                       value_to_date record.send(raw_option_value)
                      elsif raw_option_value.is_a? Fixnum
                        time.at(raw_option_value).to_date
                      elsif raw_option_value.respond_to? :to_date

data/spec/validations/date_spec.rb

@@ -68,4 +68,12 @@ describe ValidationsSpecHelper::Date do
       expect(model('Yesterday, a fish nibbled my toe.')).to_not be_valid
     end
   end
+
+
+  it 'works when comparing to another column' do
+    with_validation 'date: { after: :v2 }' do
+      expect(model(Date.today, Date.today - 2.days)).to be_valid
+      expect(model(Date.today.to_s, (Date.today - 2.days).to_s)).to be_valid
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_validations
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Martin Tournoij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack