rom-core 5.1.2 → 5.2.1

data/lib/rom/initializer.rb

@@ -11,6 +11,7 @@ module ROM
       def param(*)
         super.tap { __define_with__ }
       end
+      ruby2_keywords(:param) if respond_to?(:ruby2_keywords, true)
 
       # @api private
       def option(*)
@@ -18,25 +19,26 @@ module ROM
           __define_with__ unless method_defined?(:with)
         end
       end
+      ruby2_keywords(:option) if respond_to?(:ruby2_keywords, true)
 
       # @api private
       def __define_with__
-        seq_names = dry_initializer.
-                      definitions.
-                      reject { |_, d| d.option }.
-                      keys.
-                      join(', ')
+        seq_names = dry_initializer
+          .definitions
+          .reject { |_, d| d.option }
+          .keys
+          .join(', ')
 
         seq_names << ', ' unless seq_names.empty?
 
         undef_method(:with) if method_defined?(:with)
 
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def with(new_options = EMPTY_HASH)
+          def with(**new_options)
             if new_options.empty?
               self
             else
-              self.class.new(#{ seq_names }options.merge(new_options))
+              self.class.new(#{seq_names}**options, **new_options)
             end
           end
         RUBY

data/lib/rom/lint/gateway.rb

@@ -77,9 +77,7 @@ module ROM
       def lint_transaction_support
         result = gateway_instance.transaction { 1 }
 
-        if result != 1
-          complain "#{gateway_instance} must return the result of a transaction block"
-        end
+        complain "#{gateway_instance} must return the result of a transaction block" if result != 1
 
         gateway_instance.transaction do |t|
           t.rollback!

data/lib/rom/lint/linter.rb

@@ -27,6 +27,7 @@ module ROM
       # @api public
       def self.each_lint
         return to_enum unless block_given?
+
         lints.each { |lint| yield lint, self }
       end
 
@@ -67,14 +68,12 @@ module ROM
       # Hook method executed before each lint method run
       #
       # @api private
-      def before_lint
-      end
+      def before_lint; end
 
       # Hook method executed after each lint method run
       #
       # @api private
-      def after_lint
-      end
+      def after_lint; end
     end
   end
 end

data/lib/rom/lint/spec.rb

@@ -3,7 +3,7 @@
 require 'rom/lint/gateway'
 require 'rom/lint/enumerable_dataset'
 
-RSpec.shared_examples "a rom gateway" do
+RSpec.shared_examples 'a rom gateway' do
   ROM::Lint::Gateway.each_lint do |name, linter|
     it name do
       result = linter.new(identifier, gateway, uri).lint(name)
@@ -12,7 +12,7 @@ RSpec.shared_examples "a rom gateway" do
   end
 end
 
-RSpec.shared_examples "a rom enumerable dataset" do
+RSpec.shared_examples 'a rom enumerable dataset' do
   ROM::Lint::EnumerableDataset.each_lint do |name, linter|
     it name do
       result = linter.new(dataset, data).lint(name)

data/lib/rom/mapper.rb

@@ -12,11 +12,11 @@ module ROM
     include Dry::Equalizer(:transformers, :header)
 
     defines :relation, :register_as, :symbolize_keys, :copy_keys,
-      :prefix, :prefix_separator, :inherit_header, :reject_keys
+            :prefix, :prefix_separator, :inherit_header, :reject_keys
 
     inherit_header true
     reject_keys false
-    prefix_separator '_'.freeze
+    prefix_separator '_'
 
     # @return [Object] transformers object built by a processor
     #
@@ -53,7 +53,8 @@ module ROM
     def self.headers(header)
       return [header] if steps.empty?
       return steps.map(&:header) if attributes.empty?
-      raise(MapperMisconfiguredError, "cannot mix outer attributes and steps")
+
+      raise(MapperMisconfiguredError, 'cannot mix outer attributes and steps')
     end
 
     # Build a mapper using provided processor type

data/lib/rom/mapper/attribute_dsl.rb

@@ -78,8 +78,10 @@ module ROM
       # @api public
       def attribute(name, options = EMPTY_HASH, &block)
         with_attr_options(name, options) do |attr_options|
-          raise ArgumentError,
-            "can't specify type and block at the same time" if options[:type] && block
+          if options[:type] && block
+            raise ArgumentError,
+                  "can't specify type and block at the same time"
+          end
           attr_options[:coercer] = block if block
           add_attribute(name, attr_options)
         end
@@ -370,9 +372,7 @@ module ROM
           attr_options[:from] = attr_options[:from].to_sym if name.is_a? Symbol
         end
 
-        if symbolize_keys
-          attr_options.update(from: attr_options.fetch(:from) { name }.to_s)
-        end
+        attr_options.update(from: attr_options.fetch(:from) { name }.to_s) if symbolize_keys
 
         yield(attr_options)
       end

data/lib/rom/mapper/dsl.rb

@@ -49,11 +49,7 @@ module ROM
         #
         # @api private
         def base_relation
-          if superclass.relation
-            superclass.relation
-          else
-            relation
-          end
+          superclass.relation || relation
         end
 
         # Return header of the mapper
@@ -117,6 +113,7 @@ module ROM
             super
           end
         end
+        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
       end
     end
   end

data/lib/rom/mapper/model_dsl.rb

@@ -50,10 +50,11 @@ module ROM
       # @api private
       def build_class
         return klass if klass
+
         included_attrs = attributes.reject do |_name, opts|
           opts && opts[:exclude]
         end
-        builder.call(included_attrs.map(&:first)) if builder
+        builder&.call(included_attrs.map(&:first))
       end
     end
   end

data/lib/rom/mapper_compiler.rb

@@ -25,12 +25,13 @@ module ROM
 
     attr_reader :mapper_options
 
-    def initialize(*args)
+    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))) }

data/lib/rom/mapper_registry.rb

@@ -14,9 +14,9 @@ module ROM
 
     # @!attribute [r] compiler
     #   @return [MapperCompiler] A mapper compiler instance
-    option :compiler, default: -> do
-      MapperCompiler.new(cache: cache)
-    end
+    option :compiler, default: lambda {
+      MapperCompiler.new(EMPTY_HASH, cache: cache)
+    }
 
     # @see Registry
     # @api public

data/lib/rom/memory/dataset.rb

@@ -31,7 +31,7 @@ module ROM
           join_map[tuple].map { |other| tuple.merge(other) }
         }
 
-        self.class.new(tuples, options)
+        self.class.new(tuples, **options)
       end
 
       # Restrict a dataset
@@ -63,7 +63,7 @@ module ROM
       #
       # @api public
       def project(*names)
-        map { |tuple| tuple.reject { |key| !names.include?(key) } }
+        map { |tuple| tuple.select { |key| names.include?(key) } }
       end
 
       # Sort a dataset
@@ -119,7 +119,8 @@ module ROM
       # @api private
       def __compare__(a, b, nils_first)
         return a <=> b unless a.nil? ^ b.nil?
-        (nils_first ^ b.nil?) ? -1 : 1
+
+        nils_first ^ b.nil? ? -1 : 1
       end
     end
   end

data/lib/rom/pipeline.rb

@@ -75,13 +75,15 @@ module ROM
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
 
     # Base composite class with left-to-right pipeline behavior
     #
     # @api private
     class Composite
-      (Kernel.private_instance_methods - %i(respond_to_missing? block_given?)).each(&method(:undef_method))
+      (Kernel.private_instance_methods - %i[respond_to_missing? block_given?])
+        .each(&method(:undef_method))
 
       include Dry::Equalizer(:left, :right)
       include Proxy

data/lib/rom/plugin.rb

@@ -32,11 +32,11 @@ module ROM
     # @param [Class,Object] target
     #
     # @api private
-    def apply_to(target, options = EMPTY_HASH)
+    def apply_to(target, **options)
       if mod.respond_to?(:apply)
-        mod.apply(target, options)
+        mod.apply(target, **options)
       elsif mod.respond_to?(:new)
-        target.include(mod.new(options))
+        target.include(mod.new(**options))
       elsif target.is_a?(::Module)
         target.include(mod)
       end

data/lib/rom/plugin_registry.rb

@@ -78,7 +78,7 @@ module ROM
     #
     # @api private
     def register(name, mod, options)
-      elements[name] = plugin_type.new(name, mod, options)
+      elements[name] = plugin_type.new(name, mod, **options)
     end
 
     # @api private

data/lib/rom/plugins/command/schema.rb

@@ -21,7 +21,7 @@ module ROM
           # @return [Command]
           #
           # @api public
-          def build(relation, options = {})
+          def build(relation, **options)
             if options.key?(:input) || !relation.schema?
               super
             else
@@ -34,7 +34,7 @@ module ROM
                   relation.input_schema
                 end
 
-              super(relation, options.merge(input: input_handler))
+              super(relation, **options, input: input_handler)
             end
           end
         end

data/lib/rom/plugins/relation/instrumentation.rb

@@ -54,7 +54,7 @@ module ROM
         private
 
         # @api private
-        def notification_payload(relation)
+        def notification_payload(_relation)
           EMPTY_HASH
         end
       end

data/lib/rom/plugins/relation/registry_reader.rb

@@ -10,14 +10,14 @@ module ROM
       # For now this plugin is always enabled
       #
       # @api public
-      class RegistryReader < Module
-        EMPTY_REGISTRY = RelationRegistry.new(EMPTY_HASH).freeze
+      class RegistryReader < ::Module
+        EMPTY_REGISTRY = RelationRegistry.build(EMPTY_HASH).freeze
 
         # @api private
         attr_reader :relations
 
         # @api private
-        def initialize(relations)
+        def initialize(relations:)
           @relations = relations
           define_readers!
         end
@@ -26,6 +26,7 @@ module ROM
         def included(klass)
           super
           return if klass.instance_methods.include?(:__registry__)
+
           klass.option :__registry__, default: -> { EMPTY_REGISTRY }
         end
 

data/lib/rom/plugins/schema/timestamps.rb

@@ -23,13 +23,11 @@ module ROM
       #
       # @api public
       module Timestamps
-        DEFAULT_TIMESTAMPS = %i(created_at updated_at).freeze
+        DEFAULT_TIMESTAMPS = %i[created_at updated_at].freeze
 
         # @api private
-        def self.apply(schema, options)
-          type = options.fetch(:type, Types::Time)
-          names = options.fetch(:attributes, DEFAULT_TIMESTAMPS)
-          attributes = names.map do |name|
+        def self.apply(schema, type: Types::Time, attributes: DEFAULT_TIMESTAMPS)
+          attrs = attributes.map do |name|
             ROM::Schema.build_attribute_info(
               type.meta(source: schema.name),
               name: name
@@ -37,7 +35,7 @@ module ROM
           end
 
           schema.attributes.concat(
-            schema.class.attributes(attributes, schema.attr_class)
+            schema.class.attributes(attrs, schema.attr_class)
           )
         end
 

data/lib/rom/processor.rb

@@ -24,7 +24,7 @@ module ROM
     #
     # @api private
     def self.build
-      raise NotImplementedError, "+build+ must be implemented"
+      raise NotImplementedError, '+build+ must be implemented'
     end
   end
 end

data/lib/rom/processor/transproc.rb

@@ -24,11 +24,8 @@ module ROM
         import ::Transproc::HashTransformations
         import ::Transproc::ClassTransformations
         import ::Transproc::ProcTransformations
-        INVALID_INJECT_UNION_VALUE = "%s attribute: block is required for :from with union value.".freeze
 
-        def self.identity(tuple)
-          tuple
-        end
+        INVALID_INJECT_UNION_VALUE = '%s attribute: block is required for :from with union value.'
 
         def self.get(arr, idx)
           arr[idx]
@@ -39,7 +36,7 @@ module ROM
         end
 
         def self.inject_union_value(tuple, name, keys, coercer)
-          raise ROM::MapperMisconfiguredError, INVALID_INJECT_UNION_VALUE % [name] if !coercer
+          raise ROM::MapperMisconfiguredError, INVALID_INJECT_UNION_VALUE % [name] unless coercer
 
           values = tuple.values_at(*keys)
           result = coercer.call(*values)
@@ -315,22 +312,22 @@ module ROM
       #
       # @api private
       def visit_unfold(attribute, preprocess = false)
-        if preprocess
-          name = attribute.name
-          header = attribute.header
-          keys = attribute.pop_keys
-          key = keys.first
+        return unless preprocess
 
-          others = header.postprocessed
+        name = attribute.name
+        header = attribute.header
+        keys = attribute.pop_keys
+        key = keys.first
 
-          compose do |ops|
-            ops << others.map { |attr|
-              t(:map_array, t(:map_value, name, visit(attr, true)))
-            }
-            ops << t(:map_array, t(:map_value, name, t(:insert_key, key)))
-            ops << t(:map_array, t(:reject_keys, [key] - [name]))
-            ops << t(:ungroup, name, [key])
-          end
+        others = header.postprocessed
+
+        compose do |ops|
+          ops << others.map { |attr|
+            t(:map_array, t(:map_value, name, visit(attr, true)))
+          }
+          ops << t(:map_array, t(:map_value, name, t(:insert_key, key)))
+          ops << t(:map_array, t(:reject_keys, [key] - [name]))
+          ops << t(:ungroup, name, [key])
         end
       end
 

data/lib/rom/registry.rb

@@ -26,21 +26,25 @@ module ROM
     option :cache, default: -> { Cache.new }
 
     # @api private
-    def self.new(*args)
-      case args.size
-      when 0
-        super({}, {})
-      when 1
-        super(*args, {})
+    def self.new(*args, **kwargs)
+      if args.empty? && kwargs.empty?
+        super({}, **{})
       else
-        super(*args)
+        super
       end
     end
 
+    # Create a registry without options
+    #
+    # @api private
+    def self.build(elements = {})
+      new(elements, **{})
+    end
+
     # @api private
     def self.[](identifier)
       fetch_or_store(identifier) do
-        Dry::Core::ClassBuilder
+        ::Dry::Core::ClassBuilder
           .new(parent: self, name: "#{name}[:#{identifier}]")
           .call
       end
@@ -53,7 +57,7 @@ module ROM
 
     # @api private
     def merge(other)
-      self.class.new(Hash(other), options)
+      self.class.new(Hash(other), **options)
     end
 
     # @api private
@@ -62,16 +66,17 @@ module ROM
     end
 
     # @api private
-    def map(&block)
+    def map
       new_elements = elements.each_with_object({}) do |(name, element), h|
         h[name] = yield(element)
       end
-      self.class.new(new_elements, options)
+      self.class.new(new_elements, **options)
     end
 
     # @api private
     def each
       return to_enum unless block_given?
+
       elements.each { |element| yield(element) }
     end
 
@@ -82,7 +87,7 @@ module ROM
 
     # @api private
     def fetch(key)
-      raise ArgumentError.new('key cannot be nil') if key.nil?
+      raise ArgumentError, 'key cannot be nil' if key.nil?
 
       elements.fetch(key.to_sym) do
         return yield if block_given?