queueing_rabbit 0.3.0 → 0.3.1

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.rvmrc
 Gemfile.lock
 InstalledFiles
 _yardoc

data/lib/queueing_rabbit.rb

@@ -66,7 +66,10 @@ module QueueingRabbit
   def follow_job_requirements(job)
     follow_bus_requirements(job) do |ch, ex|
       conn.define_queue(ch, job.queue_name, job.queue_options) do |q|
-        conn.bind_queue(q, ex, job.binding_options) if job.bind_queue?
+        if job.bind_queue?
+          job.binding_declarations.each { |o| conn.bind_queue(q, ex, o) }
+        end
+
         yield ch, ex, q
       end
     end

data/lib/queueing_rabbit/extensions/direct_exchange.rb

@@ -14,8 +14,9 @@ module QueueingRabbit
           @exchange_options.merge(:type => :direct)
         end
 
-        def binding_options
-          @binding_options || {:routing_key => queue_name.to_s}
+        def binding_declarations
+          @binding_declarations ||= []
+          @binding_declarations.push(:routing_key => queue_name.to_s)
         end
       end
 

data/lib/queueing_rabbit/job.rb

@@ -9,7 +9,7 @@ module QueueingRabbit
       othermod.class_eval do
         inheritable_variables :queue_name, :queue_options, :channel_options,
                               :exchange_name, :exchange_options,
-                              :binding_options, :listening_options,
+                              :binding_declarations, :listening_options,
                               :publishing_defaults
       end
     end
@@ -34,16 +34,18 @@ module QueueingRabbit
     end
 
     def bind(options = {})
-      @binding_options ||= {}
-      @binding_options.update(options)
+      @binding_declarations ||= []
+      @binding_declarations << options
     end
 
-    def binding_options
-      @binding_options || nil
+    def binding_declarations
+      @binding_declarations || []
     end
 
     def bind_queue?
-      exchange_options[:type] && exchange_options[:type] != :default && binding_options
+      exchange_options[:type] &&
+          exchange_options[:type] != :default &&
+          !binding_declarations.empty?
     end
 
     def listening_options

data/lib/queueing_rabbit/version.rb

@@ -1,3 +1,3 @@
 module QueueingRabbit
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/integration/configuration_spec.rb

@@ -7,7 +7,7 @@ describe 'Configuring jobs' do
         exchange 'exchange_name', :durable => true
         channel :prefetch => 15
         queue :durable => true
-        bind :ack => true
+        bind :routing_key => 'sunday'
         publish_with :persistent => true
       end
     }
@@ -23,7 +23,7 @@ describe 'Configuring jobs' do
     its(:queue_name) { should == 'queue_name' }
     its(:exchange_name) { should == 'exchange_name' }
     its(:queue_options) { should include(:durable => true) }
-    its(:binding_options) { should include(:ack => true) }
+    its(:binding_declarations) { should include(:routing_key => 'sunday') }
     its(:publishing_defaults) { should include(:persistent => true) }
     its(:channel_options) { should include(:prefetch => 15) }
   end
@@ -34,7 +34,7 @@ describe 'Configuring jobs' do
         exchange 'exchange_name', :durable => true
         channel :prefetch => 15
         queue :durable => true
-        bind :ack => true
+        bind :routing_key => 'sunday'
         publish_with :persistent => true
       end
     }
@@ -43,7 +43,7 @@ describe 'Configuring jobs' do
       Class.new(base_class) do
         channel :use_publisher_confirms => true
         queue 'queue_name', :durable => false
-        bind :ack => false
+        bind :routing_key => 'monday'
       end
     }
 
@@ -52,7 +52,7 @@ describe 'Configuring jobs' do
     its(:channel_options) { should include(:use_publisher_confirms => true,
                                            :prefetch => 15) }
     its(:queue_options) { should include(:durable => false) }
-    its(:binding_options) { should include(:ack => false) }
+    its(:binding_declarations) { should include(:routing_key => 'sunday') and include(:routing_key => 'monday') }
     its(:publishing_defaults) { should include(:persistent => true) }
 
   end
@@ -70,6 +70,6 @@ describe 'Configuring jobs' do
 
     its(:exchange_name) { should == 'exchange_name' }
     its(:exchange_options) { should include(:type => :direct) }
-    its(:binding_options) { should include(:routing_key => 'queue_name')}
+    its(:binding_declarations) { should include(:routing_key => 'queue_name')}
   end
 end

data/spec/unit/queueing_rabbit/extensions/direct_exchange_spec.rb

@@ -15,6 +15,6 @@ describe QueueingRabbit::JobExtensions::DirectExchange do
 
   its(:exchange_name) { should == 'test_job' }
   its(:exchange_options) { should include(:type => :direct) }
-  its(:binding_options) { should include(:routing_key => 'test_queue') }
+  its(:binding_declarations) { should include(:routing_key => 'test_queue') }
 
 end

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

@@ -31,7 +31,7 @@ describe QueueingRabbit::AbstractJob do
   its(:queue_name) { should == 'test_queue' }
   its(:queue_options) { should include(:durable => true) }
   its(:exchange_options) { should include(:durable => false) }
-  its(:binding_options) { should include(:routing_key => 'test.*') }
+  its(:binding_declarations) { should include(:routing_key => 'test.*') }
   its(:publishing_defaults) { should include(:routing_key => 'test_queue') }
 
   describe ".queue_size" do

data/spec/unit/queueing_rabbit_spec.rb

@@ -10,14 +10,16 @@ describe QueueingRabbit do
   let(:channel_options) { {:prefetch => 1, :auto_recovery => true} }
   let(:exchange_name) { mock }
   let(:exchange_options) { {:type => :direct, :durable => true} }
-  let(:binding_options) { {:key => 'routing_key'} }
+  let(:binding_declaration_1) { {:routing_key => 'routing_key'} }
+  let(:binding_declaration_2) { {:routing_key => 'routing_key2'} }
   let(:job) {
     stub(:queue_name => queue_name,
          :queue_options => queue_options,
          :channel_options => channel_options,
          :exchange_name => exchange_name,
          :exchange_options => exchange_options,
-         :binding_options => binding_options,
+         :binding_declarations => [binding_declaration_1, 
+                                   binding_declaration_2],
          :bind_queue? => true)
   }
 
@@ -83,7 +85,9 @@ describe QueueingRabbit do
                  with(channel, job.queue_name, job.queue_options).
                  and_yield(queue)
       connection.should_receive(:bind_queue).
-                 with(queue, exchange, job.binding_options)
+                 with(queue, exchange, binding_declaration_1)
+      connection.should_receive(:bind_queue).
+                 with(queue, exchange, binding_declaration_2)
 
       subject.follow_job_requirements(job) do |ch, ex, q|
         ch.should == channel

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queueing_rabbit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1557293148620146716
+      hash: 3868838367172199305
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1557293148620146716
+      hash: 3868838367172199305
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25