mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-23 06:16:44 +00:00
Add Rails 6.1 compatibility
Rails 6.1 needs the following changes: - Add `owner: nil` to `define_method_attribute` calls - Pass `options` to error `add` method as keyword argument Ref: - https://api.rubyonrails.org/v6.0.0/classes/ActiveModel/Errors.html#method-i-add - https://api.rubyonrails.org/v6.1.0/classes/ActiveModel/Errors.html#method-i-add Fix: #193
This commit is contained in:
parent
16221ac092
commit
709d2c87e2
@ -6,6 +6,8 @@ gemfile:
|
||||
- gemfiles/rails_5_0.gemfile
|
||||
- gemfiles/rails_5_1.gemfile
|
||||
- gemfiles/rails_5_2.gemfile
|
||||
- gemfiles/rails_6_0.gemfile
|
||||
- gemfiles/rails_6_1.gemfile
|
||||
|
||||
rvm:
|
||||
- "2.5.3"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
appraise "rails_5_0" do
|
||||
gem "rails", "~> 5.0.0"
|
||||
gem 'sqlite3', '~> 1.3.6'
|
||||
end
|
||||
|
||||
appraise "rails_5_1" do
|
||||
@ -9,3 +10,11 @@ end
|
||||
appraise "rails_5_2" do
|
||||
gem "rails", "~> 5.2.0"
|
||||
end
|
||||
|
||||
appraise "rails_6_0" do
|
||||
gem "rails", "~> 6.0.0"
|
||||
end
|
||||
|
||||
appraise "rails_6_1" do
|
||||
gem "rails", "~> 6.1.0"
|
||||
end
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
in a request.
|
||||
* Add initializer to ensure Timeliness v0.4+ ambiguous date config is set
|
||||
correctly when using `use_euro_formats` or `remove_use_formats'.
|
||||
* Add Rails 6.1 compatibility
|
||||
|
||||
Breaking Changes
|
||||
* Update Multiparameter extension to use ActiveRecord type classes with multiparameter handling
|
||||
|
||||
4
Gemfile
4
Gemfile
@ -2,11 +2,11 @@ source 'http://rubygems.org'
|
||||
|
||||
gemspec
|
||||
|
||||
gem 'rails', '~> 5.2.4'
|
||||
gem 'rails', '~> 6.1.0'
|
||||
gem 'rspec'
|
||||
gem 'rspec-rails', '~> 3.7'
|
||||
gem 'sqlite3'
|
||||
gem 'timecop'
|
||||
gem 'byebug'
|
||||
gem 'appraisal'
|
||||
gem 'sqlite3', '~> 1.3.6'
|
||||
gem 'nokogiri', '~> 1.8'
|
||||
|
||||
@ -5,10 +5,10 @@ source "http://rubygems.org"
|
||||
gem "rails", "~> 5.0.0"
|
||||
gem "rspec"
|
||||
gem "rspec-rails", "~> 3.7"
|
||||
gem "sqlite3", "~> 1.3.6"
|
||||
gem "timecop"
|
||||
gem "byebug"
|
||||
gem "appraisal"
|
||||
gem "sqlite3", "~> 1.3.6"
|
||||
gem "nokogiri", "~> 1.8"
|
||||
|
||||
gemspec path: "../"
|
||||
|
||||
@ -5,10 +5,10 @@ source "http://rubygems.org"
|
||||
gem "rails", "~> 5.1.0"
|
||||
gem "rspec"
|
||||
gem "rspec-rails", "~> 3.7"
|
||||
gem "sqlite3"
|
||||
gem "timecop"
|
||||
gem "byebug"
|
||||
gem "appraisal"
|
||||
gem "sqlite3", "~> 1.3.6"
|
||||
gem "nokogiri", "~> 1.8"
|
||||
|
||||
gemspec path: "../"
|
||||
|
||||
@ -5,10 +5,10 @@ source "http://rubygems.org"
|
||||
gem "rails", "~> 5.2.0"
|
||||
gem "rspec"
|
||||
gem "rspec-rails", "~> 3.7"
|
||||
gem "sqlite3"
|
||||
gem "timecop"
|
||||
gem "byebug"
|
||||
gem "appraisal"
|
||||
gem "sqlite3", "~> 1.3.6"
|
||||
gem "nokogiri", "~> 1.8"
|
||||
|
||||
gemspec path: "../"
|
||||
|
||||
14
gemfiles/rails_6_0.gemfile
Normal file
14
gemfiles/rails_6_0.gemfile
Normal file
@ -0,0 +1,14 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 6.0.0"
|
||||
gem "rspec"
|
||||
gem "rspec-rails", "~> 3.7"
|
||||
gem "sqlite3"
|
||||
gem "timecop"
|
||||
gem "byebug"
|
||||
gem "appraisal"
|
||||
gem "nokogiri", "~> 1.8"
|
||||
|
||||
gemspec path: "../"
|
||||
14
gemfiles/rails_6_1.gemfile
Normal file
14
gemfiles/rails_6_1.gemfile
Normal file
@ -0,0 +1,14 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 6.1.0"
|
||||
gem "rspec"
|
||||
gem "rspec-rails", "~> 3.7"
|
||||
gem "sqlite3"
|
||||
gem "timecop"
|
||||
gem "byebug"
|
||||
gem "appraisal"
|
||||
gem "nokogiri", "~> 1.8"
|
||||
|
||||
gemspec path: "../"
|
||||
@ -86,7 +86,7 @@ module ValidatesTimeliness
|
||||
def add_error(record, attr_name, message, value=nil)
|
||||
value = format_error_value(value) if value
|
||||
message_options = { :message => options.fetch(:"#{message}_message", options[:message]), :restriction => value }
|
||||
record.errors.add(attr_name, message, message_options)
|
||||
record.errors.add(attr_name, message, **message_options)
|
||||
end
|
||||
|
||||
def format_error_value(value)
|
||||
|
||||
@ -15,11 +15,11 @@ module TestModel
|
||||
self.model_attributes[name] = type
|
||||
end
|
||||
|
||||
def define_method_attribute=(attr_name)
|
||||
def define_method_attribute=(attr_name, owner: nil)
|
||||
generated_attribute_methods.module_eval("def #{attr_name}=(new_value); @attributes['#{attr_name}']=self.class.type_cast('#{attr_name}', new_value); end", __FILE__, __LINE__)
|
||||
end
|
||||
|
||||
def define_method_attribute(attr_name)
|
||||
def define_method_attribute(attr_name, owner: nil)
|
||||
generated_attribute_methods.module_eval("def #{attr_name}; @attributes['#{attr_name}']; end", __FILE__, __LINE__)
|
||||
end
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user