amqp 0.9.9 → 0.9.10

data/lib/amqp/channel.rb

@@ -263,6 +263,9 @@ module AMQP
     def auto_recover
       return unless auto_recovering?
 
+      @channel_is_open_deferrable.fail
+      @channel_is_open_deferrable = AMQ::Client::EventMachineClient::Deferrable.new
+
       self.open do
         @channel_is_open_deferrable.succeed
 
@@ -286,6 +289,9 @@ module AMQP
       @id    = self.class.next_channel_id
       self.class.release_channel_id(old_id)
 
+      @channel_is_open_deferrable.fail
+      @channel_is_open_deferrable = AMQ::Client::EventMachineClient::Deferrable.new
+
       self.open do
         @channel_is_open_deferrable.succeed
 
@@ -929,16 +935,27 @@ module AMQP
     #
     # @api public
     def once_open(&block)
-      @channel_is_open_deferrable.callback(&block)
+      @channel_is_open_deferrable.callback do
+        # guards against cases when deferred operations
+        # don't complete before the channel is closed
+        block.call if open?
+      end
     end # once_open(&block)
     alias once_opened once_open
 
+    # @return [Boolean]
+    # @api public
+    def closing?
+      self.status == :closing
+    end
+
     # Closes AMQP channel.
     #
     # @api public
     def close(reply_code = 200, reply_text = DEFAULT_REPLY_TEXT, class_id = 0, method_id = 0, &block)
+      self.status = :closing
       r = super(reply_code, reply_text, class_id, method_id, &block)
-    
+
       r
     end
 
@@ -1122,7 +1139,7 @@ module AMQP
       self.class.error(method.reply_text)
       self.class.release_channel_id(@id)
     end
-    
+
     # Overrides AMQ::Client::Channel version to also release the channel id
     #
     # @private

data/lib/amqp/queue.rb

@@ -221,7 +221,11 @@ module AMQP
     #
     # @api public
     def once_declared(&block)
-      @declaration_deferrable.callback(&block)
+      @declaration_deferrable.callback do
+        # guards against cases when deferred operations
+        # don't complete before the channel is closed
+        block.call if @channel.open?
+      end
     end # once_declared(&block)
 
 
@@ -281,14 +285,8 @@ module AMQP
     # @api public
     # @see Queue#unbind
     def bind(exchange, opts = {}, &block)
-      if self.server_named?
-        @channel.once_open do
-          @declaration_deferrable.callback do
-            super(exchange, (opts[:key] || opts[:routing_key] || AMQ::Protocol::EMPTY_STRING), (opts[:nowait] || block.nil?), opts[:arguments], &block)
-          end
-        end
-      else
-        @channel.once_open do
+      @channel.once_open do
+        self.once_name_is_available do
           super(exchange, (opts[:key] || opts[:routing_key] || AMQ::Protocol::EMPTY_STRING), (opts[:nowait] || block.nil?), opts[:arguments], &block)
         end
       end
@@ -357,7 +355,9 @@ module AMQP
     # @see Queue#bind
     def unbind(exchange, opts = {}, &block)
       @channel.once_open do
-        super(exchange, (opts[:key] || opts[:routing_key] || AMQ::Protocol::EMPTY_STRING), opts[:arguments], &block)
+        self.once_name_is_available do
+          super(exchange, (opts[:key] || opts[:routing_key] || AMQ::Protocol::EMPTY_STRING), opts[:arguments], &block)
+        end
       end
     end
 
@@ -391,7 +391,9 @@ module AMQP
     # @see Queue#unbind
     def delete(opts = {}, &block)
       @channel.once_open do
-        super(opts.fetch(:if_unused, false), opts.fetch(:if_empty, false), opts.fetch(:nowait, false), &block)
+        self.once_name_is_available do
+          super(opts.fetch(:if_unused, false), opts.fetch(:if_empty, false), opts.fetch(:nowait, false), &block)
+        end
       end
 
       # backwards compatibility
@@ -416,7 +418,9 @@ module AMQP
     # @see Queue#unbind
     def purge(opts = {}, &block)
       @channel.once_open do
-        super(opts.fetch(:nowait, false), &block)
+        self.once_declared do
+          super(opts.fetch(:nowait, false), &block)
+        end
       end
 
       # backwards compatibility
@@ -477,11 +481,17 @@ module AMQP
         }
 
         @channel.once_open do
-          # see AMQ::Client::Queue#get in amq-client
-          self.get(!opts.fetch(:ack, false), &shim)
+          self.once_name_is_available do
+            # see AMQ::Client::Queue#get in amq-client
+            self.get(!opts.fetch(:ack, false), &shim)
+          end
         end
       else
-        @channel.once_open { self.get(!opts.fetch(:ack, false)) }
+        @channel.once_open do
+          self.once_name_is_available do
+            self.get(!opts.fetch(:ack, false))
+          end
+        end
       end
     end
 
@@ -719,7 +729,9 @@ module AMQP
       opts[:nowait] = false if (@on_confirm_subscribe = opts[:confirm])
 
       @channel.once_open do
-        self.once_declared do
+        self.once_name_is_available do
+          # guards against a pathological case race condition when a channel
+          # is opened and closed before delayed operations are completed.
           self.consume(!opts[:ack], opts[:exclusive], (opts[:nowait] || block.nil?), opts[:no_local], nil, &opts[:confirm])
 
           self.on_delivery(&block)
@@ -785,7 +797,7 @@ module AMQP
     # @api public
     def unsubscribe(opts = {}, &block)
       @channel.once_open do
-        self.once_declared do
+        self.once_name_is_available do
           if @default_consumer
             @default_consumer.cancel(opts.fetch(:nowait, true), &block); @default_consumer = nil
           end
@@ -812,12 +824,14 @@ module AMQP
       shim = Proc.new { |q, declare_ok| block.call(declare_ok.message_count, declare_ok.consumer_count) }
 
       @channel.once_open do
-        # we do not use self.declare here to avoid caching of @passive since that will cause unexpected side-effects during automatic
-        # recovery process. MK.
-        @connection.send_frame(AMQ::Protocol::Queue::Declare.encode(@channel.id, @name, true, @opts[:durable], @opts[:exclusive], @opts[:auto_delete], false, @opts[:arguments]))
+        self.once_name_is_available do
+          # we do not use self.declare here to avoid caching of @passive since that will cause unexpected side-effects during automatic
+          # recovery process. MK.
+          @connection.send_frame(AMQ::Protocol::Queue::Declare.encode(@channel.id, @name, true, @opts[:durable], @opts[:exclusive], @opts[:auto_delete], false, @opts[:arguments]))
 
-        self.append_callback(:declare, &shim)
-        @channel.queues_awaiting_declare_ok.push(self)
+          self.append_callback(:declare, &shim)
+          @channel.queues_awaiting_declare_ok.push(self)
+        end
       end
 
       self
@@ -883,6 +897,16 @@ module AMQP
       { :queue => name, :nowait => (block.nil? && !name.empty?) }.merge(opts)
     end
 
+    def once_name_is_available(&block)
+      if server_named?
+        self.once_declared do
+          block.call
+        end
+      else
+        block.call
+      end
+    end
+
     private
 
     # Default direct exchange that we use to publish messages directly to this queue.

data/lib/amqp/version.rb

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

data/spec/integration/basic_get_spec.rb

@@ -61,36 +61,92 @@ describe AMQP::Queue, "#pop" do
 
   context "when THERE ARE messages in the queue" do
     it "yields message payload to the callback" do
-      number_of_received_messages = 0
-      expected_number_of_messages = 300
+      @channel.default_exchange.publish(@dispatched_data, :routing_key => @queue.name)
 
-      expected_number_of_messages.times do |i|
-        @exchange.publish(@dispatched_data + "_#{i}", :key => @queue_name)
+      @queue.pop do |headers, payload|
+        payload.should == @dispatched_data
       end
 
-      @queue.status do |number_of_messages, number_of_consumers|
-        expected_number_of_messages.times do
-          @queue.pop do |headers, payload|
-            payload.should_not be_nil
-            number_of_received_messages += 1
-            headers.message_count.should == (expected_number_of_messages - number_of_received_messages)
-
-            if RUBY_VERSION =~ /^1.9/
-              payload.force_encoding("UTF-8").should =~ /#{@dispatched_data}/
-            else
-              payload.should =~ /#{@dispatched_data}/
-            end
-          end # pop
-        end # do
-      end
-
-      delayed(1.3) {
+      delayed(0.5) {
         # Queue.Get doesn't qualify for subscription, hence, manual deletion is required
         @queue.delete
       }
-      done(2.5) {
-        number_of_received_messages.should == expected_number_of_messages
-      }
+      done(0.8)
     end # it
   end # context
+
+
+  context "with manual acknowledgements" do
+    default_timeout 4
+
+    let(:queue_name) { "amqpgem.integration.basic.get.acks.manual#{rand}" }
+
+    it "does not remove messages from the queue unless ack-ed" do
+      ch1 = AMQP::Channel.new
+      ch2 = AMQP::Channel.new
+
+      ch1.on_error do |ch, close_ok|
+        puts "Channel error: #{close_ok.reply_code} #{close_ok.reply_text}"
+      end
+
+      q  = ch1.queue(queue_name, :exclusive => true)
+      x  = ch1.default_exchange
+
+      q.purge
+      delayed(0.2) { x.publish(@dispatched_data, :routing_key => q.name) }
+
+      delayed(0.5) {
+        q.pop(:ack => true) do |meta, payload|
+          # never ack
+        end
+
+        ch1.close
+
+        EventMachine.add_timer(0.7) {
+          ch2.queue(queue_name, :exclusive => true).status do |number_of_messages, number_of_consumers|
+            number_of_messages.should == 1
+            done
+          end
+        }
+      }
+    end
+  end
+
+
+
+  context "with automatic acknowledgements" do
+    default_timeout 4
+
+    let(:queue_name) { "amqpgem.integration.basic.get.acks.automatic#{rand}" }
+
+    it "does remove messages from the queue after delivery" do
+      ch1 = AMQP::Channel.new
+      ch2 = AMQP::Channel.new
+
+      ch1.on_error do |ch, close_ok|
+        puts "Channel error: #{close_ok.reply_code} #{close_ok.reply_text}"
+      end
+
+      q  = ch1.queue(queue_name, :exclusive => true)
+      x  = ch1.default_exchange
+
+      q.purge
+      x.publish(@dispatched_data, :routing_key => q.name)
+
+      delayed(0.5) {
+        q.pop(:ack => false) do |meta, payload|
+          # never ack
+        end
+
+        ch1.close
+
+        EventMachine.add_timer(0.5) {
+          ch2.queue(queue_name, :exclusive => true).status do |number_of_messages, number_of_consumers|
+            number_of_messages.should == 0
+            done
+          end
+        }
+      }
+    end
+  end
 end # describe

data/spec/integration/fanout_exchange_routing_spec.rb

@@ -77,7 +77,7 @@ describe AMQP::Exchange, "of type fanout" do
       end
 
       # for Rubinius, it is surprisingly slow on this workload
-      done(2.5) {
+      done(1.5) {
         [@queue1, @queue2, @queue3].each do |q|
           @received_messages[q.name].size.should == @expected_number_of_messages[q.name]
 

data/spec/integration/store_and_forward_spec.rb

@@ -53,19 +53,16 @@ describe "Store-and-forward routing" do
         @queue.subscribe(:ack => false) do |payload|
           payload.should_not be_nil
           number_of_received_messages += 1
-          if RUBY_VERSION =~ /^1.9/
-            payload.force_encoding("UTF-8").should == dispatched_data
-          else
-            payload.should == dispatched_data
-          end
+          payload.should == dispatched_data
         end # subscribe
 
-        expected_number_of_messages.times do
-          @exchange.publish(dispatched_data, :routing_key => @queue_name)
+        delayed(0.3) do
+          expected_number_of_messages.times do
+            @exchange.publish(dispatched_data, :routing_key => @queue_name)
+          end
         end
 
-        # 6 seconds are for Rubinius, it is surprisingly slow on this workload
-        done(6.0) {
+        done(4.0) {
           number_of_received_messages.should == expected_number_of_messages
           @queue.unsubscribe
         }

data/spec/integration/topic_subscription_spec.rb

@@ -66,9 +66,9 @@ describe "Topic-based subscription" do
       # publish some messages none of our queues should be receiving
       3.times do
         @exchange.publish(626 + rand(1000)/400.0, :key => "nasdaq.goog")
-      end # do
+      end
 
-      done(0.4) {
+      done(0.5) {
         received_messages.should == expected_messages
         @aapl_queue.unsubscribe
         @amzn_queue.unsubscribe
@@ -117,7 +117,7 @@ describe "Topic-based subscription" do
       @exchange.publish("Blatche, Wall lead Wizards over Jazz 108-101", :key => "sports.nba.jazz")
       @exchange.publish("Deron Williams Receives NBA Cares Community Assist Award", :key => "sports.nba.jazz")
 
-      done(0.2) {
+      done(0.6) {
         received_messages.should == expected_messages
 
         @nba_queue.unsubscribe
@@ -151,6 +151,7 @@ describe "Topic-based subscription" do
         @celtics_queue.name => 3
       }
 
+
       @sports_queue.bind(@exchange, :key => "sports.#").subscribe do |payload|
         received_messages[@sports_queue.name] += 1
       end
@@ -180,7 +181,7 @@ describe "Topic-based subscription" do
       @exchange.publish("Philadelphia's Daniel Briere has been named as an All-Star replacement for Jarome Iginla.", :key => "sports.nhl.allstargame")
       @exchange.publish("Devils blank Sid- and Malkin-less Penguins 2-0", :key => "sports.nhl.penguins")
 
-      done(0.2) {
+      done(0.5) {
         received_messages.should == expected_messages
 
         @sports_queue.unsubscribe

data/spec/spec_helper.rb

@@ -15,6 +15,12 @@ puts "Using Ruby #{RUBY_VERSION}, amq-client #{AMQ::Client::VERSION} and amq-pro
 
 amqp_config = File.dirname(__FILE__) + '/amqp.yml'
 
+port = if ENV["TRACER"]
+         5673
+       else
+         5672
+       end
+
 if File.exists? amqp_config
   class Hash
     def symbolize_keys
@@ -28,7 +34,7 @@ if File.exists? amqp_config
   end
   AMQP_OPTS = YAML::load_file(amqp_config).symbolize_keys[:test]
 else
-  AMQP_OPTS = {:host => 'localhost', :port => 5672}
+  AMQP_OPTS = {:host => 'localhost', :port => port}
 end
 
 # puts "AMQP_OPTS = #{AMQP_OPTS.inspect}"
@@ -82,4 +88,4 @@ module PlatformDetection
   def rubinius?
     defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'rbx')
   end
-end
+end

data/spec/unit/amqp/connection_spec.rb

@@ -29,7 +29,8 @@ describe AMQP, 'class object' do
       :ssl       => false,
       :broker    => nil,
       :frame_max => 131072,
-      :heartbeat => 0
+      :heartbeat => 0,
+      :auth_mechanism => "PLAIN"
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
   prerelease:
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine