rom-core 5.3.1 → 5.4.0

data/lib/rom/relation/class_interface.rb

@@ -15,6 +15,7 @@ module ROM
     # Global class-level API for relation classes
     #
     # @api public
+    # rubocop:disable Metrics/ModuleLength
     module ClassInterface
       extend Notifications::Listener
 
@@ -91,10 +92,11 @@ module ROM
       # @param [Boolean] infer Whether to do an automatic schema inferring
       #
       # @api public
-      def schema(dataset = nil, as: nil, infer: false, &block)
-        if defined?(@schema) && !block && !infer
+      # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+      def schema(dataset = nil, as: nil, infer: false, &)
+        if defined?(@schema) && !block_given? && !infer
           @schema
-        elsif block || infer
+        elsif block_given? || infer
           raise MissingSchemaClassError, self unless schema_class
 
           ds_name = dataset || schema_opts.fetch(:dataset, default_name.dataset)
@@ -110,11 +112,12 @@ module ROM
               schema_class: schema_class,
               attr_class: schema_attr_class,
               inferrer: schema_inferrer.with(enabled: infer),
-              &block
+              &
             ).call(*args, &inner_block)
           end
         end
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
       # Assign a schema to a relation class
       #
@@ -187,8 +190,9 @@ module ROM
       # @return [Symbol] view method name
       #
       # @api public
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
       def view(*args, &block)
-        if args.size == 1 && block.arity > 0
+        if args.size == 1 && block.arity.positive?
           raise ArgumentError, 'schema attribute names must be provided as the second argument'
         end
 
@@ -206,7 +210,7 @@ module ROM
             new_schema_fn
           end
 
-        if relation_block.arity > 0
+        if relation_block.arity.positive?
           auto_curry_guard do
             define_method(name, &relation_block)
 
@@ -222,6 +226,7 @@ module ROM
 
         name
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
 
       # Dynamically define a method that will forward to the dataset and wrap
       # response in the relation itself
@@ -234,10 +239,10 @@ module ROM
       # @api public
       def forward(*methods)
         methods.each do |method|
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{method}(*args, &block)
-              new(dataset.__send__(:#{method}, *args, &block))
-            end
+          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+            def #{method}(...)                        # def super_query(...)
+              new(dataset.__send__(:#{method}, ...))  #   new(dataset.__send__(:super_query, ...))
+            end                                       # end
           RUBY
         end
       end
@@ -272,9 +277,7 @@ module ROM
       end
 
       # @api private
-      def curried
-        Curried
-      end
+      def curried = Curried
 
       # @api private
       def view_methods
@@ -309,9 +312,7 @@ module ROM
       end
 
       # @api private
-      def name
-        super || superclass.name
-      end
+      def name = super || superclass.name
 
       private
 
@@ -319,5 +320,6 @@ module ROM
         INVALID_RELATIONS_NAMES.include?(relation.to_sym)
       end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/rom/relation/combined.rb

@@ -95,7 +95,8 @@ module ROM
       # @return [Relation]
       #
       # @api public
-      def node(name, &block)
+      # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+      def node(name, &)
         if name.is_a?(Symbol) && !nodes.map { |n| n.name.key }.include?(name)
           raise ArgumentError, "#{name.inspect} is not a valid aggregate node name"
         end
@@ -107,7 +108,7 @@ module ROM
           when Hash
             other, *rest = name.flatten(1)
             if other == node.name.key
-              nodes.detect { |n| n.name.key == other }.node(*rest, &block)
+              nodes.detect { |n| n.name.key == other }.node(*rest, &)
             else
               node
             end
@@ -118,6 +119,7 @@ module ROM
 
         with_nodes(new_nodes)
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
       # Return a `:create` command that can insert data from a nested hash.
       #
@@ -140,11 +142,12 @@ module ROM
       # @raise NotImplementedError when type is not `:create`
       #
       # @api public
-      def command(type, *args)
+      def command(type, **)
         if type == :create
           super
         else
-          raise NotImplementedError, "#{self.class}#command doesn't work with #{type.inspect} command type yet"
+          raise NotImplementedError,
+                "#{self.class}#command doesn't work with #{type.inspect} command type yet"
         end
       end
 

data/lib/rom/relation/composite.rb

@@ -34,9 +34,7 @@ module ROM
       # @see Relation#map_to
       #
       # @api public
-      def map_to(klass)
-        self >> left.map_to(klass).mapper
-      end
+      def map_to(klass) = self >> left.map_to(klass).mapper
 
       private
 
@@ -45,9 +43,7 @@ module ROM
       # @see Pipeline::Proxy#decorate?
       #
       # @api private
-      def decorate?(response)
-        super || response.is_a?(Graph)
-      end
+      def decorate?(response) = super || response.is_a?(Graph)
     end
   end
 end

data/lib/rom/relation/curried.rb

@@ -5,6 +5,9 @@ require 'rom/initializer'
 require 'rom/pipeline'
 require 'rom/relation/name'
 require 'rom/relation/materializable'
+require 'rom/relation/graph'
+require 'rom/relation/wrap'
+require 'rom/relation/composite'
 
 module ROM
   class Relation
@@ -19,6 +22,8 @@ module ROM
     class Curried
       extend Initializer
 
+      WRAPS = [Relation, Graph, Wrap, Composite].freeze
+
       include Dry::Equalizer(:relation, :options)
       include Materializable
       include Pipeline
@@ -50,7 +55,8 @@ module ROM
         all_args = curry_args + args
 
         if all_args.empty?
-          raise ArgumentError, "curried #{relation.class}##{view} relation was called without any arguments"
+          raise ArgumentError,
+                "curried #{relation.class}##{view} relation was called without any arguments"
         end
 
         if args.empty?
@@ -83,9 +89,7 @@ module ROM
       # @return [true]
       #
       # @api private
-      def curried?
-        true
-      end
+      def curried? = true
 
       # @api private
       def respond_to_missing?(name, include_private = false)
@@ -100,18 +104,16 @@ module ROM
       end
 
       # @api private
-      def composite_class
-        Relation::Composite
-      end
+      def composite_class = Relation::Composite
 
       # @api private
-      def method_missing(meth, *args, &block)
+      def method_missing(meth, ...)
         if relation.respond_to?(meth)
-          response = relation.__send__(meth, *args, &block)
+          response = relation.__send__(meth, ...)
 
           super if response.is_a?(self.class)
 
-          if response.is_a?(Relation) || response.is_a?(Graph) || response.is_a?(Wrap) || response.is_a?(Composite)
+          if WRAPS.any? { |klass| response.is_a?(klass) }
             __new__(response)
           else
             response
@@ -120,7 +122,6 @@ module ROM
           super
         end
       end
-      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

data/lib/rom/relation/graph.rb

@@ -42,18 +42,14 @@ module ROM
       # @return [Graph]
       #
       # @api public
-      def with_nodes(nodes)
-        self.class.new(root, nodes)
-      end
+      def with_nodes(nodes) = self.class.new(root, nodes)
 
       # Return if this is a graph relation
       #
       # @return [true]
       #
       # @api private
-      def graph?
-        true
-      end
+      def graph? = true
 
       # Map graph tuples via custom mappers
       #
@@ -80,9 +76,7 @@ module ROM
       # @see Relation#mapper
       #
       # @api private
-      def mapper
-        mappers[to_ast]
-      end
+      def mapper = mappers[to_ast]
 
       # @api private
       memoize def to_ast
@@ -97,9 +91,7 @@ module ROM
       end
 
       # @api private
-      def composite_class
-        Relation::Composite
-      end
+      def composite_class = Relation::Composite
     end
   end
 end

data/lib/rom/relation/loaded.rb

@@ -8,8 +8,8 @@ module ROM
     #
     # @api public
     class Loaded
-      include Enumerable
-      include Dry::Equalizer(:source, :collection)
+      include ::Enumerable
+      include ::Dry::Equalizer(:source, :collection)
 
       # Coerce loaded relation to an array
       #
@@ -43,10 +43,10 @@ module ROM
       # @yield [Hash]
       #
       # @api public
-      def each
+      def each(&)
         return to_enum unless block_given?
 
-        collection.each { |tuple| yield(tuple) }
+        collection.each(&)
       end
 
       # Returns a single tuple from the relation if there is one.
@@ -93,9 +93,7 @@ module ROM
       # @raise KeyError when provided key doesn't exist in any of the tuples
       #
       # @api public
-      def pluck(key)
-        map { |tuple| tuple.fetch(key) }
-      end
+      def pluck(key) = map { |tuple| tuple.fetch(key) }
 
       # Pluck primary key values
       #
@@ -110,25 +108,19 @@ module ROM
       # @return [Array]
       #
       # @api public
-      def primary_keys
-        pluck(source.primary_key)
-      end
+      def primary_keys = pluck(source.primary_key)
 
       # Return if loaded relation is empty
       #
       # @return [TrueClass,FalseClass]
       #
       # @api public
-      def empty?
-        collection.empty?
-      end
+      def empty? = collection.empty?
 
       # Return a loaded relation with a new collection
       #
       # @api public
-      def new(collection)
-        self.class.new(source, collection)
-      end
+      def new(collection) = self.class.new(source, collection)
     end
   end
 end

data/lib/rom/relation/materializable.rb

@@ -11,9 +11,7 @@ module ROM
       # @return [Array]
       #
       # @api public
-      def to_a
-        call.to_a
-      end
+      def to_a = call.to_a
       alias_method :to_ary, :to_a
 
       # Yield relation tuples
@@ -21,10 +19,10 @@ module ROM
       # @yield [Hash,Object]
       #
       # @api public
-      def each
+      def each(&)
         return to_enum unless block_given?
 
-        to_a.each { |tuple| yield(tuple) }
+        to_a.each(&)
       end
 
       # Delegate to loaded relation and return one object
@@ -34,9 +32,7 @@ module ROM
       # @see Loaded#one
       #
       # @api public
-      def one
-        call.one
-      end
+      def one = call.one
 
       # Delegate to loaded relation and return one object
       #
@@ -45,18 +41,14 @@ module ROM
       # @see Loaded#one
       #
       # @api public
-      def one!
-        call.one!
-      end
+      def one! = call.one!
 
       # Return first tuple from a relation coerced to an array
       #
       # @return [Object]
       #
       # @api public
-      def first
-        to_a.first
-      end
+      def first = to_a.first
     end
   end
 end

data/lib/rom/relation/name.rb

@@ -15,7 +15,7 @@ module ROM
     #
     # @api private
     class Name
-      include Dry::Equalizer(:relation, :dataset, :key)
+      include ::Dry::Equalizer(:relation, :dataset, :key)
 
       # Coerce an object to a Name instance
       #
@@ -54,7 +54,6 @@ module ROM
       attr_reader :dataset
 
       attr_reader :aliaz
-
       attr_reader :key
 
       # @api private
@@ -66,14 +65,10 @@ module ROM
       end
 
       # @api private
-      def as(aliaz)
-        self.class[relation, dataset, aliaz]
-      end
+      def as(aliaz) = self.class[relation, dataset, aliaz]
 
       # @api private
-      def aliased?
-        aliaz && aliaz != relation
-      end
+      def aliased? = aliaz && aliaz != relation
 
       # Return relation name
       #
@@ -95,18 +90,14 @@ module ROM
       # @return [Symbol]
       #
       # @api private
-      def to_sym
-        relation
-      end
+      def to_sym = relation
 
       # Return inspected relation
       #
       # @return [String]
       #
       # @api private
-      def inspect
-        "#{self.class.name}(#{self})"
-      end
+      def inspect = "#{self.class.name}(#{self})"
     end
   end
 end

data/lib/rom/relation/view_dsl.rb

@@ -24,12 +24,12 @@ module ROM
       attr_reader :new_schema
 
       # @api private
-      def initialize(name, schema, &block)
+      def initialize(name, schema, &)
         @name = name
         @schema = schema
         @new_schema = nil
         @relation_block = nil
-        instance_eval(&block)
+        instance_eval(&)
       end
 
       # Define a schema for a relation view
@@ -39,8 +39,8 @@ module ROM
       # @see Relation::ClassInterface.view
       #
       # @api public
-      def schema(&block)
-        @new_schema = -> relations { @schema.with(relations: relations).instance_exec(&block) }
+      def schema(&)
+        @new_schema = -> relations { @schema.with(relations: relations).instance_exec(&) }
       end
 
       # Define a relation block for a relation view
@@ -50,8 +50,8 @@ module ROM
       # @see Relation::ClassInterface.view
       #
       # @api public
-      def relation(&block)
-        @relation_block = proc(&block)
+      def relation(&)
+        @relation_block = proc(&)
       end
 
       # Return procs captured by the DSL
@@ -59,9 +59,7 @@ module ROM
       # @return [Array]
       #
       # @api private
-      def call
-        [name, new_schema, relation_block]
-      end
+      def call = [name, new_schema, relation_block]
     end
   end
 end

data/lib/rom/relation/wrap.rb

@@ -40,25 +40,19 @@ module ROM
       # @abstract
       #
       # @api private
-      def relation
-        raise NotImplementedError
-      end
+      def relation = raise ::NotImplementedError
 
       # Return if this is a wrap relation
       #
       # @return [true]
       #
       # @api private
-      def wrap?
-        true
-      end
+      def wrap? = true
 
       private
 
       # @api private
-      def decorate?(other)
-        super || other.is_a?(Combined)
-      end
+      def decorate?(other) = super || other.is_a?(Combined)
     end
   end
 end