Create Executor make it testable

Author: hoppergee

lib/active_method.rb

@@ -3,8 +3,9 @@
 require_relative "active_method/version"
 
 module ActiveMethod
-  autoload :Base, "active_method/base"
   autoload :Util, "active_method/util"
+  autoload :Executor, "active_method/executor"
+  autoload :Base, "active_method/base"
 
   def self.included(base)
     base.extend ClassMethods
@@ -15,9 +16,7 @@ def active_method(name, method_class = nil)
       method_class ||= Util.constantize self, Util.camel_case(name)
 
       define_method name do |*args|
-        method = method_class.new(*args)
-        method.__set_owner(self)
-        method.call
+        method_class[self].call(*args)
       end
     end
   end

lib/active_method/base.rb

@@ -12,6 +12,11 @@ def initialize(name, default: nil)
 
     class << self
 
+      def [](owner)
+        Executor.new(self, owner)
+      end
+      alias_method :on, :[]
+
       def call(*args)
         new(*args).call
       end
@@ -96,9 +101,6 @@ def initialize(*args)
       end
     end
 
-    def call
-    end
-
     def __set_owner(owner)
       @__method_owner = owner
 
@@ -108,6 +110,9 @@ def __set_owner(owner)
       end
     end
 
+    def call
+    end
+
     private
 
     def arguments

lib/active_method/executor.rb

@@ -0,0 +1,18 @@
+module ActiveMethod
+  class Executor
+
+    attr_reader :method_class, :owner
+
+    def initialize(klass, owner)
+      @method_class = klass
+      @owner = owner
+    end
+
+    def call(*args)
+      method = method_class.new(*args)
+      method.__set_owner(owner)
+      method.call
+    end
+
+  end
+end