fix arity for activerecord relations

Author: mpantel

ruby/hyper-model/lib/active_record_base.rb

@@ -286,23 +286,23 @@ def regulate_relationship(name, &block)
 
         alias pre_syncromesh_has_many has_many
 
-        def has_many(name, *args, &block)
+        def has_many(name,*args, **kwargs, &block)
           __synchromesh_regulate_from_macro(
-            opts = args.extract_options!,
+            kwargs,# opts = args.extract_options!,
             name,
             method_defined?(:"__secure_remote_access_to_#{name}"),
             &method(:regulate_relationship)
           )
-          pre_syncromesh_has_many name, *args, opts.except(:regulate), &block
+          pre_syncromesh_has_many name, *args, **kwargs.except(:regulate), &block
         end
 
         %i[belongs_to has_one composed_of].each do |macro|
           alias_method :"pre_syncromesh_#{macro}", macro
-          define_method(macro) do |name, *aargs, &block|
-            define_method(:"__secure_remote_access_to_#{name}") do |this, _acting_user, *args|
-              this.send(name, *args)
+          define_method(macro) do |name,  **aargs, &block|
+            define_method(:"__secure_remote_access_to_#{name}") do |this, _acting_user, **args|
+              this.send(name, **args)
             end
-            send(:"pre_syncromesh_#{macro}", name, *aargs, &block)
+            send(:"pre_syncromesh_#{macro}", name, **aargs, &block)
           end
         end
       end

ruby/hyper-model/lib/reactive_record/permissions.rb

@@ -74,21 +74,21 @@ class << self
     attr_reader :reactive_record_association_keys
 
     [:has_many, :belongs_to, :composed_of].each do |macro|
-      define_method "#{macro}_with_reactive_record_add_changed_method".to_sym do |attr_name, *args, &block|
+      define_method "#{macro}_with_reactive_record_add_changed_method".to_sym do |attr_name, *args, **kwargs, &block|
         define_method "#{attr_name}_changed?".to_sym do
           instance_variable_get "@reactive_record_#{attr_name}_changed".to_sym
         end
         (@reactive_record_association_keys ||= []) << attr_name
-        send "#{macro}_without_reactive_record_add_changed_method".to_sym, attr_name, *args, &block
+        send "#{macro}_without_reactive_record_add_changed_method".to_sym, attr_name, *args, **kwargs, &block
       end
       alias_method "#{macro}_without_reactive_record_add_changed_method".to_sym, macro
       alias_method macro, "#{macro}_with_reactive_record_add_changed_method".to_sym
     end
 
     alias belongs_to_without_reactive_record_add_is_method belongs_to
 
-    def belongs_to(attr_name, *args)
-      belongs_to_without_reactive_record_add_is_method(attr_name, *args).tap do
+    def belongs_to(attr_name,*args,**kwargs)
+      belongs_to_without_reactive_record_add_is_method(attr_name, *args, **kwargs).tap do
         define_method "#{attr_name}_is?".to_sym do |model|
           attributes[self.class.reflections[attr_name.to_s].foreign_key] == model.id
         end