celerb 0.3.4 → 0.3.6

data/lib/celerb.rb

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

data/lib/celerb/result_consumer.rb

@@ -35,7 +35,6 @@ module Celerb
     end
 
     def task_id_to_queue(task_id)
-      puts @channel.inspect
       @channel.queue(task_id.delete('-'), :auto_delete => true,
         :arguments => (
           @options[:results_arguments] and

data/lib/celerb/task.rb

@@ -4,11 +4,12 @@ module Celerb
 
     def self.included(base)
       base.extend ClassMethods
+      base.send :attr_accessor, :queue
     end
 
     # Sends task to celery worker
     def delay
-      self.class.delay self.to_celery
+      self.class.delay self.queue, self.to_celery
     end
 
     # Should return valid arguments for task specified by #task_name
@@ -22,14 +23,14 @@ module Celerb
         @name = value
       end
 
-      def delay(args)
+      def delay(queue, args)
         argz = args.dup
         kwargz = {}
         if argz.last.kind_of? Hash
           kwargz = argz.pop
         end
         AsyncResult.new(TaskPublisher.delay_task(
-          @name, task_args=argz, task_kwargs=kwargz))
+          queue, @name, task_args=argz, task_kwargs=kwargz))
       end
     end
 

data/lib/celerb/task_publisher.rb

@@ -2,17 +2,17 @@ module Celerb
   class TaskPublisher
 
     def self.connect(opts)
-      channel = AMQP::Channel.new
-      @exchange = channel.direct(opts[:exchange],
+      @channel = AMQP::Channel.new
+      @default_exchange = @channel.direct(opts[:exchange],
         :key => opts[:key], :durable => true)
       @results = ResultConsumer.new channel, opts
     end
 
-    def self.delay_task(task_name, task_args=[], task_kwargs={},
+    def self.delay_task(queue, task_name, task_args=[], task_kwargs={},
                    task_id=nil, taskset_id=nil, expires=nil, eta=nil,
                    exchange=nil, exchange_type=nil, retries=0)
       task_id ||= TaskPublisher.uniq_id
-      publish({
+      publish(queue, {
         :task => task_name,
         :id   => task_id,
         :args => task_args,
@@ -30,8 +30,13 @@ module Celerb
 
     private
 
-    def self.publish(body)
-      @exchange.publish MessagePack.pack(body), {
+    def self.publish(queue, body)
+      exchange = @default_exchange
+      if queue.kind_of? String
+        exchange = @channel.direct(queue, :key => queue,
+          :durable => true)
+      end
+      exchange.publish MessagePack.pack(body), {
         :content_type => 'application/x-msgpack',
         :content_encoding => 'binary'
       }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: celerb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Dusan Maliarik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 +02:00
+date: 2011-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,6 @@ files:
 - test/thumbTask.pb.rb
 - test/thumbTask.proto
 - test/vleugel.kmz
-- .gemtest
 has_rdoc: true
 homepage: https://github.com/skrat/celerb
 licenses: []