ditkrg/validates_timeliness
4
0
Fork 0
mirror of https://github.com/ditkrg/validates_timeliness.git synced 2026-01-22 22:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167 from AquisTech/fix-issue166-alias_method_chain_not_working_in_rails5

Browse Source 
Fix issue#166 alias_method_chain not working in Rails 5
This commit is contained in:
Adam Meehan 2018-05-15 17:09:07 +10:00 committed by GitHub
commit 973090df85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/validates_timeliness/extensions.rb
View File

@ -1,10 +1,10 @@
module ValidatesTimeliness module ValidatesTimeliness
module Extensions module Extensions
autoload :DateTimeSelect, 'validates_timeliness/extensions/date_time_select' autoload :TimelinessDateTimeSelect, 'validates_timeliness/extensions/date_time_select'
end end
def self.enable_date_time_select_extension! def self.enable_date_time_select_extension!
::ActionView::Helpers::Tags::DateSelect.send(:include, ValidatesTimeliness::Extensions::DateTimeSelect) ::ActionView::Helpers::Tags::DateSelect.send(:prepend, ValidatesTimeliness::Extensions::TimelinessDateTimeSelect)
end end
def self.enable_multiparameter_extension! def self.enable_multiparameter_extension!

51
lib/validates_timeliness/extensions/date_time_select.rb
View File

@ -1,54 +1,31 @@
module ValidatesTimeliness module ValidatesTimeliness
module Extensions module Extensions
module DateTimeSelect module TimelinessDateTimeSelect
extend ActiveSupport::Concern
# Intercepts the date and time select helpers to reuse the values from # Intercepts the date and time select helpers to reuse the values from
# the params rather than the parsed value. This allows invalid date/time # the params rather than the parsed value. This allows invalid date/time
# values to be redisplayed instead of blanks to aid correction by the user. # values to be redisplayed instead of blanks to aid correction by the user.
# It's a minor usability improvement which is rarely an issue for the user. # It's a minor usability improvement which is rarely an issue for the user.
attr_accessor :object_name, :method_name, :template_object, :options, :html_options
included do def initialize(object_name, method_name, template_object, options, html_options)
alias_method_chain :value, :timeliness @object_name, @method_name = object_name.to_s.dup, method_name.to_s.dup
@template_object, @options, @html_options = template_object, options, html_options
end end
class TimelinessDateTime def value
attr_accessor :year, :month, :day, :hour, :min, :sec return super unless @template_object.params[@object_name]
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(
options[:year] || year,
options[:month] || month,
options[:day] || day,
options[:hour] || hour,
options[:min] || (options[:hour] ? 0 : min),
options[:sec] || ((options[:hour] || options[:min]) ? 0 : sec)
)
end
end
def value_with_timeliness(object)
return value_without_timeliness(object) unless @template_object.params[@object_name]
@template_object.params[@object_name]
pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ } pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
return value_without_timeliness(object) if pairs.empty? return super if pairs.empty?
values = [nil] * 6 values = {}
pairs.map do |(param, value)| pairs.each_pair do |key, value|
position = param.scan(/\((\d+)\w+\)/).first.first position = key[/\((\d+)\w+\)/, 1]
values[position.to_i-1] = value.to_i values[::ActionView::Helpers::DateTimeSelector::POSITION.key(position.to_i)] = value.to_i
end
TimelinessDateTime.new(*values)
end end
values
end
end end
end end
end end