rom-core 5.1.2 → 5.2.1

data/lib/rom/relation.rb

@@ -156,7 +156,7 @@ module ROM
     # @!attribute [r] output_schema
     #   @return [Object#[]] tuple processing function, uses schema or defaults to NOOP_OUTPUT_SCHEMA
     #   @api private
-    option :output_schema, default: -> {
+    option :output_schema, default: lambda {
       schema.any?(&:read?) ? schema.to_output_hash : NOOP_OUTPUT_SCHEMA
     }
 
@@ -396,7 +396,7 @@ module ROM
     #
     # @api private
     def schema?
-      ! schema.empty?
+      !schema.empty?
     end
 
     # Return a new relation with provided dataset and additional options
@@ -417,7 +417,7 @@ module ROM
     # @param [Hash] new_opts Additional options
     #
     # @api public
-    def new(dataset, new_opts = EMPTY_HASH)
+    def new(dataset, **new_opts)
       opts =
         if new_opts.empty?
           options
@@ -427,7 +427,7 @@ module ROM
           options.merge(new_opts)
         end
 
-      self.class.new(dataset, opts)
+      self.class.new(dataset, **opts)
     end
 
     undef_method :with
@@ -450,7 +450,7 @@ module ROM
           opts
         end
 
-      new(dataset, options.merge(new_options))
+      new(dataset, **options, **new_options)
     end
 
     # Return schema's association set (empty by default)
@@ -473,7 +473,7 @@ module ROM
 
     # @api private
     def attr_ast
-      schema.map { |t| t.to_read_ast }
+      schema.map(&:to_read_ast)
     end
 
     # @api private

data/lib/rom/relation/class_interface.rb

@@ -95,12 +95,12 @@ module ROM
         if defined?(@schema) && !block && !infer
           @schema
         elsif block || infer
-          raise MissingSchemaClassError.new(self) unless schema_class
+          raise MissingSchemaClassError, self unless schema_class
 
           ds_name = dataset || schema_opts.fetch(:dataset, default_name.dataset)
           relation = as || schema_opts.fetch(:relation, ds_name)
 
-          raise InvalidRelationName.new(relation) if invalid_relation_name?(relation)
+          raise InvalidRelationName, relation if invalid_relation_name?(relation)
 
           @relation_name = Name[relation, ds_name]
 
@@ -133,7 +133,8 @@ module ROM
       # @!attribute [r] relation_name
       #   @return [Name] Qualified relation name
       def relation_name
-        raise MissingSchemaError.new(self) unless defined?(@relation_name)
+        raise MissingSchemaError, self unless defined?(@relation_name)
+
         @relation_name
       end
 
@@ -188,7 +189,7 @@ module ROM
       # @api public
       def view(*args, &block)
         if args.size == 1 && block.arity > 0
-          raise ArgumentError, "schema attribute names must be provided as the second argument"
+          raise ArgumentError, 'schema attribute names must be provided as the second argument'
         end
 
         name, new_schema_fn, relation_block =
@@ -248,8 +249,8 @@ module ROM
       # @option options [Symbol] :adapter (:default) first adapter to check for plugin
       #
       # @api public
-      def use(plugin, options = EMPTY_HASH)
-        ROM.plugin_registry[:relation].fetch(plugin, adapter).apply_to(self, options)
+      def use(plugin, **options)
+        ROM.plugin_registry[:relation].fetch(plugin, adapter).apply_to(self, **options)
       end
 
       # Build default mapper registry
@@ -261,13 +262,13 @@ module ROM
         adapter_ns = ROM.adapters[adapter]
 
         compiler =
-          if adapter_ns && adapter_ns.const_defined?(:MapperCompiler)
+          if adapter_ns&.const_defined?(:MapperCompiler)
             adapter_ns.const_get(:MapperCompiler)
           else
             MapperCompiler
           end
 
-        MapperRegistry.new({}, { compiler: compiler.new(opts) }.merge(opts))
+        MapperRegistry.new({}, compiler: compiler.new(**opts), **opts)
       end
 
       # @api private

data/lib/rom/relation/curried.rb

@@ -97,8 +97,8 @@ module ROM
       private
 
       # @api private
-      def __new__(relation, new_opts = EMPTY_HASH)
-        self.class.new(relation, new_opts.empty? ? options : options.merge(new_opts))
+      def __new__(relation, **new_opts)
+        self.class.new(relation, **options, **new_opts)
       end
 
       # @api private
@@ -122,6 +122,7 @@ module ROM
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

data/lib/rom/relation/loaded.rb

@@ -47,6 +47,7 @@ module ROM
       # @api public
       def each
         return to_enum unless block_given?
+
         collection.each { |tuple| yield(tuple) }
       end
 

data/lib/rom/relation/materializable.rb

@@ -23,6 +23,7 @@ module ROM
       # @api public
       def each
         return to_enum unless block_given?
+
         to_a.each { |tuple| yield(tuple) }
       end
 

data/lib/rom/relation/name.rb

@@ -106,7 +106,7 @@ module ROM
       #
       # @api private
       def inspect
-        "#{self.class.name}(#{to_s})"
+        "#{self.class.name}(#{self})"
       end
     end
   end

data/lib/rom/relation_registry.rb

@@ -6,7 +6,7 @@ module ROM
   # @api private
   class RelationRegistry < Registry
     # @api private
-    def initialize(elements = {}, options = {})
+    def initialize(elements = {}, **options)
       super
       yield(self, elements) if block_given?
     end

data/lib/rom/schema.rb

@@ -60,7 +60,7 @@ module ROM
       end
     end
 
-    EMPTY_ASSOCIATION_SET = AssociationSet.new(EMPTY_HASH).freeze
+    EMPTY_ASSOCIATION_SET = AssociationSet.build(EMPTY_HASH).freeze
 
     DEFAULT_INFERRER = Inferrer.new(enabled: false).freeze
 
@@ -73,9 +73,9 @@ module ROM
       k.required(false)
     end
 
-    HASH_SCHEMA = Types::Coercible::Hash.
-                    schema(EMPTY_HASH).
-                    with_type_transform(type_transformation)
+    HASH_SCHEMA = Types::Coercible::Hash
+      .schema(EMPTY_HASH)
+      .with_type_transform(type_transformation)
 
     extend Initializer
 
@@ -147,7 +147,7 @@ module ROM
     # @return [Hash] A hash with `:type` and `:options` keys.
     #
     # @api private
-    def self.build_attribute_info(type, options)
+    def self.build_attribute_info(type, **options)
       {
         type: type,
         options: options
@@ -157,7 +157,7 @@ module ROM
     # @api private
     def self.attributes(attributes, attr_class)
       attributes.map do |attr|
-        attr_class.new(attr[:type], attr.fetch(:options))
+        attr_class.new(attr[:type], **attr.fetch(:options))
       end
     end
 
@@ -167,6 +167,7 @@ module ROM
 
       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
     #
@@ -200,7 +201,7 @@ module ROM
     #
     # @api public
     def empty?
-      attributes.size == 0
+      attributes.empty?
     end
 
     # Coerce schema into a <AttributeName=>Attribute> Hash
@@ -228,9 +229,7 @@ module ROM
           source_index[src][key]
         end
 
-      unless attr
-        raise(KeyError, "#{key.inspect} attribute doesn't exist in #{src} schema")
-      end
+      raise(KeyError, "#{key.inspect} attribute doesn't exist in #{src} schema") unless attr
 
       attr
     end
@@ -362,7 +361,7 @@ module ROM
     #
     # @api public
     def key?(name)
-      ! attributes.detect { |attr| attr.name == name }.nil?
+      !attributes.detect { |attr| attr.name == name }.nil?
     end
 
     # Return if a schema is canonical
@@ -371,7 +370,7 @@ module ROM
     #
     # @api public
     def canonical?
-      self.equal?(canonical)
+      equal?(canonical)
     end
 
     # Finalize a schema
@@ -379,8 +378,9 @@ module ROM
     # @return [self]
     #
     # @api private
-    def finalize!(**opts)
+    def finalize!(**_opts)
       return self if frozen?
+
       freeze
     end
 
@@ -452,7 +452,7 @@ module ROM
 
     # @api private
     def set!(key, value)
-      instance_variable_set("@#{ key }", value)
+      instance_variable_set("@#{key}", value)
       options[key] = value
     end
 
@@ -470,10 +470,10 @@ module ROM
 
     # @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
+      select(&:source)
+        .group_by(&:source)
+        .map { |src, grp| [src.to_sym, grp.map { |attr| [attr.name, attr] }.to_h] }
+        .to_h
     end
 
     # @api private
@@ -483,10 +483,10 @@ module ROM
 
     # @api private
     def initialize_primary_key_names
-      if primary_key.size > 0
-        set!(:primary_key_name, primary_key[0].name)
-        set!(:primary_key_names, primary_key.map(&:name))
-      end
+      return if primary_key.empty?
+
+      set!(:primary_key_name, primary_key[0].name)
+      set!(:primary_key_names, primary_key.map(&:name))
     end
 
     memoize :count_index, :name_index, :source_index, :to_ast, :to_input_hash, :to_output_hash

data/lib/rom/schema/associations_dsl.rb

@@ -59,11 +59,11 @@ module ROM
       # @see #many_to_many
       #
       # @api public
-      def one_to_many(target, options = {})
+      def one_to_many(target, **options)
         if options[:through]
-          many_to_many(target, options)
+          many_to_many(target, **options)
         else
-          add(::ROM::Associations::Definitions::OneToMany.new(source, target, options))
+          add(::ROM::Associations::Definitions::OneToMany.new(source, target, **options))
         end
       end
       alias_method :has_many, :one_to_many
@@ -84,11 +84,11 @@ module ROM
       # @see #belongs_to
       #
       # @api public
-      def one_to_one(target, options = {})
+      def one_to_one(target, **options)
         if options[:through]
-          one_to_one_through(target, options)
+          one_to_one_through(target, **options)
         else
-          add(::ROM::Associations::Definitions::OneToOne.new(source, target, options))
+          add(::ROM::Associations::Definitions::OneToOne.new(source, target, **options))
         end
       end
 
@@ -100,8 +100,8 @@ module ROM
       # @return [Associations::OneToOneThrough]
       #
       # @api public
-      def one_to_one_through(target, options = {})
-        add(::ROM::Associations::Definitions::OneToOneThrough.new(source, target, options))
+      def one_to_one_through(target, **options)
+        add(::ROM::Associations::Definitions::OneToOneThrough.new(source, target, **options))
       end
 
       # Establish a many-to-many association
@@ -117,8 +117,8 @@ module ROM
       # @see #one_to_many
       #
       # @api public
-      def many_to_many(target, options = {})
-        add(::ROM::Associations::Definitions::ManyToMany.new(source, target, options))
+      def many_to_many(target, **options)
+        add(::ROM::Associations::Definitions::ManyToMany.new(source, target, **options))
       end
 
       # Establish a many-to-one association
@@ -134,8 +134,8 @@ module ROM
       # @see #one_to_many
       #
       # @api public
-      def many_to_one(target, options = {})
-        add(::ROM::Associations::Definitions::ManyToOne.new(source, target, options))
+      def many_to_one(target, **options)
+        add(::ROM::Associations::Definitions::ManyToOne.new(source, target, **options))
       end
 
       # Shortcut for many_to_one which sets alias automatically
@@ -151,8 +151,8 @@ module ROM
       # @return [Associations::ManyToOne]
       #
       # @api public
-      def belongs_to(target, options = {})
-        many_to_one(dataset_name(target), { as: target }.merge(options))
+      def belongs_to(target, **options)
+        many_to_one(dataset_name(target), as: target, **options)
       end
 
       # Shortcut for one_to_one which sets alias automatically
@@ -168,8 +168,8 @@ module ROM
       # @return [Associations::OneToOne]
       #
       # @api public
-      def has_one(target, options = {})
-        one_to_one(dataset_name(target), { as: target }.merge(options))
+      def has_one(target, **options)
+        one_to_one(dataset_name(target), as: target, **options)
       end
 
       # Return an association set for a schema
@@ -178,7 +178,7 @@ module ROM
       #
       # @api private
       def call
-        AssociationSet[source.relation].new(registry)
+        AssociationSet[source.relation].build(registry)
       end
 
       private

data/lib/rom/schema/dsl.rb

@@ -12,7 +12,7 @@ module ROM
     #
     # @api public
     class DSL < BasicObject
-      KERNEL_METHODS = %i(extend method).freeze
+      KERNEL_METHODS = %i[extend method].freeze
       KERNEL_METHODS.each { |m| define_method(m, ::Kernel.instance_method(m)) }
 
       extend Initializer
@@ -65,6 +65,7 @@ module ROM
 
         @definition = block
       end
+      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
       # Defines a relation attribute with its type and options.
       #
@@ -78,7 +79,7 @@ module ROM
       def attribute(name, type_or_options, options = EMPTY_HASH)
         if attributes.key?(name)
           ::Kernel.raise ::ROM::AttributeAlreadyDefinedError,
-                         "Attribute #{ name.inspect } already defined"
+                         "Attribute #{name.inspect} already defined"
         end
 
         attributes[name] = build_attribute_info(name, type_or_options, options)
@@ -132,8 +133,7 @@ module ROM
                           [build_type(type_or_options, options), options]
                         end
         Schema.build_attribute_info(
-          type,
-          options.merge(name: name)
+          type, **options, name: name
         )
       end
 
@@ -185,9 +185,9 @@ module ROM
         instance_exec(&block) if block
         instance_exec(&definition) if definition
 
-        schema_class.define(relation, opts) do |schema|
+        schema_class.define(relation, **opts) do |schema|
           plugins.values.each do |plugin, options|
-            plugin.apply_to(schema, options)
+            plugin.apply_to(schema, **options)
           end
         end
       end

data/lib/rom/schema/inferrer.rb

@@ -76,9 +76,7 @@ module ROM
       def check_all_attributes_defined(schema, all_known, not_inferred)
         not_defined = not_inferred - all_known.map(&:name)
 
-        if not_defined.size > 0
-          raise MissingAttributesError.new(schema.name, not_defined)
-        end
+        raise MissingAttributesError.new(schema.name, not_defined) unless not_defined.empty?
       end
 
       # @api private
@@ -91,7 +89,7 @@ module ROM
             attrs << if attr.type.nil?
                        attr.class.new(
                          type_lookup.(inferred, attr.name),
-                         attr.options
+                         **attr.options
                        )
                      else
                        attr