rom-core 5.3.2 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5e68490bae63d219c64bbe41960ea6bbbbdece0bc591db565cd3c944776c3dd
-  data.tar.gz: 6fd7e95b205623590c498a36965dc9a717eafe8bba4ed3a079004a8b9295e1cd
+  metadata.gz: d157d2abe517cdafa10b73c50b3ccf54647a5251887b0bd59e007abfc72b5de3
+  data.tar.gz: 944ee8977bd9cdd2e980c7d67ec5d96e96db4dd51b8372218cfaaa58ddb397e7
 SHA512:
-  metadata.gz: b45737ce39e9e6b42d5a6231c521ea0aff6818595d70f8a5eb176518eb9ebf3f420e3353a1bbbb3538d593dbdb2fee51ecc429f11f3992891bb129a19bd2cdb7
-  data.tar.gz: c800a5b88a63d6a1dbe8f20f722a081db90b66cea2f88c0712180d32d046ab0f3f0336717556ead878fa1939484df64e6d756ed48e47fdfae6ba8cb6c6a6807a
+  metadata.gz: 346ca3842e535322fd537e01812db38ee8f1f9b5eb35087deb3e8bfa3e55d378b9702a12f49f9e084610307281ab1a638c728dafa598517bd691104d80be12a3
+  data.tar.gz: a60428bda2a664a8b38deec4fd272ecb02e31cb3530bd9e5f4a6f30371f128fb6abb4186e4d914a8f8f35c7d7c6d3cfa771a47aea47c9fe1dd212683c0321b88

data/lib/rom/array_dataset.rb

@@ -35,11 +35,11 @@ module ROM
       map! combination cycle delete_if keep_if permutation reject!
       select! sort_by!
     ].each do |method|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{method}(*args, &block)
-          return to_enum unless block
-          self.class.new(data.send(:#{method}, *args, &block), **options)
-        end
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+        def #{method}(*args, &)                                          # def map!(*args, &)
+          return to_enum unless block_given?                             #   return to_enum unless block_given?
+          self.class.new(data.__send__(:#{method}, *args, &), **options) #   self.class.new(data.__send__(:map!, *args, &), **options)
+        end                                                              # end
       RUBY
     end
   end

data/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

data/lib/rom/associations/definitions/abstract.rb

@@ -67,14 +67,16 @@ module ROM
         # @option opts [Symbol] :as The name of the association (defaults to target)
         # @option opts [Symbol] :relation The name of the target relation (defaults to target)
         # @option opts [Symbol] :foreign_key The name of a custom foreign key
-        # @option opts [Symbol] :view The name of a custom relation view on the target's relation side
-        # @option opts [TrueClass,FalseClass] :override Whether provided :view should override association's default view
+        # @option opts [Symbol] :view The name of a custom relation view
+        #                             on the target's relation side
+        # @option opts [true, false] :override Whether provided :view should override
+        #                                      association's default view
         #
         # @api public
         def self.new(source, target, **opts)
           source_name = Relation::Name[source]
           target_name = resolve_target_name(target, opts)
-          options = process_options(target_name, Hash[opts])
+          options = process_options(target_name, opts.to_h)
 
           super(source_name, target_name, **options)
         end

data/lib/rom/associations/many_to_many.rb

@@ -14,11 +14,10 @@ module ROM
       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
       #

data/lib/rom/attribute.rb

@@ -23,7 +23,8 @@ module ROM
     META_OPTIONS = %i[primary_key foreign_key source target relation].freeze
 
     # @!attribute [r] type
-    #   @return [Dry::Types::Nominal, Dry::Types::Sum, Dry::Types::Constrained] The attribute's type object
+    #   @return [Dry::Types::Nominal, Dry::Types::Sum, Dry::Types::Constrained] The attribute's
+    #                                                                           type object
     param :type
 
     # @!attribute [r] name
@@ -82,9 +83,7 @@ module ROM
     # @return [TrueClass,FalseClass]
     #
     # @api public
-    def primary_key?
-      meta[:primary_key].equal?(true)
-    end
+    def primary_key? = meta[:primary_key].equal?(true)
 
     # Return true if this attribute type is a foreign key
     #
@@ -105,9 +104,7 @@ module ROM
     # @return [TrueClass,FalseClass]
     #
     # @api public
-    def foreign_key?
-      meta[:foreign_key].equal?(true)
-    end
+    def foreign_key? = meta[:foreign_key].equal?(true)
 
     # Return true if this attribute has a configured alias
     #
@@ -128,9 +125,7 @@ module ROM
     # @return [TrueClass,FalseClass]
     #
     # @api public
-    def aliased?
-      !self.alias.nil?
-    end
+    def aliased? = !self.alias.nil?
 
     # Return source relation of this attribute type
     #
@@ -151,9 +146,7 @@ module ROM
     # @return [Symbol, Relation::Name]
     #
     # @api public
-    def source
-      meta[:source]
-    end
+    def source = meta[:source]
 
     # Return target relation of this attribute type
     #
@@ -174,9 +167,7 @@ module ROM
     # @return [NilClass, Symbol, Relation::Name]
     #
     # @api public
-    def target
-      meta[:target]
-    end
+    def target = meta[:target]
 
     # Return tuple key
     #
@@ -199,9 +190,7 @@ module ROM
     # @return [Symbol]
     #
     # @api public
-    def key
-      self.alias || name
-    end
+    def key = self.alias || name
 
     # Return new attribute type with provided alias
     #
@@ -229,9 +218,7 @@ module ROM
     # @return [Attribute]
     #
     # @api public
-    def aliased(name)
-      with(alias: name)
-    end
+    def aliased(name) = with(alias: name)
     alias_method :as, :aliased
 
     # Return new attribute type with an alias using provided prefix
@@ -276,9 +263,7 @@ module ROM
     # correctly in places like auto-mapping.
     #
     # @api public
-    def wrapped?
-      meta[:wrapped].equal?(true)
-    end
+    def wrapped? = meta[:wrapped].equal?(true)
 
     # Return attribute type wrapped for the specified relation name
     #
@@ -337,27 +322,21 @@ module ROM
     # @return [TrueClass, FalseClass]
     #
     # @api private
-    def read?
-      !meta[:read].nil?
-    end
+    def read? = !meta[:read].nil?
 
     # Return read type
     #
     # @return [Dry::Types::Type]
     #
     # @api private
-    def to_read_type
-      read? ? meta[:read] : type
-    end
+    def to_read_type = read? ? meta[:read] : type
 
     # Return write type
     #
     # @return [Dry::Types::Type]
     #
     # @api private
-    def to_write_type
-      type
-    end
+    def to_write_type = type
 
     # Return nullable attribute
     #
@@ -405,9 +384,9 @@ module ROM
     private
 
     # @api private
-    def method_missing(meth, *args, &block)
+    def method_missing(meth, ...)
       if type.respond_to?(meth)
-        response = type.__send__(meth, *args, &block)
+        response = type.__send__(meth, ...)
 
         if response.is_a?(type.class)
           self.class.new(response, **options)
@@ -418,6 +397,5 @@ module ROM
         super
       end
     end
-    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/rom/auto_curry.rb

@@ -5,6 +5,33 @@ module ROM
   #
   # @api private
   module AutoCurry
+    # @api private
+    class Wrapper < ::Module
+      def initialize(name, arity, &block)
+        define_method(name) do |*args, **kwargs, &mblock|
+          kwargs_size =
+            if kwargs.empty?
+              0
+            else
+              1
+            end
+
+          response =
+            if arity.negative? || arity.eql?(args.size + kwargs_size)
+              super(*args, **kwargs, &mblock)
+            else
+              self.class.curried.new(self, view: name, curry_args: args, arity: arity)
+            end
+
+          if block
+            response.instance_exec(&block)
+          else
+            response
+          end
+        end
+      end
+    end
+
     def self.extended(klass)
       klass.define_singleton_method(:method_added) do |name|
         return if auto_curry_busy?
@@ -37,34 +64,18 @@ module ROM
     # @param [Symbol] name The name of a method
     #
     # @api private
-    def auto_curry(name, &block)
+    def auto_curry(name, &)
       arity = instance_method(name).arity
 
-      return unless public_instance_methods.include?(name) && arity != 0
+      if public_instance_methods.include?(name) && arity != 0
+        mod = Wrapper.new(name, arity, &)
 
-      mod = Module.new
-
-      mod.module_eval do
-        define_method(name) do |*args, &mblock|
-          response =
-            if arity < 0 || arity == args.size
-              super(*args, &mblock)
-            else
-              self.class.curried.new(self, view: name, curry_args: args, arity: arity)
-            end
+        auto_curried_methods << name
 
-          if block
-            response.instance_exec(&block)
-          else
-            response
-          end
-        end
-        ruby2_keywords(name) if respond_to?(:ruby2_keywords, true)
+        prepend(mod)
+      else
+        self
       end
-
-      auto_curried_methods << name
-
-      prepend(mod)
     end
   end
 end

data/lib/rom/cache.rb

@@ -24,45 +24,33 @@ module ROM
       end
 
       # @api private
-      def [](key)
-        cache[[namespace, key].hash]
-      end
+      def [](key) = cache[[namespace, key].hash]
 
       # @api private
-      def fetch_or_store(*args, &block)
-        cache.fetch_or_store([namespace, args.hash].hash, &block)
+      def fetch_or_store(*args, &)
+        cache.fetch_or_store([namespace, args].hash, &)
       end
 
       # @api private
-      def size
-        cache.size
-      end
+      def size = cache.size
 
       # @api private
-      def inspect
-        %(#<#{self.class} size=#{size}>)
-      end
+      def inspect = %(#<#{self.class} size=#{size}>)
     end
 
     # @api private
     def initialize
-      @objects = Concurrent::Map.new
+      @objects = ::Concurrent::Map.new
       @namespaced = {}
     end
 
-    def [](key)
-      cache[key]
-    end
+    def [](key) = objects[key]
 
     # @api private
-    def fetch_or_store(*args, &block)
-      objects.fetch_or_store(args.hash, &block)
-    end
+    def fetch_or_store(*args, &) = objects.fetch_or_store(args.hash, &)
 
     # @api private
-    def size
-      objects.size
-    end
+    def size = objects.size
 
     # @api private
     def namespaced(namespace)

data/lib/rom/command.rb

@@ -265,7 +265,9 @@ module ROM
     # This method will apply before/after hooks automatically
     #
     # @api public
-    def call(*args, &block)
+    #
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
+    def call(*args, &)
       tuples =
         if hooks?
           prepared =
@@ -275,7 +277,7 @@ module ROM
               apply_hooks(before_hooks, *args)
             end
 
-          result = prepared ? execute(prepared, &block) : execute(&block)
+          result = prepared ? execute(prepared, &) : execute(&)
 
           if curried?
             if !args.empty?
@@ -286,10 +288,10 @@ module ROM
               apply_hooks(after_hooks, result)
             end
           else
-            apply_hooks(after_hooks, result, *args[1..args.size - 1])
+            apply_hooks(after_hooks, result, *args.drop(1))
           end
         else
-          execute(*(curry_args + args), &block)
+          execute(*(curry_args + args), &)
         end
 
       if one?
@@ -298,6 +300,8 @@ module ROM
         tuples
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
+
     alias_method :[], :call
 
     # Curry this command with provided args
@@ -323,18 +327,14 @@ module ROM
     # @return [Command::Graph]
     #
     # @api public
-    def combine(*others)
-      Graph.new(self, others)
-    end
+    def combine(*others) = Graph.new(self, others)
 
     # Check if this command is curried
     #
     # @return [TrueClass, FalseClass]
     #
     # @api public
-    def curried?
-      !curry_args.empty?
-    end
+    def curried? = !curry_args.empty?
 
     # Return a new command with appended before hooks
     #
@@ -363,18 +363,14 @@ module ROM
     # @return [Array]
     #
     # @api public
-    def before_hooks
-      options[:before]
-    end
+    def before_hooks = options[:before]
 
     # List of after hooks
     #
     # @return [Array]
     #
     # @api public
-    def after_hooks
-      options[:after]
-    end
+    def after_hooks = options[:after]
 
     # Return a new command with other source relation
     #
@@ -390,54 +386,42 @@ module ROM
     # Check if this command has any hooks
     #
     # @api private
-    def hooks?
-      !before_hooks.empty? || !after_hooks.empty?
-    end
+    def hooks? = !before_hooks.empty? || !after_hooks.empty?
 
     # Check if this command is lazy
     #
     # @return [false]
     #
     # @api private
-    def lazy?
-      false
-    end
+    def lazy? = false
 
     # Check if this command is a graph
     #
     # @return [false]
     #
     # @api private
-    def graph?
-      false
-    end
+    def graph? = false
 
     # Check if this command returns a single tuple
     #
     # @return [TrueClass,FalseClass]
     #
     # @api private
-    def one?
-      result.equal?(:one)
-    end
+    def one? = result.equal?(:one)
 
     # Check if this command returns many tuples
     #
     # @return [TrueClass,FalseClass]
     #
     # @api private
-    def many?
-      result.equal?(:many)
-    end
+    def many? = result.equal?(:many)
 
     # Check if this command is restrictible through relation
     #
     # @return [TrueClass,FalseClass]
     #
     # @api private
-    def restrictible?
-      self.class.restrictable.equal?(true)
-    end
+    def restrictible? = self.class.restrictable.equal?(true)
 
     # Yields tuples for insertion or return an enumerator
     #
@@ -459,9 +443,7 @@ module ROM
     # @return [Class]
     #
     # @api private
-    def composite_class
-      Command::Composite
-    end
+    def composite_class = Command::Composite
 
     # Apply provided hooks
     #

data/lib/rom/command_compiler.rb

@@ -128,6 +128,8 @@ module ROM
     private
 
     # @api private
+    #
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
     def visit_relation(node, parent_relation = nil)
       name, header, meta = node
       other = header.map { |attr| visit(attr, name) }.compact
@@ -157,21 +159,20 @@ module ROM
             default_mapping
           end
 
-        if !other.empty?
-          [mapping, [type, other]]
-        else
+        if other.empty?
           [mapping, type]
+        else
+          [mapping, [type, other]]
         end
       else
         registry[name][id] = commands[name][id]
         [name, id]
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
 
     # @api private
-    def visit_attribute(*_args)
-      nil
-    end
+    def visit_attribute(*_args) = nil
 
     # Build a command object for a specific relation
     #
@@ -187,6 +188,8 @@ module ROM
     # @return [ROM::Command]
     #
     # @api private
+    #
+    # rubocop:disable Metrics/AbcSize
     def register_command(rel_name, type, rel_meta, parent_relation = nil)
       relation = relations[rel_name]
 
@@ -216,15 +219,14 @@ module ROM
         registry[rel_name][type] = klass.build(relation)
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # Return default result type
     #
     # @return [Symbol]
     #
     # @api private
-    def result
-      meta.fetch(:result, :one)
-    end
+    def result = meta.fetch(:result, :one)
 
     # Sets up `associates` plugin for a given command class and relation
     #
@@ -241,11 +243,7 @@ module ROM
           singular_name if relation.associations.key?(singular_name)
         end
 
-      if assoc_name
-        klass.associates(assoc_name)
-      else
-        klass.associates(parent_relation)
-      end
+      klass.associates(assoc_name || parent_relation)
     end
   end
 end

data/lib/rom/command_proxy.rb

@@ -8,7 +8,9 @@ module ROM
   #
   # @api private
   class CommandProxy
-    attr_reader :command, :root
+    attr_reader :command
+
+    attr_reader :root
 
     # @api private
     def initialize(command, root = Inflector.singularize(command.name.relation).to_sym)
@@ -17,18 +19,12 @@ module ROM
     end
 
     # @api private
-    def call(input)
-      command.call(root => input)
-    end
+    def call(input) = command.call(root => input)
 
     # @api private
-    def >>(other)
-      self.class.new(command >> other)
-    end
+    def >>(other) = self.class.new(command >> other)
 
     # @api private
-    def restrictible?
-      command.restrictible?
-    end
+    def restrictible? = command.restrictible?
   end
 end

data/lib/rom/command_registry.rb

@@ -34,9 +34,7 @@ module ROM
     option :compiler, optional: true
 
     # @api private
-    def self.element_not_found_error
-      CommandNotFoundError
-    end
+    def self.element_not_found_error = CommandNotFoundError
 
     # Return a command from the registry
     #
@@ -86,17 +84,15 @@ module ROM
     # @return [CommandRegistry]
     #
     # @api public
-    def map_with(mapper_name)
-      with(mapper: mappers[mapper_name])
-    end
+    def map_with(mapper_name) = with(mapper: mappers[mapper_name])
 
     # @api private
-    def set_compiler(compiler)
+    def set_compiler(compiler) # rubocop:disable Naming/AccessorMethodName
       options[:compiler] = @compiler = compiler
     end
 
     # @api private
-    def set_mappers(mappers)
+    def set_mappers(mappers) # rubocop:disable Naming/AccessorMethodName
       options[:mappers] = @mappers = mappers
     end