amqp 0.9.7 → 0.9.8

data/.travis.yml

@@ -43,3 +43,6 @@ matrix:
       gemfile: gemfiles/eventmachine-pre
     - rvm: 1.9.2
       gemfile: Gemfile
+
+services:
+  - rabbitmq

data/amqp.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "eventmachine"
-  s.add_dependency "amq-client",   "~> 0.9.4"
+  s.add_dependency "amq-client",   "~> 0.9.5"
   s.add_dependency "amq-protocol", ">= 0.9.4"
 
   begin

data/examples/error_handling/hello_world_producer.rb

@@ -39,7 +39,7 @@ AMQP.start(:host => ENV.fetch("BROKER_HOST", "localhost")) do |connection, open_
   EventMachine.add_periodic_timer(0.8) do
     puts "Publishing via amq.fanout..."
     # messages must be routable & there must be at least one consumer.
-    exchange.publish("Routed via amq.fanout", :immediate => true, :mandatory => true)
+    exchange.publish("Routed via amq.fanout", :mandatory => true)
   end
 
 

data/examples/patterns/request_reply/client.rb

@@ -19,8 +19,7 @@ EventMachine.run do
     channel.default_exchange.publish("get.time",
                                      :routing_key => "amqpgem.examples.services.time",
                                      :message_id  => Kernel.rand(10101010).to_s,
-                                     :reply_to    => replies_queue.name,
-                                     :immediate   => true)
+                                     :reply_to    => replies_queue.name)
   end
 
 

data/examples/patterns/request_reply/server.rb

@@ -14,7 +14,6 @@ EventMachine.run do
     channel.default_exchange.publish(Time.now.to_s,
                                      :routing_key    => metadata.reply_to,
                                      :correlation_id => metadata.message_id,
-                                     :immediate      => true,
                                      :mandatory      => true)
 
     metadata.ack

data/examples/publishing/returned_messages.rb

@@ -22,7 +22,7 @@ AMQP.start(:host => '127.0.0.1') do |connection|
 
   EventMachine.add_timer(0.3) {
     10.times do |i|
-      exchange.publish("Message ##{i}", :immediate => true)
+      exchange.publish("Message ##{i}")
     end
   }
 

data/lib/amqp/exceptions.rb

@@ -43,8 +43,17 @@ module AMQP
     def initialize(settings)
       @settings = settings
 
-      super("AMQP broker closed TCP connection before authentication succeeded: this usually means authentication failure due to misconfiguration. Settings are #{settings.inspect}")
+      super("AMQP broker closed TCP connection before authentication succeeded: this usually means authentication failure due to misconfiguration. Settings are #{filtered_settings.inspect}")
     end # initialize(settings)
+
+    def filtered_settings
+      filtered_settings = settings.dup
+      [:pass, :password].each do |sensitve_setting|
+        filtered_settings[sensitve_setting] &&= '[filtered]'
+      end
+
+      filtered_settings
+    end
   end # PossibleAuthenticationFailureError
 
 

data/lib/amqp/version.rb

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

data/spec/integration/basic_return_spec.rb

@@ -38,11 +38,11 @@ describe "Message published as mandatory" do
       @exchange.on_return do |basic_return, header, body|
         returned_messages << basic_return.reply_text
       end
-      (1..10).to_a.each { |m| @exchange.publish(m, :immediate => true) }
+      (1..10).to_a.each { |m| @exchange.publish(m, :mandatory => true) }
 
       done(1.0) {
-        returned_messages.should == Array.new(10) { "NO_CONSUMERS" }
+        returned_messages.should == Array.new(10) { "NO_ROUTE" }
       }
     end
   end
-end
+end

data/spec/integration/channel_level_exception_with_multiple_channels_spec.rb

@@ -53,7 +53,6 @@ describe AMQP do
       }
 
       delayed(0.3) {
-        @q1.delete
         @q2.delete
       }
 

data/spec/integration/extensions/rabbitmq/publisher_confirmations_spec.rb

@@ -116,7 +116,7 @@ describe "Publisher confirmation(s)" do
         end
 
         EventMachine.add_timer(0.5) do
-          exchange.publish("Hi", :persistent => false, :immediately => true)
+          exchange.publish("Hi", :persistent => false)
         end
 
         done(2.0) do

data/spec/integration/multiple_consumers_per_queue_spec.rb

@@ -58,7 +58,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -104,7 +104,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -150,7 +150,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -199,7 +199,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -245,7 +245,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -256,64 +256,4 @@ describe "Multiple non-exclusive consumers per queue" do
       }
     end # it
   end # context
-
-
-
-  context "with equal prefetch levels and ALL consumers cancelled mid-flight" do
-    it "returns all immediate messages" do
-      @returned_messages = []
-
-      channel = AMQP::Channel.new
-      channel.on_error do |ch, channel_close|
-        raise(channel_close.reply_text)
-      end
-
-      queue   = channel.queue("amqpgem.integration.roundrobin.queue1", :auto_delete => true) do
-        consumer1 = AMQP::Consumer.new(channel, queue)
-        consumer2 = AMQP::Consumer.new(channel, queue, "#{queue.name}-consumer-#{rand}-#{Time.now}", false, true)
-
-        consumer1.consume.on_delivery do |basic_deliver, metadata, payload|
-          @consumer1_mailbox << payload
-        end
-
-        consumer2.consume(true).on_delivery do |metadata, payload|
-          @consumer2_mailbox << payload
-        end
-
-        queue.subscribe do |metadata, payload|
-          @consumer3_mailbox << payload
-        end
-        queue.should be_subscribed
-        queue.unsubscribe
-        queue.should_not be_subscribed
-
-        consumer2.should be_subscribed
-        consumer2.callback.should_not be_nil
-        consumer2.cancel
-        consumer2.should_not be_subscribed
-        consumer2.callback.should be_nil
-
-        consumer1.should be_subscribed
-        consumer1.callback.should_not be_nil
-        consumer1.cancel
-        consumer1.should_not be_subscribed
-        consumer1.callback.should be_nil
-      end
-
-      exchange = channel.default_exchange
-      exchange.on_return do |basic_return, metadata, payload|
-        @returned_messages << payload
-      end
-
-      EventMachine.add_timer(1.0) do
-        messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
-        end
-      end
-
-      done(6.0) {
-        @returned_messages.size.should == 100
-      }
-    end # it
-  end # context
 end # describe

data/spec/integration/regressions/concurrent_publishing_on_the_same_channel_spec.rb

@@ -73,7 +73,7 @@ if mri?
         20.times do
           Thread.new do
             messages.each do |message|
-              exchange.publish(message, :routing_key => queue.name, :immediate => true, :mandatory => true)
+              exchange.publish(message, :routing_key => queue.name, :mandatory => true)
             end
           end
         end

data/spec/integration/reply_queue_communication_spec.rb

@@ -53,8 +53,7 @@ describe "Exclusive server-named queue" do
                           :reply_to    => queue2.name,
                           :app_id      => "Client",
                           :timestamp   => request_timestamp,
-                          :mandatory   => true,
-                          :immediate   => true)
+                          :mandatory   => true)
 
         done(0.2) {
           queue1.unsubscribe

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Aman Gupta
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 Z
+date: 2012-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
         - 9
-        - 4
-        version: 0.9.4
+        - 5
+        version: 0.9.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -306,7 +306,6 @@ files:
 - spec/integration/fanout_exchange_routing_spec.rb
 - spec/integration/headers_exchange_routing_spec.rb
 - spec/integration/hello_world_spec.rb
-- spec/integration/immediate_messages_spec.rb
 - spec/integration/mandatory_messages_spec.rb
 - spec/integration/message_acknowledgement_spec.rb
 - spec/integration/message_metadata_access_spec.rb

data/spec/integration/immediate_messages_spec.rb

@@ -1,59 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-
-describe "When queue has no consumers" do
-
-  #
-  # Environment
-  #
-
-  include EventedSpec::AMQPSpec
-  default_timeout 1.5
-
-  amqp_before do
-    @producer_channel    = AMQP::Channel.new
-    @consumer_channel    = AMQP::Channel.new
-  end
-
-  # ...
-
-
-  #
-  # Examples
-  #
-
-  context "and message is published as :immediate" do
-    it "that message is returned to the publisher" do
-      exchange = @producer_channel.fanout("amq.fanout")
-      queue    = @consumer_channel.queue("", :exclusive => true)
-
-      exchange.on_return do |basic_return, metadata, payload|
-        done if payload == "immediate message body"
-      end
-
-      queue.bind(exchange) do
-        exchange.publish "immediate message body", :immediate => true
-      end
-    end
-  end
-
-
-
-  context "and message is published as non :immediate" do
-    it "that message is dropped" do
-      exchange = @producer_channel.fanout("amq.fanout")
-      queue    = @consumer_channel.queue("", :exclusive => true)
-
-      exchange.on_return do |basic_return, metadata, payload|
-        fail "Should not happen"
-      end
-
-      queue.bind(exchange) do
-        exchange.publish "non-immediate message body", :immediate => false
-      end
-
-      done(1.0)
-    end
-  end
-end # describe