rom-core 5.3.1 → 5.4.0

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

@@ -55,14 +55,12 @@ module ROM
       # @api private
       def name_error_message(attempted)
         'required file does not define expected constant name; either ' \
-        'register your constant explicitly of try following the path' \
-        "naming convention like:\n\n\t- #{attempted.join("\n\t- ")}\n"
+          'register your constant explicitly of try following the path' \
+          "naming convention like:\n\n\t- #{attempted.join("\n\t- ")}\n"
       end
 
       # @api private
-      def filename
-        Pathname(file).basename('.rb')
-      end
+      def filename = Pathname(file).basename('.rb')
 
       # @api private
       def ns_const
@@ -70,9 +68,7 @@ module ROM
       end
 
       # @api private
-      def path_arr
-        file_path << filename
-      end
+      def path_arr = file_path << filename
 
       # @api private
       def file_path

data/lib/rom/setup/finalize/finalize_commands.rb

@@ -26,6 +26,8 @@ module ROM
       # @return [Hash]
       #
       # @api private
+      #
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def run!
         commands = @command_classes.map do |klass|
           relation = @relations[klass.relation]
@@ -60,6 +62,7 @@ module ROM
 
         registry
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
   end
 end

data/lib/rom/setup/finalize/finalize_mappers.rb

@@ -5,7 +5,9 @@ require 'rom/registry'
 module ROM
   class Finalize
     class FinalizeMappers
-      attr_reader :mapper_classes, :mapper_objects, :registry_hash
+      attr_reader :mapper_classes
+      attr_reader :mapper_objects
+      attr_reader :registry_hash
 
       # @api private
       def initialize(mapper_classes, mapper_objects)
@@ -17,21 +19,21 @@ module ROM
         @registry_hash = [@mapper_classes.map(&:base_relation) + @mapper_objects.keys]
           .flatten
           .uniq
-          .each_with_object({}) { |n, h| h[n] = {} }
+          .to_h { [_1, {}] }
       end
 
       # @api private
       def run!
         cache = Cache.new
 
-        mappers = registry_hash.each_with_object({}) do |(relation_name, relation_mappers), h|
+        mappers = registry_hash.to_h do |relation_name, relation_mappers|
           relation_mappers.update(build_mappers(relation_name))
 
           if mapper_objects.key?(relation_name)
             relation_mappers.update(mapper_objects[relation_name])
           end
 
-          h[relation_name] = MapperRegistry.new(relation_mappers, cache: cache)
+          [relation_name, MapperRegistry.new(relation_mappers, cache: cache)]
         end
 
         Registry.new(mappers, cache: cache)
@@ -40,22 +42,22 @@ module ROM
       private
 
       def check_duplicate_registered_mappers
-        mapper_relation_register = mapper_classes.map { |mapper_class| [mapper_class.relation, mapper_class.register_as].compact }
-        return if mapper_relation_register.uniq.count == mapper_classes.count
+        duplicates = mapper_classes.map { [_1.relation, _1.register_as] }.tally.select { _2 > 1 }
 
-        mapper_relation_register.select { |relation_register_as| mapper_relation_register.count(relation_register_as) > 1 }
-          .uniq
-          .each do |duplicated_mappers|
-            raise MapperAlreadyDefinedError,
-                  "Mapper with `register_as #{duplicated_mappers.last.inspect}` registered more " \
-                  "than once for relation #{duplicated_mappers.first.inspect}"
-          end
+        case duplicates.first
+        in [rel, as], _
+          raise MapperAlreadyDefinedError,
+                "Mapper with `register_as #{as.inspect}` registered more " \
+                "than once for relation #{rel.inspect}"
+        else
+          nil
+        end
       end
 
       def build_mappers(relation_name)
         mapper_classes
           .select { |klass| klass.base_relation == relation_name }
-          .each_with_object({}) { |klass, h| h[klass.register_as || klass.relation] = klass.build }
+          .to_h { |k| [k.register_as || k.relation, k.build] }
       end
     end
   end

data/lib/rom/setup/finalize/finalize_relations.rb

@@ -9,6 +9,16 @@ module ROM
     class FinalizeRelations
       attr_reader :notifications
 
+      class RegistryReaders < ::Module
+        def initialize(relations)
+          super()
+
+          relations.each do |name|
+            define_method(name) { __registry__[name] }
+          end
+        end
+      end
+
       # Build relation registry of specified descendant classes
       #
       # This is used by the setup
@@ -28,8 +38,11 @@ module ROM
       # @return [Hash]
       #
       # @api private
+      #
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def run!
         relation_registry = RelationRegistry.new do |registry, relations|
+          registry_readers = RegistryReaders.new(relation_names)
           @relation_classes.each do |klass|
             unless klass.adapter
               raise MissingAdapterIdentifierError,
@@ -43,14 +56,18 @@ module ROM
                     "Relation with name #{key.inspect} registered more than once"
             end
 
-            klass.use(:registry_reader, relations: relation_names)
+            klass.use(:registry_reader, readers: registry_readers)
 
-            notifications.trigger('configuration.relations.class.ready', relation: klass, adapter: klass.adapter)
+            notifications.trigger(
+              'configuration.relations.class.ready',
+              relation: klass,
+              adapter: klass.adapter
+            )
 
             relations[key] = build_relation(klass, registry)
           end
 
-          registry.each do |_, relation|
+          registry.each_value do |relation|
             notifications.trigger(
               'configuration.relations.object.registered',
               relation: relation, registry: registry
@@ -64,10 +81,13 @@ module ROM
 
         relation_registry
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       # @return [ROM::Relation]
       #
       # @api private
+      #
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def build_relation(klass, registry)
         # TODO: raise a meaningful error here and add spec covering the case
         #       where klass' gateway points to non-existant repo
@@ -103,10 +123,16 @@ module ROM
           dataset: dataset, relation: klass, adapter: klass.adapter
         )
 
-        options = { __registry__: registry, mappers: mapper_registry(rel_key, klass), schema: schema, **plugin_options }
+        options = {
+          __registry__: registry,
+          mappers: mapper_registry(rel_key, klass),
+          schema: schema,
+          **plugin_options
+        }
 
         klass.new(dataset, **options)
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       # @api private
       def mapper_registry(rel_key, rel_class)

data/lib/rom/setup/finalize.rb

@@ -22,9 +22,23 @@ module ROM
   #
   # @private
   class Finalize
-    attr_reader :gateways, :repo_adapter,
-                :relation_classes, :mapper_classes, :mapper_objects,
-                :command_classes, :plugins, :config, :notifications
+    attr_reader :gateways
+
+    attr_reader :repo_adapter
+
+    attr_reader :relation_classes
+
+    attr_reader :mapper_classes
+
+    attr_reader :mapper_objects
+
+    attr_reader :command_classes
+
+    attr_reader :plugins
+
+    attr_reader :config
+
+    attr_reader :notifications
 
     # @api private
     def initialize(options)

data/lib/rom/setup.rb

@@ -41,16 +41,17 @@ module ROM
     #
     # @param [String, Pathname] directory The root path to components
     # @param [Hash] options
-    # @option options [Boolean, String] :namespace Enable/disable namespace or provide a custom namespace name
+    # @option options [Boolean, String] :namespace Enable/disable
+    #                                              namespace or provide a custom namespace name
     #
     # @return [Setup]
     #
     # @api public
     def auto_registration(directory, **options)
       auto_registration = AutoRegistration.new(directory, **options)
-      auto_registration.relations.map { |r| register_relation(r) }
-      auto_registration.commands.map { |r| register_command(r) }
-      auto_registration.mappers.map { |r| register_mapper(r) }
+      auto_registration.relations.each { |r| register_relation(r) }
+      auto_registration.commands.each { |r| register_command(r) }
+      auto_registration.mappers.each { |r| register_mapper(r) }
       self
     end
 

data/lib/rom/struct.rb

@@ -15,9 +15,10 @@ module ROM
   # about attribute types returned from relations, thus can be introspected to build
   # additional functionality when desired.
   #
-  # There is a caveat you should know about when working with structs. Struct classes
-  # have names but at the same time they're anonymous, i.e. you can't get the User struct class
-  # with ROM::Struct::User. ROM will create as many struct classes for User as needed,
+  # *NOTE*: There is a caveat you should know about when working with ROM structs.
+  # Struct classes have names but at the same time they're anonymous,
+  # i.e. you can't get the User struct class with ROM::Struct::User.
+  # ROM will create as many struct classes for User as needed,
   # they all will have the same name and ROM::Struct::User will be the common parent class for
   # them. Combined with the ability to provide your own namespace for structs this enables to
   # pre-define the parent class.
@@ -28,6 +29,11 @@ module ROM
   #       primary_key :id
   #       column :name, String
   #     end
+  #
+  #     conf.relation(:users) do
+  #       schema(infer: true)
+  #       auto_struct true
+  #     end
   #   end
   #
   #   class UserRepo < ROM::Repository[:users]
@@ -41,11 +47,12 @@ module ROM
   #
   #   # see struct's schema attributes
   #
-  #   # model.schema.key(:id)
+  #   model.schema.key(:id)
   #   # => #<Dry::Types[id: Nominal<Integer meta={primary_key: true, source: :users}>]>
   #
   #   model.schema[:name]
-  #   # => #<Dry::Types[name: Sum<Nominal<NilClass> | Nominal<String> meta={source: :users}>]>
+  #   # => #<Dry::Types[name: Sum<Nominal<NilClass> |
+  #   #                           Nominal<String meta={source: :users}> meta={source: :users}>]>
   #
   # @example passing a namespace with an existing parent class
   #   module Entities
@@ -61,6 +68,7 @@ module ROM
   #   end
   #
   #   user_repo = UserRepo.new(rom)
+  #   user_repo.users.insert(name: "Jane")
   #   user = user_repo.users.by_pk(1).one!
   #   user.name # => "Jane"
   #   user.upcased_name # => "JANE"
@@ -69,16 +77,14 @@ module ROM
   # @see http://dry-rb.org/gems/dry-types dry-types
   #
   # @api public
-  class Struct < Dry::Struct
-    MissingAttribute = Class.new(NameError) do
+  class Struct < ::Dry::Struct
+    MissingAttribute = ::Class.new(::NameError) do
       def initialize(&block)
         super
         @message_proc = block
       end
 
-      def message
-        @message_proc.call
-      end
+      def message = @message_proc.call
     end
 
     # Return attribute value
@@ -86,21 +92,17 @@ module ROM
     # @param [Symbol] name The attribute name
     #
     # @api public
-    def fetch(name)
-      __send__(name)
-    end
+    def fetch(name) = __send__(name)
 
     # @api private
-    def respond_to_missing?(*)
-      super
-    end
+    def respond_to_missing?(*) = super
 
     private
 
     def method_missing(*)
       super
-    rescue NameError => error
-      raise MissingAttribute.new { "#{error.message} (attribute not loaded?)" }
+    rescue ::NameError => e
+      raise(MissingAttribute.new { "#{e.message} (attribute not loaded?)" })
     end
   end
 end

data/lib/rom/struct_compiler.rb

@@ -18,11 +18,10 @@ module ROM
     option :cache, default: -> { Cache.new }
 
     # @api private
-    def initialize(*)
+    def initialize(*, **)
       super
       @cache = cache.namespaced(:structs)
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     # Build a struct class based on relation header ast
     #
@@ -95,15 +94,13 @@ module ROM
     end
 
     # @api private
-    def build_class(name, parent, ns, &block)
+    def build_class(name, parent, ns, &)
       Dry::Core::ClassBuilder
         .new(name: class_name(name), parent: parent, namespace: ns)
-        .call(&block)
+        .call(&)
     end
 
     # @api private
-    def class_name(name)
-      Inflector.classify(name)
-    end
+    def class_name(name) = Inflector.classify(name)
   end
 end

data/lib/rom/support/configurable.rb

@@ -7,7 +7,7 @@ module ROM
   # @api private
   module Configurable
     class Config
-      WRITER_REGEXP = /=$/.freeze
+      WRITER_REGEXP = /=$/
 
       # @!attribute [r] settings
       #   @return [Hash] A hash with defined settings
@@ -23,43 +23,33 @@ module ROM
       # @return [Mixed]
       #
       # @api public
-      def [](name)
-        public_send(name)
-      end
+      def [](name) = public_send(name)
 
       # @api private
-      def key?(name)
-        settings.key?(name)
-      end
+      def key?(name) = settings.key?(name)
 
-      def to_hash
-        settings
-      end
+      def to_hash = settings
 
       # @api private
-      def respond_to_missing?(_name, _include_private = false)
-        true
-      end
+      def respond_to_missing?(_name, _include_private = false) = true
 
       # @api private
-      def dup
-        self.class.new(dup_settings(settings))
-      end
+      def dup = self.class.new(dup_settings(settings))
 
       private
 
       def dup_settings(settings)
-        settings.each_with_object({}) do |(key, value), new_settings|
+        settings.to_h do |key, value|
           if value.is_a?(self.class)
-            new_settings[key] = value.dup
+            [key, value.dup]
           else
-            new_settings[key] = value
+            [key, value]
           end
         end
       end
 
       # @api private
-      def method_missing(meth, *args, &_block)
+      def method_missing(meth, *args, &)
         return settings.fetch(meth, nil) if frozen?
 
         name = meth.to_s

data/lib/rom/support/memoizable.rb

@@ -11,12 +11,11 @@ module ROM
         prepend(Memoizer.new(self, names))
       end
 
-      def new(*)
+      def new(*, **, &)
         obj = super
-        obj.instance_variable_set(:'@__memoized__', MEMOIZED_HASH.dup)
+        obj.instance_variable_set(:@__memoized__, MEMOIZED_HASH.dup)
         obj
       end
-      ruby2_keywords(:new) if respond_to?(:ruby2_keywords, true)
     end
 
     def self.included(klass)
@@ -27,12 +26,14 @@ module ROM
     attr_reader :__memoized__
 
     # @api private
-    class Memoizer < Module
+    class Memoizer < ::Module
       attr_reader :klass
+
       attr_reader :names
 
       # @api private
       def initialize(klass, names)
+        super()
         @names = names
         @klass = klass
         define_memoizable_names!
@@ -45,14 +46,14 @@ module ROM
         names.each do |name|
           meth = klass.instance_method(name)
 
-          if !meth.parameters.empty?
-            define_method(name) do |*args|
-              __memoized__[:"#{name}_#{args.hash}"] ||= super(*args)
-            end
-          else
+          if meth.parameters.empty?
             define_method(name) do
               __memoized__[name] ||= super()
             end
+          else
+            define_method(name) do |*args|
+              __memoized__[:"#{name}_#{args.hash}"] ||= super(*args)
+            end
           end
         end
       end

data/lib/rom/support/notifications.rb

@@ -36,7 +36,7 @@ module ROM
   #   end
   #
   module Notifications
-    LISTENERS_HASH = Hash.new { |h, k| h[k] = [] }
+    LISTENERS_HASH = ::Hash.new { |h, k| h[k] = [] }
 
     # Extension used for classes that can trigger events
     #
@@ -75,7 +75,7 @@ module ROM
     #
     # @api public
     class Event
-      include Dry::Equalizer(:id, :payload)
+      include ::Dry::Equalizer(:id, :payload)
 
       # @!attribute [r] id
       #   @return [Symbol] The event identifier
@@ -99,18 +99,14 @@ module ROM
       # @param [String,Symbol] name
       #
       # @api public
-      def [](name)
-        @payload.fetch(name)
-      end
+      def [](name) = @payload.fetch(name)
 
       # Coerce an event to a hash
       #
       # @return [Hash]
       #
       # @api public
-      def to_h
-        @payload
-      end
+      def to_h = @payload
       alias_method :to_hash, :to_h
 
       # Get or set a payload

data/lib/rom/transaction.rb

@@ -4,7 +4,7 @@ module ROM
   # @api private
   class Transaction
     # @api private
-    Rollback = Class.new(StandardError)
+    Rollback = ::Class.new(::StandardError)
 
     # @api private
     def run(_opts = EMPTY_HASH)
@@ -16,9 +16,7 @@ module ROM
     # Unconditionally roll back the current transaction
     #
     # @api public
-    def rollback!
-      raise Rollback
-    end
+    def rollback! = raise(Rollback)
 
     # @api private
     NoOp = Transaction.new.freeze

data/lib/rom/transformer.rb

@@ -9,8 +9,8 @@ module ROM
   # transformations.
   #
   # @api public
-  class Transformer < Transproc::Transformer[ROM::Processor::Transproc::Functions]
-    extend Dry::Core::ClassAttributes
+  class Transformer < Transproc::Transformer[::ROM::Processor::Transproc::Functions]
+    extend ::Dry::Core::ClassAttributes
 
     # @!method self.register_as
     #  Get or set registration name
@@ -70,26 +70,22 @@ module ROM
     # @return [self]
     #
     # @api public
-    def self.map(&block)
+    def self.map(&)
       define! do
-        map_array(&block)
+        map_array(&)
       end
     end
 
     # This is needed to make transformers compatible with rom setup
     #
     # @api private
-    def self.base_relation
-      relation
-    end
+    def self.base_relation = relation
 
     # Build a mapper instance
     #
     # @return [Transformer]
     #
     # @api public
-    def self.build
-      new
-    end
+    def self.build = new
   end
 end

data/lib/rom/types.rb

@@ -8,7 +8,6 @@ module ROM
   #
   # @api public
   #
-  # rubocop:disable Naming/MethodName
   module Types
     include Dry::Types(default: :nominal)
 
@@ -44,11 +43,9 @@ module ROM
     # @api public
     def Coercible.JSONHash(symbol_keys: false, type: Types::Hash)
       Types.Constructor(type) do |value|
-        begin
-          ::JSON.parse(value.to_s, symbolize_names: symbol_keys)
-        rescue ::JSON::ParserError
-          value
-        end
+        ::JSON.parse(value.to_s, symbolize_names: symbol_keys)
+      rescue ::JSON::ParserError
+        value
       end
     end