lib/elevate/operation.rb in elevate-0.4.0 vs lib/elevate/operation.rb in elevate-0.5.0

@@ -1,33 +1,23 @@
 module Elevate
-  class Context
-    def initialize(args, &block)
-      metaclass = class << self; self; end
-      metaclass.send(:define_method, :execute, &block)
-
-      args.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
-    end
-  end
-
   class ElevateOperation < NSOperation
     def initWithTarget(target, args:args)
       if init()
         @coordinator = IOCoordinator.new
-        @target = target
-        @context = Context.new(args, &target)
-        @finished_callback = nil
+        @context = TaskContext.new(args, &target)
+        @update_callback = nil
+        @finish_callback = nil
 
         setCompletionBlock(lambda do
-          if @finished_callback
-            @finished_callback.call(@result, @exception) unless isCancelled
+          if @finish_callback
+            @finish_callback.call(@result, @exception) unless isCancelled
           end
 
           Dispatch::Queue.main.sync do
-            @target = nil
-            @finished_callback = nil
+            @context = nil
+            @update_callback = nil
+            @finish_callback = nil
           end
         end)
       end
 
       self
@@ -40,11 +30,10 @@
     end
 
     def inspect
       details = []
       details << "<canceled>" if @coordinator.cancelled?
-      details << "@target=#{@target.class.name}"
 
       "#<#{self.class.name}: #{details.join(" ")}>"
     end
 
     def log(line)
@@ -56,11 +45,13 @@
 
       @coordinator.install
 
       begin
         unless @coordinator.cancelled?
-          @result = @context.execute
+          @result = @context.execute do |*args|
+            @update_callback.call(*args) if @update_callback
+          end
         end
 
       rescue Exception => e
         @exception = e
       end
@@ -71,20 +62,24 @@
     end
 
     attr_reader :exception
     attr_reader :result
 
-    def on_started=(callback)
-      started_callback = callback
-      started_callback.retain
+    def on_finish=(callback)
+      @finish_callback = callback
+    end
 
+    def on_start=(callback)
+      start_callback = callback
+      start_callback.retain
+
       Dispatch::Queue.main.async do
-        started_callback.call unless isCancelled
-        started_callback.release
+        start_callback.call unless isCancelled
+        start_callback.release
       end
     end
 
-    def on_finished=(callback)
-      @finished_callback = callback
+    def on_update=(callback)
+      @update_callback = callback
     end
   end
 end