amq-client 0.7.0.alpha20 → 0.7.0.alpha21

data/amq-client.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ruby-amqp/amq-client"
   s.summary = "amq-client is a fully-featured, low-level AMQP 0.9.1 client"
   s.description = "amq-client supports multiple networking adapters (EventMachine, TCP sockets, cool.io) and supposed to back more opinionated AMQP clients (such as amqp gem, bunny, et cetera) or be used directly in cases when access to more advanced AMQP 0.9.1 features is more important that convenient APIs"
-  s.cert_chain = nil
-  s.has_rdoc   = true
 
   # files
   s.files = `git ls-files`.split("\n").reject { |file| file =~ /^vendor\// || file =~ /^gemfiles\// }

data/lib/amq/client/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Client
-    VERSION = "0.7.0.alpha20"
+    VERSION = "0.7.0.alpha21"
   end
 end

data/spec/integration/coolio/basic_ack_spec.rb

@@ -30,9 +30,9 @@ describe "AMQ::Client::CoolioClient", "Basic.Ack", :nojruby => true do
         end # open
 
         done(0.8) {
-          @received_messages.size.should == messages.size
+          @received_messages.should =~ messages
         }
       end # coolio_amqp_connect
     end # it
   end # context
-end # describe
+end # describe

data/spec/integration/coolio/basic_cancel_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'integration/coolio/spec_helper'
+
+describe "AMQ::Client::CoolioClient", "Basic.Cancel", :nojruby => true do
+  include EventedSpec::SpecHelper
+  default_timeout 4
+
+  let(:messages) { (0..99).map {|i| "Message #{i}" } }
+
+  it "should stop receiving messages after receiving cancel-ok" do
+    @received_messages = []
+    coolio_amqp_connect do |client|
+      channel = AMQ::Client::Channel.new(client, 1)
+      channel.open do
+        queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+        queue.bind("amq.fanout")
+        exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+
+        queue.consume(true) do |amq_method|
+          queue.on_delivery do |method, header, payload|
+            @received_messages << payload
+          end
+
+          messages.each do |message|
+            exchange.publish(message)
+          end
+        end
+
+        delayed(1.5) {
+          @received_messages.should =~ messages
+          queue.cancel do
+            exchange.publish("Extra message, should not be received")
+          end
+        }
+
+        done(2.5) {
+          @received_messages.should =~ messages
+        }
+      end
+    end
+
+  end # it "should stop receiving messages after receiving cancel-ok"
+end # describe AMQ::Client::CoolioClient, "Basic.Consume"

data/spec/integration/coolio/basic_consume_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+require 'integration/coolio/spec_helper'
+
+#
+# Note that this spec doesn't test acknowledgements.
+# See basic_ack_spec for example with acks
+#
+
+describe "AMQ::Client::CoolioClient", "Basic.Consume", :nojruby => true do
+  include EventedSpec::SpecHelper
+  default_timeout 4
+
+  context "sending 100 messages" do
+    let(:messages) { (0..99).map {|i| "Message #{i}" } }
+
+    it "should receive all the messages" do
+      @received_messages = []
+      coolio_amqp_connect do |client|
+        channel = AMQ::Client::Channel.new(client, 1)
+        channel.open do
+          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+          queue.bind("amq.fanout")
+
+          queue.consume(true) do |amq_method|
+            queue.on_delivery do |method, header, payload|
+              @received_messages << payload
+            end
+
+            exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+            messages.each do |message|
+              exchange.publish(message)
+            end
+          end
+
+          done(1.5) {
+            @received_messages.should =~ messages
+          }
+        end
+      end
+    end # it "should receive all the messages"
+
+    it "should not leave messages in the queues with noack=true" do
+      @received_messages = []
+      @rereceived_messages = []
+      coolio_amqp_connect do |client|
+        channel = AMQ::Client::Channel.new(client, 1)
+        channel.open do
+          channel.qos(0, 1) # Maximum prefetch size = 1
+          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+          queue.bind("amq.fanout")
+
+          # Change noack to false and watch spec fail
+          queue.consume(true) do |amq_method|
+            queue.on_delivery do |method, header, payload|
+              @received_messages << payload
+            end
+
+            exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+            messages.each do |message|
+              exchange.publish(message)
+            end
+          end
+
+          # We're opening another channel and starting consuming the same queue,
+          # assuming 1.5 secs was enough to receive all the messages
+          delayed(1.5) do
+            other_channel = AMQ::Client::Channel.new(client, 2)
+            other_channel.open do
+              other_channel.qos(0, 1) # Maximum prefetch size = 1
+              other_queue = AMQ::Client::Queue.new(client, other_channel, queue.name)
+              other_queue.consume(true) do |amq_method|
+                other_queue.on_delivery do |method, header, payload|
+                  @rereceived_messages << payload
+                end
+              end
+            end
+          end
+
+        end
+
+
+        done(2.5) {
+          @rereceived_messages.should == []
+          @received_messages.should =~ messages
+        }
+      end
+    end # it "should not leave messages in the queues with noack=true"
+  end # context "sending 100 messages"
+end # describe AMQ::Client::CoolioClient, "Basic.Consume"

data/spec/integration/coolio/exchange_declare_spec.rb

@@ -94,7 +94,6 @@ describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
               end
               exchange = AMQ::Client::Exchange.new(client, channel, exchange_name, :fanout)
               exchange.declare(false, false, false, false) do # initial declaration
-                exchange.delete
                 AMQ::Client::Exchange.new(client, channel, exchange_name, :fanout).declare(false) do
                   @callback_fired = true
                 end

data/spec/integration/eventmachine/basic_ack_spec.rb

@@ -29,10 +29,10 @@ describe AMQ::Client::EventMachineClient, "Basic.Ack" do
           end
 
           done(2.5) {
-            @received_messages.size == messages.size
+            @received_messages =~ messages
           }
         end
       end
     end
   end
-end
+end

data/spec/integration/eventmachine/basic_cancel_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'integration/eventmachine/spec_helper'
+
+describe AMQ::Client::EventMachineClient, "Basic.Cancel" do
+  include EventedSpec::SpecHelper
+  default_timeout 4
+
+  let(:messages) { (0..99).map {|i| "Message #{i}" } }
+
+  it "should stop receiving messages after receiving cancel-ok" do
+    @received_messages = []
+    em_amqp_connect do |client|
+      channel = AMQ::Client::Channel.new(client, 1)
+      channel.open do
+        queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+        queue.bind("amq.fanout")
+        exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+
+        queue.consume(true) do |amq_method|
+          queue.on_delivery do |method, header, payload|
+            @received_messages << payload
+          end
+
+          messages.each do |message|
+            exchange.publish(message)
+          end
+        end
+
+        delayed(1.5) {
+          @received_messages.should =~ messages
+          queue.cancel do
+            exchange.publish("Extra message, should not be received")
+          end
+        }
+
+        done(2.5) {
+          @received_messages.should =~ messages
+        }
+      end
+    end
+
+  end # it "should stop receiving messages after receiving cancel-ok"
+end # describe AMQ::Client::EventMachineClient, "Basic.Consume"

data/spec/integration/eventmachine/basic_consume_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+require 'integration/eventmachine/spec_helper'
+
+#
+# Note that this spec doesn't test acknowledgements.
+# See basic_ack_spec for example with acks
+#
+
+describe AMQ::Client::EventMachineClient, "Basic.Consume" do
+  include EventedSpec::SpecHelper
+  default_timeout 4
+
+  context "sending 100 messages" do
+    let(:messages) { (0..99).map {|i| "Message #{i}" } }
+
+    it "should receive all the messages" do
+      @received_messages = []
+      em_amqp_connect do |client|
+        channel = AMQ::Client::Channel.new(client, 1)
+        channel.open do
+          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+          queue.bind("amq.fanout")
+
+          queue.consume(true) do |amq_method|
+            queue.on_delivery do |method, header, payload|
+              @received_messages << payload
+            end
+
+            exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+            messages.each do |message|
+              exchange.publish(message)
+            end
+          end
+
+          done(1.5) {
+            @received_messages.should =~ messages
+          }
+        end
+      end
+    end # it "should receive all the messages"
+
+    it "should not leave messages in the queues with noack=true" do
+      @received_messages = []
+      @rereceived_messages = []
+      em_amqp_connect do |client|
+        channel = AMQ::Client::Channel.new(client, 1)
+        channel.open do
+          channel.qos(0, 1) # Maximum prefetch size = 1
+          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+          queue.bind("amq.fanout")
+
+          # Change noack to false and watch spec fail
+          queue.consume(true) do |amq_method|
+            queue.on_delivery do |method, header, payload|
+              @received_messages << payload
+            end
+
+            exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+            messages.each do |message|
+              exchange.publish(message)
+            end
+          end
+
+          # We're opening another channel and starting consuming the same queue,
+          # assuming 1.5 secs was enough to receive all the messages
+          delayed(1.5) do
+            other_channel = AMQ::Client::Channel.new(client, 2)
+            other_channel.open do
+              other_channel.qos(0, 1) # Maximum prefetch size = 1
+              other_queue = AMQ::Client::Queue.new(client, other_channel, queue.name)
+              other_queue.consume(true) do |amq_method|
+                other_queue.on_delivery do |method, header, payload|
+                  @rereceived_messages << payload
+                end
+              end
+            end
+          end
+
+        end
+
+
+        done(2.5) {
+          @rereceived_messages.should == []
+          @received_messages.should =~ messages
+        }
+      end
+    end # it "should not leave messages in the queues with noack=true"
+  end # context "sending 100 messages"
+end # describe AMQ::Client::EventMachineClient, "Basic.Consume"

data/spec/integration/eventmachine/exchange_declare_spec.rb

@@ -94,7 +94,6 @@ describe AMQ::Client::EventMachineClient, "Exchange.Declare" do
               end
               exchange = AMQ::Client::Exchange.new(client, channel, exchange_name, :fanout)
               exchange.declare(false, false, false, false) do # initial declaration
-                exchange.delete
                 AMQ::Client::Exchange.new(client, channel, exchange_name, :fanout).declare(false) do
                   @callback_fired = true
                 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: 1552698946208022711
+  hash: -3702664442
   prerelease: 6
   segments: 
   - 0
   - 7
   - 0
   - alpha
-  - 20
-  version: 0.7.0.alpha20
+  - 21
+  version: 0.7.0.alpha21
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -18,9 +18,9 @@ authors:
 - Mark Abramov
 autorequire: 
 bindir: bin
-cert_chain: 
-date: 2011-05-06 00:00:00 +04:00
-default_executable: 
+cert_chain: []
+
+date: 2011-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -178,6 +178,8 @@ files:
 - spec/client/framing/string_frame_spec.rb
 - spec/client/protocol/get_response_spec.rb
 - spec/integration/coolio/basic_ack_spec.rb
+- spec/integration/coolio/basic_cancel_spec.rb
+- spec/integration/coolio/basic_consume_spec.rb
 - spec/integration/coolio/basic_get_spec.rb
 - spec/integration/coolio/basic_return_spec.rb
 - spec/integration/coolio/channel_close_spec.rb
@@ -189,6 +191,8 @@ files:
 - spec/integration/coolio/tx_commit_spec.rb
 - spec/integration/coolio/tx_rollback_spec.rb
 - spec/integration/eventmachine/basic_ack_spec.rb
+- spec/integration/eventmachine/basic_cancel_spec.rb
+- spec/integration/eventmachine/basic_consume_spec.rb
 - spec/integration/eventmachine/basic_get_spec.rb
 - spec/integration/eventmachine/basic_return_spec.rb
 - spec/integration/eventmachine/channel_close_spec.rb
@@ -218,7 +222,6 @@ files:
 - doc/index.html
 - doc/method_list.html
 - doc/top-level-namespace.html
-has_rdoc: true
 homepage: http://github.com/ruby-amqp/amq-client
 licenses: []
 
@@ -250,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amq-client
-rubygems_version: 1.5.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: amq-client is a fully-featured, low-level AMQP 0.9.1 client