Remove old version checks

This commit is contained in:
Adam Meehan 2018-05-16 13:12:30 +10:00
parent 076714d648
commit a1f42fce28
2 changed files with 11 additions and 25 deletions

View File

@ -14,7 +14,6 @@ module ValidatesTimeliness
timeliness_column_for_attribute(attr_name).type
end
if ::ActiveModel.version >= Gem::Version.new('4.2')
def timeliness_column_for_attribute(attr_name)
columns_hash.fetch(attr_name.to_s) do |key|
validation_type = _validators[key.to_sym].find {|v| v.kind == :timeliness }.type.to_s
@ -29,14 +28,6 @@ module ValidatesTimeliness
when 'time' then ::ActiveRecord::Type::Time.new
end
end
else
def timeliness_column_for_attribute(attr_name)
columns_hash.fetch(attr_name.to_s) do |key|
validation_type = _validators[key.to_sym].find {|v| v.kind == :timeliness }.type.to_s
::ActiveRecord::ConnectionAdapters::Column.new(key, nil, validation_type)
end
end
end
def define_attribute_methods
super.tap {

View File

@ -55,11 +55,6 @@ module ValidatesTimeliness
end
end
# Rails 4.0 compatibility for old #setup method with class as arg
if Gem::Version.new(ActiveModel::VERSION::STRING) <= Gem::Version.new('4.1')
alias_method(:setup, :setup_timeliness_validated_attributes)
end
def validate_each(record, attr_name, value)
raw_value = attribute_raw_value(record, attr_name) || value
return if (@allow_nil && raw_value.nil?) || (@allow_blank && raw_value.blank?)