queueing_rabbit 0.3.6 → 0.3.7

data/lib/queueing_rabbit.rb

@@ -60,7 +60,7 @@ module QueueingRabbit
     info "enqueueing job #{job}"
 
     follow_job_requirements(job) do |channel, exchange, _|
-      conn.enqueue(exchange, payload, options)
+      publish_to_exchange(exchange, payload, options)
       channel.close
     end
 
@@ -70,10 +70,17 @@ module QueueingRabbit
   def publish(bus, payload = nil, options = {})
     info "publishing to event bus #{bus}"
 
-    follow_bus_requirements(bus) do |ch, ex|
-      conn.enqueue(ex, payload, options)
-      ch.close
+    follow_bus_requirements(bus) do |channel, exchange|
+      publish_to_exchange(exchange, payload, options)
+      channel.close
     end
+
+    true
+  end
+
+  def publish_to_exchange(exchange, payload = nil, options = {})
+    conn.publish(exchange, payload, options)
+    true
   end
 
   def begin_worker_loop
@@ -114,8 +121,10 @@ module QueueingRabbit
 
   def purge_queue(job)
     connection.open_channel(job.channel_options) do |c, _|
-      connection.define_queue(c, job.queue_name, job.queue_options).purge
-      c.close
+      connection.define_queue(c, job.queue_name, job.queue_options) do |q|
+        q.purge(:nowait => true)
+        c.close
+      end
     end
     true
   end

data/lib/queueing_rabbit/bus.rb

@@ -10,6 +10,8 @@ module QueueingRabbit
       end
     end
 
+    attr_reader :shared_exchange
+
     def channel(options = {})
       @channel_options ||= {}
       @channel_options.update(options)
@@ -43,8 +45,24 @@ module QueueingRabbit
       @publishing_defaults || {}
     end
 
-    def publish(payload, options = {})
-      QueueingRabbit.publish(self, payload, publishing_defaults.merge(options))
+    def demand_batch_publishing!
+      QueueingRabbit.follow_bus_requirements(self) do |_, exchange|
+        @shared_exchange = exchange
+      end
+    end
+
+    def batch_publishing?
+      !!@shared_exchange
+    end
+
+    def publish(payload, options = {}, method = :publish)
+      args = [payload, publishing_defaults.merge(options)]
+      
+      if batch_publishing?
+        QueueingRabbit.publish_to_exchange(@shared_exchange, *args)
+      else
+        QueueingRabbit.send(method, self, *args)
+      end
     end
 
     protected

data/lib/queueing_rabbit/job.rb

@@ -63,8 +63,14 @@ module QueueingRabbit
       {:routing_key => queue_name.to_s}.merge(@publishing_defaults)
     end
 
+    def demand_batch_publishing!
+      QueueingRabbit.follow_job_requirements(self) do |_, exchange, _|
+        @shared_exchange = exchange
+      end
+    end
+
     def enqueue(payload, options = {})
-      QueueingRabbit.enqueue(self, payload, publishing_defaults.merge(options))
+      publish(payload, options, :enqueue)
     end
 
   end

data/lib/queueing_rabbit/version.rb

@@ -1,3 +1,3 @@
 module QueueingRabbit
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/integration/asynchronous_batch_publishing_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe "Asynchronous batch publishing" do
+  include_context "Auto-disconnect"
+  include_context "Evented spec"
+  include_context "StringIO logger"
+
+  before(:all) { QueueingRabbit.client = QueueingRabbit::Client::AMQP }
+  after(:all) { QueueingRabbit.client = QueueingRabbit.default_client }
+
+  let(:line) { "Hello, world!" }
+  let(:connection) { QueueingRabbit.connection }
+  let(:job) {
+    Class.new(QueueingRabbit::AbstractJob) do
+      queue 'asynchronous_batch_publishing'
+    end
+  }
+
+  it 'produces 100 jobs in a batch' do
+    em {
+      @queue_size = 0
+
+      def request_queue_size
+        connection.open_channel do |c, _|
+          connection.define_queue(c, job.queue_name, job.queue_options).status do |s, _|
+            @queue_size = s
+          end
+        end
+      end
+
+      delayed(0.5) {
+        job.demand_batch_publishing!
+      }
+
+      delayed(1.0) {
+        100.times { job.enqueue(line) }
+      }
+
+      delayed(3.0) {
+        request_queue_size
+      }
+
+      delayed(3.5) {
+        QueueingRabbit.purge_queue(job)
+      }
+
+      done(4.0) {
+        expect(@queue_size).to eq(100)
+      }
+    }
+  end
+  
+end
+

data/spec/integration/synchronous_batch_publishing_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe "Synchronous batch publishing" do
+  include_context "Auto-disconnect"
+  include_context "Evented spec"
+  include_context "StringIO logger"
+
+  before(:all) { QueueingRabbit.client = QueueingRabbit::Client::Bunny }
+  after(:all) { QueueingRabbit.client = QueueingRabbit.default_client }
+
+  let(:line) { "Hello, world!" }
+  let(:connection) { QueueingRabbit.connection }
+  let(:job) {
+    Class.new(QueueingRabbit::AbstractJob) do
+      queue 'synchronous_batch_publishing'
+    end
+  }
+
+  it 'produces 100 jobs in a batch' do
+    em {
+      delayed(0.5) {
+        job.demand_batch_publishing!
+      }
+
+      delayed(1.0) {
+        100.times { job.enqueue(line) }
+      }
+
+      done(3.0) {
+        expect(QueueingRabbit.queue_size(job)).to eq(100)
+        QueueingRabbit.purge_queue(job)
+      }
+    }
+  end
+  
+end
+

data/spec/unit/queueing_rabbit/buses/abstract_bus_spec.rb

@@ -21,5 +21,21 @@ describe QueueingRabbit::AbstractBus do
   its(:exchange_name) { should == 'test_exchange' }
   its(:exchange_options) { should include(:durable => false) }
   its(:publishing_defaults) { should include(:routing_key => 'test_queue') }
+
+  describe '.demand_batch_publishing!' do
+
+    let(:exchange) { mock }
+    
+    it 'assigns a shared exchange instance to a job class' do
+      QueueingRabbit.should_receive(:follow_bus_requirements).
+                     with(subject).
+                     and_yield(nil, exchange)
+      subject.demand_batch_publishing!
+      expect(subject.shared_exchange).to eq(exchange)
+      expect(subject.batch_publishing?).to be_true
+      expect(QueueingRabbit::AbstractBus.shared_exchange).to be_nil
+    end
+
+  end
   
 end

data/spec/unit/queueing_rabbit/jobs/abstract_job_spec.rb

@@ -45,6 +45,22 @@ describe QueueingRabbit::AbstractJob do
     its(:queue_size) { should == size }
   end
 
+  describe '.demand_batch_publishing!' do
+
+    let(:exchange) { mock }
+    
+    it 'assigns a shared exchange instance to a job class' do
+      QueueingRabbit.should_receive(:follow_job_requirements).
+                     with(subject).
+                     and_yield(nil, exchange, nil)
+      subject.demand_batch_publishing!
+      expect(subject.shared_exchange).to eq(exchange)
+      expect(subject.batch_publishing?).to be_true
+      expect(QueueingRabbit::AbstractJob.shared_exchange).to be_nil
+    end
+
+  end
+
   describe '.enqueue' do
     let(:payload) { mock }
     let(:options) { {:persistent => true} }

data/spec/unit/queueing_rabbit_spec.rb

@@ -52,7 +52,7 @@ describe QueueingRabbit do
       subject.should_receive(:follow_job_requirements).
               with(job).
               and_yield(channel, exchange, nil)
-      connection.should_receive(:enqueue).with(exchange, payload, options)
+      connection.should_receive(:publish).with(exchange, payload, options)
       channel.should_receive(:close)
     end
 
@@ -66,6 +66,40 @@ describe QueueingRabbit do
     end
   end
 
+  describe '.publish' do
+
+    let(:bus) { QueueingRabbit::AbstractBus }
+    let(:payload) { mock(:to_s => 'payload') }
+    let(:options) { mock }
+    let(:exchange) { mock }
+    let(:channel) { mock }
+
+    it 'publishes payload to a given bus with options' do
+      subject.instance_variable_set(:@connection, connection)
+      subject.should_receive(:follow_bus_requirements).
+              with(bus).
+              and_yield(channel, exchange)
+      connection.should_receive(:publish).with(exchange, payload, options)
+      channel.should_receive(:close)
+      subject.publish(bus, payload, options).should be_true
+    end
+
+  end
+
+  describe '.publish_to_exchange' do
+
+    let(:exchange) { mock }
+    let(:payload) { mock }
+    let(:options) { mock }
+
+    it 'publishes payload to a given exchange with options' do
+      subject.instance_variable_set(:@connection, connection)
+      connection.should_receive(:publish).with(exchange, payload, options)
+      subject.publish_to_exchange(exchange, payload, options).should be_true
+    end
+
+  end
+
   describe '.begin_worker_loop' do
 
     before do
@@ -164,8 +198,9 @@ describe QueueingRabbit do
       connection.should_receive(:open_channel).
                  with(channel_options).and_yield(channel, nil)
       connection.should_receive(:define_queue).
-                 with(channel, queue_name, queue_options).and_return(queue)
-      queue.should_receive(:purge).and_return(true)
+                 with(channel, queue_name, queue_options).
+                 and_yield(queue)
+      queue.should_receive(:purge).with(:nowait => true).and_return(true)
       channel.should_receive(:close)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queueing_rabbit
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -123,6 +123,7 @@ files:
 - lib/queueing_rabbit/worker.rb
 - lib/tasks/queueing_rabbit.rake
 - queueing_rabbit.gemspec
+- spec/integration/asynchronous_batch_publishing_spec.rb
 - spec/integration/asynchronous_publishing_and_consuming_spec.rb
 - spec/integration/asynchronous_publishing_and_consuming_with_retries_spec.rb
 - spec/integration/binary_synchronous_publishing_via_bus_and_asynchronous_consuming_via_job_spec.rb
@@ -134,6 +135,7 @@ files:
 - spec/integration/json_job_synchronous_publishing_and_consuming_spec.rb
 - spec/integration/json_synchronous_publishing_via_bus_and_asynchronous_consuming_via_job_spec.rb
 - spec/integration/persistent_asynchronous_publishing_and_consuming_spec.rb
+- spec/integration/synchronous_batch_publishing_spec.rb
 - spec/integration/synchronous_publishing_and_asynchronous_consuming_spec.rb
 - spec/integration/synchronous_publishing_and_consuming_spec.rb
 - spec/integration/synchronous_publishing_and_threaded_consuming_spec.rb
@@ -172,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1747676710658043461
+      hash: 656088827131633906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1747676710658043461
+      hash: 656088827131633906
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -189,6 +191,7 @@ signing_key:
 specification_version: 3
 summary: QueueingRabbit is an AMQP-based queueing system
 test_files:
+- spec/integration/asynchronous_batch_publishing_spec.rb
 - spec/integration/asynchronous_publishing_and_consuming_spec.rb
 - spec/integration/asynchronous_publishing_and_consuming_with_retries_spec.rb
 - spec/integration/binary_synchronous_publishing_via_bus_and_asynchronous_consuming_via_job_spec.rb
@@ -200,6 +203,7 @@ test_files:
 - spec/integration/json_job_synchronous_publishing_and_consuming_spec.rb
 - spec/integration/json_synchronous_publishing_via_bus_and_asynchronous_consuming_via_job_spec.rb
 - spec/integration/persistent_asynchronous_publishing_and_consuming_spec.rb
+- spec/integration/synchronous_batch_publishing_spec.rb
 - spec/integration/synchronous_publishing_and_asynchronous_consuming_spec.rb
 - spec/integration/synchronous_publishing_and_consuming_spec.rb
 - spec/integration/synchronous_publishing_and_threaded_consuming_spec.rb