rom-core 5.1.1 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3937d432700b0d1f83c80f86e39fecf7b162f48cebf3aa0da70ecbf98bb3d74b
-  data.tar.gz: c2870cc40c18958f8b5b7c57a486bc4dbb639086efe9b108027ed70dd7251ef0
+  metadata.gz: 35f12c6601d4e265450e2c8d6cc450da987ba13f5de31f33dfefc1687c83c023
+  data.tar.gz: 62e345fc8d4630732b40ebc58d201255f6359ed23e498feceb9385cf739d2749
 SHA512:
-  metadata.gz: 6296974fe1790016095700736478a76b68ecb054ab6c53e1219ab54997467d6def0058427982186eb06e33e86f0c1f964c1d7b35d8bbba2febee62ee89b700b3
-  data.tar.gz: cf9f5ac91c372e72f21184a437dadf2ad671cfacc7926ce3d985accd138cc5c4e7ca7974207a5c74c003a4a0d23c2f529865d39fcf98cd8f8e2bec3ba3a470cb
+  metadata.gz: be684d34005176ce3535b8533700055f2103ea04869b19d07917680f024ea4918a4c97af8d13bbaa1f35e912c4a822c6238489227dbee90c1a1c6b5875280d78
+  data.tar.gz: c7dba5888e86336bcaa2448825caaafd8eb7b57ea8b7b0449df00b58e34e7b662966ac63fc2bdf6a6e0917e5bc23607d211b05dae36e827ba10c1f52ab924880

data/lib/rom/array_dataset.rb

@@ -31,14 +31,14 @@ module ROM
       :slice, :slice!, :sort!, :uniq, :uniq!, :unshift, :values_at
     )
 
-    [
-      :map!, :combination, :cycle, :delete_if, :keep_if, :permutation, :reject!,
-      :select!, :sort_by!
+    %i[
+      map! combination cycle delete_if keep_if permutation reject!
+      select! sort_by!
     ].each do |method|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{method}(*args, &block)
           return to_enum unless block
-          self.class.new(data.send(:#{method}, *args, &block), options)
+          self.class.new(data.send(:#{method}, *args, &block), **options)
         end
       RUBY
     end

data/lib/rom/association_set.rb

@@ -12,10 +12,9 @@ module ROM
     def initialize(*)
       super
       elements.values.each do |assoc|
-        if assoc.aliased? && !key?(assoc.name)
-          elements[assoc.name] = assoc
-        end
+        elements[assoc.name] = assoc if assoc.aliased? && !key?(assoc.name)
       end
     end
+    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/rom/associations/definitions/abstract.rb

@@ -73,12 +73,12 @@ module ROM
         # @option opts [TrueClass,FalseClass] :override Whether provided :view should override association's default view
         #
         # @api public
-        def self.new(source, target, opts = EMPTY_HASH)
+        def self.new(source, target, **opts)
           source_name = Relation::Name[source]
           target_name = resolve_target_name(target, opts)
           options = process_options(target_name, Hash[opts])
 
-          super(source_name, target_name, options)
+          super(source_name, target_name, **options)
         end
 
         # @api private

data/lib/rom/associations/many_to_many.rb

@@ -18,6 +18,7 @@ module ROM
         super
         @join_relation = relations[through]
       end
+      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
       # Adapters should implement this method
       #

data/lib/rom/attribute.rb

@@ -304,7 +304,7 @@ module ROM
     # @api public
     def meta(opts = nil)
       if opts
-        self.class.new(type.meta(opts), options)
+        self.class.new(type.meta(opts), **options)
       else
         type.meta
       end
@@ -340,7 +340,7 @@ module ROM
     #
     # @api private
     def read?
-      ! meta[:read].nil?
+      !meta[:read].nil?
     end
 
     # Return read type
@@ -367,7 +367,7 @@ module ROM
     #
     # @api public
     def optional
-      sum = self.class.new(super, options)
+      sum = self.class.new(super, **options)
       read? ? sum.meta(read: meta[:read].optional) : sum
     end
 
@@ -412,7 +412,7 @@ module ROM
         response = type.__send__(meth, *args, &block)
 
         if response.is_a?(type.class)
-          self.class.new(response, options)
+          self.class.new(response, **options)
         else
           response
         end
@@ -420,5 +420,6 @@ module ROM
         super
       end
     end
+    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/rom/auto_curry.rb

@@ -8,6 +8,7 @@ module ROM
     def self.extended(klass)
       klass.define_singleton_method(:method_added) do |name|
         return if auto_curry_busy?
+
         auto_curry_guard { auto_curry(name) }
         super(name)
       end
@@ -58,6 +59,7 @@ module ROM
             response
           end
         end
+        ruby2_keywords(name) if respond_to?(:ruby2_keywords, true)
       end
 
       auto_curried_methods << name

data/lib/rom/command.rb

@@ -280,7 +280,7 @@ module ROM
           result = prepared ? execute(prepared, &block) : execute(&block)
 
           if curried?
-            if args.size > 0
+            if !args.empty?
               apply_hooks(after_hooks, result, *args)
             elsif curry_args.size > 1
               apply_hooks(after_hooks, result, curry_args[1])
@@ -288,7 +288,7 @@ module ROM
               apply_hooks(after_hooks, result)
             end
           else
-            apply_hooks(after_hooks, result, *args[1..args.size-1])
+            apply_hooks(after_hooks, result, *args[1..args.size - 1])
           end
         else
           execute(*(curry_args + args), &block)
@@ -314,7 +314,7 @@ module ROM
       if curry_args.empty? && args.first.is_a?(Graph::InputEvaluator)
         Lazy[self].new(self, *args)
       else
-        self.class.build(relation, { **options, curry_args: args })
+        self.class.build(relation, **options, curry_args: args)
       end
     end
 
@@ -335,7 +335,7 @@ module ROM
     #
     # @api public
     def curried?
-      curry_args.size > 0
+      !curry_args.empty?
     end
 
     # Return a new command with appended before hooks
@@ -386,14 +386,14 @@ module ROM
     #
     # @api public
     def new(new_relation)
-      self.class.build(new_relation, {**options, source: relation})
+      self.class.build(new_relation, **options, source: relation)
     end
 
     # Check if this command has any hooks
     #
     # @api private
     def hooks?
-      before_hooks.size > 0 || after_hooks.size > 0
+      !before_hooks.empty? || !after_hooks.empty?
     end
 
     # Check if this command is lazy

data/lib/rom/command_compiler.rb

@@ -157,7 +157,7 @@ module ROM
             default_mapping
           end
 
-        if other.size > 0
+        if !other.empty?
           [mapping, [type, other]]
         else
           [mapping, type]
@@ -169,7 +169,7 @@ module ROM
     end
 
     # @api private
-    def visit_attribute(*args)
+    def visit_attribute(*_args)
       nil
     end
 
@@ -193,19 +193,15 @@ module ROM
       type.create_class(rel_name, type) do |klass|
         klass.result(rel_meta.fetch(:combine_type, result))
 
-        klass.input(meta.fetch(:input, relation.input_schema))
-
         meta.each do |name, value|
           klass.public_send(name, value)
         end
 
-        if rel_meta[:combine_type]
-          setup_associates(klass, relation, rel_meta, parent_relation)
-        end
+        setup_associates(klass, relation, rel_meta, parent_relation) if rel_meta[:combine_type]
 
         plugins.each do |plugin|
           plugin_options = plugins_options.fetch(plugin) { EMPTY_HASH }
-          klass.use(plugin, plugin_options)
+          klass.use(plugin, **plugin_options)
         end
 
         gateway = gateways[relation.gateway]
@@ -236,7 +232,7 @@ module ROM
     # @param [Relation] relation The relation for the command
     #
     # @api private
-    def setup_associates(klass, relation, meta, parent_relation)
+    def setup_associates(klass, relation, _meta, parent_relation)
       assoc_name =
         if relation.associations.key?(parent_relation)
           parent_relation

data/lib/rom/commands/class_interface.rb

@@ -71,8 +71,8 @@ module ROM
       # @return [Command]
       #
       # @api public
-      def build(relation, options = EMPTY_HASH)
-        new(relation, self.options.merge(options))
+      def build(relation, **options)
+        new(relation, **self.options, **options)
       end
 
       # Create a command class with a specific type
@@ -111,8 +111,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[:command].fetch(plugin, adapter).apply_to(self, options)
+      def use(plugin, **options)
+        ROM.plugin_registry[:command].fetch(plugin, adapter).apply_to(self, **options)
       end
 
       # Extend a command class with relation view methods
@@ -151,7 +151,7 @@ module ROM
       #       relation :users
       #       register_as :create
       #
-      #       before my_hook: { arg1: 1, arg1: 2 }
+      #       before my_hook: { arg1: 1, arg2: 2 }
       #
       #       def my_hook(tuple, arg1:, arg2:)
       #         puts "hook called with args: #{arg1} and #{arg2}"
@@ -164,7 +164,7 @@ module ROM
       #
       # @api public
       def before(*hooks)
-        if hooks.size > 0
+        if !hooks.empty?
           set_hooks(:before, hooks)
         else
           @before
@@ -209,7 +209,7 @@ module ROM
       #
       # @api public
       def after(*hooks)
-        if hooks.size > 0
+        if !hooks.empty?
           set_hooks(:after, hooks)
         else
           @after

data/lib/rom/commands/composite.rb

@@ -18,7 +18,7 @@ module ROM
       def call(*args)
         response = left.call(*args)
 
-        if response.nil? || (many? && response.size == 0)
+        if response.nil? || (many? && response.empty?)
           return one? ? nil : EMPTY_ARRAY
         end
 

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

@@ -72,7 +72,7 @@ module ROM
           value =
             begin
               if index
-                tuple_path[0..tuple_path.size-2]
+                tuple_path[0..tuple_path.size - 2]
                   .reduce(input) { |a, e| a.fetch(e) }
                   .at(index)[tuple_path.last]
               else

data/lib/rom/commands/lazy.rb

@@ -44,7 +44,7 @@ module ROM
       # @return [Array,Hash]
       #
       # @api public
-      def call(*args)
+      def call(*_args)
         raise NotImplementedError
       end
 
@@ -96,6 +96,7 @@ module ROM
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

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

@@ -26,7 +26,7 @@ module ROM
             end.reduce(:concat)
           else
             input = evaluator.call(first)
-            command.call(input, *args[1..size-1])
+            command.call(input, *args[1..size - 1])
           end
         end
       end

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

@@ -31,12 +31,12 @@ module ROM
             input = evaluator.call(first)
 
             if input.is_a?(Array)
-              input.map.with_index do |item, index|
-                command_proc[command, last, item].call(item,  *args[1..size-1])
+              input.map.with_index do |item, _index|
+                command_proc[command, last, item].call(item, *args[1..size - 1])
               end
             else
               command_proc[command, *(size > 1 ? [last, input] : [input])]
-                .call(input, *args[1..size-1])
+                .call(input, *args[1..size - 1])
             end
           end
         end

data/lib/rom/configuration.rb

@@ -37,8 +37,8 @@ module ROM
     attr_reader :notifications
 
     def_delegators :@setup, :register_relation, :register_command, :register_mapper, :register_plugin,
-                            :command_classes, :mapper_classes,
-                            :auto_registration
+                   :command_classes, :mapper_classes,
+                   :auto_registration
 
     def_delegators :@environment, :gateways, :gateways_map, :configure, :config
 
@@ -54,7 +54,7 @@ module ROM
       @notifications = Notifications.event_bus(:configuration)
       @setup = Setup.new(notifications)
 
-      block.call(self) if block
+      block&.call(self)
     end
 
     # Apply a plugin to the configuration
@@ -100,8 +100,8 @@ module ROM
 
     # @api private
     def adapter_for_gateway(gateway)
-      ROM.adapters.select do |key, value|
-        value.const_defined?(:Gateway) && gateway.kind_of?(value.const_get(:Gateway))
+      ROM.adapters.select do |_key, value|
+        value.const_defined?(:Gateway) && gateway.is_a?(value.const_get(:Gateway))
       end.keys.first
     end
 

data/lib/rom/configuration_dsl/relation.rb

@@ -20,7 +20,7 @@ module ROM
 
         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) {}
         end
       end
     end

data/lib/rom/constants.rb

@@ -14,7 +14,7 @@ module ROM
     def initialize(adapter, component)
       super(
         "Failed to find #{component} class for #{adapter} adapter. " \
-        "Make sure ROM setup was started and the adapter identifier is correct."
+        'Make sure ROM setup was started and the adapter identifier is correct.'
       )
     end
   end

data/lib/rom/core/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module Core
-    VERSION = '5.1.1'
+    VERSION = '5.2.4'
   end
 end

data/lib/rom/data_proxy.rb

@@ -8,8 +8,8 @@ module ROM
   #
   # @private
   module DataProxy
-    NON_FORWARDABLE = [
-      :each, :to_a, :to_ary, :kind_of?, :instance_of?, :is_a?
+    NON_FORWARDABLE = %i[
+      each to_a to_ary kind_of? instance_of? is_a?
     ].freeze
 
     # Wrapped data array
@@ -46,6 +46,7 @@ module ROM
     # @api private
     def each
       return to_enum unless block_given?
+
       data.each { |tuple| yield(row_proc[tuple]) }
     end
 

data/lib/rom/enumerable_dataset.rb

@@ -55,14 +55,14 @@ module ROM
 
     forward :take
 
-    [
-      :chunk, :collect, :collect_concat, :drop_while, :find_all, :flat_map,
-      :grep, :map, :reject, :select, :sort, :sort_by, :take_while
+    %i[
+      chunk collect collect_concat drop_while find_all flat_map
+      grep map reject select sort sort_by take_while
     ].each do |method|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{method}(*args, &block)
           return to_enum unless block
-          self.class.new(super(*args, &block), options)
+          self.class.new(super(*args, &block), **options)
         end
       RUBY
     end

data/lib/rom/environment.rb

@@ -35,7 +35,6 @@ module ROM
       end
     end
 
-
     # @api private
     def normalize_gateway_args(*args)
       args.first.is_a?(Hash) ? args.first : { default: args }