Remove the rest of Ruby 2.7 deprecation warnings

lib/activity_notification/common.rb

@@ -16,7 +16,11 @@ def self.resolve_value(context, thing, *args)
     when Symbol
       symbol_method = context.method(thing)
       if symbol_method.arity > 1
-        symbol_method.call(ActivityNotification.get_controller, *args)
+        if args.last.kind_of?(Hash)
+          symbol_method.call(ActivityNotification.get_controller, *args[0...-1], **args[-1])
+        else
+          symbol_method.call(ActivityNotification.get_controller, *args)
+        end
       elsif symbol_method.arity > 0
         symbol_method.call(ActivityNotification.get_controller)
       else
@@ -74,7 +78,11 @@ def resolve_value(thing, *args)
       when Symbol
         symbol_method = method(thing)
         if symbol_method.arity > 0
-          symbol_method.call(*args)
+          if args.last.kind_of?(Hash)
+            symbol_method.call(*args[0...-1], **args[-1])
+          else
+            symbol_method.call(*args)
+          end
         else
           symbol_method.call
         end
@@ -128,4 +136,4 @@ def printable_name
       "#{self.printable_type} (#{id})"
     end
   end
-end
+end

lib/activity_notification/renderable.rb

@@ -29,8 +29,8 @@ def text(params = {})
       )
 
       # Generate the :default fallback key without using pluralization key :count
-      default = I18n.t(k, attrs)
-      I18n.t(k, attrs.merge(count: group_notification_count, default: default))
+      default = I18n.t(k, **attrs)
+      I18n.t(k, **attrs.merge(count: group_notification_count, default: default))
     end
 
     # Renders notification from views.

spec/concerns/common_spec.rb

@@ -34,7 +34,7 @@ def custom_method(controller)
           test_instance.extend(AdditionalMethods)
           expect(ActivityNotification.resolve_value(test_instance, :custom_method)).to eq(1)
         end
-  
+
         it "returns specified symbol with controller and additional arguments" do
           module AdditionalMethods
             def custom_method(controller, key)
@@ -45,6 +45,17 @@ def custom_method(controller, key)
           expect(ActivityNotification.resolve_value(test_instance, :custom_method, 'test1.key')).to eq(1)
           expect(ActivityNotification.resolve_value(test_instance, :custom_method, 'test2.key')).to eq(0)
         end
+
+        it "returns specified symbol with controller and additional arguments including hash as last argument" do
+           module AdditionalMethods
+             def custom_method(controller, key, options:)
+               controller == 'StubController' and key == 'test1.key' ? 1 : 0
+             end
+           end
+           test_instance.extend(AdditionalMethods)
+           expect(ActivityNotification.resolve_value(test_instance, :custom_method, 'test1.key', options: 1)).to eq(1)
+           expect(ActivityNotification.resolve_value(test_instance, :custom_method, 'test2.key', options: 1)).to eq(0)
+         end
       end
 
       context "with Proc" do
@@ -62,7 +73,7 @@ def custom_method(controller, key)
           test_proc = ->(controller, model){ controller == 'StubController' and model == test_instance ? 1 : 0 }
           expect(ActivityNotification.resolve_value(test_instance, test_proc)).to eq(1)
         end
-  
+
         it "returns specified lambda with controller, context(model) and additional arguments" do
           test_proc = ->(controller, model, key){ controller == 'StubController' and model == test_instance and key == 'test1.key' ? 1 : 0 }
           expect(ActivityNotification.resolve_value(test_instance, test_proc, 'test1.key')).to eq(1)
@@ -188,4 +199,4 @@ def custom_method
     end
   end
 
-end
+end

spec/concerns/renderable_spec.rb

@@ -32,15 +32,15 @@
       expect(I18n.t("notification.#{target_type_key}.#{params_text_key}.text"))
         .to eq(params_text_original)
       expect(I18n.t("notification.#{target_type_key}.#{params_text_key}.text",
-        {article_title: article_title}))
+        article_title: article_title))
         .to eq(params_text_embedded)
     end
 
     it "has key configured with embedded params including group_member_count and group_notification_count" do
       expect(I18n.t("notification.#{target_type_key}.#{group_text_key}.text"))
         .to eq(group_text_original)
       expect(I18n.t("notification.#{target_type_key}.#{group_text_key}.text",
-        {notifier_name: notifier_name, group_member_count: group_member_count, group_notification_count: group_notification_count}))
+        **{ notifier_name: notifier_name, group_member_count: group_member_count, group_notification_count: group_notification_count }))
         .to eq(group_text_embedded)
     end
 
@@ -50,10 +50,10 @@
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text")[:other])
         .to eq(plural_text_original_other)
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text",
-        {article_title: article_title, notifier_name: notifier_name, count: 1}))
+        **{ article_title: article_title, notifier_name: notifier_name, count: 1 }))
         .to eq(plural_text_embedded_one)
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text",
-        {article_title: article_title, notifier_name: notifier_name, count: group_notification_count}))
+        **{ article_title: article_title, notifier_name: notifier_name, count: group_notification_count }))
         .to eq(plural_text_embedded_other)
     end
   end
@@ -126,4 +126,4 @@
     # #layout_path
 
   end
-end
+end

spec/controllers/controller_spec_utility.rb

@@ -76,15 +76,15 @@ module CommitteeUtility
         def api_path
           "/#{root_path}/#{target_type}/#{test_target.id}"
         end
-  
+
         def schema_path
-          Rails.root.join('..', 'openapi.json') 
+          Rails.root.join('..', 'openapi.json')
         end
-  
+
         def write_schema_file(schema_json)
           File.open(schema_path, "w") { |file| file.write(schema_json) }
         end
-  
+
         def read_schema_file
           JSON.parse(File.read(schema_path))
         end
@@ -97,31 +97,31 @@ def get_with_compatibility path, options = {}
           if Rails::VERSION::MAJOR <= 4
             get path, options[:params], options[:headers]
           else
-            get path, options
+            get path, **options
           end
         end
 
         def post_with_compatibility path, options = {}
           if Rails::VERSION::MAJOR <= 4
             post path, options[:params], options[:headers]
           else
-            post path, options
+            post path, **options
           end
         end
 
         def put_with_compatibility path, options = {}
           if Rails::VERSION::MAJOR <= 4
             put path, options[:params], options[:headers]
           else
-            put path, options
+            put path, **options
           end
         end
 
         def delete_with_compatibility path, options = {}
           if Rails::VERSION::MAJOR <= 4
             delete path, options[:params], options[:headers]
           else
-            delete path, options
+            delete path, **options
           end
         end
 
@@ -133,4 +133,4 @@ def assert_all_schema_confirm(response, status)
       end
     end
   end
-end
+end