queueing_rabbit 0.1.2 → 0.1.3

data/lib/queueing_rabbit.rb

@@ -40,6 +40,7 @@ module QueueingRabbit
     connection.open_channel(job.channel_options) do |c, _|
       connection.define_queue(c, job.queue_name, job.queue_options)
       connection.enqueue(c, job.queue_name, arguments)
+      c.close
     end
 
     true
@@ -51,6 +52,7 @@ module QueueingRabbit
     connection.open_channel(job.channel_options) do |c, _|
       queue = connection.define_queue(c, job.queue_name, job.queue_options)
       size = connection.queue_size(queue)
+      c.close
     end
     size
   end
@@ -58,6 +60,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).purge
+      c.close
     end
     true
   end

data/lib/queueing_rabbit/client/bunny.rb

@@ -19,15 +19,19 @@ module QueueingRabbit
       def open_channel(options = {})
         ch = connection.create_channel
         yield ch, nil
-        # ch.close
+        ch
       end
 
       def define_queue(channel, name, options = {})
-        routing_keys = [*options.delete(:routing_keys)] + [name]
+        routing_keys = ([*options.delete(:routing_keys)] + [name]).compact
 
-        channel.queue(name.to_s, options) do |q|
-          routing_keys.each { |key| q.bind(exchange, :routing_key => key.to_s) }
+        queue = channel.queue(name.to_s, options)
+
+        routing_keys.each do |key|
+          queue.bind(exchange(channel), :routing_key => key.to_s)
         end
+
+        queue
       end
 
       def enqueue(channel, routing_key, payload)

data/lib/queueing_rabbit/version.rb

@@ -1,3 +1,3 @@
 module QueueingRabbit
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/support/shared_examples.rb

@@ -1,28 +1,5 @@
 shared_examples :client do
 
-  describe '#define_queue' do
-    let(:exchange) { mock }
-    let(:channel) { mock }
-    let(:queue) { mock }
-    let(:queue_name) { "test_queue_name" }
-    let(:routing_keys) { [:test_job] }
-    let(:options) { {:durable => false, :routing_keys => routing_keys} }
-
-    before do
-      client.stub(:exchange => exchange)
-      channel.should_receive(:queue).with(queue_name, options).
-                                     and_yield(queue)
-      queue.should_receive(:bind).
-            with(exchange, :routing_key => routing_keys.first.to_s).ordered
-      queue.should_receive(:bind).
-            with(exchange, :routing_key => queue_name).ordered
-    end
-
-    it "defines a queue and binds it to its name and the given routing keys" do
-      client.define_queue(channel, queue_name, options)
-    end
-  end
-
   describe '#define_exchange' do
     let(:channel) { mock }
     let(:options) { {:durable => true} }

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

@@ -89,6 +89,29 @@ describe QueueingRabbit::Client::AMQP do
 
     it { should be }
 
+    describe '#define_queue' do
+      let(:exchange) { mock }
+      let(:channel) { mock }
+      let(:queue) { mock }
+      let(:queue_name) { "test_queue_name" }
+      let(:routing_keys) { [:test_job] }
+      let(:options) { {:durable => false, :routing_keys => routing_keys} }
+
+      before do
+        client.stub(:exchange => exchange)
+        channel.should_receive(:queue).with(queue_name, options).
+                                       and_yield(queue)
+        queue.should_receive(:bind).
+              with(exchange, :routing_key => routing_keys.first.to_s).ordered
+        queue.should_receive(:bind).
+              with(exchange, :routing_key => queue_name).ordered
+      end
+
+      it "defines a queue and binds it to its name and the given routing keys" do
+        client.define_queue(channel, queue_name, options)
+      end
+    end
+
     describe '#listen_queue' do
       let(:channel) { mock }
       let(:queue_name) { mock }

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

@@ -51,6 +51,22 @@ describe QueueingRabbit::Client::Bunny do
       end
     end
 
+    describe '#define_queue' do
+      let(:channel) { mock }
+      let(:queue) { mock }
+      let(:exchange) { mock }
+      let(:name) { 'queue_name_test' }
+      let(:options) { {:foo => 'bar'} }
+
+      it 'creates a queue and binds it to the global exchange' do
+        channel.should_receive(:queue).with(name, options).and_return(queue)
+        client.should_receive(:exchange).with(channel).and_return(exchange)
+        queue.should_receive(:bind).with(exchange, :routing_key => name)
+
+        client.define_queue(channel, name, options)
+      end
+    end
+
     describe '#queue_size' do
       let(:queue) { mock }
       let(:status) { {:message_count => 42} }

data/spec/unit/queueing_rabbit_spec.rb

@@ -47,6 +47,7 @@ describe QueueingRabbit do
                                                     queue_options)
       connection.should_receive(:enqueue).with(channel,
                                                queue_name, arguments)
+      channel.should_receive(:close)
     end
 
     it 'returns true when a message was enqueued successfully' do
@@ -76,6 +77,7 @@ describe QueueingRabbit do
                  with(channel, queue_name, queue_options).
                  and_return(queue)
       connection.should_receive(:queue_size).with(queue).and_return(size)
+      channel.should_receive(:close)
     end
 
     it 'returns queue size for specific job' do
@@ -93,6 +95,7 @@ describe QueueingRabbit do
       connection.should_receive(:define_queue).
                  with(channel, queue_name, queue_options).and_return(queue)
       queue.should_receive(:purge).and_return(true)
+      channel.should_receive(:close)
     end
 
     it 'purges messages from the queue' do

metadata

@@ -1,104 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: queueing_rabbit
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - Artem Chistyakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-06-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: amqp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-- !ruby/object:Gem::Dependency
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: bunny
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0.pre7
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -756668528
+        segments: 
+        - 0
+        - 9
+        - 0
+        - pre
+        - 7
         version: 0.9.0.pre7
-- !ruby/object:Gem::Dependency
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "    QueueingRabbit is a Ruby library providing convenient object-oriented
-  syntax\n    for managing background jobs using AMQP. All jobs' argumets are serialized\n
-  \   to JSON and transfered to jobs using AMQP message payload. The library\n    implements
-  amqp and bunny gems as adapters making it possible to use\n    synchronous publishing
-  and asynchronous consuming, which might be useful for\n    Rails app running on
-  non-EventMachine based application servers (i. e.\n    Passenger).\n\n    Any Ruby
-  class or Module can be transformed into QueueingRabbit's background\n    job by
-  including QueueingRabbit::Job module. It is also possible to inherit\n    your class
-  from QueueingRabbit::AbstractJob abstract class.\n\n    The library is bundled with
-  a Rake task which is capable of starting a\n    worker processing a specified list
-  of jobs.\n\n    To achieve the required simplicity the gem doesn't try to support
-  all\n    features of AMQP protocol. It uses a restricted subset instead:\n\n    *
-  Only a single direct exchange is used\n    * Every job is consumed using a separate
-  channel\n    * All jobs are consumed with acknowledgements\n    * ACK is only sent
-  to the broker if a job was processed successfully\n    * Currently all messages
-  are published with persistent option\n"
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+description: "    QueueingRabbit is a Ruby library providing convenient object-oriented syntax\n    for managing background jobs using AMQP. All jobs' argumets are serialized\n    to JSON and transfered to jobs using AMQP message payload. The library\n    implements amqp and bunny gems as adapters making it possible to use\n    synchronous publishing and asynchronous consuming, which might be useful for\n    Rails app running on non-EventMachine based application servers (i. e.\n    Passenger).\n\n    Any Ruby class or Module can be transformed into QueueingRabbit's background\n    job by including QueueingRabbit::Job module. It is also possible to inherit\n    your class from QueueingRabbit::AbstractJob abstract class.\n\n    The library is bundled with a Rake task which is capable of starting a\n    worker processing a specified list of jobs.\n\n    To achieve the required simplicity the gem doesn't try to support all\n    features of AMQP protocol. It uses a restricted subset instead:\n\n    * Only a single direct exchange is used\n    * Every job is consumed using a separate channel\n    * All jobs are consumed with acknowledgements\n    * ACK is only sent to the broker if a job was processed successfully\n    * Currently all messages are published with persistent option\n"
+email: 
 - chistyakov.artem@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - .gitignore
 - .rvmrc
 - .travis.yml
@@ -140,36 +131,38 @@ files:
 - spec/unit/queueing_rabbit_spec.rb
 homepage: https://github.com/temochka/queueing_rabbit
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -404030946286887403
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -404030946286887403
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: QueueingRabbit is an AMQP-based queueing system
-test_files:
+test_files: 
 - spec/integration/asynchronous_publishing_and_consuming_spec.rb
 - spec/integration/jobs/print_line_job.rb
 - spec/integration/synchronous_publishing_and_asynchronous_consuming_spec.rb