celerb 0.0.2.1 → 0.0.2.2

data/lib/celerb.rb

@@ -7,7 +7,7 @@ require 'msgpack'
 require 'uuid'
 
 module Celerb
-  VERSION = '0.0.2.1'
+  VERSION = '0.0.2.2'
 end
 
 require 'celerb/task'

data/lib/celerb/result_consumer.rb

@@ -1,36 +1,43 @@
 module Celerb
   class ResultConsumer
+
     def initialize(opts)
       @exchange = MQ.direct(opts[:results], :auto_delete => true)
       @handlers = {}
-      @queues = {}
-    end
-
-    def register(task_id, &blk)
-      @handlers[task_id] = blk
+      EM.add_periodic_timer(60) do
+        now = Time.now
+        @handlers.delete_if {|h| h[:expires] > now}
+      end
     end
 
-    def subscribe(task_id)
-      queue = task_id_to_queue(task_id)
-      queue.subscribe &method(:consume)
+    def register(task_id, expiration, &blk)
+      @handlers[task_id] = {
+        :queue   => subscribe(task_id),
+        :expires => Time.now + expiration,
+        :proc    => blk
+      }
     end
 
     def consume(header, body)
       result = Result.new(MessagePack.unpack(body))
-      queue  = @queues.delete result.task_id
-      queue.unsubscribe
       if @handlers.include? result.task_id
         handler = @handlers.delete result.task_id
-        handler.call result
+        handler[:queue].unsubscribe
+        handler[:proc].call result
       end
     end
 
     private
 
+    def subscribe(task_id)
+      queue = task_id_to_queue(task_id)
+      queue.subscribe &method(:consume)
+    end
+
     def task_id_to_queue(task_id)
       queue = MQ.queue(task_id_to_queue_name(task_id), :auto_delete => true)
       queue.bind(@exchange)
-      @queues[task_id] = queue
+      queue
     end
 
     def task_id_to_queue_name(task_id)

data/lib/celerb/task.rb

@@ -6,10 +6,12 @@ module Celerb
       base.extend ClassMethods
     end
 
+    # Sends task to celery worker
     def delay
       self.class.delay self.to_celery
     end
 
+    # Should return valid arguments for task specified by #task_name
     def to_celery
       raise NotImplementedError, "You have to return Celery task arguments here"
     end
@@ -41,8 +43,11 @@ module Celerb
       @task_id = task_id
     end
 
-    def wait(&blk)
-      TaskPublisher.register_result_handler(@task_id, &blk)
+    # Awaits a task result and calls block when the result is available.
+    # Expiration needs to be explicitly specified in seconds to prevent memory
+    # leaks. Result handlers are periodically checked and expired ones are deleted.
+    def wait(expiration, &blk)
+      TaskPublisher.register_result_handler(@task_id, expiration, &blk)
     end
   end
 end

data/lib/celerb/task_publisher.rb

@@ -11,7 +11,6 @@ module Celerb
                    task_id=nil, taskset_id=nil, expires=nil, eta=nil,
                    exchange=nil, exchange_type=nil, retries=0)
       task_id ||= TaskPublisher.uniq_id
-      @@results.subscribe task_id
       publish({
         :task => task_name,
         :id   => task_id,
@@ -24,8 +23,8 @@ module Celerb
       return task_id
     end
 
-    def self.register_result_handler(task_id, &blk)
-      @@results.register(task_id, &blk)
+    def self.register_result_handler(task_id, expiry, &blk)
+      @@results.register(task_id, expiry, &blk)
     end
 
     private
@@ -37,7 +36,6 @@ module Celerb
       }
     end
 
-
     def self.uniq_id
       return UUID.create_v4.to_s
     end

data/test/test_celerb.rb

@@ -25,7 +25,7 @@ class TestCelerb < Test::Unit::TestCase
         :styles     => [Floorplanner::ThumbStyle.new(
           :name => 'original',
           :size => 512)]
-      ).delay.wait do |result|
+      ).delay.wait(60) do |result|
         puts result.body
       end
       puts "Done..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: celerb
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 67
   prerelease: false
   segments: 
   - 0
   - 0
   - 2
-  - 1
-  version: 0.0.2.1
+  - 2
+  version: 0.0.2.2
 platform: ruby
 authors: 
 - Dusan Maliarik