mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-25 15:22:58 +00:00
Moving back to plugin cache for ActiveRecord
This simplifies the code a lot and fixes the issues with date and time colummns when using the plugin parser. Add appraisals for all rails 3 versions
This commit is contained in:
@@ -3,19 +3,6 @@ module ValidatesTimeliness
|
||||
module ActiveRecord
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def self.use_plugin_cache?
|
||||
::ActiveRecord::VERSION::STRING < '3.1.0'
|
||||
end
|
||||
|
||||
included do
|
||||
if ValidatesTimeliness::ORM::ActiveRecord.use_plugin_cache?
|
||||
include Reload
|
||||
else
|
||||
# Just use the built-in before_type_cast retrieval
|
||||
alias_method :_timeliness_raw_value_for, :read_attribute_before_type_cast
|
||||
end
|
||||
end
|
||||
|
||||
module ClassMethods
|
||||
public
|
||||
|
||||
@@ -36,34 +23,12 @@ module ValidatesTimeliness
|
||||
|
||||
def define_attribute_methods
|
||||
super.tap do |attribute_methods_generated|
|
||||
use_before_type_cast = ValidatesTimeliness::ORM::ActiveRecord.use_plugin_cache?
|
||||
define_timeliness_methods use_before_type_cast
|
||||
define_timeliness_methods true
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def define_attribute_timeliness_methods(attr_name, before_type_cast=false)
|
||||
if before_type_cast
|
||||
define_timeliness_write_method(attr_name)
|
||||
define_timeliness_before_type_cast_method(attr_name)
|
||||
elsif ValidatesTimeliness.use_plugin_parser
|
||||
define_timeliness_write_method_without_cache(attr_name)
|
||||
end
|
||||
end
|
||||
|
||||
def define_timeliness_write_method_without_cache(attr_name)
|
||||
method_body, line = <<-EOV, __LINE__ + 1
|
||||
def #{attr_name}=(value)
|
||||
original_value = value
|
||||
if value.is_a?(String)\n#{timeliness_type_cast_code(attr_name, 'value')}\nend
|
||||
super(value)
|
||||
@attributes['#{attr_name}'] = original_value
|
||||
end
|
||||
EOV
|
||||
generated_timeliness_methods.module_eval(method_body, __FILE__, line)
|
||||
end
|
||||
|
||||
def timeliness_type_cast_code(attr_name, var_name)
|
||||
type = timeliness_attribute_type(attr_name)
|
||||
|
||||
@@ -73,11 +38,9 @@ module ValidatesTimeliness
|
||||
end
|
||||
end
|
||||
|
||||
module Reload
|
||||
def reload(*args)
|
||||
_clear_timeliness_cache
|
||||
super
|
||||
end
|
||||
def reload(*args)
|
||||
_clear_timeliness_cache
|
||||
super
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user