rom-core 5.3.1 → 5.4.0

data/lib/rom/relation.rb

@@ -144,7 +144,9 @@ module ROM
     # @!attribute [r] name
     #   @return [Object] The relation name
     #   @api public
-    option :name, default: -> { self.class.schema ? self.class.schema.name : self.class.default_name }
+    option :name, default: lambda {
+      self.class.schema ? self.class.schema.name : self.class.default_name
+    }
 
     # @!attribute [r] input_schema
     #   @return [Object#[]] tuple processing function, uses schema or defaults to Hash[]
@@ -159,12 +161,13 @@ module ROM
     }
 
     # @!attribute [r] auto_map
-    #   @return [TrueClass,FalseClass] Whether or not a relation and its compositions should be auto-mapped
+    #   @return [true, false] Whether or not a relation and its
+    #                         compositions should be auto-mapped
     #   @api private
     option :auto_map, default: -> { self.class.auto_map }
 
     # @!attribute [r] auto_struct
-    #   @return [TrueClass,FalseClass] Whether or not tuples should be auto-mapped to structs
+    #   @return [true, false] Whether or not tuples should be auto-mapped to structs
     #   @api private
     option :auto_struct, default: -> { self.class.auto_struct }
 
@@ -191,19 +194,19 @@ module ROM
     #
     # @example accessing canonical attribute
     #   users[:id]
-    #   # => #<ROM::SQL::Attribute[Integer] primary_key=true name=:id source=ROM::Relation::Name(users)>
+    #   # => #<ROM::SQL::Attribute[Integer] primary_key=true
+    #   #     name=:id source=ROM::Relation::Name(users)>
     #
     # @example accessing joined attribute
     #   tasks_with_users = tasks.join(users).select_append(tasks[:title])
     #   tasks_with_users[:title, :tasks]
-    #   # => #<ROM::SQL::Attribute[String] primary_key=false name=:title source=ROM::Relation::Name(tasks)>
+    #   # => #<ROM::SQL::Attribute[String] primary_key=false
+    #   #     name=:title source=ROM::Relation::Name(tasks)>
     #
     # @return [Attribute]
     #
     # @api public
-    def [](name)
-      schema[name]
-    end
+    def [](name) = schema[name]
 
     # Yields relation tuples
     #
@@ -214,11 +217,11 @@ module ROM
     # @return [Enumerator] if block is not provided
     #
     # @api public
-    def each
+    def each(&)
       return to_enum unless block_given?
 
       if auto_map?
-        mapper.(dataset.map { |tuple| output_schema[tuple] }).each { |struct| yield(struct) }
+        mapper.(dataset.map { |tuple| output_schema[tuple] }).each(&)
       else
         dataset.each { |tuple| yield(output_schema[tuple]) }
       end
@@ -248,9 +251,7 @@ module ROM
     # @return [Relation]
     #
     # @api public
-    def combine(*args)
-      combine_with(*nodes(*args))
-    end
+    def combine(*args) = combine_with(*nodes(*args))
 
     # Composes with other relations
     #
@@ -259,9 +260,7 @@ module ROM
     # @return [Relation::Graph]
     #
     # @api public
-    def combine_with(*others)
-      Combined.new(self, others)
-    end
+    def combine_with(*others) = Combined.new(self, others)
 
     # @api private
     def nodes(*args)
@@ -314,9 +313,7 @@ module ROM
     # @return [Relation::Curried]
     #
     # @api private
-    def preload_assoc(assoc, other)
-      assoc.preload(self, other)
-    end
+    def preload_assoc(assoc, other) = assoc.preload(self, other)
 
     # Wrap other relations using association names
     #
@@ -339,63 +336,49 @@ module ROM
     # @return [Relation::Wrap]
     #
     # @api public
-    def wrap_around(*others)
-      wrap_class.new(self, others)
-    end
+    def wrap_around(*others) = wrap_class.new(self, others)
 
     # Loads a relation
     #
     # @return [Relation::Loaded]
     #
     # @api public
-    def call
-      Loaded.new(self)
-    end
+    def call = Loaded.new(self)
 
     # Materializes a relation into an array
     #
     # @return [Array<Hash>]
     #
     # @api public
-    def to_a
-      to_enum.to_a
-    end
+    def to_a = to_enum.to_a
 
     # Returns if this relation is curried
     #
     # @return [false]
     #
     # @api private
-    def curried?
-      false
-    end
+    def curried? = false
 
     # Returns if this relation is a graph
     #
     # @return [false]
     #
     # @api private
-    def graph?
-      false
-    end
+    def graph? = false
 
     # Return if this is a wrap relation
     #
     # @return [false]
     #
     # @api private
-    def wrap?
-      false
-    end
+    def wrap? = false
 
     # Returns true if a relation has schema defined
     #
     # @return [TrueClass, FalseClass]
     #
     # @api private
-    def schema?
-      !schema.empty?
-    end
+    def schema? = !schema.empty?
 
     # Return a new relation with provided dataset and additional options
     #
@@ -420,7 +403,7 @@ module ROM
         if new_opts.empty?
           options
         elsif new_opts.key?(:schema)
-          options.merge(new_opts).reject { |k, _| k == :input_schema || k == :output_schema }
+          options.merge(new_opts).except(:input_schema, :output_schema)
         else
           options.merge(new_opts)
         end
@@ -456,45 +439,34 @@ module ROM
     # @return [AssociationSet] Schema's association set (empty by default)
     #
     # @api public
-    def associations
-      schema.associations
-    end
+    def associations = schema.associations
 
     # Returns AST for the wrapped relation
     #
     # @return [Array]
     #
     # @api public
-    def to_ast
-      [:relation, [name.relation, attr_ast, meta_ast]]
-    end
+    def to_ast = [:relation, [name.relation, attr_ast, meta_ast]]
 
     # @api private
-    def attr_ast
-      schema.map(&:to_read_ast)
-    end
+    def attr_ast = schema.map(&:to_read_ast)
 
     # @api private
     def meta_ast
-      meta = self.meta.merge(dataset: name.dataset, alias: name.aliaz, struct_namespace: options[:struct_namespace])
+      meta = self.meta.merge(dataset: name.dataset, alias: name.aliaz,
+                             struct_namespace: options[:struct_namespace])
       meta[:model] = false unless auto_struct? || meta[:model]
       meta
     end
 
     # @api private
-    def auto_map?
-      (auto_map || auto_struct) && !meta[:combine_type]
-    end
+    def auto_map? = (auto_map || auto_struct) && !meta[:combine_type]
 
     # @api private
-    def auto_struct?
-      auto_struct && !meta[:combine_type]
-    end
+    def auto_struct? = auto_struct && !meta[:combine_type]
 
     # @api private
-    def mapper
-      mappers[to_ast]
-    end
+    def mapper = mappers[to_ast]
 
     # Maps relation with custom mappers available in the registry
     #
@@ -522,9 +494,7 @@ module ROM
     # @return [Relation::Composite] Mapped relation
     #
     # @api public
-    def map_with(*names, **opts)
-      super(*names).with(opts)
-    end
+    def map_with(*names, **opts) = super(*names).with(opts)
 
     # Return a new relation that will map its tuples to instances of the provided class
     #
@@ -550,25 +520,19 @@ module ROM
     # @return [Relation]
     #
     # @api public
-    def as(aliaz)
-      with(name: name.as(aliaz))
-    end
+    def as(aliaz) = with(name: name.as(aliaz))
 
     # @return [Symbol] The wrapped relation's adapter identifier ie :sql or :http
     #
     # @api private
-    def adapter
-      self.class.adapter
-    end
+    def adapter = self.class.adapter
 
     # Return name of the source gateway of this relation
     #
     # @return [Symbol]
     #
     # @api private
-    def gateway
-      self.class.gateway
-    end
+    def gateway = self.class.gateway
 
     # Return all registered relation schemas
     #
@@ -577,9 +541,7 @@ module ROM
     # @return [Hash<Symbol=>Schema>]
     #
     # @api public
-    def schemas
-      self.class.schemas
-    end
+    def schemas = self.class.schemas
 
     # Return a foreign key name for the provided relation name
     #
@@ -624,17 +586,13 @@ module ROM
     # @return [Class]
     #
     # @api private
-    def composite_class
-      Relation::Composite
-    end
+    def composite_class = Relation::Composite
 
     # Return configured "wrap" relation class used in Relation#wrap
     #
     # @return [Class]
     #
     # @api private
-    def wrap_class
-      self.class.wrap_class
-    end
+    def wrap_class = self.class.wrap_class
   end
 end

data/lib/rom/schema/associations_dsl.rb

@@ -21,10 +21,10 @@ module ROM
       attr_reader :registry
 
       # @api private
-      def initialize(source, &block)
+      def initialize(source, &)
         @source = source
         @registry = {}
-        instance_exec(&block)
+        instance_exec(&)
       end
 
       # Establish a one-to-many association
@@ -177,9 +177,7 @@ module ROM
       # @return [AssociationSet]
       #
       # @api private
-      def call
-        AssociationSet[source.relation].build(registry)
-      end
+      def call = AssociationSet[source.relation].build(registry)
 
       private
 
@@ -198,9 +196,7 @@ module ROM
       end
 
       # @api private
-      def dataset_name(name)
-        Inflector.pluralize(name).to_sym
-      end
+      def dataset_name(name) = Inflector.pluralize(name).to_sym
     end
   end
 end

data/lib/rom/schema/dsl.rb

@@ -9,8 +9,8 @@ module ROM
     # Schema DSL exposed as `schema { .. }` in relation classes
     #
     # @api public
-    class DSL < BasicObject
-      KERNEL_METHODS = %i[extend method].freeze
+    class DSL < ::BasicObject
+      KERNEL_METHODS = %i[extend method block_given?].freeze
       KERNEL_METHODS.each { |m| define_method(m, ::Kernel.instance_method(m)) }
 
       extend Initializer
@@ -55,7 +55,7 @@ module ROM
       attr_reader :associations_dsl
 
       # @api private
-      def initialize(*, &block)
+      def initialize(*, **, &block)
         super
 
         @attributes = {}
@@ -63,7 +63,6 @@ module ROM
 
         @definition = block
       end
-      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
       # Defines a relation attribute with its type and options.
       #
@@ -112,8 +111,8 @@ module ROM
       # @return [AssociationDSL]
       #
       # @api public
-      def associations(&block)
-        @associations_dsl = AssociationsDSL.new(relation, &block)
+      def associations(&)
+        @associations_dsl = AssociationsDSL.new(relation, &)
       end
 
       # Builds a representation of the information needed to create an
@@ -140,6 +139,7 @@ module ROM
       # @return [Dry::Types::Type] Type instance
       #
       # @api private
+      # rubocop:disable Metrics/AbcSize
       def build_type(type, options = EMPTY_HASH)
         if options[:read]
           type.meta(source: relation, read: options[:read])
@@ -147,8 +147,11 @@ module ROM
           type.meta(source: relation, read: type.meta[:read].optional)
         else
           type.meta(source: relation)
-        end.meta(Attribute::META_OPTIONS.map { |opt| [opt, options[opt]] if options.key?(opt) }.compact.to_h)
+        end.meta(Attribute::META_OPTIONS.map { |opt|
+                   [opt, options[opt]] if options.key?(opt)
+                 }.compact.to_h)
       end
+      # rubocop:enable Metrics/AbcSize
 
       # Specify which key(s) should be the primary key
       #
@@ -179,21 +182,19 @@ module ROM
       end
 
       # @api private
-      def call(&block)
-        instance_exec(&block) if block
+      def call(&)
+        instance_exec(&) if block_given?
         instance_exec(&definition) if definition
 
         schema_class.define(relation, **opts) do |schema|
-          plugins.values.each do |plugin, options|
+          plugins.each_value do |plugin, options|
             plugin.apply_to(schema, **options)
           end
         end
       end
 
       # @api private
-      def plugin_options(plugin)
-        @plugins[plugin][1]
-      end
+      def plugin_options(plugin) = @plugins[plugin][1]
 
       private
 

data/lib/rom/schema/inferrer.rb

@@ -24,10 +24,10 @@ module ROM
       #     @return [Class(ROM::Attribute)]
       defines :attributes_inferrer, :attr_class
 
-      MissingAttributesError = Class.new(StandardError) do
+      MissingAttributesError = ::Class.new(::StandardError) do
         def initialize(name, attributes)
           super(
-            "Following attributes in #{Relation::Name[name].relation.inspect} schema cannot "\
+            "Following attributes in #{Relation::Name[name].relation.inspect} schema cannot " \
             "be inferred and have to be defined explicitly: #{attributes.map(&:inspect).join(', ')}"
           )
         end
@@ -39,7 +39,7 @@ module ROM
 
       attr_class Attribute
 
-      include Dry::Equalizer(:options)
+      include ::Dry::Equalizer(:options)
 
       # @!attribute [r] attr_class
       #   @return [Class(ROM::Attribute)]
@@ -78,6 +78,7 @@ module ROM
       end
 
       # @api private
+      # rubocop:disable Metrics/AbcSize
       def merge_attributes(defined, inferred)
         type_lookup = lambda do |attrs, name|
           attrs.find { |a| a.name == name }.type
@@ -99,6 +100,7 @@ module ROM
           defined_names.include?(attr.name)
         end
       end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/rom/schema.rb

@@ -31,6 +31,7 @@ module ROM
   # schemas are merged, and we know which attributes belong to which relation.
   #
   # @api public
+  # rubocop:disable Metrics/ClassLength
   class Schema
     include Memoizable
 
@@ -39,7 +40,7 @@ module ROM
     subscribe('configuration.relations.registry.created') do |event|
       registry = event[:registry]
 
-      registry.each do |_, relation|
+      registry.each_value do |relation|
         unless relation.schema.frozen?
           relation.schema.finalize_associations!(relations: registry)
           relation.schema.finalize!
@@ -160,12 +161,11 @@ module ROM
     end
 
     # @api private
-    def initialize(*)
+    def initialize(*, **)
       super
 
       yield(self) if block_given?
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     # Abstract method for creating a new relation based on schema definition
     #
@@ -180,27 +180,21 @@ module ROM
     # @return [Relation]
     #
     # @api public
-    def call(relation)
-      relation
-    end
+    def call(relation) = relation
 
     # Iterate over schema's attributes
     #
     # @yield [Attribute]
     #
     # @api public
-    def each(&block)
-      attributes.each(&block)
-    end
+    def each(&) = attributes.each(&)
 
     # Check if schema has any attributes
     #
     # @return [TrueClass, FalseClass]
     #
     # @api public
-    def empty?
-      attributes.empty?
-    end
+    def empty? = attributes.empty?
 
     # Coerce schema into a <AttributeName=>Attribute> Hash
     #
@@ -208,7 +202,11 @@ module ROM
     #
     # @api public
     def to_h
-      each_with_object({}) { |attr, h| h[attr.name] = attr }
+      if block_given?
+        super
+      else
+        super { [_1.name, _1] }
+      end
     end
 
     # Return attribute
@@ -250,9 +248,7 @@ module ROM
     # @return [Schema]
     #
     # @api public
-    def exclude(*names)
-      project(*(map(&:name) - names))
-    end
+    def exclude(*names) = project(*(map(&:name) - names))
 
     # Project a schema with renamed attributes
     #
@@ -309,9 +305,7 @@ module ROM
     # @return [Array<Attribute>]
     #
     # @api public
-    def primary_key
-      select(&:primary_key?)
-    end
+    def primary_key = select(&:primary_key?)
 
     # Merge with another schema
     #
@@ -320,9 +314,7 @@ module ROM
     # @return [Schema]
     #
     # @api public
-    def merge(other)
-      append(*other)
-    end
+    def merge(other) = append(*other)
     alias_method :+, :merge
 
     # Append more attributes to the schema
@@ -343,9 +335,9 @@ module ROM
     # @return [Schema]
     #
     # @api public
-    def uniq(&block)
-      if block
-        new(attributes.uniq(&block))
+    def uniq(&)
+      if block_given?
+        new(attributes.uniq(&))
       else
         new(attributes.uniq(&:name))
       end
@@ -367,9 +359,7 @@ module ROM
     # @return [Boolean]
     #
     # @api public
-    def canonical?
-      equal?(canonical)
-    end
+    def canonical? = equal?(canonical)
 
     # Finalize a schema
     #
@@ -390,7 +380,7 @@ module ROM
     # @return [self]
     #
     # @api private
-    def finalize_attributes!(gateway: nil, relations: nil)
+    def finalize_attributes!(gateway: nil, **)
       inferrer.(self, gateway).each { |key, value| set!(key, value) }
 
       yield if block_given?
@@ -407,7 +397,7 @@ module ROM
     # @return [self]
     #
     # @api private
-    def finalize_associations!(relations:)
+    def finalize_associations!(**)
       set!(:associations, yield) if associations.any?
       self
     end
@@ -421,7 +411,7 @@ module ROM
     # @api private
     def to_output_hash
       HASH_SCHEMA.schema(
-        map { |attr| [attr.key, attr.to_read_type] }.to_h
+        to_h { |attr| [attr.key, attr.to_read_type] }
       )
     end
 
@@ -435,7 +425,7 @@ module ROM
     # @api private
     def to_input_hash
       HASH_SCHEMA.schema(
-        map { |attr| [attr.name, attr.to_write_type] }.to_h
+        to_h { |attr| [attr.name, attr.to_write_type] }
       )
     end
 
@@ -444,9 +434,7 @@ module ROM
     # @return [Array]
     #
     # @api public
-    def to_ast
-      [:schema, [name, attributes.map(&:to_ast)]]
-    end
+    def to_ast = [:schema, [name, attributes.map(&:to_ast)]]
 
     # @api private
     def set!(key, value)
@@ -458,20 +446,17 @@ module ROM
 
     # @api private
     def count_index
-      map(&:name).map { |name| [name, count { |attr| attr.name == name }] }.to_h
+      to_h { |attr| [attr.name, count { |a| a.name.eql?(attr.name) }] }
     end
 
     # @api private
-    def name_index
-      map { |attr| [attr.name, attr] }.to_h
-    end
+    def name_index = to_h { |attr| [attr.name, attr] }
 
     # @api private
     def source_index
       select(&:source)
         .group_by(&:source)
-        .map { |src, grp| [src.to_sym, grp.map { |attr| [attr.name, attr] }.to_h] }
-        .to_h
+        .to_h { |src, grp| [src.to_sym, grp.to_h { |attr| [attr.name, attr] }] }
     end
 
     # @api private
@@ -489,4 +474,5 @@ module ROM
 
     memoize :count_index, :name_index, :source_index, :to_ast, :to_input_hash, :to_output_hash
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/rom/setup/auto_registration.rb

@@ -44,11 +44,9 @@ module ROM
     # @!attribute [r] globs
     #   @return [Hash] File globbing functions for each component dir
     option :globs, default: lambda {
-      Hash[
-        component_dirs.map { |component, path|
-          [component, directory.join("#{path}/**/*.rb")]
-        }
-      ]
+      component_dirs.transform_values { |path|
+        directory.join("#{path}/**/*.rb")
+      }
     }
 
     # Load relation files
@@ -78,7 +76,7 @@ module ROM
     #
     # @api private
     def load_entities(entity)
-      Dir[globs[entity]].sort.map do |file|
+      Dir[globs[entity]].map do |file|
         require file
         klass_name =
           case namespace

data/lib/rom/setup/auto_registration_strategies/base.rb

@@ -13,7 +13,7 @@ module ROM
 
       PathnameType = Types.Instance(Pathname)
 
-      EXTENSION_REGEX = /\.rb\z/.freeze
+      EXTENSION_REGEX = /\.rb\z/
 
       # @!attribute [r] file
       #   @return [String] Name of a component file