From f547cd2fe8fcb66ab4ef8b3b18626d1e63ad338e Mon Sep 17 00:00:00 2001 From: Radu Cugut Date: Thu, 6 Jan 2022 13:13:01 -0500 Subject: [PATCH 1/3] handle ruby 3.x keyword arguments delegation https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/ --- lib/polymorphic_integer_type/extensions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/polymorphic_integer_type/extensions.rb b/lib/polymorphic_integer_type/extensions.rb index 97bea34..9d43529 100644 --- a/lib/polymorphic_integer_type/extensions.rb +++ b/lib/polymorphic_integer_type/extensions.rb @@ -87,7 +87,7 @@ def has_many(name, scope = nil, **options, &extension) end remove_type_and_establish_mapping(name, options, scope) - super(name, options.delete(:scope), options, &extension) + super(name, options.delete(:scope), **options, &extension) end def has_one(name, scope = nil, **options) @@ -97,7 +97,7 @@ def has_one(name, scope = nil, **options) end remove_type_and_establish_mapping(name, options, scope) - super(name, options.delete(:scope), options) + super(name, options.delete(:scope), **options) end From 46cdaa478d09b12de96ea1d566a2339a03c4e264 Mon Sep 17 00:00:00 2001 From: Oleg Antonyan Date: Fri, 21 Jan 2022 23:09:22 +0200 Subject: [PATCH 2/3] unlock activerecord < 7 dependency --- polymorphic_integer_type.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polymorphic_integer_type.gemspec b/polymorphic_integer_type.gemspec index 827a846..7692e32 100644 --- a/polymorphic_integer_type.gemspec +++ b/polymorphic_integer_type.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "activerecord", "< 7" + spec.add_dependency "activerecord" spec.add_development_dependency "bundler" spec.add_development_dependency "rake" spec.add_development_dependency "rspec" From c01f473d3010dcd512e043791268765f7a305a37 Mon Sep 17 00:00:00 2001 From: Oleg Antonyan Date: Wed, 2 Feb 2022 14:32:29 +0200 Subject: [PATCH 3/3] fix non-integer relation --- .../activerecord_5_0_0/polymorphic_array_value_extension.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb b/lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb index 7f1fc5e..df57836 100644 --- a/lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb +++ b/lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb @@ -29,7 +29,7 @@ def type_to_ids_mapping hash[key] << convert_to_id(value) else - hash[klass.polymorphic_name] << convert_to_id(value) + hash[klass(value)&.polymorphic_name] << convert_to_id(value) end end end