Fixing name collisions, fixed adding pavlov options, removed creating…

… pavlov_options in compatablity layer.

lib/pavlov/alpha_compatibility.rb

@@ -30,26 +30,22 @@ def self.arguments_to_attributes(operation_class, arguments)
 
   module Helpers
     def old_interactor name, *args
-      args = add_pavlov_options args
+      args = add_compatablity_pavlov_options args
       Pavlov.old_interactor name, *args
     end
 
     def old_query name, *args
-      args = add_pavlov_options args
+      args = add_compatablity_pavlov_options args
       Pavlov.old_query name, *args
     end
 
     def old_command name, *args
-      args = add_pavlov_options args
+      args = add_compatablity_pavlov_options args
       Pavlov.old_command name, *args
     end
 
-    def pavlov_options
-      {}
-    end
-
     private
-    def add_pavlov_options args
+    def add_compatablity_pavlov_options args
       # TODO: we should do this at a point where we know how many arguments we need
       # so we can decide if we need to merge with another options object or
       # just add it.
@@ -67,9 +63,6 @@ def arguments(*args)
         args.each do |argument|
           attribute argument, Object
         end
-
-        # Add attribute for pavlov_options
-        attribute :pavlov_options, Hash, default: {}
       end
     end
   end

lib/pavlov/helpers.rb

@@ -1,33 +1,31 @@
 module Pavlov
   module Helpers
-    def interactor name, *args
-      args = add_pavlov_options args
-      Pavlov.interactor name, *args
+    def interactor name, hash
+      hash = add_pavlov_options hash
+      Pavlov.interactor name, hash
     end
 
-    def query name, *args
-      args = add_pavlov_options args
-      Pavlov.query name, *args
+    def query name, hash
+      hash = add_pavlov_options hash
+      Pavlov.query name, hash
     end
 
-    def command name, *args
-      args = add_pavlov_options args
-      Pavlov.command name, *args
+    def command name, hash
+      hash = add_pavlov_options hash
+      Pavlov.command name, hash
     end
 
     def pavlov_options
       {}
     end
 
     private
-    def add_pavlov_options args
-      # TODO: we should do this at a point where we know how many arguments we need
-      # so we can decide if we need to merge with another options object or
-      # just add it.
+    def add_pavlov_options hash
       if pavlov_options != {}
-        args << pavlov_options
+        hash ||= {}
+        hash[:pavlov_options] = pavlov_options.merge(hash[:pavlov_options])
       end
-      args
+      hash
     end
   end
 end