active_model_validators_ex 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb623b9155719e88023b83b4833516fa09a614a0
-  data.tar.gz: d0a82d484adf8b88c4c2e0f07d2d3670fb963b33
+  metadata.gz: e7e4923568aea755dd748e40e079e60342b3cab5
+  data.tar.gz: cd6d41be058b4b2c7feaaf0f5739d3550bb80ad8
 SHA512:
-  metadata.gz: 0673775f33792232fd1ffc390dad636a0879f0b86821728784728b0cca87d5d8c4073e4ee66d16356a81d4ee708b7a9bd64d1096690e14e632f162fcabf32361
-  data.tar.gz: d0742f05524b44c5dffec0c6a951a102705a1965fa024458ced3374b6dd08241d1329eaa5cc65ebabfc670311568840463063944d507720f31fee9bfefa79491
+  metadata.gz: c8591102bc58f6d967bb6b68ecfff0ec5faf4385efed81956f188c7103751baca638228701b8c463c9ac00434a670531ce3fd7a1f303290ce13fba87d0a1d03d
+  data.tar.gz: 6ffdaf156137c21e301610bfba8c0d99519db34e84167d405d4230bc9984f82df8441f3c3199f0698c915874549ba84a77bf8f20c787f5e1b602ef7652916d4f

data/README.md

@@ -97,7 +97,7 @@ validations:
           validates :time, time_format: {
               # value can be either a lambda or a time, and indicates that
               # attribute value must be after this value
-              after: lambda { Time.new(2014) },
+              after: lambda { |model| Time.new(2014) },
 
               # can be either true or false, indicates if nil is accepted
               # defaults to false

data/lib/active_model_validators_ex/time_format_validator.rb

@@ -1,9 +1,17 @@
 class TimeFormatValidator < ActiveModel::EachValidator
+  def initialize(options)
+    options[:allow_nil] ||= false
+
+    super(options)
+  end
+
   def validate_each(record, attribute, value)
     return if options[:allow_nil] && value.nil?
 
     parsed_time = value.is_a?(Time) ? value : Time.parse(value.to_s)
 
+    previous_time = calculate_previous_time(record)
+
     if !previous_time.nil? and parsed_time < previous_time
       record.errors[attribute] << "invalid value, #{value} must be after #{previous_time}"
     end
@@ -11,10 +19,10 @@ class TimeFormatValidator < ActiveModel::EachValidator
     record.errors[attribute] << "invalid value, #{value} not valid for #{attribute}"
   end
 
-  def previous_time
+  def calculate_previous_time(record)
     case options[:after].class.name
     when 'Proc'
-      options[:after].call
+      options[:after].call(record)
     when 'Time'
       options[:after]
     end

data/lib/active_model_validators_ex/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelValidatorsEx
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/active_model_validators_ex/time_format_validator_spec.rb

@@ -103,7 +103,7 @@ describe TimeFormatValidator do
       end
 
       context 'and after is a Proc that returns Time' do
-        let(:after) { lambda { Time.now } }
+        let(:after) { lambda { |a| Time.now } }
         let(:options) do
           { attributes: attribute, allow_nil: false, after: after }
         end
@@ -186,7 +186,7 @@ describe TimeFormatValidator do
       end
 
       context 'and after is a Proc that returns Time' do
-        let(:after) { lambda { Time.now } }
+        let(:after) { lambda { |a| Time.now } }
         let(:options) do
           { attributes: attribute, allow_nil: true, after: after }
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_validators_ex
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - junhanamaki