rom-core 5.1.1 → 5.2.4

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

data/lib/rom/setup.rb

@@ -46,8 +46,8 @@ module ROM
     # @return [Setup]
     #
     # @api public
-    def auto_registration(directory, options = {})
-      auto_registration = AutoRegistration.new(directory, options)
+    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) }

data/lib/rom/setup/auto_registration.rb

@@ -43,7 +43,7 @@ module ROM
 
     # @!attribute [r] globs
     #   @return [Hash] File globbing functions for each component dir
-    option :globs, default: -> {
+    option :globs, default: lambda {
       Hash[
         component_dirs.map { |component, path|
           [component, directory.join("#{path}/**/*.rb")]
@@ -78,7 +78,7 @@ module ROM
     #
     # @api private
     def load_entities(entity)
-      Dir[globs[entity]].map do |file|
+      Dir[globs[entity]].sort.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/
+      EXTENSION_REGEX = /\.rb\z/.freeze
 
       # @!attribute [r] file
       #   @return [String] Name of a component file

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

@@ -32,7 +32,7 @@ module ROM
         attempted = []
 
         potential.map do |path|
-          const_fragment = path.join("::")
+          const_fragment = path.join('::')
 
           constant = "#{namespace}::#{const_fragment}"
 
@@ -54,8 +54,8 @@ 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" \
+        '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"
       end
 
@@ -76,7 +76,7 @@ module ROM
 
       # @api private
       def file_path
-        File.dirname(file).split("/") - directory.to_s.split("/")
+        File.dirname(file).split('/') - directory.to_s.split('/')
       end
     end
   end

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

@@ -25,7 +25,7 @@ module ROM
       # @api private
       def call
         Inflector.camelize(
-          file.sub(/^#{directory}\/#{entity}\//, '').sub(EXTENSION_REGEX, '')
+          file.sub(%r{^#{directory}/#{entity}/}, '').sub(EXTENSION_REGEX, '')
         )
       end
     end

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

@@ -21,7 +21,7 @@ module ROM
       # @api private
       def call
         Inflector.camelize(
-          file.sub(/^#{directory.dirname}\//, '').sub(EXTENSION_REGEX, '')
+          file.sub(%r{^#{directory.dirname}/}, '').sub(EXTENSION_REGEX, '')
         )
       end
     end

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

@@ -41,13 +41,16 @@ module ROM
           klass.build(relation)
         end
 
-        registry = Registry.new({})
+        registry = Registry.new
         compiler = CommandCompiler.new(@gateways, @relations, registry, notifications)
 
         @relations.each do |(name, relation)|
-          commands.
-            select { |c| c.relation.name == relation.name }.
-            each { |c| relation.commands.elements[c.class.register_as || c.class.default_name] = c }
+          rel_commands = commands.select { |c| c.relation.name == relation.name }
+
+          rel_commands.each do |command|
+            identifier = command.class.register_as || command.class.default_name
+            relation.commands.elements[identifier] = command
+          end
 
           relation.commands.set_compiler(compiler)
           relation.commands.set_mappers(relation.mappers)

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

@@ -14,10 +14,10 @@ module ROM
 
         check_duplicate_registered_mappers
 
-        @registry_hash = [@mapper_classes.map(&:base_relation) + @mapper_objects.keys].
-                           flatten.
-                           uniq.
-                           each_with_object({}) { |n, h| h[n] = {} }
+        @registry_hash = [@mapper_classes.map(&:base_relation) + @mapper_objects.keys]
+          .flatten
+          .uniq
+          .each_with_object({}) { |n, h| h[n] = {} }
       end
 
       # @api private
@@ -40,8 +40,9 @@ module ROM
       private
 
       def check_duplicate_registered_mappers
-        mapper_relation_register = mapper_classes.map {|mapper_class| [mapper_class.relation, mapper_class.register_as].compact }
+        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
+
         mapper_relation_register.select { |relation_register_as| mapper_relation_register.count(relation_register_as) > 1 }
           .uniq
           .each do |duplicated_mappers|
@@ -52,9 +53,9 @@ module ROM
       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  }
+        mapper_classes
+          .select { |klass| klass.base_relation == relation_name }
+          .each_with_object({}) { |klass, h| h[klass.register_as || klass.relation] = klass.build }
       end
     end
   end

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

@@ -43,7 +43,7 @@ module ROM
                     "Relation with name #{key.inspect} registered more than once"
             end
 
-            klass.use(:registry_reader, relation_names)
+            klass.use(:registry_reader, relations: relation_names)
 
             notifications.trigger('configuration.relations.class.ready', relation: klass, adapter: klass.adapter)
 
@@ -105,7 +105,7 @@ module ROM
 
         options = { __registry__: registry, mappers: mapper_registry(rel_key, klass), schema: schema, **plugin_options }
 
-        klass.new(dataset, options)
+        klass.new(dataset, **options)
       end
 
       # @api private

data/lib/rom/struct.rb

@@ -102,7 +102,7 @@ module ROM
     def method_missing(*)
       super
     rescue NameError => error
-      raise MissingAttribute.new { "#{ error.message } (attribute not loaded?)" }
+      raise MissingAttribute.new { "#{error.message} (attribute not loaded?)" }
     end
   end
 end

data/lib/rom/struct_compiler.rb

@@ -20,10 +20,11 @@ module ROM
     option :cache, default: -> { Cache.new }
 
     # @api private
-    def initialize(*args)
+    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
     #
@@ -84,7 +85,7 @@ module ROM
 
     # @api private
     def visit_constrained(node)
-      definition, _ = node
+      definition, = node
 
       visit(definition)
     end
@@ -97,14 +98,14 @@ module ROM
 
     # @api private
     def build_class(name, parent, ns, &block)
-      Dry::Core::ClassBuilder.
-        new(name: class_name(name), parent: parent, namespace: ns).
-        call(&block)
+      Dry::Core::ClassBuilder
+        .new(name: class_name(name), parent: parent, namespace: ns)
+        .call(&block)
     end
 
     # @api private
     def class_name(name)
-      Inflector.classify(Inflector.singularize(name))
+      Inflector.classify(name)
     end
   end
 end

data/lib/rom/support/configurable.rb

@@ -36,12 +36,6 @@ module ROM
         settings
       end
 
-      # @api private
-      def freeze
-        settings.each_value(&:freeze)
-        super
-      end
-
       # @api private
       def respond_to_missing?(_name, _include_private = false)
         true

data/lib/rom/support/memoizable.rb

@@ -3,7 +3,7 @@
 module ROM
   # @api private
   module Memoizable
-    MEMOIZED_HASH = {}
+    MEMOIZED_HASH = {}.freeze
 
     module ClassInterface
       # @api private
@@ -16,6 +16,7 @@ module ROM
         obj.instance_variable_set(:'@__memoized__', MEMOIZED_HASH.dup)
         obj
       end
+      ruby2_keywords(:new) if respond_to?(:ruby2_keywords, true)
     end
 
     def self.included(klass)
@@ -44,7 +45,7 @@ module ROM
         names.each do |name|
           meth = klass.instance_method(name)
 
-          if meth.parameters.size > 0
+          if !meth.parameters.empty?
             define_method(name) do |*args|
               __memoized__[:"#{name}_#{args.hash}"] ||= super(*args)
             end

data/lib/rom/transaction.rb

@@ -7,7 +7,7 @@ module ROM
     Rollback = Class.new(StandardError)
 
     # @api private
-    def run(opts = EMPTY_HASH)
+    def run(_opts = EMPTY_HASH)
       yield(self)
     rescue Rollback
       # noop

data/lib/rom/transformer.rb

@@ -53,6 +53,7 @@ module ROM
     # @api public
     def self.relation(name = Undefined, options = EMPTY_HASH)
       return @relation if name.equal?(Undefined) && defined?(@relation)
+
       register_as(options.fetch(:as, name))
       @relation = name
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-core
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.4
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -327,7 +327,7 @@ metadata:
   documentation_uri: https://api.rom-rb.org/rom/
   mailing_list_uri: https://discourse.rom-rb.org/
   bug_tracker_uri: https://github.com/rom-rb/rom/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -342,8 +342,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Ruby Object Mapper
 test_files: []