rom-core 5.3.2 → 5.4.0

data/lib/rom/mapper.rb

@@ -9,7 +9,7 @@ module ROM
   # @private
   class Mapper
     include DSL
-    include Dry::Equalizer(:transformers, :header)
+    include ::Dry::Equalizer(:transformers, :header)
 
     defines :relation, :register_as, :symbolize_keys, :copy_keys,
             :prefix, :prefix_separator, :inherit_header, :reject_keys
@@ -86,9 +86,7 @@ module ROM
     # @return [Class] optional model that is instantiated by a mapper
     #
     # @api private
-    def model
-      header.model
-    end
+    def model = header.model
 
     # Process a relation using the transformers
     #

data/lib/rom/mapper_compiler.rb

@@ -23,13 +23,12 @@ module ROM
 
     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))) }
@@ -43,6 +42,7 @@ module ROM
       __send__("visit_#{name}", node)
     end
 
+    # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
     def visit_relation(node)
       rel_name, header, meta_options = node
       name = meta_options[:combine_name] || meta_options[:alias] || rel_name
@@ -69,6 +69,7 @@ module ROM
         options
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
     def visit_attribute(node)
       name, _, meta_options = node

data/lib/rom/mapper_registry.rb

@@ -8,9 +8,7 @@ module ROM
   # @private
   class MapperRegistry < Registry
     # @api private
-    def self.element_not_found_error
-      MapperMissingError
-    end
+    def self.element_not_found_error = MapperMissingError
 
     # @!attribute [r] compiler
     #   @return [MapperCompiler] A mapper compiler instance
@@ -21,7 +19,7 @@ module ROM
     # @see Registry
     # @api public
     def [](*args)
-      if args[0].is_a?(Symbol)
+      if args[0].is_a?(::Symbol)
         super
       else
         cache.fetch_or_store(args.hash) { compiler.(*args) }

data/lib/rom/memory/commands.rb

@@ -17,7 +17,7 @@ module ROM
 
         # @see ROM::Commands::Create#execute
         def execute(tuples)
-          Array([tuples]).flatten.map { |tuple|
+          [tuples].flatten.map { |tuple|
             attributes = input[tuple]
             relation.insert(attributes.to_h)
             attributes

data/lib/rom/memory/dataset.rb

@@ -19,11 +19,12 @@ module ROM
       # @return [Dataset]
       #
       # @api public
+      # rubocop:disable Metrics/AbcSize
       def join(*args)
         left, right = args.size > 1 ? args : [self, args.first]
 
         join_map = left.each_with_object({}) { |tuple, h|
-          others = right.to_a.find_all { |t| (tuple.to_a & t.to_a).any? }
+          others = right.to_a.find_all { |t| tuple.to_a.intersect?(t.to_a) }
           (h[tuple] ||= []).concat(others)
         }
 
@@ -33,6 +34,7 @@ module ROM
 
         self.class.new(tuples, **options)
       end
+      # rubocop:enable Metrics/AbcSize
 
       # Restrict a dataset
       #
@@ -41,14 +43,14 @@ module ROM
       # @return [Dataset]
       #
       # @api public
-      def restrict(criteria = nil)
-        return find_all { |tuple| yield(tuple) } unless criteria
+      def restrict(criteria = nil, &)
+        return find_all(&) unless criteria
 
         find_all do |tuple|
           criteria.all? do |k, v|
             case v
-            when Array then v.include?(tuple[k])
-            when Regexp then tuple[k].match(v)
+            when ::Array then v.include?(tuple[k])
+            when ::Regexp then tuple[k].match(v)
             else tuple[k].eql?(v)
             end
           end

data/lib/rom/memory/gateway.rb

@@ -24,6 +24,7 @@ module ROM
 
       # @api private
       def initialize
+        super
         @connection = Storage.new
       end
 

data/lib/rom/model_builder.rb

@@ -19,7 +19,11 @@ module ROM
   class ModelBuilder
     attr_reader :name
 
-    attr_reader :const_name, :namespace, :klass
+    attr_reader :const_name
+
+    attr_reader :namespace
+
+    attr_reader :klass
 
     # Return model builder subclass based on type
     #
@@ -32,7 +36,7 @@ module ROM
       case type
       when :poro then PORO
       else
-        raise ArgumentError, "#{type.inspect} is not a supported model type"
+        raise ::ArgumentError, "#{type.inspect} is not a supported model type"
       end
     end
 
@@ -41,9 +45,7 @@ module ROM
     # @return [Class]
     #
     # @api private
-    def self.call(*args)
-      new(*args).call
-    end
+    def self.call(*args) = new(*args).call
 
     # @api private
     def initialize(options = {})
@@ -66,9 +68,7 @@ module ROM
     # Define a model class constant
     #
     # @api private
-    def define_const
-      namespace.const_set(const_name, klass)
-    end
+    def define_const = namespace.const_set(const_name, klass)
 
     # Build a model class supporting specific attributes
     #
@@ -86,14 +86,14 @@ module ROM
     # @private
     class PORO < ModelBuilder
       def define_class(attrs)
-        @klass = Class.new
+        @klass = ::Class.new
 
-        @klass.send(:attr_reader, *attrs)
+        @klass.attr_reader(*attrs)
 
-        @klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def initialize(params)
-            #{attrs.map { |name| "@#{name} = params[:#{name}]" }.join("\n")}
-          end
+        @klass.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def initialize(params)                                             # def initialize(params)
+            #{attrs.map { |name| "@#{name} = params[:#{name}]" }.join("\n")} #   @name = params[:name]
+          end                                                                # end
         RUBY
 
         self

data/lib/rom/open_struct.rb

@@ -24,7 +24,7 @@ module ROM
     private
 
     # @api private
-    def method_missing(meth, *args, &block)
+    def method_missing(meth, *args, &)
       ivar = IVAR[meth]
 
       if instance_variables.include?(ivar)

data/lib/rom/pipeline.rb

@@ -19,16 +19,12 @@ module ROM
       # @return [Relation::Composite]
       #
       # @api public
-      def >>(other)
-        composite_class.new(self, other)
-      end
+      def >>(other) = composite_class.new(self, other)
 
       private
 
       # @api private
-      def composite_class
-        raise NotImplementedError
-      end
+      def composite_class = raise ::NotImplementedError
     end
 
     include Operator
@@ -57,14 +53,12 @@ module ROM
       # Check if response from method missing should be decorated
       #
       # @api private
-      def decorate?(response)
-        response.is_a?(left.class)
-      end
+      def decorate?(response) = response.is_a?(left.class)
 
       # @api private
-      def method_missing(name, *args, &block)
+      def method_missing(name, ...)
         if left.respond_to?(name)
-          response = left.__send__(name, *args, &block)
+          response = left.__send__(name, ...)
 
           if decorate?(response)
             self.class.new(response, right)
@@ -75,7 +69,6 @@ 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
@@ -109,9 +102,7 @@ module ROM
       # Compose this composite with another object
       #
       # @api public
-      def >>(other)
-        self.class.new(self, other)
-      end
+      def >>(other) = self.class.new(self, other)
     end
   end
 end

data/lib/rom/plugin_registry.rb

@@ -42,9 +42,7 @@ module ROM
     end
 
     # @api private
-    def [](type)
-      types.fetch(singularize(type))
-    end
+    def [](type) = types.fetch(singularize(type))
 
     # Old API compatibility
     #
@@ -64,7 +62,7 @@ module ROM
   #
   # @api private
   class PluginsContainer < Registry
-    include Dry::Equalizer(:elements, :type)
+    include ::Dry::Equalizer(:elements, :type)
 
     # @!attribute [r] plugin_type
     #   @return [Class] Typically ROM::PluginBase or its descendant
@@ -82,9 +80,7 @@ module ROM
     end
 
     # @api private
-    def plugin_type
-      Plugins[type][:plugin_type]
-    end
+    def plugin_type = Plugins[type][:plugin_type]
   end
 
   # Store a set of registries grouped by adapter
@@ -114,9 +110,7 @@ module ROM
     # @return [AdapterRegistry]
     #
     # @api private
-    def adapter(name)
-      registries[name]
-    end
+    def adapter(name) = registries[name]
 
     # @api private
     def register(name, mod, options)

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

@@ -22,16 +22,20 @@ module ROM
       #   result[:created_at]  #=> Time.now.utc
       #
       # @api public
-      class Timestamps < Module
-        attr_reader :timestamps, :datestamps
+      class Timestamps < ::Module
+        attr_reader :timestamps
+
+        attr_reader :datestamps
+
         def initialize(timestamps: [], datestamps: [])
+          super()
           @timestamps = store_attributes(timestamps)
           @datestamps = store_attributes(datestamps)
         end
 
         # @api private
         def store_attributes(attr)
-          attr.is_a?(Array) ? attr : Array[attr]
+          attr.is_a?(Array) ? attr : [attr]
         end
 
         # @api private
@@ -117,7 +121,7 @@ module ROM
           def timestamps(*names)
             timestamp_columns timestamp_columns.merge(names)
           end
-          alias timestamp timestamps
+          alias_method :timestamp, :timestamps
 
           # Set up attributes to datestamp when the command is called
           #
@@ -139,7 +143,7 @@ module ROM
           def datestamps(*names)
             datestamp_columns datestamp_columns.merge(names)
           end
-          alias datestamp datestamps
+          alias_method :datestamp, :datestamps
         end
       end
     end

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

@@ -45,8 +45,13 @@ module ROM
         # Execute a block using instrumentation
         #
         # @api public
-        def instrument(&block)
-          notifications.instrument(self.class.adapter, name: name.relation, **notification_payload(self), &block)
+        def instrument(&)
+          notifications.instrument(
+            self.class.adapter,
+            name: name.relation,
+            **notification_payload(self),
+            &
+          )
         end
 
         private

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

@@ -14,12 +14,9 @@ module ROM
         EMPTY_REGISTRY = RelationRegistry.build(EMPTY_HASH).freeze
 
         # @api private
-        attr_reader :relations
-
-        # @api private
-        def initialize(relations:)
-          @relations = relations
-          define_readers!
+        def initialize(readers:)
+          super()
+          include readers
         end
 
         # @api private
@@ -29,15 +26,6 @@ module ROM
 
           klass.option :__registry__, default: -> { EMPTY_REGISTRY }
         end
-
-        private
-
-        # @api private
-        def define_readers!
-          relations.each do |name|
-            define_method(name) { __registry__[name] }
-          end
-        end
       end
     end
   end

data/lib/rom/plugins.rb

@@ -11,9 +11,7 @@ module ROM
 
     class << self
       # @api private
-      def register(entity_type, plugin_type: Plugin, adapter: true)
-        super(entity_type, plugin_type: plugin_type, adapter: adapter)
-      end
+      def register(entity_type, plugin_type: Plugin, adapter: true) = super
     end
   end
 end

data/lib/rom/processor/transproc.rb

@@ -13,6 +13,7 @@ module ROM
     # @see https://github.com/solnic/transproc too
     #
     # @private
+    # rubocop:disable Metrics/ClassLength
     class Transproc < Processor
       include ::Transproc::Composer
 
@@ -84,6 +85,7 @@ module ROM
 
       # @api private
       def initialize(mapper, header)
+        super()
         @mapper = mapper
         @header = header
         @model = header.model
@@ -96,6 +98,7 @@ module ROM
       # @return [Transproc::Function]
       #
       # @api private
+      # rubocop:disable Metrics/AbcSize
       def to_transproc
         compose(t(:identity)) do |ops|
           combined = header.combined
@@ -105,6 +108,7 @@ module ROM
           ops << header.postprocessed.map { |attr| visit(attr, true) }
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 
@@ -130,6 +134,8 @@ module ROM
       # @param [Header::Attribute] attribute
       #
       # @api private
+      #
+      # rubocop:disable Metrics/AbcSize
       def visit_attribute(attribute)
         coercer = attribute.meta[:coercer]
         if attribute.union?
@@ -143,6 +149,7 @@ module ROM
           t(:map_value, attribute.name, t(:"to_#{attribute.type}"))
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       # Visit hash attribute
       #
@@ -232,7 +239,7 @@ module ROM
       #                             function that is applied to the whole relation
       #
       # @api private
-      def visit_group(attribute, preprocess = false)
+      def visit_group(attribute, preprocess = false) # rubocop:disable Style/OptionalBooleanParameter
         if preprocess
           name = attribute.name
           header = attribute.header
@@ -262,7 +269,7 @@ module ROM
       #                             function that is applied to the whole relation
       #
       # @api private
-      def visit_ungroup(attribute, preprocess = false)
+      def visit_ungroup(attribute, preprocess = false) # rubocop:disable Style/OptionalBooleanParameter
         if preprocess
           name = attribute.name
           header = attribute.header
@@ -290,7 +297,7 @@ module ROM
       #                             function that is applied to the whole relation
       #
       # @api private
-      def visit_fold(attribute, preprocess = false)
+      def visit_fold(attribute, preprocess = false) # rubocop:disable Style/OptionalBooleanParameter
         if preprocess
           name = attribute.name
           keys = attribute.tuple_keys
@@ -312,7 +319,8 @@ module ROM
       #                             function that is applied to the whole relation
       #
       # @api private
-      def visit_unfold(attribute, preprocess = false)
+      # rubocop:disable Metrics/AbcSize
+      def visit_unfold(attribute, preprocess = false) # rubocop:disable Style/OptionalBooleanParameter
         return unless preprocess
 
         name = attribute.name
@@ -331,6 +339,7 @@ module ROM
           ops << t(:ungroup, name, [key])
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       # Visit excluded attribute
       #
@@ -411,5 +420,6 @@ module ROM
         Functions[*args]
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rom/processor.rb

@@ -13,6 +13,7 @@ module ROM
     #
     # @api private
     def self.inherited(processor)
+      super
       Mapper.register_processor(processor)
     end
 

data/lib/rom/registry.rb

@@ -8,10 +8,10 @@ module ROM
   # @api private
   class Registry
     extend Initializer
-    extend Dry::Core::Cache
+    extend ::Dry::Core::Cache
 
-    include Enumerable
-    include Dry::Equalizer(:elements)
+    include ::Enumerable
+    include ::Dry::Equalizer(:elements)
 
     # @!attribute [r] elements
     #   @return [Hash] Internal hash for storing registry objects
@@ -33,9 +33,7 @@ module ROM
     # Create a registry without options
     #
     # @api private
-    def self.build(elements = {})
-      new(elements, **{})
-    end
+    def self.build(elements = {}) = new(elements, **{})
 
     # @api private
     def self.[](identifier)
@@ -47,40 +45,37 @@ module ROM
     end
 
     # @api private
-    def self.element_not_found_error
-      ElementNotFoundError
-    end
+    def self.element_not_found_error = ElementNotFoundError
 
     # @api private
-    def merge(other)
-      self.class.new(Hash(other), **options)
-    end
+    def merge(other) = self.class.new(Hash(other), **options)
 
     # @api private
-    def to_hash
-      elements
-    end
+    def to_hash = elements
 
     # @api private
-    def map
-      new_elements = elements.each_with_object({}) do |(name, element), h|
-        h[name] = yield(element)
-      end
+    def map(&)
+      new_elements = elements.transform_values(&)
       self.class.new(new_elements, **options)
     end
 
     # @api private
-    def each
+    def each(&)
       return to_enum unless block_given?
 
-      elements.each { |element| yield(element) }
+      elements.each(&)
     end
 
     # @api private
-    def key?(name)
-      !name.nil? && elements.key?(name.to_sym)
+    def each_value(&)
+      return to_enum(:each_value) unless block_given?
+
+      elements.each_value(&)
     end
 
+    # @api private
+    def key?(name) = !name.nil? && elements.key?(name.to_sym)
+
     # @api private
     def fetch(key)
       raise ArgumentError, 'key cannot be nil' if key.nil?
@@ -93,9 +88,7 @@ module ROM
     end
     alias_method :[], :fetch
 
-    def type
-      self.class.name
-    end
+    def type = self.class.name
 
     # @api private
     def respond_to_missing?(name, include_private = false)
@@ -105,8 +98,6 @@ module ROM
     private
 
     # @api private
-    def method_missing(name, *)
-      elements.fetch(name) { super }
-    end
+    def method_missing(name, *) = elements.fetch(name) { super }
   end
 end