Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove InstanceMethods module when using AS::Concern, as it was depre…

…cated in 3.2
  • Loading branch information...
commit 7a784a6c54688be62f0a2c1c508370cfa076e635 1 parent 907fd3e
@carlosantoniodasilva carlosantoniodasilva authored
View
13 lib/validates_timeliness/attribute_methods.rb
@@ -65,15 +65,12 @@ def generated_timeliness_methods
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
View
43 lib/validates_timeliness/extensions/date_time_select.rb
@@ -15,11 +15,11 @@ module DateTimeSelect
class TimelinessDateTime
attr_accessor :year, :month, :day, :hour, :min, :sec
-
+
def initialize(year, month, day, hour, min, sec)
@year, @month, @day, @hour, @min, @sec = year, month, day, hour, min, sec
end
-
+
# adapted from activesupport/lib/active_support/core_ext/date_time/calculations.rb, line 36 (3.0.7)
def change(options)
TimelinessDateTime.new(
@@ -30,35 +30,32 @@ def change(options)
options[:min] || (options[:hour] ? 0 : min),
options[:sec] || ((options[:hour] || options[:min]) ? 0 : sec)
)
- end
+ end
end
- module InstanceMethods
- def datetime_selector_with_timeliness(*args)
- @timeliness_date_or_time_tag = true
- datetime_selector_without_timeliness(*args)
- 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]
+ def value_with_timeliness(object)
+ unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
+ return value_without_timeliness(object)
+ end
- pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
- return value_without_timeliness(object) if pairs.empty?
+ @template_object.params[@object_name]
- values = [nil] * 6
- pairs.map do |(param, value)|
- position = param.scan(/\((\d+)\w+\)/).first.first
- values[position.to_i-1] = value.to_i
- end
+ pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
+ return value_without_timeliness(object) if pairs.empty?
- TimelinessDateTime.new(*values)
+ values = [nil] * 6
+ pairs.map do |(param, value)|
+ position = param.scan(/\((\d+)\w+\)/).first.first
+ values[position.to_i-1] = value.to_i
end
- end
+ TimelinessDateTime.new(*values)
+ end
end
end
end
View
9 lib/validates_timeliness/orm/active_record.rb
@@ -30,13 +30,10 @@ def timeliness_type_cast_code(attr_name, var_name)
end
end
- module InstanceMethods
- def reload(*args)
- _clear_timeliness_cache
- super
- end
+ def reload(*args)
+ _clear_timeliness_cache
+ super
end
-
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.