Perhaps we could now drop ruby2_keywords

mostlyobvious · mostlyobvious · commit 75cb026bf190 · 2022-05-27T11:48:07.000+02:00
#1052 (comment)
diff --git a/aggregate_root/Gemfile.lock b/aggregate_root/Gemfile.lock
@@ -3,13 +3,11 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
   specs:
     aggregate_root (2.3.0)
-      ruby2_keywords
       ruby_event_store (= 2.3.0)
 
 GEM
@@ -60,7 +58,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    ruby2_keywords (0.0.5)
     sorbet-runtime (0.5.10032)
     thread_safe (0.3.6)
     tzinfo (1.2.9)
diff --git a/aggregate_root/aggregate_root.gemspec b/aggregate_root/aggregate_root.gemspec
@@ -23,6 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.6"
 
-  spec.add_dependency "ruby2_keywords"
   spec.add_dependency "ruby_event_store", "= 2.3.0"
 end
diff --git a/aggregate_root/lib/aggregate_root.rb b/aggregate_root/lib/aggregate_root.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "ruby2_keywords"
 require_relative "aggregate_root/version"
 require_relative "aggregate_root/configuration"
 require_relative "aggregate_root/transform"
@@ -32,7 +31,7 @@ def on_methods
   end
 
   module Constructor
-    ruby2_keywords def new(*)
+    def new(*)
       super.tap do |instance|
         instance.instance_variable_set(:@version, -1)
         instance.instance_variable_set(:@unpublished_events, [])
diff --git a/aggregate_root/lib/aggregate_root/instrumented_repository.rb b/aggregate_root/lib/aggregate_root/instrumented_repository.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "ruby2_keywords"
-
 module AggregateRoot
   class InstrumentedRepository
     def initialize(repository, instrumentation)
@@ -32,9 +30,9 @@ def with_aggregate(aggregate, stream_name, &block)
       store(aggregate, stream_name)
     end
 
-    ruby2_keywords def method_missing(method_name, *arguments, &block)
+    def method_missing(method_name, *arguments, **keyword_arguments, &block)
       if respond_to?(method_name)
-        repository.public_send(method_name, *arguments, &block)
+        repository.public_send(method_name, *arguments, **keyword_arguments, &block)
       else
         super
       end
diff --git a/rails_event_store/Gemfile.lock b/rails_event_store/Gemfile.lock
@@ -2,7 +2,6 @@ PATH
   remote: ../aggregate_root
   specs:
     aggregate_root (2.3.0)
-      ruby2_keywords
       ruby_event_store (= 2.3.0)
 
 PATH
@@ -24,7 +23,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
diff --git a/rails_event_store/Gemfile.rails_6_0.lock b/rails_event_store/Gemfile.rails_6_0.lock
@@ -2,7 +2,6 @@ PATH
   remote: ../aggregate_root
   specs:
     aggregate_root (2.3.0)
-      ruby2_keywords
       ruby_event_store (= 2.3.0)
 
 PATH
@@ -24,7 +23,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
diff --git a/rails_event_store/Gemfile.rails_6_1.lock b/rails_event_store/Gemfile.rails_6_1.lock
@@ -2,7 +2,6 @@ PATH
   remote: ../aggregate_root
   specs:
     aggregate_root (2.3.0)
-      ruby2_keywords
       ruby_event_store (= 2.3.0)
 
 PATH
@@ -24,7 +23,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
diff --git a/rails_event_store/spec/dummy_6_0/Gemfile.lock b/rails_event_store/spec/dummy_6_0/Gemfile.lock
@@ -2,7 +2,6 @@ PATH
   remote: ../../../aggregate_root
   specs:
     aggregate_root (2.3.0)
-      ruby2_keywords
       ruby_event_store (= 2.3.0)
 
 PATH
@@ -24,7 +23,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: ../..
diff --git a/rails_event_store/spec/dummy_6_1/Gemfile.lock b/rails_event_store/spec/dummy_6_1/Gemfile.lock
@@ -2,7 +2,6 @@ PATH
   remote: ../../../aggregate_root
   specs:
     aggregate_root (2.3.0)
-      ruby2_keywords
       ruby_event_store (= 2.3.0)
 
 PATH
@@ -24,7 +23,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: ../..
diff --git a/rails_event_store/spec/dummy_7_0/Gemfile.lock b/rails_event_store/spec/dummy_7_0/Gemfile.lock
@@ -2,7 +2,6 @@ PATH
   remote: ../../../aggregate_root
   specs:
     aggregate_root (2.3.0)
-      ruby2_keywords
       ruby_event_store (= 2.3.0)
 
 PATH
@@ -24,7 +23,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: ../..
diff --git a/rails_event_store_active_record/Gemfile.lock b/rails_event_store_active_record/Gemfile.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
@@ -187,7 +186,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    ruby2_keywords (0.0.5)
     sorbet-runtime (0.5.10032)
     sqlite3 (1.4.2)
     strscan (3.0.3)
diff --git a/rails_event_store_active_record/Gemfile.rails_6_0.lock b/rails_event_store_active_record/Gemfile.rails_6_0.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
@@ -162,7 +161,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    ruby2_keywords (0.0.5)
     sorbet-runtime (0.5.10032)
     sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
diff --git a/rails_event_store_active_record/Gemfile.rails_6_1.lock b/rails_event_store_active_record/Gemfile.rails_6_1.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
@@ -166,7 +165,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    ruby2_keywords (0.0.5)
     sorbet-runtime (0.5.10032)
     sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
diff --git a/ruby_event_store-browser/Gemfile.lock b/ruby_event_store-browser/Gemfile.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
diff --git a/ruby_event_store-rspec/Gemfile.lock b/ruby_event_store-rspec/Gemfile.lock
@@ -2,7 +2,6 @@ PATH
   remote: ../aggregate_root
   specs:
     aggregate_root (2.3.0)
-      ruby2_keywords
       ruby_event_store (= 2.3.0)
 
 PATH
@@ -17,7 +16,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 PATH
   remote: .
@@ -73,7 +71,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    ruby2_keywords (0.0.5)
     sorbet-runtime (0.5.10032)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
diff --git a/ruby_event_store/Gemfile.lock b/ruby_event_store/Gemfile.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     ruby_event_store (2.3.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
-      ruby2_keywords
 
 GEM
   remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/
@@ -54,7 +53,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    ruby2_keywords (0.0.5)
     sorbet-runtime (0.5.10032)
     thread_safe (0.3.6)
     tzinfo (1.2.9)
diff --git a/ruby_event_store/lib/ruby_event_store/instrumented_dispatcher.rb b/ruby_event_store/lib/ruby_event_store/instrumented_dispatcher.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "ruby2_keywords"
-
 module RubyEventStore
   class InstrumentedDispatcher
     def initialize(dispatcher, instrumentation)
@@ -15,9 +13,9 @@ def call(subscriber, event, record)
       end
     end
 
-    ruby2_keywords def method_missing(method_name, *arguments, &block)
+    def method_missing(method_name, *arguments, **keyword_arguments, &block)
       if respond_to?(method_name)
-        dispatcher.public_send(method_name, *arguments, &block)
+        dispatcher.public_send(method_name, *arguments, **keyword_arguments,  &block)
       else
         super
       end
diff --git a/ruby_event_store/lib/ruby_event_store/instrumented_repository.rb b/ruby_event_store/lib/ruby_event_store/instrumented_repository.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "ruby2_keywords"
-
 module RubyEventStore
   class InstrumentedRepository
     def initialize(repository, instrumentation)
@@ -51,9 +49,9 @@ def streams_of(event_id)
       end
     end
 
-    ruby2_keywords def method_missing(method_name, *arguments, &block)
+    def method_missing(method_name, *arguments, **keyword_arguments, &block)
       if respond_to?(method_name)
-        repository.public_send(method_name, *arguments, &block)
+        repository.public_send(method_name, *arguments, **keyword_arguments, &block)
       else
         super
       end
diff --git a/ruby_event_store/ruby_event_store.gemspec b/ruby_event_store/ruby_event_store.gemspec
@@ -28,6 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.6"
 
-  spec.add_dependency "ruby2_keywords"
   spec.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.1.6"
 end
