rabbit_jobs 0.0.6 → 0.0.7

data/lib/rabbit_jobs/amqp_helpers.rb

@@ -7,7 +7,7 @@ module RabbitJobs
     def amqp_with_exchange(&block)
       raise ArgumentError unless block
 
-      AMQP.start(host: RabbitJobs.config.host) do |connection|
+      AMQP.start(host: RJ.config.host) do |connection|
         channel  = AMQP::Channel.new(connection)
 
         channel.on_error do |ch, channel_close|
@@ -15,7 +15,7 @@ module RabbitJobs
           connection.close { EM.stop }
         end
 
-        exchange = channel.direct(RabbitJobs.config[:exchange], RabbitJobs.config[:exchange_params])
+        exchange = channel.direct(RJ.config[:exchange], RJ.config[:exchange_params])
 
         # go work
         block.call(connection, exchange)
@@ -25,7 +25,7 @@ module RabbitJobs
     def em_amqp_with_exchange(&block)
       raise ArgumentError unless block
 
-      connection = AMQP.connect(host: RabbitJobs.config.host)
+      connection = AMQP.connect(host: RJ.config.host)
       channel = AMQP::Channel.new(connection)
 
       channel.on_error do |ch, channel_close|
@@ -33,19 +33,17 @@ module RabbitJobs
         connection.close { EM.stop }
       end
 
-      exchange = channel.direct(RabbitJobs.config[:exchange], RabbitJobs.config[:exchange_params])
+      exchange = channel.direct(RJ.config[:exchange], RJ.config[:exchange_params])
 
       # go work
       block.call(connection, exchange)
     end
 
     def amqp_with_queue(routing_key, &block)
-
       raise ArgumentError unless routing_key && block
 
       amqp_with_exchange do |connection, exchange|
-        queue = exchange.channel.queue(RabbitJobs.config.queue_name(routing_key), RabbitJobs.config[:queues][routing_key])
-        queue.bind(exchange, :routing_key => routing_key)
+        queue = make_queue(exchange, routing_key.to_s)
 
         # go work
         block.call(connection, queue)
@@ -53,7 +51,7 @@ module RabbitJobs
     end
 
     def make_queue(exchange, routing_key)
-      queue = exchange.channel.queue(RabbitJobs.config.queue_name(routing_key), RabbitJobs.config[:queues][routing_key])
+      queue = exchange.channel.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key])
       queue.bind(exchange, :routing_key => routing_key)
       queue
     end

data/lib/rabbit_jobs/job.rb

@@ -26,6 +26,12 @@ module RabbitJobs::Job
         yield if block_given?
       else
         begin
+          if defined?(ActiveRecord::Base)
+            ActiveRecord::Base.establish_connection
+          end
+          if defined?(MongoMapper)
+            MongoMapper.database.connection.connect_to_master
+          end
           # log 'before perform'
           self.class.perform(*params)
           # log 'after perform'

data/lib/rabbit_jobs/publisher.rb

@@ -10,7 +10,7 @@ module RabbitJobs
     extend AmqpHelpers
 
     def publish(klass, opts = {}, *params)
-      key = RabbitJobs.config.routing_keys.first
+      key = RJ.config.routing_keys.first
       publish_to(key, klass, opts, *params)
     end
 
@@ -31,12 +31,12 @@ module RabbitJobs
     def publish_job_to(routing_key, job)
       amqp_with_exchange do |connection, exchange|
 
-        queue = make_queue(exchange, routing_key)
+        queue = make_queue(exchange, routing_key.to_s)
 
         job.opts['created_at'] = Time.now.to_i
 
         payload = job.payload
-        exchange.publish(job.payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({routing_key: routing_key})) {
+        exchange.publish(job.payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({routing_key: routing_key.to_s})) {
           connection.close {
             EM.stop
           }
@@ -46,29 +46,41 @@ module RabbitJobs
 
     def em_publish_job_to(routing_key, job)
       em_amqp_with_exchange do |connection, exchange|
-        queue = make_queue(exchange, routing_key)
+        queue = make_queue(exchange, routing_key.to_s)
 
         job.opts['created_at'] = Time.now.to_i
 
         payload = job.payload
-        exchange.publish(job.payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({routing_key: routing_key})) {
+        exchange.publish(job.payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({routing_key: routing_key.to_s})) {
           connection.close {
           }
         }
       end
     end
 
-    def purge_queue(routing_key)
-      raise ArgumentError unless routing_key
+    def purge_queue(*routing_keys)
+      raise ArgumentError unless routing_keys && routing_keys.count > 0
 
-      amqp_with_queue(routing_key) do |connection, queue|
-        queue.status do |number_of_messages, number_of_consumers|
-          queue.purge {
-            connection.close {
-              EM.stop
-              return number_of_messages
+      amqp_with_exchange do |connection, exchange|
+        queues_purged = routing_keys.count
+
+        messages_count = 0
+        routing_keys.each do |routing_key|
+          queue = exchange.channel.queue(RabbitJobs.config.queue_name(routing_key), RabbitJobs.config[:queues][routing_key])
+          queue.bind(exchange, :routing_key => routing_key)
+
+          queue.status do |number_of_messages, number_of_consumers|
+            messages_count += number_of_messages
+            queue.purge {
+              queues_purged -= 1
+              if queues_purged == 0
+                connection.close {
+                  EM.stop
+                  return messages_count
+                }
+              end
             }
-          }
+          end
         end
       end
     end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/rabbit_jobs/worker.rb

@@ -54,13 +54,20 @@ module RabbitJobs
 
           log "Worker ##{Process.pid} <= #{exchange.name}##{routing_key}"
 
-          queue.subscribe(ack: true) do |metadata, payload|
-            @job = RabbitJobs::Job.parse(payload)
+          explicit_ack = !!RJ.config[:queues][routing_key][:ack]
+
+          queue.subscribe(ack: explicit_ack) do |metadata, payload|
+            @job = RJ::Job.parse(payload)
+
             unless @job.expired?
               @job.run_perform
-              metadata.ack
               processed_count += 1
+            else
+              log "Job expired: #{@job.inspect}"
             end
+
+            metadata.ack if explicit_ack
+
             check_shutdown.call
           end
         end

data/lib/rabbit_jobs.rb

@@ -25,6 +25,4 @@ module RabbitJobs
   end
 end
 
-module RJ
-  include RabbitJobs
-end
+RJ = RabbitJobs

data/spec/integration/publisher_spec.rb

@@ -16,4 +16,9 @@ describe RabbitJobs::Publisher do
     RabbitJobs.publish(TestJob, nil, 'some', 'other', 'params')
     RabbitJobs::Publisher.purge_queue('rspec_queue').should == 1
   end
+
+  it 'should accept symbol as queue name' do
+    RabbitJobs.publish_to(:rspec_queue, TestJob)
+    RabbitJobs::Publisher.purge_queue('rspec_queue').should == 1
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70238047574860 !ruby/object:Gem::Requirement
+  requirement: &70275283417720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70238047574860
+  version_requirements: *70275283417720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70238047573560 !ruby/object:Gem::Requirement
+  requirement: &70275283417300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70238047573560
+  version_requirements: *70275283417300
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70238047572140 !ruby/object:Gem::Requirement
+  requirement: &70275283416760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70238047572140
+  version_requirements: *70275283416760
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Background jobs on RabbitMQ