bunny 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b9d1b9674fc6fe77346de7896e4ac8900c4c047
-  data.tar.gz: 19972fd3c10baf9a7acf1bc2c49a43ed995baeaa
+  metadata.gz: 972f0f0055bbc831144da54e6805c4d5f5e2262c
+  data.tar.gz: ad2f3539fb6946771238e6451b17d33cfdba692b
 SHA512:
-  metadata.gz: ba09b21e9cbe72298decba6a551ecc554e17ff58c7f88a907979a4859453c7674341989588fd407d6923de40ebaa9e6af9cbbe31615e41d223a8c4163c5f89a0
-  data.tar.gz: df71d64b16826cfb887db8bcec84ecc114410cfaa92e9c97ca2d03cc003ffa7558998fcad6019031729c999888642ec82a69e2b00d10e3984b538dec61ebd800
+  metadata.gz: ad93a02f5623437589eb2027259de36a2269df8ab06d251b00e6b28b265f8f562068a1c7e473b2513eff18bdde77902b46a24c114a9a1c9dbe29426c93f67085
+  data.tar.gz: da94e1d8349674cf2819678f2fb18a1fd911017fb7c99104d64d755c9d7f9622068db60a5502411c6442d04fe341372d09d31c6e5885c0cda18293ea04db3e81

data/ChangeLog.md

@@ -1,4 +1,25 @@
-## Changes between Bunny 1.2.1 and 1.2.2
+## Changes between Bunny 1.2.0 and 1.3.0
+
+### TLS Can Be Explicitly Disabled
+
+TLS now can be explicitly disabled even when connecting (without TLS)
+to the default RabbitMQ TLS/amqps port (5671):
+
+``` ruby
+conn = Bunny.new(:port => 5671, :tls => false)
+```
+
+Contributed by Muhan Zou.
+
+
+### Single Threaded Connections Raise Shutdown Exceptions
+
+Single threaded Bunny connections will now raise exceptions
+that occur during shutdown as is (instead of trying to shut down
+I/O loop which only threaded ones have).
+
+Contributed by Carl Hörberg.
+
 
 ### Synchronization Improvements for Session#close
 
@@ -6,7 +27,29 @@
 eliminating a few race condition scenarios with I/O reader thread.
 
 
-## Changes between Bunny 1.2.0 and 1.2.1
+### Bunny::Exchange.default Fix
+
+`Bunny::Exchange.default` no longer raises an exception.
+
+Note that it is a legacy compatibility method. Please use
+`Bunny::Channel#default_exchange` instead.
+
+Contributed by Justin Litchfield.
+
+GH issue [#211](https://github.com/ruby-amqp/bunny/pull/211).
+
+### Bunny::Queue#pop_as_hash Removed
+
+`Bunny::Queue#pop_as_hash`, which was added to ease migration
+to Bunny 0.9, was removed.
+
+### Bunny::Queue#pop Wraps Metadata
+
+`Bunny::Queue#pop` now wraps `basic.get-ok` and message properties
+into `Bunny::GetResponse` and `Bunny::MessageProperties`, just like
+`basic.consume` deliveries.
+
+GH issue: [#212](https://github.com/ruby-amqp/bunny/issues/212).
 
 ### Better Synchronization for Publisher Confirms
 
@@ -23,6 +66,7 @@ on a recovered connection (in addition to the channels
 it already had).
 
 
+
 ## Changes between Bunny 1.1.0 and 1.2.0
 
 ### :key Supported in Bunny::Channel#queue_bind

data/Gemfile

@@ -34,7 +34,7 @@ group :development do
 end
 
 group :test do
-  gem "rspec", ">= 2.13.0"
+  gem "rspec", "~> 2.13.0"
   gem "rabbitmq_http_api_client", "~> 1.1.0"
 end
 

data/lib/bunny/get_response.rb

@@ -0,0 +1,83 @@
+require "bunny/versioned_delivery_tag"
+
+module Bunny
+  # Wraps {AMQ::Protocol::Basic::GetOk} to
+  # provide access to the delivery properties as immutable hash as
+  # well as methods.
+  class GetResponse
+
+    #
+    # Behaviors
+    #
+
+    include Enumerable
+
+    #
+    # API
+    #
+
+    # @return [Bunny::Channel] Channel this basic.get-ok response is on
+    attr_reader :channel
+
+    # @private
+    def initialize(get_ok, consumer, channel)
+      @get_ok = get_ok
+      @hash          = {
+        :delivery_tag => @get_ok.delivery_tag,
+        :redelivered  => @get_ok.redelivered,
+        :exchange     => @get_ok.exchange,
+        :routing_key  => @get_ok.routing_key,
+        :channel      => channel
+      }
+      @channel       = channel
+    end
+
+    # Iterates over the delivery properties
+    # @see Enumerable#each
+    def each(*args, &block)
+      @hash.each(*args, &block)
+    end
+
+    # Accesses delivery properties by key
+    # @see Hash#[]
+    def [](k)
+      @hash[k]
+    end
+
+    # @return [Hash] Hash representation of this delivery info
+    def to_hash
+      @hash
+    end
+
+    # @private
+    def to_s
+      to_hash.to_s
+    end
+
+    # @private
+    def inspect
+      to_hash.inspect
+    end
+
+    # @return [String] Delivery identifier that is used to acknowledge, reject and nack deliveries
+    def delivery_tag
+      @get_ok.delivery_tag
+    end
+
+    # @return [Boolean] true if this delivery is a redelivery (the message was requeued at least once)
+    def redelivered
+      @get_ok.redelivered
+    end
+    alias redelivered? redelivered
+
+    # @return [String] Name of the exchange this message was published to
+    def exchange
+      @get_ok.exchange
+    end
+
+    # @return [String] Routing key this message was published with
+    def routing_key
+      @get_ok.routing_key
+    end
+  end
+end

data/lib/bunny/queue.rb

@@ -1,4 +1,5 @@
 require "bunny/compatibility"
+require "bunny/get_response"
 
 module Bunny
   # Represents AMQP 0.9.1 queue.
@@ -229,33 +230,29 @@ module Bunny
     #   puts "This is the message: " + payload + "\n\n"
     #   conn.close
     def pop(opts = {:ack => false}, &block)
-      delivery_info, properties, content = @channel.basic_get(@name, opts)
+      get_response, properties, content = @channel.basic_get(@name, opts)
 
       if block
-        block.call(delivery_info, properties, content)
+        if properties
+          di = GetResponse.new(get_response, properties, @channel)
+          mp = MessageProperties.new(properties)
+
+          block.call(di, mp, content)
+        else
+          block.call(nil, nil, nil)
+        end
       else
-        [delivery_info, properties, content]
+        if properties
+          di = GetResponse.new(get_response, properties, @channel)
+          mp = MessageProperties.new(properties)
+          [di, mp, content]
+        else
+          [nil, nil, nil]
+        end
       end
     end
     alias get pop
 
-    # Version of {Bunny::Queue#pop} that returns data in legacy format
-    # (as a hash).
-    # @return [Hash]
-    # @deprecated
-    def pop_as_hash(opts = {:ack => false}, &block)
-      delivery_info, properties, content = @channel.basic_get(@name, opts)
-
-      result = {:header => properties, :payload => content, :delivery_details => delivery_info}
-
-      if block
-        block.call(result)
-      else
-        result
-      end
-    end
-
-
     # Publishes a message to the queue via default exchange. Takes the same arguments
     # as {Bunny::Exchange#publish}
     #

data/lib/bunny/session.rb

@@ -707,7 +707,11 @@ module Bunny
       @continuations.push(method)
 
       clean_up_on_shutdown
-      @origin_thread.terminate_with(@last_connection_error)
+      if threaded?
+        @origin_thread.terminate_with(@last_connection_error)
+      else
+        raise @last_connection_error
+      end
     end
 
     def clean_up_on_shutdown

data/lib/bunny/transport.rb

@@ -265,7 +265,9 @@ module Bunny
     protected
 
     def tls_enabled?(opts)
-      opts[:tls] || opts[:ssl] || (opts[:port] == AMQ::Protocol::TLS_PORT) || false
+      return opts[:tls] unless opts[:tls].nil?
+      return opts[:ssl] unless opts[:ssl].nil?
+      (opts[:port] == AMQ::Protocol::TLS_PORT) || false
     end
 
     def tls_certificate_path_from(opts)

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/spec/higher_level_api/integration/basic_get_spec.rb

@@ -19,11 +19,17 @@ describe Bunny::Queue, "#pop" do
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
 
-      x.publish("xyzzy", :routing_key => q.name)
+      msg = "xyzzy"
+      x.publish(msg, :routing_key => q.name)
 
       sleep(0.5)
-      delivery_info, properties, content = q.pop
-      content.should == "xyzzy"
+      get_ok, properties, content = q.pop
+      expect(get_ok).to be_kind_of(Bunny::GetResponse)
+      expect(properties).to be_kind_of(Bunny::MessageProperties)
+      expect(properties.content_type).to eq("application/octet-stream")
+      expect(get_ok.routing_key).to eq(q.name)
+      expect(get_ok.delivery_tag).to be_kind_of(Bunny::VersionedDeliveryTag)
+      expect(content).to eq(msg)
       q.message_count.should == 0
 
       ch.close
@@ -38,8 +44,10 @@ describe Bunny::Queue, "#pop" do
       q  = ch.queue("", :exclusive => true)
       q.purge
 
-      _, _, content = q.pop
-      content.should be_nil
+      get_empty, properties, content = q.pop
+      expect(get_empty).to eq(nil)
+      expect(properties).to eq(nil)
+      expect(content).to eq(nil)
       q.message_count.should == 0
 
       ch.close

data/spec/higher_level_api/integration/connection_recovery_spec.rb

@@ -13,7 +13,7 @@ unless ENV["CI"]
     end
 
     def wait_for_recovery
-      sleep 0.7
+      sleep 1.5
     end
 
     def with_open(c = Bunny.new(:network_recovery_interval => 0.2, :recover_from_connection_close => true), &block)
@@ -209,7 +209,7 @@ unless ENV["CI"]
       end
     end
 
-    it "recovers consumer" do
+    it "recovers consumers" do
       with_open do |c|
         delivered = false
 
@@ -230,5 +230,51 @@ unless ENV["CI"]
         expect(delivered).to be_true
       end
     end
+
+    it "recovers all consumers" do
+      n = 1024
+
+      with_open do |c|
+        ch = c.create_channel
+        q  = ch.queue("", :exclusive => true)
+        n.times do
+          q.subscribe do |_, _, _|
+            delivered = true
+          end
+        end
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+
+        q.consumer_count.should == n
+      end
+    end
+
+    it "recovers all queues" do
+      n = 256
+
+      qs = []
+
+      with_open do |c|
+        ch = c.create_channel
+
+        n.times do
+          qs << ch.queue("", :exclusive => true)
+        end
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+
+        qs.each do |q|
+          ch.queue_declare(q.name, :passive => true)
+        end
+      end
+    end
   end
 end

data/spec/higher_level_api/integration/publishing_edge_cases_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require "spec_helper"
 
 unless ENV["CI"]
@@ -37,6 +38,27 @@ unless ENV["CI"]
     end
 
 
+    context "with payload of several MBs of non-ASCII characters" do
+      it "successfully frames the message" do
+        ch = connection.create_channel
+
+        q  = ch.queue("", :exclusive => true)
+        x  = ch.default_exchange
+
+        as = "кириллца, йо" * (1024 * 1024)
+        x.publish(as, :routing_key => q.name, :persistent => true)
+
+        sleep(1)
+        q.message_count.should == 1
+
+        _, _, payload      = q.pop
+        payload.bytesize.should == as.bytesize
+
+        ch.close
+      end
+    end
+
+
 
     context "with empty message body" do
       it "successfully publishes the message" do

data/spec/stress/connection_open_close_spec.rb

@@ -23,24 +23,6 @@ unless defined?(JRUBY_VERSION) && !ENV["FORCE_JRUBY_RUN"]
       end
     end
 
-    n.times do |i|
-      it "can be closed in the Hello, World example (take #{i})" do
-        c  = Bunny.new(:automatically_recover => false)
-        c.start
-        ch = c.create_channel
-        x  = ch.default_exchange
-        q  = ch.queue("", :exclusive => true)
-        q.subscribe do |delivery_info, properties, payload|
-          # no-op
-        end
-        20.times { x.publish("hello", :routing_key => q.name) }
-
-        c.should be_connected
-        c.stop
-        c.should be_closed
-      end
-    end
-
     n.times do |i|
       it "can be closed (automatic recovery enabled, take #{i})" do
         c  = Bunny.new(:automatically_recover => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -118,6 +118,7 @@ files:
 - lib/bunny/exceptions.rb
 - lib/bunny/exchange.rb
 - lib/bunny/framing.rb
+- lib/bunny/get_response.rb
 - lib/bunny/heartbeat_sender.rb
 - lib/bunny/jruby/socket.rb
 - lib/bunny/jruby/ssl_socket.rb
@@ -305,4 +306,3 @@ test_files:
 - spec/unit/concurrent/synchronized_sorted_set_spec.rb
 - spec/unit/system_timer_spec.rb
 - spec/unit/version_delivery_tag_spec.rb
-has_rdoc: true