amqp 0.9.10 → 1.0.0.pre1

data/lib/amqp/session.rb

@@ -110,7 +110,7 @@ module AMQP
 
 
     # Properly close connection with AMQ broker, as described in
-    # section 2.2.4 of the {http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification}.
+    # section 2.2.4 of the {http://bit.ly/hw2ELX AMQP 0.9.1 specification}.
     #
     # @api  plugin
     # @see  #close_connection
@@ -129,19 +129,19 @@ module AMQP
     # Server properties (product information, platform, et cetera)
     #
     # @return [Hash]
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
+    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
     attr_reader :server_properties
 
     # Server capabilities (usually used to detect AMQP 0.9.1 extensions like basic.nack, publisher
     # confirms and so on)
     #
     # @return [Hash]
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
+    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
     attr_reader :server_capabilities
 
     # Locales server supports
     #
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
+    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
     attr_reader :server_locales
 
     # @return [AMQP::Broker] Broker this connection is established with

data/lib/amqp/version.rb

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

data/spec/integration/basic_get_spec.rb

@@ -61,92 +61,36 @@ describe AMQP::Queue, "#pop" do
 
   context "when THERE ARE messages in the queue" do
     it "yields message payload to the callback" do
-      @channel.default_exchange.publish(@dispatched_data, :routing_key => @queue.name)
+      number_of_received_messages = 0
+      expected_number_of_messages = 300
 
-      @queue.pop do |headers, payload|
-        payload.should == @dispatched_data
+      expected_number_of_messages.times do |i|
+        @exchange.publish(@dispatched_data + "_#{i}", :key => @queue_name)
       end
 
-      delayed(0.5) {
+      @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) {
         # Queue.Get doesn't qualify for subscription, hence, manual deletion is required
         @queue.delete
       }
-      done(0.8)
+      done(2.5) {
+        number_of_received_messages.should == expected_number_of_messages
+      }
     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/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, :mandatory => true) }
+      (1..10).to_a.each { |m| @exchange.publish(m, :immediate => true) }
 
       done(1.0) {
-        returned_messages.should == Array.new(10) { "NO_ROUTE" }
+        returned_messages.should == Array.new(10) { "NO_CONSUMERS" }
       }
     end
   end
-end
+end

data/spec/integration/channel_level_exception_with_multiple_channels_spec.rb

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

data/spec/integration/exchange_declaration_spec.rb

@@ -127,14 +127,27 @@ describe AMQP::Channel do
     end # context
 
 
+    context "when exchange name was specified as a blank string" do
+      it 'returns direct exchange with server-generated name' do
+        pending <<-EOF
+      This has to be fixed in RabbitMQ first
+      https://bugzilla.rabbitmq.com/show_bug.cgi?id=23509
+    EOF
+        @channel.direct("") do |exchange|
+          exchange.name.should_not be_empty
+          done
+        end
+      end
+    end # context
+
+
     context "when passive option is used" do
       context "and exchange with given name already exists" do
         it "silently returns" do
-          name    = "a_new_direct_exchange declared at #{Time.now.to_i}"
-          channel = AMQP::Channel.new
+          name = "a_new_direct_exchange declared at #{Time.now.to_i}"
 
-          original_exchange = channel.direct(name)
-          exchange          = channel.direct(name, :passive => true)
+          original_exchange = @channel.direct(name)
+          exchange          = @channel.direct(name, :passive => true)
 
           exchange.should == original_exchange
 
@@ -144,16 +157,13 @@ describe AMQP::Channel do
 
       context "and exchange with given name DOES NOT exist" do
         it "raises an exception" do
-          channel = AMQP::Channel.new
-          channel.on_error do |ch, channel_close|
-            @error_code = channel_close.reply_code
-          end
+          pending "Not yet supported"
 
-          exchange = channel.direct("direct exchange declared at #{Time.now.to_i}", :passive => true)
+          expect {
+            exchange = @channel.direct("direct exchange declared at #{Time.now.to_i}", :passive => true)
+          }.to raise_error
 
-          done(0.5) {
-            @error_code.should == 404
-          }
+          done
         end # it
       end # context
     end # context
@@ -213,16 +223,27 @@ describe AMQP::Channel do
 
     context "when exchange is re-declared with parameters different from original declaration" do
       it "raises an exception" do
-        channel = AMQP::Channel.new
-        channel.direct("previously.declared.durable.direct.exchange", :durable => true)
+        @channel.direct("previously.declared.durable.direct.exchange", :durable => true)
 
         expect {
-          channel.direct("previously.declared.durable.direct.exchange", :durable => false)
+          @channel.direct("previously.declared.durable.direct.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         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
 
 
@@ -266,17 +287,12 @@ describe AMQP::Channel do
       end
 
       context "and exchange with given name DOES NOT exist" do
-        it "results in a channel exception" do
-          channel = AMQP::Channel.new
-          channel.on_error do |ch, channel_close|
-            @error_code = channel_close.reply_code
-          end
-
-          exchange = channel.fanout("fanout exchange declared at #{Time.now.to_i}", :passive => true)
+        it "raises an exception" do
+          pending "Not yet supported"
 
-          done(0.5) {
-            @error_code.should == 404
-          }
+          expect {
+            exchange = @channel.fanout("fanout exchange declared at #{Time.now.to_i}", :passive => true)
+          }.to raise_error
 
           done
         end # it
@@ -338,11 +354,10 @@ describe AMQP::Channel do
 
     context "when exchange is re-declared with parameters different from original declaration" do
       it "raises an exception" do
-        channel = AMQP::Channel.new
-        channel.fanout("previously.declared.durable.topic.exchange", :durable => true)
+        @channel.fanout("previously.declared.durable.topic.exchange", :durable => true)
 
         expect {
-          channel.fanout("previously.declared.durable.topic.exchange", :durable => false)
+          @channel.fanout("previously.declared.durable.topic.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
@@ -362,7 +377,7 @@ describe AMQP::Channel do
         exchange.name.should == name
 
         done
-      end # it
+      end
     end # context
 
     context "when exchange name is omitted" do
@@ -372,7 +387,7 @@ describe AMQP::Channel do
         exchange.name.should_not == "amq.topic2"
 
         done
-      end # it
+      end
     end # context
 
     context "when passive option is used" do
@@ -387,23 +402,20 @@ describe AMQP::Channel do
 
           done
         end # it
-      end # context
+      end
 
       context "and exchange with given name DOES NOT exist" do
-        it "results in a channel exception" do
-          channel = AMQP::Channel.new
-          channel.on_error do |ch, channel_close|
-            @error_code = channel_close.reply_code
-          end
+        it "raises an exception" do
+          pending "Not yet supported"
 
-          exchange = channel.topic("topic exchange declared at #{Time.now.to_i}", :passive => true)
+          expect {
+            exchange = @channel.topic("topic exchange declared at #{Time.now.to_i}", :passive => true)
+          }.to raise_error
 
-          done(0.5) {
-            @error_code.should == 404
-          }
+          done
         end # it
       end # context
-    end
+    end # context
 
 
     context "when exchange is declared as durable" do
@@ -458,14 +470,16 @@ describe AMQP::Channel do
     end # context
 
 
-    context "when exchange is re-declared with parameters different from the original declaration" do
+    context "when exchange is re-declared with parameters different from original declaration" do
       amqp_after do
         done
       end
 
       it "raises an exception" do
         channel = AMQP::Channel.new
+
         channel.topic("previously.declared.durable.topic.exchange", :durable => true)
+        channel.should be_open
 
         expect {
           channel.topic("previously.declared.durable.topic.exchange", :durable => false)
@@ -484,8 +498,7 @@ describe AMQP::Channel do
       let(:name) { "new.headers.exchange" }
 
       it "declares a new headers exchange with that name" do
-        channel  = AMQP::Channel.new
-        exchange = channel.headers(name)
+        exchange = @channel.headers(name)
 
         exchange.name.should == name
 
@@ -499,8 +512,7 @@ describe AMQP::Channel do
       end
 
       it "uses amq.match" do
-        channel  = AMQP::Channel.new
-        exchange = channel.headers
+        exchange = @channel.headers
         exchange.name.should == "amq.match"
         exchange.name.should_not == "amq.headers"
 
@@ -511,11 +523,10 @@ describe AMQP::Channel do
     context "when passive option is used" do
       context "and exchange with given name already exists" do
         it "silently returns" do
-          name    = "a_new_headers_exchange declared at #{Time.now.to_i}"
-          channel = AMQP::Channel.new
+          name = "a_new_headers_exchange declared at #{Time.now.to_i}"
 
-          original_exchange = channel.headers(name)
-          exchange          = channel.headers(name, :passive => true)
+          original_exchange = @channel.headers(name)
+          exchange          = @channel.headers(name, :passive => true)
 
           exchange.should == original_exchange
 
@@ -525,16 +536,13 @@ describe AMQP::Channel do
 
       context "and exchange with given name DOES NOT exist" do
         it "raises an exception" do
-          channel = AMQP::Channel.new
-          channel.on_error do |ch, channel_close|
-            @error_code = channel_close.reply_code
-          end
+          pending "Not yet supported"
 
-          exchange = channel.headers("headers exchange declared at #{Time.now.to_i}", :passive => true)
+          expect {
+            exchange = @channel.headers("headers exchange declared at #{Time.now.to_i}", :passive => true)
+          }.to raise_error
 
-          done(0.5) {
-            @error_code.should == 404
-          }
+          done
         end # it
       end # context
     end # context
@@ -542,8 +550,7 @@ describe AMQP::Channel do
 
     context "when exchange is declared as durable" do
       it "returns a new durable headers exchange" do
-        channel  = AMQP::Channel.new
-        exchange = channel.headers("a_new_durable_headers_exchange", :durable => true)
+        exchange = @channel.headers("a_new_durable_headers_exchange", :durable => true)
         exchange.should be_durable
         exchange.should_not be_transient
 
@@ -554,8 +561,7 @@ describe AMQP::Channel do
 
     context "when exchange is declared as non-durable" do
       it "returns a new NON-durable headers exchange" do
-        channel  = AMQP::Channel.new
-        exchange = channel.headers("a_new_non_durable_headers_exchange", :durable => false)
+        exchange = @channel.headers("a_new_non_durable_headers_exchange", :durable => false)
         exchange.should_not be_durable
         exchange.should be_transient
 
@@ -566,8 +572,7 @@ describe AMQP::Channel do
 
     context "when exchange is declared as auto-deleted" do
       it "returns a new auto-deleted headers exchange" do
-        channel  = AMQP::Channel.new
-        exchange = channel.headers("a new auto-deleted headers exchange", :auto_delete => true)
+        exchange = @channel.headers("a new auto-deleted headers exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
         done
@@ -577,8 +582,7 @@ describe AMQP::Channel do
 
     context "when exchange is declared as auto-deleted" do
       it "returns a new auto-deleted headers exchange" do
-        channel  = AMQP::Channel.new
-        exchange = channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
+        exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
         done
@@ -588,8 +592,7 @@ describe AMQP::Channel do
 
     context "when exchange is declared without explicit :nowait parameter" do
       it "is declared with :nowait by default" do
-        channel  = AMQP::Channel.new
-        exchange = channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
+        exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
         done
@@ -603,15 +606,43 @@ describe AMQP::Channel do
       end
 
       it "raises an exception" do
-        channel = AMQP::Channel.new
-        channel.headers("previously.declared.durable.headers.exchange", :durable => true)
+        @channel.headers("previously.declared.durable.headers.exchange", :durable => true)
 
         expect {
-          channel.headers("previously.declared.durable.headers.exchange", :durable => false)
+          @channel.headers("previously.declared.durable.headers.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
     end # context
+
+
+    context "when exchange is re-declared with parameters different from original declaration on two separate channels" do
+      it "raises an exception" do
+        channel2 = AMQP::Channel.new
+        @channel.headers("previously.declared.durable.headers.exchange", :durable => true)
+
+        channel2.on_error do |ch, channel_close|
+          puts "reply_text: #{channel_close.reply_text}, reply_code: #{channel_close.reply_code}"
+          done
+        end
+        channel2.headers("previously.declared.durable.headers.exchange", :durable => false)
+      end # it
+    end # context
+
+
+
+    context "when exchange is re-declared with type different from original declaration on two separate channels" do
+      it "raises an exception" do
+        channel2 = AMQP::Channel.new
+        @channel.topic("previously.declared.durable.topic.exchange", :durable => true)
+
+        channel2.on_error do |ch, channel_close|
+          puts "reply_text: #{channel_close.reply_text}, reply_code: #{channel_close.reply_code}"
+          done
+        end
+        channel2.headers("previously.declared.durable.topic.exchange", :durable => true)
+      end # it
+    end # context
   end # describe
 end # describe AMQP