mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-22 22:06:45 +00:00
Remove InstanceMethods module when using AS::Concern, as it was deprecated in 3.2
This commit is contained in:
parent
907fd3e439
commit
7a784a6c54
@ -65,15 +65,12 @@ module ValidatesTimeliness
|
||||
end
|
||||
end
|
||||
|
||||
module InstanceMethods
|
||||
def _timeliness_raw_value_for(attr_name)
|
||||
@timeliness_cache && @timeliness_cache[attr_name.to_s]
|
||||
end
|
||||
|
||||
def _clear_timeliness_cache
|
||||
@timeliness_cache = {}
|
||||
end
|
||||
def _timeliness_raw_value_for(attr_name)
|
||||
@timeliness_cache && @timeliness_cache[attr_name.to_s]
|
||||
end
|
||||
|
||||
def _clear_timeliness_cache
|
||||
@timeliness_cache = {}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -33,32 +33,29 @@ module ValidatesTimeliness
|
||||
end
|
||||
end
|
||||
|
||||
module InstanceMethods
|
||||
def datetime_selector_with_timeliness(*args)
|
||||
@timeliness_date_or_time_tag = true
|
||||
datetime_selector_without_timeliness(*args)
|
||||
end
|
||||
|
||||
def value_with_timeliness(object)
|
||||
unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
|
||||
return value_without_timeliness(object)
|
||||
end
|
||||
|
||||
@template_object.params[@object_name]
|
||||
|
||||
pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
|
||||
return value_without_timeliness(object) if pairs.empty?
|
||||
|
||||
values = [nil] * 6
|
||||
pairs.map do |(param, value)|
|
||||
position = param.scan(/\((\d+)\w+\)/).first.first
|
||||
values[position.to_i-1] = value.to_i
|
||||
end
|
||||
|
||||
TimelinessDateTime.new(*values)
|
||||
end
|
||||
def datetime_selector_with_timeliness(*args)
|
||||
@timeliness_date_or_time_tag = true
|
||||
datetime_selector_without_timeliness(*args)
|
||||
end
|
||||
|
||||
def value_with_timeliness(object)
|
||||
unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
|
||||
return value_without_timeliness(object)
|
||||
end
|
||||
|
||||
@template_object.params[@object_name]
|
||||
|
||||
pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
|
||||
return value_without_timeliness(object) if pairs.empty?
|
||||
|
||||
values = [nil] * 6
|
||||
pairs.map do |(param, value)|
|
||||
position = param.scan(/\((\d+)\w+\)/).first.first
|
||||
values[position.to_i-1] = value.to_i
|
||||
end
|
||||
|
||||
TimelinessDateTime.new(*values)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -30,13 +30,10 @@ module ValidatesTimeliness
|
||||
end
|
||||
end
|
||||
|
||||
module InstanceMethods
|
||||
def reload(*args)
|
||||
_clear_timeliness_cache
|
||||
super
|
||||
end
|
||||
def reload(*args)
|
||||
_clear_timeliness_cache
|
||||
super
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user