Remove all ruby2_keywords

It only affected the auto_curry plugin in a minor way

Author: flash-gordon

Gemfile

@@ -34,7 +34,7 @@ group :sql do
   # else
   #   gem 'rom-sql', '~> 3.0'
   # end
-  gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'release-3.6'
+  gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'release-3.7'
 end
 
 group :test do

changeset/lib/rom/changeset/stateful.rb

@@ -266,9 +266,9 @@ def respond_to_missing?(meth, include_private = false)
       end
 
       # @api private
-      def method_missing(meth, *args, &block)
+      def method_missing(meth, *args, **kwargs, &block)
         if __data__.respond_to?(meth)
-          response = __data__.__send__(meth, *args, &block)
+          response = __data__.__send__(meth, *args, **kwargs, &block)
 
           if response.is_a?(__data__.class)
             with(__data__: response)
@@ -279,7 +279,6 @@ def method_missing(meth, *args, &block)
           super
         end
       end
-      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

changeset/spec/unit/map_spec.rb

@@ -82,11 +82,10 @@ def extend_data(tuple)
           { **t, three: t.fetch(:three) { next_value } }
         end
 
-        def initialize(*)
+        def initialize(...)
           super
           @counter = 0
         end
-        ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
         def default_command_type
           :test

core/lib/rom/association_set.rb

@@ -9,12 +9,11 @@ module ROM
   # @api public
   class AssociationSet < ROM::Registry
     # @api private
-    def initialize(*)
+    def initialize(...)
       super
       elements.values.each do |assoc|
         elements[assoc.name] = assoc if assoc.aliased? && !key?(assoc.name)
       end
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
   end
 end

core/lib/rom/associations/many_to_many.rb

@@ -14,11 +14,10 @@ class ManyToMany < Abstract
       attr_reader :join_relation
 
       # @api private
-      def initialize(*)
+      def initialize(*, **)
         super
         @join_relation = relations[through]
       end
-      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
       # Adapters should implement this method
       #

core/lib/rom/attribute.rb

@@ -405,9 +405,9 @@ def meta_options_ast
     private
 
     # @api private
-    def method_missing(meth, *args, &block)
+    def method_missing(meth, *args, **kwargs, &block)
       if type.respond_to?(meth)
-        response = type.__send__(meth, *args, &block)
+        response = type.__send__(meth, *args, **kwargs, &block)
 
         if response.is_a?(type.class)
           self.class.new(response, **options)
@@ -418,6 +418,5 @@ def method_missing(meth, *args, &block)
         super
       end
     end
-    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
   end
 end

core/lib/rom/auto_curry.rb

@@ -42,13 +42,20 @@ def auto_curry(name, &block)
 
       return unless public_instance_methods.include?(name) && arity != 0
 
-      mod = Module.new
+      mod = ::Module.new
 
       mod.module_eval do
-        define_method(name) do |*args, &mblock|
+        define_method(name) do |*args, **kwargs, &mblock|
+          kwargs_size =
+            if kwargs.empty?
+              0
+            else
+              1
+            end
+
           response =
-            if arity < 0 || arity == args.size
-              super(*args, &mblock)
+            if arity < 0 || arity == (args.size + kwargs_size)
+              super(*args, **kwargs, &mblock)
             else
               self.class.curried.new(self, view: name, curry_args: args, arity: arity)
             end
@@ -59,7 +66,6 @@ def auto_curry(name, &block)
             response
           end
         end
-        ruby2_keywords(name) if respond_to?(:ruby2_keywords, true)
       end
 
       auto_curried_methods << name

core/lib/rom/commands/class_interface.rb

@@ -253,8 +253,8 @@ def relation_methods_mod(relation_class)
         Module.new do
           relation_class.view_methods.each do |meth|
             module_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def #{meth}(*args)
-                response = relation.public_send(:#{meth}, *args)
+              def #{meth}(*args, **kwargs)
+                response = relation.public_send(:#{meth}, *args, **kwargs)
 
                 if response.is_a?(relation.class)
                   new(response)

core/lib/rom/commands/lazy.rb

@@ -83,9 +83,9 @@ def respond_to_missing?(name, include_private = false)
       private
 
       # @api private
-      def method_missing(name, *args, &block)
+      def method_missing(name, *args, **kwargs, &block)
         if command.respond_to?(name)
-          response = command.public_send(name, *args, &block)
+          response = command.public_send(name, *args, **kwargs, &block)
 
           if response.instance_of?(command.class)
             self.class.new(response, evaluator, command_proc)
@@ -96,7 +96,6 @@ def method_missing(name, *args, &block)
           super
         end
       end
-      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

core/lib/rom/gateway.rb

@@ -78,7 +78,7 @@ class Gateway
     # @return [Gateway] a specific gateway subclass
     #
     # @api public
-    def self.setup(gateway_or_scheme, *args)
+    def self.setup(gateway_or_scheme, *args, **kwargs)
       case gateway_or_scheme
       when String
         raise ArgumentError, <<-STRING.gsub(/^ {10}/, '')
@@ -91,7 +91,7 @@ def self.setup(gateway_or_scheme, *args)
         if klass.instance_method(:initialize).arity.zero?
           klass.new
         else
-          klass.new(*args)
+          klass.new(*args, **kwargs)
         end
       else
         raise ArgumentError, "Can't accept arguments when passing an instance" unless args.empty?
@@ -100,10 +100,6 @@ def self.setup(gateway_or_scheme, *args)
       end
     end
 
-    class << self
-      ruby2_keywords(:setup) if respond_to?(:ruby2_keywords, true)
-    end
-
     # Get gateway subclass for a specific adapter
     #
     # @param [Symbol] type Adapter identifier

core/lib/rom/header/attribute.rb

@@ -113,7 +113,7 @@ class Embedded < Attribute
       attr_reader :header
 
       # @api private
-      def initialize(*)
+      def initialize(*, **)
         super
         @header = meta.fetch(:header)
       end

core/lib/rom/initializer.rb

@@ -8,18 +8,16 @@ module Initializer
     # @api private
     module DefineWithHook
       # @api private
-      def param(*)
+      def param(*, **)
         super.tap { __define_with__ }
       end
-      ruby2_keywords(:param) if respond_to?(:ruby2_keywords, true)
 
       # @api private
-      def option(*)
+      def option(*, **)
         super.tap do
           __define_with__ unless method_defined?(:with)
         end
       end
-      ruby2_keywords(:option) if respond_to?(:ruby2_keywords, true)
 
       # @api private
       def __define_with__

core/lib/rom/mapper/dsl.rb

@@ -105,14 +105,13 @@ def dsl
         # Delegate Attribute DSL method to the dsl instance
         #
         # @api private
-        def method_missing(name, *args, &block)
+        def method_missing(name, *args, **kwargs, &block)
           if dsl.respond_to?(name)
-            dsl.public_send(name, *args, &block)
+            dsl.public_send(name, *args, **kwargs, &block)
           else
             super
           end
         end
-        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
       end
     end
   end

core/lib/rom/mapper_compiler.rb

@@ -23,13 +23,12 @@ class MapperCompiler
 
     attr_reader :mapper_options
 
-    def initialize(*)
+    def initialize(*, **)
       super
       @struct_compiler = StructCompiler.new(cache: cache)
       @cache = cache.namespaced(:mappers)
       @mapper_options = self.class.mapper_options
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     def call(ast)
       cache.fetch_or_store(ast.hash) { Mapper.build(Header.coerce(*visit(ast))) }

core/lib/rom/pipeline.rb

@@ -62,9 +62,9 @@ def decorate?(response)
       end
 
       # @api private
-      def method_missing(name, *args, &block)
+      def method_missing(name, *args, **kwargs, &block)
         if left.respond_to?(name)
-          response = left.__send__(name, *args, &block)
+          response = left.__send__(name, *args, **kwargs, &block)
 
           if decorate?(response)
             self.class.new(response, right)
@@ -75,7 +75,6 @@ def method_missing(name, *args, &block)
           super
         end
       end
-      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
 
     # Base composite class with left-to-right pipeline behavior

core/lib/rom/relation/curried.rb

@@ -105,9 +105,9 @@ def composite_class
       end
 
       # @api private
-      def method_missing(meth, *args, &block)
+      def method_missing(meth, *args, **kwargs, &block)
         if relation.respond_to?(meth)
-          response = relation.__send__(meth, *args, &block)
+          response = relation.__send__(meth, *args, **kwargs, &block)
 
           super if response.is_a?(self.class)
 
@@ -120,7 +120,6 @@ def method_missing(meth, *args, &block)
           super
         end
       end
-      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

core/lib/rom/schema.rb

@@ -160,12 +160,11 @@ def self.attributes(attributes, attr_class)
     end
 
     # @api private
-    def initialize(*)
+    def initialize(*, **)
       super
 
       yield(self) if block_given?
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     # Abstract method for creating a new relation based on schema definition
     #

core/lib/rom/schema/dsl.rb

@@ -55,15 +55,14 @@ class DSL < BasicObject
       attr_reader :associations_dsl
 
       # @api private
-      def initialize(*, &block)
+      def initialize(*, **, &block)
         super
 
         @attributes = {}
         @plugins = {}
 
         @definition = block
       end
-      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
       # Defines a relation attribute with its type and options.
       #

core/lib/rom/struct_compiler.rb

@@ -18,11 +18,10 @@ class StructCompiler < Dry::Types::Compiler
     option :cache, default: -> { Cache.new }
 
     # @api private
-    def initialize(*)
+    def initialize(*, **)
       super
       @cache = cache.namespaced(:structs)
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     # Build a struct class based on relation header ast
     #

core/lib/rom/support/memoizable.rb

@@ -11,12 +11,11 @@ def memoize(*names)
         prepend(Memoizer.new(self, names))
       end
 
-      def new(*)
+      def new(*, **, &)
         obj = super
         obj.instance_variable_set(:'@__memoized__', MEMOIZED_HASH.dup)
         obj
       end
-      ruby2_keywords(:new) if respond_to?(:ruby2_keywords, true)
     end
 
     def self.included(klass)

repository/lib/rom/repository.rb

@@ -104,11 +104,10 @@ class Repository
     # Initializes a new repository object
     #
     # @api private
-    def initialize(*)
+    def initialize(*, **)
       super
       @relations = {}
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     # Open a database transaction
     #

repository/lib/rom/repository/root.rb

@@ -56,11 +56,10 @@ def self.inherited(klass)
       end
 
       # @see Repository#initialize
-      def initialize(*)
+      def initialize(*, **)
         super
         @root = set_relation(self.class.root)
       end
-      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
     end
   end
 end