rom-core 5.3.1 → 5.4.0

data/lib/rom/commands/class_interface.rb

@@ -13,8 +13,8 @@ module ROM
       # @api private
       def inherited(klass)
         super
-        klass.instance_variable_set(:'@before', before.dup)
-        klass.instance_variable_set(:'@after', after.dup)
+        klass.instance_variable_set(:@before, before.dup)
+        klass.instance_variable_set(:@after, after.dup)
       end
 
       # Sets up the base class
@@ -84,12 +84,12 @@ module ROM
       # @return [Class, Object]
       #
       # @api public
-      def create_class(name, type, &block)
+      def create_class(name, type, &)
         klass = Dry::Core::ClassBuilder
           .new(name: "#{Inflector.classify(type)}[:#{name}]", parent: type)
           .call
 
-        if block
+        if block_given?
           yield(klass)
         else
           klass
@@ -163,10 +163,10 @@ module ROM
       #
       # @api public
       def before(*hooks)
-        if !hooks.empty?
-          set_hooks(:before, hooks)
-        else
+        if hooks.empty?
           @before
+        else
+          set_hooks(:before, hooks)
         end
       end
 
@@ -208,10 +208,10 @@ module ROM
       #
       # @api public
       def after(*hooks)
-        if !hooks.empty?
-          set_hooks(:after, hooks)
-        else
+        if hooks.empty?
           @after
+        else
+          set_hooks(:after, hooks)
         end
       end
 
@@ -252,16 +252,16 @@ module ROM
       def relation_methods_mod(relation_class)
         Module.new do
           relation_class.view_methods.each do |meth|
-            module_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def #{meth}(*args)
-                response = relation.public_send(:#{meth}, *args)
-
-                if response.is_a?(relation.class)
-                  new(response)
-                else
-                  response
-                end
-              end
+            module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+              def #{meth}(*args, **kwargs)                                 # def create(*args, **kwargs)
+                response = relation.public_send(:#{meth}, *args, **kwargs) #   response = relation.public_send(:create, *args, **kwargs)
+                                                                           #
+                if response.is_a?(relation.class)                          #   if response.is_a?(relation.class)
+                  new(response)                                            #     new(response)
+                else                                                       #   else
+                  response                                                 #     response
+                end                                                        #   end
+              end                                                          # end
             RUBY
           end
         end

data/lib/rom/commands/composite.rb

@@ -15,6 +15,8 @@ module ROM
       # @return [Object]
       #
       # @api public
+      #
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def call(*args)
         response = left.call(*args)
 
@@ -35,6 +37,7 @@ module ROM
         end
       end
       alias_method :[], :call
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       # @api private
       def graph?

data/lib/rom/commands/graph/class_interface.rb

@@ -25,6 +25,7 @@ module ROM
         end
 
         # @api private
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
         def build_command(registry, spec, other, path)
           cmd_opts, nodes = other
 
@@ -43,7 +44,7 @@ module ROM
             end
 
           command = registry[relation][name]
-          tuple_path = Array[*path] << key
+          tuple_path = [*path] << key
           input_proc = InputEvaluator.build(tuple_path, nodes)
 
           command = command.curry(input_proc, opts)
@@ -58,6 +59,7 @@ module ROM
             command
           end
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
       end
     end
   end

data/lib/rom/commands/graph/input_evaluator.rb

@@ -48,7 +48,7 @@ module ROM
         #
         # @api private
         def self.exclude_proc(excluded_keys)
-          -> input { input.reject { |k, _| excluded_keys.include?(k) } }
+          -> input { input.except(*excluded_keys) }
         end
 
         # Initialize a new input evaluator
@@ -68,6 +68,7 @@ module ROM
         # @param [Integer] index Optional index
         #
         # @return [Hash]
+        # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
         def call(input, index = nil)
           value =
             begin
@@ -88,6 +89,7 @@ module ROM
             value
           end
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
       end
     end
   end

data/lib/rom/commands/graph.rb

@@ -49,6 +49,8 @@ module ROM
       # @return [Array] nested array with command results
       #
       # @api public
+      #
+      # rubocop:disable Metrics/PerceivedComplexity
       def call(*args)
         left = root.call(*args)
 
@@ -73,6 +75,7 @@ module ROM
           [left, right]
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       # @api private
       def graph?

data/lib/rom/commands/lazy/create.rb

@@ -14,6 +14,7 @@ module ROM
         # @return [Hash,Array<Hash>]
         #
         # @api public
+        # rubocop:disable Metrics/AbcSize
         def call(*args)
           first = args.first
           last = args.last
@@ -29,6 +30,7 @@ module ROM
             command.call(input, *args[1..size - 1])
           end
         end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/rom/commands/lazy/update.rb

@@ -14,6 +14,7 @@ module ROM
         # @return [Hash, Array<Hash>]
         #
         # @api public
+        # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
         def call(*args)
           first = args.first
           last = args.last
@@ -40,6 +41,7 @@ module ROM
             end
           end
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
       end
     end
   end

data/lib/rom/commands/lazy.rb

@@ -83,9 +83,9 @@ module ROM
       private
 
       # @api private
-      def method_missing(name, *args, &block)
+      def method_missing(name, ...)
         if command.respond_to?(name)
-          response = command.public_send(name, *args, &block)
+          response = command.public_send(name, ...)
 
           if response.instance_of?(command.class)
             self.class.new(response, evaluator, command_proc)
@@ -96,7 +96,6 @@ module ROM
           super
         end
       end
-      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

data/lib/rom/configuration.rb

@@ -20,9 +20,9 @@ module ROM
     register_event('configuration.relations.dataset.allocated')
     register_event('configuration.commands.class.before_build')
 
-    include ROM::ConfigurationDSL
+    include ::ROM::ConfigurationDSL
 
-    NoDefaultAdapterError = Class.new(StandardError)
+    NoDefaultAdapterError = ::Class.new(::StandardError)
 
     # @!attribute [r] environment
     #   @return [Environment] Environment object with gateways
@@ -36,7 +36,8 @@ module ROM
     #   @return [Notifications] Notification bus instance
     attr_reader :notifications
 
-    def_delegators :@setup, :register_relation, :register_command, :register_mapper, :register_plugin,
+    def_delegators :@setup, :register_relation, :register_command,
+                   :register_mapper, :register_plugin,
                    :command_classes, :mapper_classes,
                    :auto_registration
 
@@ -49,12 +50,12 @@ module ROM
     # @return [Configuration]
     #
     # @api private
-    def initialize(*args, &block)
+    def initialize(*args, &)
       @environment = Environment.new(*args)
       @notifications = Notifications.event_bus(:configuration)
       @setup = Setup.new(notifications)
 
-      block&.call(self)
+      yield self if block_given?
     end
 
     # Apply a plugin to the configuration
@@ -66,9 +67,9 @@ module ROM
     #
     # @api public
     def use(plugin, options = {})
-      if plugin.is_a?(Array)
+      if plugin.is_a?(::Array)
         plugin.each { |p| use(p) }
-      elsif plugin.is_a?(Hash)
+      elsif plugin.is_a?(::Hash)
         plugin.to_a.each { |p| use(*p) }
       else
         ROM.plugin_registry[:configuration].fetch(plugin).apply_to(self, options)
@@ -82,16 +83,12 @@ module ROM
     # @return [Gateway]
     #
     # @api private
-    def [](name)
-      gateways.fetch(name)
-    end
+    def [](name) = gateways.fetch(name)
 
     # Hook for respond_to? used internally
     #
     # @api private
-    def respond_to?(name, include_all = false)
-      gateways.key?(name) || super
-    end
+    def respond_to?(name, ...) = gateways.key?(name) || super
 
     # @api private
     def default_gateway
@@ -122,13 +119,14 @@ module ROM
 
     private
 
+    # @api private
+    def respond_to_missing?(name, ...) = gateways.key?(name) || super
+
     # Returns gateway if method is a name of a registered gateway
     #
     # @return [Gateway]
     #
     # @api private
-    def method_missing(name, *)
-      gateways.fetch(name) { super }
-    end
+    def method_missing(name, ...) = gateways.fetch(name) { super }
   end
 end

data/lib/rom/configuration_dsl/command.rb

@@ -13,7 +13,7 @@ module ROM
       # This is used by Setup#commands DSL and its `define` block
       #
       # @api private
-      def self.build_class(name, relation, options = EMPTY_HASH, &block)
+      def self.build_class(name, relation, options = EMPTY_HASH, &)
         type = options.fetch(:type) { name }
         command_type = Inflector.classify(type)
         adapter = options.fetch(:adapter)
@@ -23,7 +23,7 @@ module ROM
         Dry::Core::ClassBuilder.new(name: class_name, parent: parent).call do |klass|
           klass.register_as(name)
           klass.relation(relation)
-          klass.class_eval(&block) if block
+          klass.class_eval(&) if block_given?
         end
       end
 

data/lib/rom/configuration_dsl/command_dsl.rb

@@ -8,14 +8,18 @@ module ROM
     #
     # @private
     class CommandDSL
-      attr_reader :relation, :adapter, :command_classes
+      attr_reader :relation
+
+      attr_reader :adapter
+
+      attr_reader :command_classes
 
       # @api private
-      def initialize(relation, adapter = nil, &block)
+      def initialize(relation, adapter = nil, &)
         @relation = relation
         @adapter = adapter
         @command_classes = []
-        instance_exec(&block)
+        instance_exec(&)
       end
 
       # Define a command class
@@ -27,9 +31,9 @@ module ROM
       # @return [Class] generated class
       #
       # @api public
-      def define(name, options = EMPTY_HASH, &block)
+      def define(name, options = EMPTY_HASH, &)
         @command_classes << Command.build_class(
-          name, relation, { adapter: adapter }.merge(options), &block
+          name, relation, { adapter: adapter }.merge(options), &
         )
       end
     end

data/lib/rom/configuration_dsl/mapper_dsl.rb

@@ -8,7 +8,11 @@ module ROM
     #
     # @private
     class MapperDSL
-      attr_reader :configuration, :mapper_classes, :defined_mappers
+      attr_reader :configuration
+
+      attr_reader :mapper_classes
+
+      attr_reader :defined_mappers
 
       # @api private
       def initialize(configuration, mapper_classes, block)
@@ -29,8 +33,13 @@ module ROM
       # @return [Class]
       #
       # @api public
-      def define(name, options = EMPTY_HASH, &block)
-        @defined_mappers << Mapper::Builder.build_class(name, (@mapper_classes + @defined_mappers), options, &block)
+      def define(name, options = EMPTY_HASH, &)
+        @defined_mappers << Mapper::Builder.build_class(
+          name,
+          @mapper_classes + @defined_mappers,
+          options,
+          &
+        )
         self
       end
 

data/lib/rom/configuration_dsl/relation.rb

@@ -17,9 +17,11 @@ module ROM
         class_name = "ROM::Relation[#{Inflector.camelize(name)}]"
         adapter = options.fetch(:adapter)
 
-        Dry::Core::ClassBuilder.new(name: class_name, parent: ROM::Relation[adapter]).call do |klass|
+        ::Dry::Core::ClassBuilder.new(
+          name: class_name, parent: ::ROM::Relation[adapter]
+        ).call do |klass|
           klass.gateway(options.fetch(:gateway, :default))
-          klass.schema(name) {}
+          klass.schema(name) { nil }
         end
       end
     end

data/lib/rom/configuration_dsl.rb

@@ -19,11 +19,11 @@ module ROM
     #   end
     #
     # @api public
-    def relation(name, options = EMPTY_HASH, &block)
+    def relation(name, options = EMPTY_HASH, &)
       klass_opts = { adapter: default_adapter }.merge(options)
       klass = Relation.build_class(name, klass_opts)
       klass.schema_opts(dataset: name, relation: name)
-      klass.class_eval(&block) if block
+      klass.class_eval(&) if block_given?
       register_relation(klass)
       klass
     end
@@ -48,8 +48,8 @@ module ROM
     #   end
     #
     # @api public
-    def commands(name, &block)
-      register_command(*CommandDSL.new(name, default_adapter, &block).command_classes)
+    def commands(name, &)
+      register_command(*CommandDSL.new(name, default_adapter, &).command_classes)
     end
 
     # Mapper definition DSL
@@ -76,22 +76,20 @@ module ROM
     # @return [Plugin]
     #
     # @api public
-    def plugin(adapter, spec, &block)
+    def plugin(adapter, spec, &)
       type, name = spec.flatten(1)
       plugin = plugin_registry[type].adapter(adapter).fetch(name) do
         plugin_registry[type].fetch(name)
       end
 
-      if block
-        register_plugin(plugin.configure(&block))
+      if block_given?
+        register_plugin(plugin.configure(&))
       else
         register_plugin(plugin)
       end
     end
 
     # @api private
-    def plugin_registry
-      ROM.plugin_registry
-    end
+    def plugin_registry = ::ROM.plugin_registry
   end
 end

data/lib/rom/constants.rb

@@ -2,12 +2,12 @@
 
 # Constants and errors common in the whole library
 module ROM
-  include Dry::Core::Constants
+  include ::Dry::Core::Constants
 
-  AdapterLoadError = Class.new(StandardError)
+  AdapterLoadError = ::Class.new(::StandardError)
 
   # Exception raised when a component is configured with an adapter that's not loaded
-  class AdapterNotPresentError < StandardError
+  class AdapterNotPresentError < ::StandardError
     # @api private
     def initialize(adapter, component)
       super(
@@ -17,22 +17,22 @@ module ROM
     end
   end
 
-  EnvAlreadyFinalizedError = Class.new(StandardError)
-  RelationAlreadyDefinedError = Class.new(StandardError)
-  MapperAlreadyDefinedError = Class.new(StandardError)
-  MapperMisconfiguredError = Class.new(StandardError)
-  NoRelationError = Class.new(StandardError)
-  InvalidRelationName = Class.new(StandardError)
-  CommandError = Class.new(StandardError)
-  KeyMissing = Class.new(ROM::CommandError)
-  TupleCountMismatchError = Class.new(CommandError)
-  UnknownPluginError = Class.new(StandardError)
-  UnsupportedRelationError = Class.new(StandardError)
-  MissingAdapterIdentifierError = Class.new(StandardError)
-  AttributeAlreadyDefinedError = Class.new(StandardError)
+  EnvAlreadyFinalizedError = ::Class.new(::StandardError)
+  RelationAlreadyDefinedError = ::Class.new(::StandardError)
+  MapperAlreadyDefinedError = ::Class.new(::StandardError)
+  MapperMisconfiguredError = ::Class.new(::StandardError)
+  NoRelationError = ::Class.new(::StandardError)
+  InvalidRelationName = ::Class.new(::StandardError)
+  CommandError = ::Class.new(::StandardError)
+  KeyMissing = ::Class.new(::ROM::CommandError)
+  TupleCountMismatchError = ::Class.new(::ROM::CommandError)
+  UnknownPluginError = ::Class.new(::StandardError)
+  UnsupportedRelationError = ::Class.new(::StandardError)
+  MissingAdapterIdentifierError = ::Class.new(::StandardError)
+  AttributeAlreadyDefinedError = ::Class.new(::StandardError)
 
   # Exception raised when a reserved keyword is used as a relation name
-  class InvalidRelationName < StandardError
+  class InvalidRelationName < ::StandardError
     # @api private
     def initialize(relation)
       super("Relation name: #{relation} is a protected word, please use another relation name")
@@ -40,7 +40,7 @@ module ROM
   end
 
   # Exception raised when an element inside a component registry is not found
-  class ElementNotFoundError < KeyError
+  class ElementNotFoundError < ::KeyError
     # @api private
     def initialize(key, registry)
       super(set_message(key, registry))
@@ -52,32 +52,32 @@ module ROM
     end
   end
 
-  MapperMissingError = Class.new(ElementNotFoundError)
+  MapperMissingError = ::Class.new(ElementNotFoundError)
 
-  CommandNotFoundError = Class.new(ElementNotFoundError) do
+  CommandNotFoundError = ::Class.new(ElementNotFoundError) do
     # @api private
     def set_message(key, registry)
       "There is no :#{key} command for :#{registry.relation_name} relation"
     end
   end
 
-  MissingSchemaClassError = Class.new(StandardError) do
+  MissingSchemaClassError = ::Class.new(::StandardError) do
     # @api private
     def initialize(klass)
       super("#{klass.inspect} relation is missing schema_class")
     end
   end
 
-  MissingSchemaError = Class.new(StandardError) do
+  MissingSchemaError = ::Class.new(::StandardError) do
     # @api private
     def initialize(klass)
       super("#{klass.inspect} relation is missing schema definition")
     end
   end
 
-  DuplicateConfigurationError = Class.new(StandardError)
-  DuplicateContainerError = Class.new(StandardError)
+  DuplicateConfigurationError = ::Class.new(::StandardError)
+  DuplicateContainerError = ::Class.new(::StandardError)
 
-  InvalidOptionValueError = Class.new(StandardError)
-  InvalidOptionKeyError = Class.new(StandardError)
+  InvalidOptionValueError = ::Class.new(::StandardError)
+  InvalidOptionKeyError = ::Class.new(::StandardError)
 end

data/lib/rom/container.rb

@@ -110,41 +110,43 @@ module ROM
       end
     end
 
+    # @api private
+    attr_reader :cache
+
+    # @api private
+    def initialize
+      super
+
+      @cache = Cache.new
+    end
+
     # Return registered gateways
     #
     # @return [Hash<Symbol=>Gateway>]
     #
     # @api public
-    def gateways
-      self[:gateways]
-    end
+    def gateways = self[:gateways]
 
     # Return mapper registry for all relations
     #
     # @return [Hash<Symbol=>MapperRegistry]
     #
     # @api public
-    def mappers
-      self[:mappers]
-    end
+    def mappers = self[:mappers]
 
     # Return relation registry
     #
     # @return [RelationRegistry]
     #
     # @api public
-    def relations
-      self[:relations]
-    end
+    def relations = self[:relations]
 
     # Return command registry
     #
     # @return [Hash<Symbol=>CommandRegistry]
     #
     # @api public
-    def commands
-      self[:commands]
-    end
+    def commands = self[:commands]
 
     # Disconnect all gateways
     #
@@ -156,8 +158,6 @@ module ROM
     # @return [Hash<Symbol=>Gateway>] a hash with disconnected gateways
     #
     # @api public
-    def disconnect
-      gateways.each_value(&:disconnect)
-    end
+    def disconnect = gateways.each_value(&:disconnect)
   end
 end

data/lib/rom/core/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module Core
-    VERSION = '5.3.1'
+    VERSION = '5.4.0'
   end
 end

data/lib/rom/core.rb

@@ -28,7 +28,6 @@ require 'rom/container'
 require 'rom/create_container'
 
 # register known plugin types
-require 'rom/schema_plugin'
 
 ROM::Plugins.register(:command)
 ROM::Plugins.register(:mapper)

data/lib/rom/create_container.rb

@@ -44,7 +44,7 @@ module ROM
   # @api private
   class InlineCreateContainer < CreateContainer
     # @api private
-    def initialize(*args, &block)
+    def initialize(*args, &)
       case args.first
       when Configuration
         environment = args.first.environment
@@ -53,7 +53,7 @@ module ROM
         environment = args.first
         setup = args[1]
       else
-        configuration = Configuration.new(*args, &block)
+        configuration = Configuration.new(*args, &)
         environment = configuration.environment
         setup = configuration.setup
       end
@@ -63,7 +63,5 @@ module ROM
   end
 
   # @api private
-  def self.container(*args, &block)
-    InlineCreateContainer.new(*args, &block).container
-  end
+  def self.container(...) = InlineCreateContainer.new(...).container
 end