rabbit_jobs 0.1.0 → 0.1.1

data/lib/rabbit_jobs/publisher.rb

@@ -21,93 +21,32 @@ module RabbitJobs
       job = klass.new(*params)
       job.opts = {'created_at' => Time.now.to_i}
 
-      b = Bunny.new(host: RJ.config.host, logging: false)
-      b.start
-
-      exchange = b.exchange(RJ.config[:exchange], RJ.config[:exchange_params])
-      queue = b.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
+      exchange = bunny.exchange(RJ.config[:exchange], RJ.config[:exchange_params])
+      queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
       queue.bind(exchange)
 
       exchange.publish(job.payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_s}))
-      b.stop
+      # b.stop
     end
 
     def purge_queue(*routing_keys)
       raise ArgumentError unless routing_keys && routing_keys.count > 0
 
-      b = Bunny.new(host: RJ.config.host, logging: false)
-      b.start
-
       messages_count = 0
       routing_keys.each do |routing_key|
-        queue = b.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
+        queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
         messages_count += queue.status[:message_count]
         queue.purge
       end
-      b.stop
+      # b.stop
       return messages_count
     end
 
-    def publish_to2(routing_key, klass, *params)
-      raise ArgumentError unless klass && routing_key && klass.is_a?(Class) && (routing_key.is_a?(Hash) || routing_key.is_a?(String))
-
-      job = klass.new(*params)
-      job.opts = {}
-
-      dont_stop_em = defined?(EM) && EM.reactor_running?
-      dont_close_connection = AMQP.connection && AMQP.connection.open?
-
-      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})) {
-          unless dont_close_connection
-            connection.close {
-              EM.stop unless dont_stop_em
-            }
-          end
-        }
-      end
-    end
-
-    def purge_queue2(*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
-
-        messages_count = 0
-        routing_keys.each do |routing_key|
-          routing_key = routing_key.to_s
-          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
-
-                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
-        end
-      end
+    private
+    def bunny
+      @bunny ||= Bunny.new(host: RJ.config.host, logging: false)
+      @bunny.start unless @bunny.status == :connected
+      @bunny
     end
   end
 end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/integration/publisher_spec.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'spec_helper'
 require 'json'
+require 'benchmark'
 
 describe RabbitJobs::Publisher do
 
@@ -36,4 +37,12 @@ describe RabbitJobs::Publisher do
     RabbitJobs.publish_to(:rspec_queue, JobWithArgsArray, 'first value', :some_symbol, 123, 'and string')
     RabbitJobs::Publisher.purge_queue(:rspec_queue).should == 1
   end
+
+  it 'should publish 1000 messages in one second' do
+    time = Benchmark.measure {
+      1000.times { RabbitJobs.publish_to(:rspec_queue, TestJob) }
+    }
+    RabbitJobs::Publisher.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3).should == 1000
+    puts time
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70362685237960 !ruby/object:Gem::Requirement
+  requirement: &70149529326900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70362685237960
+  version_requirements: *70149529326900
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70362685237460 !ruby/object:Gem::Requirement
+  requirement: &70149529326400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70362685237460
+  version_requirements: *70149529326400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70362685237080 !ruby/object:Gem::Requirement
+  requirement: &70149529326020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362685237080
+  version_requirements: *70149529326020
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70362685236540 !ruby/object:Gem::Requirement
+  requirement: &70149529325480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362685236540
+  version_requirements: *70149529325480
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com