bunny 0.10.8 → 1.0.0.pre1

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "0.10.8"
+  VERSION = "1.0.0.pre1"
 end

data/spec/higher_level_api/integration/basic_ack_spec.rb

@@ -7,65 +7,50 @@ describe Bunny::Channel, "#ack" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close if connection.open?
   end
 
+  subject do
+    connection.create_channel
+  end
+
   context "with a valid (known) delivery tag" do
     it "acknowleges a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
-      x  = ch.default_exchange
+      q = subject.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      x = subject.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
-      sleep 0.5
+      sleep(0.25)
       q.message_count.should == 1
       delivery_details, properties, content = q.pop(:ack => true)
 
-      ch.ack(delivery_details.delivery_tag, true)
+      subject.ack(delivery_details.delivery_tag, true)
+      sleep(0.25)
       q.message_count.should == 0
 
-      ch.close
-    end
-  end
-
-
-  context "with a valid (known) delivery tag and automatic ack mode" do
-    it "results in a channel exception" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
-      x  = ch.default_exchange
-
-      q.subscribe(:manual_ack => false) do |delivery_info, properties, payload|
-        ch.ack(delivery_info.delivery_tag, false)
-      end
-
-      x.publish("bunneth", :routing_key => q.name)
-      sleep 0.5
-      lambda do
-        q.message_count
-      end.should raise_error(Bunny::ChannelAlreadyClosed)
+      subject.close
     end
   end
 
   context "with an invalid (random) delivery tag" do
     it "causes a channel-level error" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.unknown-delivery-tag", :exclusive => true)
-      x  = ch.default_exchange
+      q = subject.queue("bunny.basic.ack.unknown-delivery-tag", :exclusive => true)
+      x = subject.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
-      sleep 0.5
+      sleep(0.25)
       q.message_count.should == 1
       _, _, content = q.pop(:ack => true)
 
-      ch.on_error do |ch, channel_close|
+      subject.on_error do |ch, channel_close|
         @channel_close = channel_close
       end
-      ch.ack(82, true)
-      sleep 0.25
+      subject.ack(82, true)
+
+      sleep 0.5
 
-      @channel_close.reply_code.should == AMQ::Protocol::PreconditionFailed::VALUE
+      @channel_close.reply_text.should == "PRECONDITION_FAILED - unknown delivery tag 82"
     end
   end
 end

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Consumer, "#cancel" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "set"
 
 describe Bunny::Queue, "#subscribe" do
   let(:connection) do
@@ -8,7 +7,7 @@ describe Bunny::Queue, "#subscribe" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close if connection.open?
   end
 
@@ -42,66 +41,6 @@ describe Bunny::Queue, "#subscribe" do
 
       ch.close
     end
-
-    context "with a single consumer" do
-      let(:queue_name) { "bunny.basic_consume#{rand}" }
-
-      it "provides delivery tag access" do
-        delivery_tags = SortedSet.new
-
-        cch = connection.create_channel
-        q = cch.queue(queue_name, :auto_delete => true, :durable => false)
-        q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
-          delivery_tags << delivery_info.delivery_tag
-        end
-        sleep 0.5
-
-        ch = connection.create_channel
-        x  = ch.default_exchange
-        100.times do
-          x.publish("hello", :routing_key => queue_name)
-        end
-
-        sleep 1.0
-        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
-
-        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
-
-        ch.close
-      end
-    end
-
-
-    context "with multiple consumers on the same channel" do
-      let(:queue_name) { "bunny.basic_consume#{rand}" }
-
-      it "provides delivery tag access" do
-        delivery_tags = SortedSet.new
-
-        cch = connection.create_channel
-        q   = cch.queue(queue_name, :auto_delete => true, :durable => false)
-
-        7.times do
-          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
-            delivery_tags << delivery_info.delivery_tag
-          end
-        end
-        sleep 1.0
-
-        ch = connection.create_channel
-        x  = ch.default_exchange
-        100.times do
-          x.publish("hello", :routing_key => queue_name)
-        end
-
-        sleep 1.5
-        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
-
-        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
-
-        ch.close
-      end
-    end
   end
 
   context "with manual acknowledgement mode" do
@@ -138,7 +77,7 @@ describe Bunny::Queue, "#subscribe" do
     end
   end
 
-  ENV.fetch("RUNS", 20).to_i.times do |i|
+  20.times do |i|
     context "with a queue that already has messages (take #{i})" do
       let(:queue_name) { "bunny.basic_consume#{rand}" }
 

data/spec/higher_level_api/integration/basic_get_spec.rb

@@ -8,7 +8,7 @@ describe Bunny::Queue, "#pop" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_nack_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel, "#nack" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_publish_spec.rb

@@ -8,7 +8,7 @@ if RUBY_VERSION <= "1.9"
       c
     end
 
-    after :each do
+    after :all do
       connection.close if connection.open?
     end
 

data/spec/higher_level_api/integration/basic_qos_spec.rb

@@ -7,22 +7,25 @@ describe Bunny::Channel, "#prefetch" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close
   end
 
+
+  subject do
+    connection.create_channel
+  end
+
   context "with a positive integer" do
     it "sets that prefetch level via basic.qos" do
-      ch = connection.create_channel
-      ch.prefetch(10).should be_instance_of(AMQ::Protocol::Basic::QosOk)
+      subject.prefetch(10).should be_instance_of(AMQ::Protocol::Basic::QosOk)
     end
   end
 
   context "with a negative integer" do
     it "raises an ArgumentError" do
-      ch = connection.create_channel
       expect {
-        ch.prefetch(-2)
+        subject.prefetch(-2)
       }.to raise_error(ArgumentError)
     end
   end

data/spec/higher_level_api/integration/basic_reject_spec.rb

@@ -7,64 +7,65 @@ describe Bunny::Channel, "#reject" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close if connection.open?
   end
 
+  subject do
+    connection.create_channel
+  end
+
   context "with requeue = true" do
     it "requeues a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.manual-acks", :exclusive => true)
-      x  = ch.default_exchange
+      q = subject.queue("bunny.basic.reject.manual-acks", :exclusive => true)
+      x = subject.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
       q.message_count.should == 1
       delivery_info, _, _ = q.pop(:ack => true)
 
-      ch.reject(delivery_info.delivery_tag, true)
+      subject.reject(delivery_info.delivery_tag, true)
       sleep(0.5)
       q.message_count.should == 1
 
-      ch.close
+      subject.close
     end
   end
 
   context "with requeue = false" do
     it "rejects a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
-      x  = ch.default_exchange
+      q = subject.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      x = subject.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
       q.message_count.should == 1
       delivery_info, _, _ = q.pop(:ack => true)
 
-      ch.reject(delivery_info.delivery_tag, false)
+      subject.reject(delivery_info.delivery_tag, false)
       sleep(0.5)
       q.message_count.should == 0
 
-      ch.close
+      subject.close
     end
   end
 
 
   context "with an invalid (random) delivery tag" do
     it "causes a channel-level error" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.unknown-delivery-tag", :exclusive => true)
-      x  = ch.default_exchange
+      q = subject.queue("bunny.basic.reject.unknown-delivery-tag", :exclusive => true)
+      x = subject.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.25)
       q.message_count.should == 1
       _, _, content = q.pop(:ack => true)
 
-      ch.on_error do |ch, channel_close|
+      subject.on_error do |ch, channel_close|
         @channel_close = channel_close
       end
-      ch.reject(82, true)
+      subject.reject(82, true)
 
       sleep 0.5
 

data/spec/higher_level_api/integration/basic_return_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange, "#publish" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/channel_close_spec.rb

@@ -7,17 +7,21 @@ describe Bunny::Channel, "when closed" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close
   end
 
+
+  subject do
+    connection.create_channel
+  end
+
   it "releases the id" do
-    ch = connection.create_channel
-    n = ch.number
+    n = subject.number
 
-    ch.should be_open
-    ch.close
-    ch.should be_closed
+    subject.should be_open
+    subject.close
+    subject.should be_closed
 
     # a new channel with the same id can be created
     connection.create_channel(n)

data/spec/higher_level_api/integration/channel_flow_spec.rb

@@ -7,15 +7,18 @@ describe Bunny::Channel, "#flow" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close
   end
 
-  it "is supported" do
-    ch = connection.create_channel
 
-    ch.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
-    ch.flow(false).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
-    ch.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+  subject do
+    connection.create_channel
+  end
+
+  it "is supported" do
+    subject.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+    subject.flow(false).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+    subject.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
   end
 end

data/spec/higher_level_api/integration/channel_open_spec.rb

@@ -7,42 +7,51 @@ describe Bunny::Channel, "when opened" do
     c
   end
 
-  after :each do
+  after :all do
     connection.close
   end
 
   context "without explicitly provided id" do
+    subject do
+      connection.create_channel
+    end
+
     it "gets an allocated id and is successfully opened" do
       connection.should be_connected
-      ch = connection.create_channel
-      ch.should be_open
+      subject.should be_open
 
-      ch.id.should be > 0
+      subject.id.should be > 0
     end
   end
 
 
   context "with explicitly provided id" do
+    subject do
+      connection.create_channel(767)
+    end
+
     it "uses that id and is successfully opened" do
-      ch = connection.create_channel(767)
       connection.should be_connected
-      ch.should be_open
+      subject.should be_open
 
-      ch.id.should == 767
+      subject.id.should == 767
     end
   end
 
 
 
   context "with explicitly provided id that is already taken" do
+    subject do
+      connection.create_channel(767)
+    end
+
     it "reuses the channel that is already opened" do
-      ch = connection.create_channel(767)
       connection.should be_connected
-      ch.should be_open
+      subject.should be_open
 
-      ch.id.should == 767
+      subject.id.should == 767
 
-      connection.create_channel(767).should == ch
+      connection.create_channel(767).should == subject
     end
   end
 end