bunny 0.7.12 → 0.8.0

data/spec/spec_09/connection_spec.rb

@@ -7,17 +7,17 @@ require "bunny"
 describe Bunny do
 
   it "should raise an error if the wrong user name or password is used" do
-    b = Bunny.new(:spec => '0.9', :user => 'wrong')
+    b = Bunny.new(:user => 'wrong')
     lambda { b.start}.should raise_error(Bunny::ProtocolError)
   end
 
   it "should merge custom settings from AMQP URL with default settings" do
-    b = Bunny.new("amqp://tagadab", :spec => "0.9")
+    b = Bunny.new("amqp://tagadab")
     b.host.should eql("tagadab")
   end
 
   it "should be able to open a TCPSocket with a timeout" do
-    b = Bunny.new(:spec => "0.9")
+    b = Bunny.new
     connect_timeout = 5
     lambda {
       Bunny::Timer::timeout(connect_timeout, Qrack::ConnectionTimeout) do
@@ -26,4 +26,9 @@ describe Bunny do
     }.should_not raise_error(Exception)
   end
 
+  it "should know the default port of a SSL connection" do
+    b = Bunny.new(:ssl => true)
+    b.port.should eql(5671)
+  end
+
 end

data/spec/spec_09/exchange_spec.rb

@@ -13,7 +13,7 @@ require "bunny"
 describe 'Exchange' do
 
   before(:each) do
-    @b = Bunny.new(:spec => '09')
+    @b = Bunny.new
     @b.start
   end
 
@@ -33,7 +33,7 @@ describe 'Exchange' do
 
   it "should allow a default direct exchange to be instantiated by specifying :type" do
     exch = @b.exchange('amq.direct', :type => :direct)
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'amq.direct'
     exch.type.should == :direct
     @b.exchanges.has_key?('amq.direct').should be(true)
@@ -41,7 +41,7 @@ describe 'Exchange' do
 
   it "should allow a default direct exchange to be instantiated without specifying :type" do
     exch = @b.exchange('amq.direct')
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'amq.direct'
     exch.type.should == :direct
     @b.exchanges.has_key?('amq.direct').should be(true)
@@ -49,7 +49,7 @@ describe 'Exchange' do
 
   it "should allow a default fanout exchange to be instantiated without specifying :type" do
     exch = @b.exchange('amq.fanout')
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'amq.fanout'
     exch.type.should == :fanout
     @b.exchanges.has_key?('amq.fanout').should be(true)
@@ -57,7 +57,7 @@ describe 'Exchange' do
 
   it "should allow a default topic exchange to be instantiated without specifying :type" do
     exch = @b.exchange('amq.topic')
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'amq.topic'
     exch.type.should == :topic
     @b.exchanges.has_key?('amq.topic').should be(true)
@@ -65,7 +65,7 @@ describe 'Exchange' do
 
   it "should allow a default headers (amq.match) exchange to be instantiated without specifying :type" do
     exch = @b.exchange('amq.match')
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'amq.match'
     exch.type.should == :headers
     @b.exchanges.has_key?('amq.match').should be(true)
@@ -73,7 +73,7 @@ describe 'Exchange' do
 
   it "should allow a default headers (amq.headers) exchange to be instantiated without specifying :type" do
     exch = @b.exchange('amq.headers')
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'amq.headers'
     exch.type.should == :headers
     @b.exchanges.has_key?('amq.headers').should be(true)
@@ -81,7 +81,7 @@ describe 'Exchange' do
 
   it "should create an exchange as direct by default" do
     exch = @b.exchange('direct_defaultex')
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'direct_defaultex'
     exch.type.should == :direct
     @b.exchanges.has_key?('direct_defaultex').should be(true)
@@ -89,7 +89,7 @@ describe 'Exchange' do
 
   it "should be able to be instantiated as a direct exchange" do
     exch = @b.exchange('direct_exchange', :type => :direct)
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'direct_exchange'
     exch.type.should == :direct
     @b.exchanges.has_key?('direct_exchange').should be(true)
@@ -97,7 +97,7 @@ describe 'Exchange' do
 
   it "should be able to be instantiated as a topic exchange" do
     exch = @b.exchange('topic_exchange', :type => :topic)
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'topic_exchange'
     exch.type.should == :topic
     @b.exchanges.has_key?('topic_exchange').should be(true)
@@ -105,7 +105,7 @@ describe 'Exchange' do
 
   it "should be able to be instantiated as a fanout exchange" do
     exch = @b.exchange('fanout_exchange', :type => :fanout)
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'fanout_exchange'
     exch.type.should == :fanout
     @b.exchanges.has_key?('fanout_exchange').should be(true)
@@ -113,7 +113,7 @@ describe 'Exchange' do
 
   it "should be able to be instantiated as a headers exchange" do
     exch = @b.exchange('headers_exchange', :type => :headers)
-    exch.should be_an_instance_of(Bunny::Exchange09)
+    exch.should be_an_instance_of(Bunny::Exchange)
     exch.name.should == 'headers_exchange'
     exch.type.should == :headers
     @b.exchanges.has_key?('headers_exchange').should be(true)
@@ -137,22 +137,25 @@ describe 'Exchange' do
 
   it "should be able to return an undeliverable message" do
     exch = @b.exchange('return_exch')
-    exch.publish('This message should be undeliverable', :mandatory => true)
+    exch.publish('This message should be undeliverable', :immediate => true)
     ret_msg = @b.returned_message
     ret_msg.should be_an_instance_of(Hash)
     ret_msg[:payload].should == 'This message should be undeliverable'
   end
 
-  it "should be able to handle connection close on trying to publish with immediate=true" do
+  it "should be able to return a message that exceeds maximum frame size" do
     exch = @b.exchange('return_exch')
-    exch.publish('This message should force a connection close', :immediate => true)
-    lambda { @b.returned_message }.should raise_error(Bunny::ForcedConnectionCloseError)
+    lg_msg = 'z' * 142000
+    exch.publish(lg_msg, :immediate => true)
+    ret_msg = @b.returned_message
+    ret_msg.should be_an_instance_of(Hash)
+    ret_msg[:payload].should == lg_msg
   end
 
-  it "should not close the connection when trying to delete a non existent exchange" do
+  it "should report an error if delete fails" do
     exch = @b.exchange('direct_exchange')
-    exch.delete(:exchange => 'bogus_ex').should == :delete_ok
-    @b.channel.active.should == true
+    lambda { exch.delete(:exchange => 'bogus_ex') }.should raise_error(Bunny::ForcedChannelCloseError)
+    @b.channel.active.should == false
   end
 
   it "should be able to be deleted" do

data/spec/spec_09/queue_spec.rb

@@ -13,7 +13,7 @@ require "bunny"
 describe 'Queue' do
 
   before(:each) do
-    @b = Bunny.new(:spec => '09')
+    @b = Bunny.new
     @b.start
 
     @default_exchange = @b.exchange("")
@@ -61,10 +61,10 @@ describe 'Queue' do
     q.unbind(exch, :nowait => true).should == :unbind_ok
   end
 
-  it "should not raise an error if unbinding from a non-existent exchange" do
+  it "should raise an error if unbinding from a non-existent exchange" do
     q = @b.queue('test1')
-    q.unbind('bogus').should == :unbind_ok
-    @b.channel.active.should == true
+    lambda {q.unbind('bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+    @b.channel.active.should == false
   end
 
   it "should be able to unbind from an exchange" do
@@ -78,12 +78,24 @@ describe 'Queue' do
     @default_exchange.publish('This is a test message', :key => 'test1')
     msg = q.pop()
     msg.should be_an_instance_of(Hash)
-    msg[:header].should be_an_instance_of(Bunny::Protocol09::Header)
+    msg[:header].should be_an_instance_of(Bunny::Protocol::Header)
     msg[:payload].should == 'This is a test message'
     msg[:delivery_details].should be_an_instance_of(Hash)
     message_count(q).should == 0
   end
 
+  it "should be able to send reply_to, correlation_id and user_id headers " do
+    q = @b.queue('test1')
+    @default_exchange.publish('This is a test message', :key => 'test1', 
+                              :reply_to => 'test_reply_to',
+                              :correlation_id => '987654',
+                              :user_id => 'guest')
+    msg = q.pop()
+    msg[:header].properties[:reply_to].should == 'test_reply_to'
+    msg[:header].properties[:correlation_id].should == '987654'
+    msg[:header].properties[:user_id].should == 'guest'
+  end
+
   it "should be able to pop a message and just get the payload" do
     q = @b.queue('test1')
     @default_exchange.publish('This is another test message', :key => 'test1')
@@ -100,15 +112,6 @@ describe 'Queue' do
     msg.should == lg_msg
   end
 
-  it "should be able to send and receive messages where body length is an exact multiple of frame_max minus framing bytes" do
-    limit = @b.frame_max-8
-    q = @b.queue('test1')
-    lg_msg = 'a' * (5*limit)
-    @default_exchange.publish(lg_msg, :key => 'test1')
-    msg = q.pop[:payload]
-    msg.should == lg_msg
-  end
-
   it "should be able call a block when popping a message" do
     q = @b.queue('test1')
     @default_exchange.publish('This is another test message', :key => 'test1')
@@ -164,10 +167,10 @@ describe 'Queue' do
     q.purge.should == :purge_ok
   end
 
-  it "should not close the connections when deleting a non existent queue" do
+  it "should raise an error when delete fails" do
     q = @b.queue('test1')
-    q.delete(:queue => 'bogus').should == :delete_ok
-    @b.channel.active.should == true
+    lambda {q.delete(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+    @b.channel.active.should == false
   end
 
   it "should pass correct block parameters through on subscribe" do
@@ -175,7 +178,7 @@ describe 'Queue' do
     @default_exchange.publish("messages pop'n", :key => 'test1')
 
     q.subscribe do |msg|
-      msg[:header].should be_an_instance_of Qrack::Protocol09::Header
+      msg[:header].should be_an_instance_of Qrack::Protocol::Header
       msg[:payload].should == "messages pop'n"
       msg[:delivery_details].should_not be_nil
 
@@ -183,6 +186,17 @@ describe 'Queue' do
       break
     end
   end
+  
+  specify "subscribe method should support cancellation through a cancellator IO object" do
+    q = @b.queue('test1')
+    a, b = IO.pipe
+    b.close
+    block_called = false
+    q.subscribe(:cancellator => a) do |msg|
+      block_called = true
+    end
+    block_called.should be_false
+  end
 
   it "should finish processing subscription messages if break is called in block" do
     q = @b.queue('test1')

metadata

@@ -1,9 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bunny
-version: !ruby/object:Gem::Version
-  version: 0.7.12
+version: !ruby/object:Gem::Version 
+  hash: 63
+  prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
-authors:
+authors: 
 - Chris Duncan
 - Eric Lindvall
 - Jakub Stastny aka botanicus
@@ -12,120 +18,107 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+
+date: 2012-06-23 00:00:00 Z
 dependencies: []
-description: A synchronous Ruby AMQP client that enables interaction with AMQP-compliant
-  brokers.
-email:
+
+description: A synchronous Ruby AMQP client that enables interaction with AMQP-compliant brokers.
+email: 
 - celldee@gmail.com
 - eric@5stops.com
 - stastny@101ideas.cz
 - michael@novemberain.com
 - skaes@railsexpress.de
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.textile
-files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
+files: 
+- .gitignore
+- .rspec
+- .travis.yml
+- .yardopts
 - CHANGELOG
 - Gemfile
 - LICENSE
 - README.textile
 - Rakefile
 - bunny.gemspec
-- examples/simple_08.rb
-- examples/simple_09.rb
-- examples/simple_ack_08.rb
-- examples/simple_ack_09.rb
-- examples/simple_consumer_08.rb
-- examples/simple_consumer_09.rb
-- examples/simple_fanout_08.rb
-- examples/simple_fanout_09.rb
-- examples/simple_headers_08.rb
-- examples/simple_headers_09.rb
-- examples/simple_publisher_08.rb
-- examples/simple_publisher_09.rb
-- examples/simple_topic_08.rb
-- examples/simple_topic_09.rb
-- ext/amqp-0.8.json
+- examples/simple.rb
+- examples/simple_ack.rb
+- examples/simple_consumer.rb
+- examples/simple_fanout.rb
+- examples/simple_headers.rb
+- examples/simple_publisher.rb
+- examples/simple_topic.rb
 - ext/amqp-0.9.1.json
 - ext/config.yml
 - ext/qparser.rb
 - lib/bunny.rb
-- lib/bunny/channel08.rb
-- lib/bunny/channel09.rb
-- lib/bunny/client08.rb
-- lib/bunny/client09.rb
+- lib/bunny/channel.rb
+- lib/bunny/client.rb
 - lib/bunny/consumer.rb
-- lib/bunny/exchange08.rb
-- lib/bunny/exchange09.rb
-- lib/bunny/queue08.rb
-- lib/bunny/queue09.rb
-- lib/bunny/subscription08.rb
-- lib/bunny/subscription09.rb
+- lib/bunny/exchange.rb
+- lib/bunny/queue.rb
+- lib/bunny/subscription.rb
 - lib/bunny/system_timer.rb
 - lib/bunny/version.rb
 - lib/qrack/amq-client-url.rb
 - lib/qrack/channel.rb
 - lib/qrack/client.rb
 - lib/qrack/errors.rb
-- lib/qrack/protocol/protocol08.rb
-- lib/qrack/protocol/protocol09.rb
-- lib/qrack/protocol/spec08.rb
-- lib/qrack/protocol/spec09.rb
-- lib/qrack/qrack08.rb
-- lib/qrack/qrack09.rb
+- lib/qrack/protocol/protocol.rb
+- lib/qrack/protocol/spec.rb
+- lib/qrack/qrack.rb
 - lib/qrack/queue.rb
 - lib/qrack/subscription.rb
-- lib/qrack/transport/buffer08.rb
-- lib/qrack/transport/buffer09.rb
-- lib/qrack/transport/frame08.rb
-- lib/qrack/transport/frame09.rb
-- spec/spec_08/bunny_spec.rb
-- spec/spec_08/connection_spec.rb
-- spec/spec_08/exchange_spec.rb
-- spec/spec_08/queue_spec.rb
+- lib/qrack/transport/buffer.rb
+- lib/qrack/transport/frame.rb
 - spec/spec_09/amqp_url_spec.rb
 - spec/spec_09/bunny_spec.rb
 - spec/spec_09/connection_spec.rb
 - spec/spec_09/exchange_spec.rb
 - spec/spec_09/queue_spec.rb
 homepage: http://github.com/ruby-amqp/bunny
-licenses:
-- MIT
-metadata: {}
-post_install_message: 
-rdoc_options:
-- "--main"
+licenses: []
+
+post_install_message: "[\e[32mVersion 0.8.0\e[0m] AMQP 0.8 client is removed. Bunny is an AMQP 0.9.1 client only now.\n"
+rdoc_options: 
+- --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubygems_version: 3.0.2
+
+rubyforge_project: bunny-amqp
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
-summary: Synchronous Ruby AMQP 0.9.1 client
-test_files:
-- spec/spec_08/bunny_spec.rb
-- spec/spec_08/connection_spec.rb
-- spec/spec_08/exchange_spec.rb
-- spec/spec_08/queue_spec.rb
+specification_version: 3
+summary: Synchronous Ruby AMQP 0.8.0 client
+test_files: 
 - spec/spec_09/amqp_url_spec.rb
 - spec/spec_09/bunny_spec.rb
 - spec/spec_09/connection_spec.rb
 - spec/spec_09/exchange_spec.rb
 - spec/spec_09/queue_spec.rb
+has_rdoc: true