rom-core 5.3.2 → 5.4.0

data/lib/rom/data_proxy.rb

@@ -56,9 +56,7 @@ module ROM
       # @return [Proc]
       #
       # @api private
-      def row_proc
-        -> tuple { tuple }
-      end
+      def row_proc = -> tuple { tuple }
 
       # Forward provided methods to the underlaying data object
       #
@@ -77,18 +75,18 @@ module ROM
         # FIXME: we should probably raise if one of the non-forwardable methods
         #       was provided
         (methods - NON_FORWARDABLE).each do |method_name|
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{method_name}(*args, &block)
-              response = data.public_send(#{method_name.inspect}, *args, &block)
-
-              if response.equal?(data)
-                self
-              elsif response.is_a?(data.class)
-                self.class.new(response)
-              else
-                response
-              end
-            end
+          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+            def #{method_name}(...)                              # def find_all(...)
+              response = data.public_send(:#{method_name}, ...)  #   response = data.public_send(:find_all, ...)
+                                                                 #
+              if response.equal?(data)                           #   if response.equal?(data)
+                self                                             #     self
+              elsif response.is_a?(data.class)                   #   elsif response.is_a?(data.class)
+                self.class.new(response)                         #     self.class.new(response)
+              else                                               #   else
+                response                                         #     response
+              end                                                #   end
+            end                                                  # end
           RUBY
         end
       end

data/lib/rom/enumerable_dataset.rb

@@ -27,7 +27,7 @@ module ROM
   # @api public
   module EnumerableDataset
     extend DataProxy::ClassMethods
-    include Enumerable
+    include ::Enumerable
 
     # Coerce a dataset to an array
     #
@@ -59,11 +59,11 @@ module ROM
       chunk collect collect_concat drop_while find_all flat_map
       grep map reject select sort sort_by take_while
     ].each do |method|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{method}(*args, &block)
-          return to_enum unless block
-          self.class.new(super(*args, &block), **options)
-        end
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+        def #{method}(...)                         # def collect(...)
+          return to_enum unless block_given?       #   return to_enum unless block_given?
+          self.class.new(super(...), **options)    #   self.class.new(super(...), **options)
+        end                                        # end
       RUBY
     end
   end

data/lib/rom/environment.rb

@@ -10,7 +10,9 @@ module ROM
   class Environment
     include Configurable
 
-    attr_reader :gateways, :gateways_map
+    attr_reader :gateways
+
+    attr_reader :gateways_map
 
     # @api private
     def initialize(*args)
@@ -49,11 +51,9 @@ module ROM
 
         if identifier.is_a?(Gateway)
           gateway = identifier
-        elsif RUBY_VERSION >= "3.0"
-          kwargs = args.last.is_a?(Hash) ? args.pop : {}
-          gateway = Gateway.setup(identifier, *args.flatten, **kwargs)
         else
-          gateway = Gateway.setup(identifier, *args.flatten)
+          kwargs = args.last.is_a?(::Hash) ? args.pop : {}
+          gateway = Gateway.setup(identifier, *args.flatten, **kwargs)
         end
 
         hash[:map][gateway] = name

data/lib/rom/gateway.rb

@@ -78,7 +78,7 @@ module ROM
     # @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 @@ module ROM
         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 @@ module ROM
       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
@@ -176,15 +172,11 @@ module ROM
     #         the transaction was rolled back
     #
     # @api public
-    def transaction(opts = EMPTY_HASH, &block)
-      transaction_runner(opts).run(opts, &block)
-    end
+    def transaction(opts = EMPTY_HASH, &) = transaction_runner(opts).run(opts, &)
 
     private
 
     # @api private
-    def transaction_runner(_)
-      Transaction::NoOp
-    end
+    def transaction_runner(_) = Transaction::NoOp
   end
 end

data/lib/rom/global/plugin_dsl.rb

@@ -21,10 +21,10 @@ module ROM
       attr_reader :registry
 
       # @api private
-      def initialize(registry, defaults = EMPTY_HASH, &block)
+      def initialize(registry, defaults = EMPTY_HASH, &)
         @registry = registry
         @defaults = defaults
-        instance_exec(&block)
+        instance_exec(&)
       end
 
       # Register a plugin
@@ -43,8 +43,8 @@ module ROM
       # @param [Symbol] type The adapter identifier
       #
       # @api public
-      def adapter(type, &block)
-        self.class.new(registry, adapter: type, &block)
+      def adapter(type, &)
+        self.class.new(registry, adapter: type, &)
       end
     end
   end

data/lib/rom/global.rb

@@ -40,8 +40,8 @@ module ROM
     #   end
     #
     # @api public
-    def plugins(*args, &block)
-      PluginDSL.new(plugin_registry, *args, &block)
+    def plugins(...)
+      PluginDSL.new(plugin_registry, ...)
     end
 
     # Register adapter namespace under a specified identifier

data/lib/rom/header/attribute.rb

@@ -113,7 +113,7 @@ module ROM
       attr_reader :header
 
       # @api private
-      def initialize(*)
+      def initialize(*, **)
         super
         @header = meta.fetch(:header)
       end

data/lib/rom/header.rb

@@ -10,8 +10,8 @@ module ROM
   #
   # @private
   class Header
-    include Enumerable
-    include Dry::Equalizer(:attributes, :model)
+    include ::Enumerable
+    include ::Dry::Equalizer(:attributes, :model)
 
     # @return [Class] optional model associated with a header
     #
@@ -54,9 +54,7 @@ module ROM
       if input.instance_of?(self)
         input
       else
-        attributes = input.each_with_object({}) { |pair, h|
-          h[pair.first] = Attribute.coerce(pair)
-        }
+        attributes = input.to_h { [_1.first, Attribute.coerce(_1)] }
 
         new(attributes, options)
       end
@@ -80,88 +78,68 @@ module ROM
     # @yield [Attribute]
     #
     # @api private
-    def each
-      attributes.each_value { |attribute| yield(attribute) }
-    end
+    def each(&) = attributes.each_value(&)
 
     # Return if there are any aliased attributes
     #
     # @api private
-    def aliased?
-      any?(&:aliased?)
-    end
+    def aliased? = any?(&:aliased?)
 
     # Return attribute keys
     #
     # An attribute key corresponds to tuple attribute names
     #
     # @api private
-    def keys
-      attributes.keys
-    end
+    def keys = attributes.keys
 
     # Return attribute identified by its name
     #
     # @return [Attribute]
     #
     # @api private
-    def [](name)
-      attributes.fetch(name)
-    end
+    def [](name) = attributes.fetch(name)
 
     # Return all Combined attributes
     #
     # @return [Array<Combined>]
     #
     # @api private
-    def combined
-      by_type(Combined)
-    end
+    def combined = by_type(Combined)
 
     # Returns all attributes that require preprocessing
     #
     # @return [Array<Group,Fold>]
     #
     # @api private
-    def preprocessed
-      by_type(Group, Fold)
-    end
+    def preprocessed = by_type(Group, Fold)
 
     # Returns all attributes that require postprocessing
     #
     # @return [Array<Ungroup,Unfold>]
     #
     # @api private
-    def postprocessed
-      by_type(Ungroup, Unfold)
-    end
+    def postprocessed = by_type(Ungroup, Unfold)
 
     # Return all Wrap attributes
     #
     # @return [Array<Wrap>]
     #
     # @api private
-    def wraps
-      by_type(Wrap)
-    end
+    def wraps = by_type(Wrap)
 
     # Return all non-primitive attributes that don't require mapping
     #
     # @return [Array<Group,Fold,Ungroup,Unfold,Wrap,Unwrap>]
     #
     # @api private
-    def non_primitives
-      preprocessed + wraps
-    end
+    def non_primitives = preprocessed + wraps
 
     # Return all primitive attributes that require mapping
     #
     # @return [Array<Attribute>]
     #
     # @api private
-    def primitives
-      to_a - non_primitives
-    end
+    def primitives = to_a - non_primitives
 
     private
 

data/lib/rom/initializer.rb

@@ -8,18 +8,14 @@ module ROM
     # @api private
     module DefineWithHook
       # @api private
-      def param(*)
-        super.tap { __define_with__ }
-      end
-      ruby2_keywords(:param) if respond_to?(:ruby2_keywords, true)
+      def param(*, **) = super.tap { __define_with__ }
 
       # @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__
@@ -34,13 +30,13 @@ module ROM
         undef_method(:with) if method_defined?(:with)
 
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def with(**new_options)
-            if new_options.empty?
-              self
-            else
-              self.class.new(#{seq_names}**options, **new_options)
-            end
-          end
+          def with(**new_options)                                  # def with(**new_options)
+            if new_options.empty?                                  #   if new_options.empty?
+              self                                                 #     self
+            else                                                   #   else
+              self.class.new(#{seq_names}**options, **new_options) #     self.class.new(relation, **options, **new_options)
+            end                                                    #   end
+          end                                                      # end
         RUBY
       end
     end
@@ -64,8 +60,8 @@ module ROM
       #
       # @api public
       def options
-        @__options__ ||= self.class.dry_initializer.definitions.values.each_with_object({}) do |item, obj|
-          obj[item.target] = instance_variable_get(item.ivar)
+        @__options__ ||= self.class.dry_initializer.definitions.values.to_h do |item|
+          [item.target, instance_variable_get(item.ivar)]
         end
       end
 

data/lib/rom/lint/enumerable_dataset.rb

@@ -26,6 +26,7 @@ module ROM
       #
       # @api public
       def initialize(dataset, data)
+        super()
         @dataset = dataset
         @data = data
       end
@@ -35,7 +36,7 @@ module ROM
       # @api public
       def lint_each
         result = []
-        dataset.each do |tuple|
+        dataset.each do |tuple| # rubocop:disable Style/MapIntoArray
           result << tuple
         end
         return if result == data

data/lib/rom/lint/gateway.rb

@@ -35,6 +35,7 @@ module ROM
       # @param [Class] gateway
       # @param [String] uri optional
       def initialize(identifier, gateway, uri = nil)
+        super()
         @identifier = identifier
         @gateway = gateway
         @uri = uri
@@ -89,7 +90,8 @@ module ROM
       # Lint: Ensure +gateway_instance+ returns adapter name
       def lint_adapter_reader
         if gateway_instance.adapter != identifier
-          complain "#{gateway_instance} must have the adapter identifier set to #{identifier.inspect}"
+          complain "#{gateway_instance} must have the adapter " \
+                   "identifier set to #{identifier.inspect}"
         end
       rescue MissingAdapterIdentifierError
         complain "#{gateway_instance} is missing the adapter identifier"

data/lib/rom/lint/linter.rb

@@ -18,7 +18,7 @@ module ROM
     # @api public
     class Linter
       # A failure raised by +complain+
-      Failure = Class.new(StandardError)
+      Failure = ::Class.new(::StandardError)
 
       # Iterate over all lint methods
       #
@@ -52,7 +52,7 @@ module ROM
       # @return [String]
       #
       # @api private
-      def self.lints
+      private_class_method def self.lints
         public_instance_methods(true).grep(/^lint_/).map(&:to_s)
       end
 

data/lib/rom/lint/test.rb

@@ -12,13 +12,11 @@ module ROM
       # @param [String] name
       #
       # @api private
-      def define_test_method(name, &block)
+      def define_test_method(name, &)
         define_method "test_#{name}" do
-          begin
-            instance_eval(&block)
-          rescue ROM::Lint::Linter::Failure => f
-            raise Minitest::Assertion, f.message
-          end
+          instance_eval(&)
+        rescue ROM::Lint::Linter::Failure => e
+          raise Minitest::Assertion, e.message
         end
       end
     end

data/lib/rom/mapper/attribute_dsl.rb

@@ -13,10 +13,21 @@ module ROM
     # TODO: break this madness down into smaller pieces
     #
     # @api private
+    # rubocop:disable Metrics/ClassLength
     class AttributeDSL
       include ModelDSL
 
-      attr_reader :attributes, :options, :copy_keys, :symbolize_keys, :reject_keys, :steps
+      attr_reader :attributes
+
+      attr_reader :options
+
+      attr_reader :copy_keys
+
+      attr_reader :symbolize_keys
+
+      attr_reader :reject_keys
+
+      attr_reader :steps
 
       # @param [Array] attributes accumulator array
       # @param [Hash] options
@@ -78,17 +89,17 @@ module ROM
       # @api public
       def attribute(name, options = EMPTY_HASH, &block)
         with_attr_options(name, options) do |attr_options|
-          if options[:type] && block
+          if options[:type] && block_given?
             raise ArgumentError,
                   "can't specify type and block at the same time"
           end
-          attr_options[:coercer] = block if block
+          attr_options[:coercer] = block if block_given?
           add_attribute(name, attr_options)
         end
       end
 
       def exclude(name)
-        attributes << [name, { exclude: true }]
+        attributes << [name,  exclude: true]
       end
 
       # Perform transformations sequentially
@@ -101,8 +112,8 @@ module ROM
       #   end
       #
       # @api public
-      def step(options = EMPTY_HASH, &block)
-        steps << new(options, &block)
+      def step(options = EMPTY_HASH, &)
+        steps << new(options, &)
       end
 
       # Define an embedded attribute
@@ -129,7 +140,7 @@ module ROM
       #                                  its attributes
       #
       # @api public
-      def embedded(name, options, &block)
+      def embedded(name, options, &)
         with_attr_options(name) do |attr_options|
           mapper = options[:mapper]
 
@@ -139,7 +150,7 @@ module ROM
               mapper, name, embedded_options.update(attr_options)
             )
           else
-            dsl = new(options, &block)
+            dsl = new(options, &)
             attr_options.update(options)
             add_attribute(
               name, { header: dsl.header, type: :array }.update(attr_options)
@@ -167,7 +178,7 @@ module ROM
       # @see AttributeDSL#embedded
       #
       # @api public
-      def wrap(*args, &block)
+      def wrap(*args, &)
         ensure_mapper_configuration('wrap', args, block_given?)
 
         with_name_or_options(*args) do |name, options, mapper|
@@ -176,7 +187,7 @@ module ROM
           if mapper
             attributes_from_mapper(mapper, name, wrap_options)
           else
-            dsl(name, wrap_options, &block)
+            dsl(name, wrap_options, &)
           end
         end
       end
@@ -200,14 +211,14 @@ module ROM
       # @see AttributeDSL#embedded
       #
       # @api public
-      def unwrap(*args, &block)
+      def unwrap(*args, &)
         with_name_or_options(*args) do |name, options, mapper|
           unwrap_options = { type: :hash, unwrap: true }.update(options)
 
           if mapper
             attributes_from_mapper(mapper, name, unwrap_options)
           else
-            dsl(name, unwrap_options, &block)
+            dsl(name, unwrap_options, &)
           end
         end
       end
@@ -229,7 +240,7 @@ module ROM
       # @see AttributeDSL#embedded
       #
       # @api public
-      def group(*args, &block)
+      def group(*args, &)
         ensure_mapper_configuration('group', args, block_given?)
 
         with_name_or_options(*args) do |name, options, mapper|
@@ -238,7 +249,7 @@ module ROM
           if mapper
             attributes_from_mapper(mapper, name, group_options)
           else
-            dsl(name, group_options, &block)
+            dsl(name, group_options, &)
           end
         end
       end
@@ -254,10 +265,10 @@ module ROM
       # @see AttributeDSL#embedded
       #
       # @api public
-      def ungroup(*args, &block)
+      def ungroup(*args, &)
         with_name_or_options(*args) do |name, options, *|
           ungroup_options = { type: :array, ungroup: true }.update(options)
-          dsl(name, ungroup_options, &block)
+          dsl(name, ungroup_options, &)
         end
       end
 
@@ -274,10 +285,10 @@ module ROM
       # @see AttributeDSL#embedded
       #
       # @api public
-      def fold(*args, &block)
+      def fold(*args, &)
         with_name_or_options(*args) do |name, *|
           fold_options = { type: :array, fold: true }
-          dsl(name, fold_options, &block)
+          dsl(name, fold_options, &)
         end
       end
 
@@ -330,8 +341,8 @@ module ROM
       #   @option options [Symbol] :type The type, either :array (default) or :hash
       #
       # @api public
-      def combine(name, options, &block)
-        dsl = new(options, &block)
+      def combine(name, options, &)
+        dsl = new(options, &)
 
         attr_opts = {
           type: options.fetch(:type, :array),
@@ -396,9 +407,9 @@ module ROM
       # This is used by embedded, wrap and group
       #
       # @api private
-      def dsl(name_or_attrs, options, &block)
-        if block
-          attributes_from_block(name_or_attrs, options, &block)
+      def dsl(name_or_attrs, options, &)
+        if block_given?
+          attributes_from_block(name_or_attrs, options, &)
         else
           attributes_from_hash(name_or_attrs, options)
         end
@@ -409,8 +420,8 @@ module ROM
       # Used by embedded, wrap and group
       #
       # @api private
-      def attributes_from_block(name, options, &block)
-        dsl = new(options, &block)
+      def attributes_from_block(name, options, &)
+        dsl = new(options, &)
         header = dsl.header
         add_attribute(name, options.update(header: header))
         header.each { |attr| remove(attr.key) unless name == attr.key }
@@ -456,9 +467,9 @@ module ROM
       # Embedded, wrap and group can override top-level options like `prefix`
       #
       # @api private
-      def new(options, &block)
+      def new(options, &)
         dsl = self.class.new([], @options.merge(options))
-        dsl.instance_exec(&block) unless block.nil?
+        dsl.instance_exec(&) if block_given?
         dsl
       end
 
@@ -476,5 +487,6 @@ module ROM
         end
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rom/mapper/builder.rb

@@ -11,7 +11,7 @@ module ROM
       # This is used by Setup#mappers DSL
       #
       # @api private
-      def self.build_class(name, mapper_registry, options = EMPTY_HASH, &block)
+      def self.build_class(name, mapper_registry, options = EMPTY_HASH, &)
         class_name = "ROM::Mapper[#{name}]"
 
         parent = options[:parent]
@@ -29,7 +29,7 @@ module ROM
           klass.relation(name)
           klass.inherit_header(inherit_header)
 
-          klass.class_eval(&block) if block
+          klass.class_eval(&) if block_given?
         end
       end
     end

data/lib/rom/mapper/dsl.rb

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

data/lib/rom/mapper/model_dsl.rb

@@ -8,7 +8,11 @@ module ROM
     #
     # @private
     module ModelDSL
-      attr_reader :attributes, :builder, :klass
+      attr_reader :attributes
+
+      attr_reader :builder
+
+      attr_reader :klass
 
       DEFAULT_TYPE = :poro