rabbit_jobs 0.0.8.4 → 0.0.9

data/lib/rabbit_jobs/amqp_helpers.rb

@@ -22,23 +22,6 @@ module RabbitJobs
       end
     end
 
-    def em_amqp_with_exchange(&block)
-      raise ArgumentError unless block
-
-      connection = AMQP.connect(host: RJ.config.host)
-      channel = AMQP::Channel.new(connection)
-
-      channel.on_error do |ch, channel_close|
-        puts "Channel-level error: #{channel_close.reply_text}, shutting down..."
-        connection.close { EM.stop }
-      end
-
-      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
 

data/lib/rabbit_jobs/publisher.rb

@@ -15,20 +15,15 @@ module RabbitJobs
     end
 
     def publish_to(routing_key, klass, opts = {}, *params)
-      raise ArgumentError unless klass && routing_key
+      raise ArgumentError unless klass && routing_key && klass.is_a?(Class)# && (routing_key.is_a?(Hash) || routing_key.is_a?(String))
       opts ||= {}
 
       job = klass.new(*params)
       job.opts = opts
 
-      if defined?(EM) && EM.reactor_running?
-        em_publish_job_to(routing_key, job)
-      else
-        publish_job_to(routing_key, job)
-      end
-    end
+      dont_stop_em = defined?(EM) && EM.reactor_running?
+      dont_close_connection = AMQP.connection && AMQP.connection.open?
 
-    def publish_job_to(routing_key, job)
       amqp_with_exchange do |connection, exchange|
 
         queue = make_queue(exchange, routing_key.to_s)
@@ -37,23 +32,11 @@ module RabbitJobs
 
         payload = job.payload
         exchange.publish(job.payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({routing_key: routing_key.to_s})) {
-          connection.close {
-            EM.stop
-          }
-        }
-      end
-    end
-
-    def em_publish_job_to(routing_key, job)
-      em_amqp_with_exchange do |connection, exchange|
-        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.to_s})) {
-          connection.close {
-          }
+          unless dont_close_connection
+            connection.close {
+              EM.stop unless dont_stop_em
+            }
+          end
         }
       end
     end
@@ -61,6 +44,9 @@ module RabbitJobs
     def purge_queue(*routing_keys)
       raise ArgumentError unless routing_keys && routing_keys.count > 0
 
+      dont_stop_em = defined?(EM) && EM.reactor_running?
+      dont_close_connection = AMQP.connection && AMQP.connection.open?
+
       amqp_with_exchange do |connection, exchange|
         queues_purged = routing_keys.count
 
@@ -75,10 +61,16 @@ module RabbitJobs
             queue.purge {
               queues_purged -= 1
               if queues_purged == 0
-                connection.close {
-                  EM.stop
+
+                if dont_close_connection
+                  puts 'return with not closed connection'
                   return messages_count
-                }
+                else
+                  connection.close {
+                    EM.stop unless dont_stop_em
+                    return messages_count
+                  }
+                end
               end
             }
           end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.0.8.4"
+  VERSION = "0.0.9"
 end

data/spec/fixtures/jobs.rb

@@ -28,6 +28,19 @@ class ExpiredJob
   end
 end
 
+class JobWithPublish
+  include RJ::Job
+
+  def self.perform(param = 0)
+    if param < 5
+      puts "publishing job #{param}"
+      RJ.publish JobWithPublish, param + 1
+    else
+      puts "processing job #{param}"
+    end
+  end
+end
+
 class JobWithErrorHook
   include RJ::Job
   on_error :first_hook, lambda { puts "second hook" }, :last_hook

data/spec/integration/worker_spec.rb

@@ -16,4 +16,16 @@ describe RabbitJobs::Worker do
 
     worker.work(1) # work for 1 second
   end
+
+  it 'should allow to publish jobs from worker' do
+    RabbitJobs.configure do |c|
+      c.exchange 'test_durable', auto_delete: false, durable: true
+      c.queue 'rspec_durable_queue', auto_delete: false, durable: true, ack: true
+    end
+
+    RabbitJobs.publish(JobWithPublish)
+    worker = RabbitJobs::Worker.new
+
+    worker.work(1) # work for 1 second
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.0.8.4
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70113688710280 !ruby/object:Gem::Requirement
+  requirement: &70108928613220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70113688710280
+  version_requirements: *70108928613220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70113690593620 !ruby/object:Gem::Requirement
+  requirement: &70108932737200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113690593620
+  version_requirements: *70108932737200
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70113690593080 !ruby/object:Gem::Requirement
+  requirement: &70108932736660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113690593080
+  version_requirements: *70108932736660
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com