amqp 0.9.5 → 0.9.6

data/.travis.yml

@@ -2,10 +2,13 @@ language: ruby
 bundler_args: --without development
 before_script: ./bin/ci/before_build.sh
 script: "bundle exec rake spec:ci"
+env:
+  - CI=true
 rvm:
   - 1.8.7
-  - rbx-18mode
-  - jruby-18mode
+  - rbx-19mode
+  - jruby-19mode
+  - jruby-head
   - 1.9.2
   - 1.9.3
 gemfile:
@@ -19,4 +22,24 @@ branches:
     - master
     - 0.9.x-stable
     - 0.8.x-stable
-    - 0.7.x-stable
+    - 0.7.x-stable
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+      gemfile: gemfiles/eventmachine-pre
+    - rvm: 1.9.3
+      gemfile: gemfiles/eventmachine-pre
+    - rvm: jruby-19mode
+      gemfile: gemfiles/eventmachine-pre
+    - rvm: jruby-head
+      gemfile: gemfiles/eventmachine-pre
+    - rvm: jruby-head
+      gemfile: Gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/eventmachine-pre
+    - rvm: rbx-19mode
+      gemfile: Gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/eventmachine-pre
+    - rvm: 1.9.2
+      gemfile: Gemfile

data/lib/amqp/channel.rb

@@ -227,6 +227,8 @@ module AMQP
       # Read more about EM::Deferrable#callback behavior in EventMachine documentation. MK.
       @channel_is_open_deferrable = AMQ::Client::EventMachineClient::Deferrable.new
 
+      @parameter_checks = {:queue => [:durable, :exclusive, :auto_delete, :arguments], :exchange => [:type, :durable, :arguments]}
+
       # only send channel.open when connection is actually open. Makes it possible to
       # do c = AMQP.connect; AMQP::Channel.new(c) that is what some people do. MK.
       @connection.on_connection do
@@ -379,7 +381,7 @@ module AMQP
       if exchange = find_exchange(name)
         extended_opts = Exchange.add_default_options(:direct, name, opts, block)
 
-        validate_parameters_match!(exchange, extended_opts)
+        validate_parameters_match!(exchange, extended_opts, :exchange)
 
         block.call(exchange) if block
         exchange
@@ -487,7 +489,7 @@ module AMQP
       if exchange = find_exchange(name)
         extended_opts = Exchange.add_default_options(:fanout, name, opts, block)
 
-        validate_parameters_match!(exchange, extended_opts)
+        validate_parameters_match!(exchange, extended_opts, :exchange)
 
         block.call(exchange) if block
         exchange
@@ -603,7 +605,7 @@ module AMQP
       if exchange = find_exchange(name)
         extended_opts = Exchange.add_default_options(:topic, name, opts, block)
 
-        validate_parameters_match!(exchange, extended_opts)
+        validate_parameters_match!(exchange, extended_opts, :exchange)
 
         block.call(exchange) if block
         exchange
@@ -709,7 +711,7 @@ module AMQP
       if exchange = find_exchange(name)
         extended_opts = Exchange.add_default_options(:headers, name, opts, block)
 
-        validate_parameters_match!(exchange, extended_opts)
+        validate_parameters_match!(exchange, extended_opts, :exchange)
 
         block.call(exchange) if block
         exchange
@@ -812,7 +814,7 @@ module AMQP
       if name && !name.empty? && (queue = find_queue(name))
         extended_opts = Queue.add_default_options(name, opts, block)
 
-        validate_parameters_match!(queue, extended_opts)
+        validate_parameters_match!(queue, extended_opts, :queue)
 
         block.call(queue) if block
         queue
@@ -1266,15 +1268,13 @@ module AMQP
     end
 
 
-
     protected
 
-    # @private
-    def validate_parameters_match!(entity, parameters)
-      parameters.delete(:no_declare)
-      unless entity.opts == parameters || parameters[:passive]
+    @private
+    def validate_parameters_match!(entity, parameters, type)
+      unless entity.opts.values_at(*@parameter_checks[type]) == parameters.values_at(*@parameter_checks[type]) || parameters[:passive]
         raise AMQP::IncompatibleOptionsError.new(entity.name, entity.opts, parameters)
       end
-    end # validate_parameters_match!(entity, parameters)
+    end # validate_parameters_match!(entity, parameters, type)
   end # Channel
 end # AMQP

data/lib/amqp/session.rb

@@ -39,12 +39,12 @@ module AMQP
     def initialize(*args, &block)
       super(*args, &block)
 
-      @client_properties = {
+      @client_properties.merge!({
         :platform    => ::RUBY_DESCRIPTION,
         :product     => "AMQP gem",
         :information => "http://github.com/ruby-amqp/amqp",
         :version     => AMQP::VERSION
-      }
+      })
     end # initialize(*args, &block)
 
     # @return [Boolean] true if this AMQP connection is currently open

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/spec/integration/exchange_declaration_spec.rb

@@ -232,6 +232,18 @@ describe AMQP::Channel do
         done
       end # it
     end # context
+
+    context "when exchange is re-declared with irrelevent parameters different from original declaration" do
+      it "doesn't raise an exception" do
+        @channel.direct("previously.declared.durable.direct.exchange", :durable => true)
+
+        expect {
+          @channel.direct("previously.declared.durable.direct.exchange", :durable => true, :header => {:random => 'stuff' })
+        }.to_not raise_error(AMQP::IncompatibleOptionsError)
+
+        done
+      end # it
+    end # context
   end # describe
 
 

data/spec/integration/queue_redeclaration_with_incompatible_attributes_spec.rb

@@ -20,14 +20,17 @@ describe AMQP do
   context "when queue is redeclared with different attributes" do
     let(:name)              { "amqp-gem.nondurable.queue" }
     let(:options)           {
-      { :durable => false, :passive => false }
+      { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false }
     }
     let(:different_options) {
-      { :durable => true, :passive => false}
+      { :durable => true, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false}
+    }
+    let(:irrelevant_different_options) {
+      { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false, :header => {:random => 'stuff' } }
     }
 
 
-    it "should raise AMQP::IncompatibleOptionsError" do
+    it "should raise AMQP::IncompatibleOptionsError for incompatable options" do
       channel = AMQP::Channel.new
       channel.on_error do |ch, close|
         @callback_fired = true
@@ -39,5 +42,18 @@ describe AMQP do
       }.to raise_error(AMQP::IncompatibleOptionsError)
       done
     end
+
+    it "should not raise AMQP::IncompatibleOptionsError for irrelevant options" do
+      channel = AMQP::Channel.new
+      channel.on_error do |ch, close|
+        @callback_fired = true
+      end
+
+      channel.queue(name, options)
+      expect {
+        channel.queue(name, irrelevant_different_options)
+      }.to_not raise_error(AMQP::IncompatibleOptionsError)
+      done
+    end
   end
 end # describe AMQP

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Aman Gupta
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-22 00:00:00 Z
+date: 2012-06-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine