queueing_rabbit 0.3.7 → 0.3.8

data/.travis.yml

@@ -4,9 +4,9 @@ before_install:
   - gem --version
 rvm:
   - "1.8.7"
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
+  - "2.1.0"
 services:
   - rabbitmq
 script: bundle exec rake spec

data/lib/queueing_rabbit/client/amqp.rb

@@ -141,6 +141,22 @@ module QueueingRabbit
         raise NotImplementedError
       end
 
+      def purge_queue(queue)
+        queue.purge do
+          yield if block_given?
+        end
+      end
+
+      def next_tick(&block)
+        EM.next_tick(&block)
+      end
+
+      def begin_worker_loop
+        EM.run do
+          yield if block_given?
+        end
+      end
+
     private
 
       def setup_callbacks

data/lib/queueing_rabbit/client/bunny.rb

@@ -87,6 +87,11 @@ module QueueingRabbit
         end
       end
 
+      def purge_queue(queue)
+        queue.purge
+        yield if block_given?
+      end
+
       def close
         @connection.close
         yield if block_given?
@@ -97,11 +102,23 @@ module QueueingRabbit
         @connection.open?
       end
 
+      def next_tick(&block)
+        if @continue_worker_loop
+          @actions_queue << block
+        else
+          block.call
+        end
+      end
+
       def begin_worker_loop
-        yield
+        yield if block_given?
+        @actions_queue = []
         @continue_worker_loop = true
         # We may need to add signal handling here
-        sleep 2 while @continue_worker_loop
+        while @continue_worker_loop
+          @actions_queue.take_while { |block| block.call || true }
+          sleep 1
+        end
       end
 
     private

data/lib/queueing_rabbit/version.rb

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

data/lib/queueing_rabbit/worker.rb

@@ -58,13 +58,15 @@ module QueueingRabbit
     end
 
     def stop
-      return unless QueueingRabbit.connection
+      connection = QueueingRabbit.connection
 
-      QueueingRabbit.connection.close {
-        info "gracefully shutting down the worker #{self}"
-        remove_pidfile
-        QueueingRabbit.trigger_event(:consuming_done)
-      }
+      connection.next_tick do
+        connection.close do
+          info "gracefully shutting down the worker #{self}"
+          remove_pidfile
+          QueueingRabbit.trigger_event(:consuming_done)
+        end
+      end
     end
 
   private

data/lib/queueing_rabbit.rb

@@ -122,8 +122,7 @@ module QueueingRabbit
   def purge_queue(job)
     connection.open_channel(job.channel_options) do |c, _|
       connection.define_queue(c, job.queue_name, job.queue_options) do |q|
-        q.purge(:nowait => true)
-        c.close
+        connection.purge_queue(q) { c.close }
       end
     end
     true

data/spec/unit/queueing_rabbit/client/amqp_spec.rb

@@ -238,5 +238,26 @@ describe QueueingRabbit::Client::AMQP do
         client.enqueue(exchange, payload, options)
       end
     end
+
+    describe '#next_tick' do
+
+      it 'schedules given action to be performed at the next EM tick' do
+        EM.should_receive(:next_tick)
+        client.next_tick {}
+      end
+
+    end
+
+    describe '#purge_queue' do
+      
+      let(:queue) { mock }
+
+      it 'purges the queue and fires the provided callback when done' do
+        queue.should_receive(:purge).and_yield
+        expect { |b| client.purge_queue(queue, &b) }.to yield_control
+      end
+
+    end
+
   end
 end

data/spec/unit/queueing_rabbit/client/bunny_spec.rb

@@ -144,5 +144,39 @@ describe QueueingRabbit::Client::Bunny do
 
     end
 
+    describe '#purge_queue' do
+
+      let(:queue) { mock }
+
+      it 'purges the queue and fires the provided callback when done' do
+        queue.should_receive(:purge)
+        expect { |b| client.purge_queue(queue, &b) }.to yield_control
+      end
+
+    end
+
+    describe '#next_tick' do
+
+      context 'given the worker loop is running' do
+
+        it 'performs the action on next tick' do
+          client.connection.should_receive(:close)
+          Thread.new { sleep 1; client.next_tick { client.close } }
+          expect { Timeout.timeout(5) { client.begin_worker_loop } }.
+              not_to raise_error(Timeout::Error)
+        end
+
+      end
+
+      context 'given the worker loop is not running' do
+
+        it 'performs the action immediately' do
+          expect(client.next_tick { 42 }).to eq(42)
+        end
+
+      end
+
+    end
+
   end
 end

data/spec/unit/queueing_rabbit/worker_spec.rb

@@ -176,6 +176,7 @@ describe QueueingRabbit::Worker do
       end
 
       it 'closes the connection, removes the pidfile and reports the event' do
+        connection.should_receive(:next_tick).and_yield
         connection.should_receive(:close).and_yield
         File.stub(:exists?).with(file_name).and_return(true)
         File.should_receive(:delete).with(file_name)

data/spec/unit/queueing_rabbit_spec.rb

@@ -200,7 +200,7 @@ describe QueueingRabbit do
       connection.should_receive(:define_queue).
                  with(channel, queue_name, queue_options).
                  and_yield(queue)
-      queue.should_receive(:purge).with(:nowait => true).and_return(true)
+      connection.should_receive(:purge_queue).and_yield
       channel.should_receive(:close)
     end
 
@@ -208,4 +208,5 @@ describe QueueingRabbit do
       subject.purge_queue(job).should be_true
     end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queueing_rabbit
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 656088827131633906
+      hash: -1744328126596891438
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 656088827131633906
+      hash: -1744328126596891438
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23