bunny 0.7.9 → 0.7.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 072792fbee28a7ddb863068d4d50082734814fcf
+  data.tar.gz: a7c720f93a3b196be83350f0694a15191ecf8148
+SHA512:
+  metadata.gz: 20d9da18623a97f363ee15ed57f26b433e4a9328769e2e8993c4c53f33a63e256438f66487c74581ce284dac2729e22dddd787446b605ad965bc40e9382569f7
+  data.tar.gz: 8d91cc821840d51811767541b5637246bbc098a71923cd52c3773044519dd5fb000a12532ca4761435e0415e76089d2cf09cad37ccd82ed9038450cd9fe4a1bf

data/.gitignore

@@ -8,3 +8,4 @@
 .rvmrc
 Gemfile.lock
 .rbx/*
+tmp/*

data/CHANGELOG

@@ -1,3 +1,11 @@
+= Version 0.7.10
+
+ * handle messages larger than frame_max correctly
+
+= Version 0.7.9
+
+ * parse a few more AMQ datatypes (related to federation plugin)
+
 = Version 0.7.8
 
  * test suite cleanup (eliminated some race conditions related to queue.message_count)

data/Gemfile

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-source :rubygems
+source 'https://rubygems.org'
 
 # Use local clones if possible.
 # If you want to use your local copy, just symlink it to vendor.
@@ -30,6 +30,8 @@ group :development do
   gem "RedCloth",  :platform => :mri
 
   gem "changelog"
+
+  gem "byebug"
 end
 
 group :test do

data/lib/bunny/client08.rb

@@ -189,6 +189,8 @@ Exchange
       method = frame.payload
 
       if method.is_a?(Qrack::Protocol::Connection::Tune)
+        @frame_max = method.frame_max if method.frame_max > 0 && method.frame_max < @frame_max
+        @channel_max = method.channel_max if method.channel_max > 0 && method.channel_max < @channel_max
         send_frame(Qrack::Protocol::Connection::TuneOk.new( :channel_max => @channel_max, :frame_max => @frame_max, :heartbeat => @heartbeat))
       end
 
@@ -462,6 +464,12 @@ using the Commit or Rollback methods.
       :select_ok
     end
 
+    protected
+
+    def check_returned_message(method)
+      check_response(method, Qrack::Protocol::Basic::Return, "Expected a returned message")
+    end
+
     private
 
     def buffer

data/lib/bunny/client09.rb

@@ -169,6 +169,8 @@ module Bunny
       method = frame.payload
 
       if method.is_a?(Qrack::Protocol09::Connection::Tune)
+        @frame_max = method.frame_max if method.frame_max > 0 && method.frame_max < @frame_max
+        @channel_max = method.channel_max if method.channel_max > 0 && method.channel_max < @channel_max
         send_frame(Qrack::Protocol09::Connection::TuneOk.new(:channel_max => @channel_max, :frame_max => @frame_max, :heartbeat => @heartbeat))
       end
 
@@ -364,6 +366,12 @@ module Bunny
       :select_ok
     end
 
+    protected
+
+    def check_returned_message(method)
+      check_response(method, Qrack::Protocol09::Basic::Return, "Expected a returned message")
+    end
+
     private
 
     def buffer

data/lib/bunny/exchange08.rb

@@ -161,7 +161,13 @@ nil
           :priority      => 0
         }.merge(opts)
       )
-      out << Qrack::Transport::Body.new(data)
+
+      limit = @client.frame_max - 8
+      i = 0
+      while i < data.bytesize
+        out << Qrack::Transport::Body.new(data.byteslice(i, limit))
+        i += limit
+      end
 
       client.send_frame(*out)
     end

data/lib/bunny/exchange09.rb

@@ -149,7 +149,13 @@ module Bunny
                                              :priority      => 0
                                            }.merge(opts)
                                            )
-      out << Qrack::Transport09::Body.new(data)
+
+      limit = @client.frame_max - 8
+      i = 0
+      while i < data.bytesize
+        out << Qrack::Transport09::Body.new(data.byteslice(i, limit))
+        i += limit
+      end
 
       client.send_frame(*out)
     end

data/lib/bunny/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Bunny
-  VERSION = "0.7.9"
+  VERSION = "0.7.10"
 end

data/lib/qrack/client.rb

@@ -20,7 +20,7 @@ module Qrack
     CONNECT_TIMEOUT = 5.0
     RETRY_DELAY     = 10.0
 
-    attr_reader   :status, :host, :vhost, :port, :logging, :spec, :heartbeat
+    attr_reader   :status, :host, :vhost, :port, :logging, :spec, :heartbeat, :frame_max
     attr_accessor :channel, :logfile, :exchanges, :queues, :channels, :message_in, :message_out, :connecting
 
     # Temporary hack to make Bunny 0.7 work with port number in AMQP URL.
@@ -142,6 +142,9 @@ module Qrack
       end
 
       method = frame.payload
+      # at this point, we can receive a channel or connection close, which we need to check for
+      check_returned_message(method)
+
       header = next_payload
 
       # If maximum frame size is smaller than message payload body then message

data/spec/spec_08/bunny_spec.rb

@@ -63,15 +63,13 @@ describe Bunny do
     @b.queues.has_key?('test1').should be(true)
   end
 
-  # Current RabbitMQ has not implemented some functionality
-  it "should raise an error if setting of QoS fails" do
-    lambda { @b.qos(:global => true) }.should raise_error(Bunny::ForcedConnectionCloseError)
-    @b.status.should == :not_connected
-  end
-
   it "should be able to set QoS" do
     @b.qos.should == :qos_ok
   end
 
+  it "should be able to set QoS (with global:true)" do
+    @b.qos(:global => true).should == :qos_ok
+  end
+
 end
 

data/spec/spec_08/exchange_spec.rb

@@ -137,25 +137,22 @@ 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', :immediate => true)
+    exch.publish('This message should be undeliverable', :mandatory => 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 return a message that exceeds maximum frame size" do
+  it "should be able to handle connection close on trying to publish with immediate=true" do
     exch = @b.exchange('return_exch')
-    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
+    exch.publish('This message should force a connection close', :immediate => true)
+    lambda { @b.returned_message }.should raise_error(Bunny::ForcedConnectionCloseError)
   end
 
-  it "should report an error if delete fails" do
+  it "should not close the connection when trying to delete a non existent exchange" do
     exch = @b.exchange('direct_exchange')
-    lambda { exch.delete(:exchange => 'bogus_ex') }.should raise_error(Bunny::ForcedChannelCloseError)
-    @b.channel.active.should == false
+    exch.delete(:exchange => 'bogus_ex').should == :delete_ok
+    @b.channel.active.should == true
   end
 
   it "should be able to be deleted" do

data/spec/spec_08/queue_spec.rb

@@ -45,12 +45,6 @@ describe 'Queue' do
     q.bind(exch, :nowait => true).should == :bind_ok
   end
 
-  it "should raise an error when trying to bind to a non-existent exchange" do
-    q = @b.queue('test1')
-    lambda {q.bind('bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
-    @b.channel.active.should == false
-  end
-
   it "should be able to bind to an existing exchange" do
     exch = @b.exchange('direct_exch')
     q = @b.queue('test1')
@@ -63,10 +57,10 @@ describe 'Queue' do
     q.unbind(exch, :nowait => true).should == :unbind_ok
   end
 
-  it "should raise an error if unbinding from a non-existent exchange" do
+  it "should not raise an error if unbinding from a non-existent exchange" do
     q = @b.queue('test1')
-    lambda {q.unbind('bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
-    @b.channel.active.should == false
+    q.unbind('bogus').should == :unbind_ok
+    @b.channel.active.should == true
   end
 
   it "should be able to unbind from an existing exchange" do
@@ -171,10 +165,10 @@ describe 'Queue' do
     q.purge.should == :purge_ok
   end
 
-  it "should raise an error when delete fails" do
+  it "should not close the connections when deleting a non existent queue" do
     q = @b.queue('test1')
-    lambda {q.delete(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
-    @b.channel.active.should == false
+    q.delete(:queue => 'bogus').should == :delete_ok
+    @b.channel.active.should == true
   end
 
   it "should pass correct block parameters through on subscribe" do

data/spec/spec_09/bunny_spec.rb

@@ -63,14 +63,12 @@ describe Bunny do
     @b.queues.has_key?('test1').should be(true)
   end
 
-  # Current RabbitMQ has not implemented some functionality
-  it "should raise an error if setting of QoS fails" do
-    lambda { @b.qos(:global => true) }.should raise_error(Bunny::ForcedConnectionCloseError)
-    @b.status.should == :not_connected
-  end
-
   it "should be able to set QoS" do
     @b.qos.should == :qos_ok
   end
 
+  it "should be able to set QoS (with global:true)" do
+    @b.qos(:global => true).should == :qos_ok
+  end
+
 end

data/spec/spec_09/exchange_spec.rb

@@ -137,25 +137,22 @@ 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', :immediate => true)
+    exch.publish('This message should be undeliverable', :mandatory => 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 return a message that exceeds maximum frame size" do
+  it "should be able to handle connection close on trying to publish with immediate=true" do
     exch = @b.exchange('return_exch')
-    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
+    exch.publish('This message should force a connection close', :immediate => true)
+    lambda { @b.returned_message }.should raise_error(Bunny::ForcedConnectionCloseError)
   end
 
-  it "should report an error if delete fails" do
+  it "should not close the connection when trying to delete a non existent exchange" do
     exch = @b.exchange('direct_exchange')
-    lambda { exch.delete(:exchange => 'bogus_ex') }.should raise_error(Bunny::ForcedChannelCloseError)
-    @b.channel.active.should == false
+    exch.delete(:exchange => 'bogus_ex').should == :delete_ok
+    @b.channel.active.should == true
   end
 
   it "should be able to be deleted" do

data/spec/spec_09/queue_spec.rb

@@ -61,10 +61,10 @@ describe 'Queue' do
     q.unbind(exch, :nowait => true).should == :unbind_ok
   end
 
-  it "should raise an error if unbinding from a non-existent exchange" do
+  it "should not raise an error if unbinding from a non-existent exchange" do
     q = @b.queue('test1')
-    lambda {q.unbind('bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
-    @b.channel.active.should == false
+    q.unbind('bogus').should == :unbind_ok
+    @b.channel.active.should == true
   end
 
   it "should be able to unbind from an exchange" do
@@ -155,10 +155,10 @@ describe 'Queue' do
     q.purge.should == :purge_ok
   end
 
-  it "should raise an error when delete fails" do
+  it "should not close the connections when deleting a non existent queue" do
     q = @b.queue('test1')
-    lambda {q.delete(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
-    @b.channel.active.should == false
+    q.delete(:queue => 'bogus').should == :delete_ok
+    @b.channel.active.should == true
   end
 
   it "should pass correct block parameters through on subscribe" do

metadata

@@ -1,15 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bunny
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 9
-  version: 0.7.9
+version: !ruby/object:Gem::Version
+  version: 0.7.10
 platform: ruby
-authors: 
+authors:
 - Chris Duncan
 - Eric Lindvall
 - Jakub Stastny aka botanicus
@@ -18,28 +12,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-07 00:00:00 Z
+date: 2015-07-15 00:00:00.000000000 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
@@ -105,39 +96,31 @@ files:
 - spec/spec_09/queue_spec.rb
 homepage: http://github.com/ruby-amqp/bunny
 licenses: []
-
-post_install_message: "[\e[32mVersion 0.7.8\e[0m] test suite cleanup (eliminated some race conditions related to queue.message_count)\n"
-rdoc_options: 
-- --main
+metadata: {}
+post_install_message: "[\e[32mVersion 0.7.10\e[0m] handle messages larger than frame_max
+  correctly\n"
+rdoc_options:
+- "--main"
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_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'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: bunny-amqp
-rubygems_version: 1.8.10
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Synchronous Ruby AMQP 0.9.1 client
-test_files: 
+test_files:
 - spec/spec_08/bunny_spec.rb
 - spec/spec_08/connection_spec.rb
 - spec/spec_08/exchange_spec.rb
@@ -147,3 +130,4 @@ test_files:
 - spec/spec_09/connection_spec.rb
 - spec/spec_09/exchange_spec.rb
 - spec/spec_09/queue_spec.rb
+has_rdoc: true