amqp 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 149ce59ec667f2680ed18e7aaf13135a63fd2a45
-  data.tar.gz: b1c307a1be91c838469d6bab945bc44ec589d168
+  metadata.gz: bd66c91f55ab8045cc63d46592f2e909ae43dccf
+  data.tar.gz: 2cd03735c97ee93a70b0fe43ee027e909f1e7c52
 SHA512:
-  metadata.gz: a961a55d34df907a3cb44d0317bca8c7df242f3ab92a36ea8100ccd2d9445a46197fb45be5113ccd68e26974ecf15ec29ce5591c0f2b0b6bd897dbb0c0e1d707
-  data.tar.gz: e7e7b5843be628d65422b8ddc5ffbba34e00999e7f0239d4b7f4dc3b3c1d54b1ec64c6e4613ff34c387c1ed71f0403e7d3cca986b0bb7e28609ba6a93d50db10
+  metadata.gz: 5fcd3df4e73c1d14209b9bd9036cadf708e4e8869f15b16bab775a13b0f796a1f55f9bdcbad5d9f12dc039eb1c17e8eb79e1eebca0b41d9e151e64694ac97625
+  data.tar.gz: 679dca56fb7b1dd36ab7eec48eb8a70249e7ec7117c2405436feaa2c6c7863ba7cc1c1b2acc52fc5d28ac7e5568c501859a136458df400ce53b4578e67322507

data/.travis.yml

@@ -6,7 +6,6 @@ env:
   - CI=true
 rvm:
   - 1.8.7
-  - rbx
   - jruby-19mode
   - 1.9.2
   - 1.9.3

data/ChangeLog.md

@@ -1,11 +1,23 @@
-## Changes Between 1.1.7 and 1.1.8
+## Changes Between 1.1.0 and 1.2.0
 
-### amq-protocol Update
+### [Authentication Failure Notification](http://www.rabbitmq.com/auth-notification.html) Support
 
-Minimum `amq-protocol` version is now `1.9.2`.
+amqp gem now supports [Authentication Failure
+Notification](http://www.rabbitmq.com/auth-notification.html). Public
+API for authentication failure handling hasn't changed.
+
+This extension is available in RabbitMQ 3.2+.
 
+## basic.qos Recovery Fix
 
-## Changes Between 1.1.6 and 1.1.7
+`basic.qos` setting will now be recovered first thing after
+channel recovery, to the most recent value passed via `:prefetch` channel
+constructor option or `AMQP::Channel#prefetch`.
+
+
+### amq-protocol Update
+
+Minimum `amq-protocol` version is now `1.9.2`.
 
 ### Automatic Recovery Fix
 
@@ -14,52 +26,31 @@ Automatic connection recovery now correctly recovers bindings again.
 Contributed by Devin Christensen.
 
 
-## Changes Between 1.1.5 and 1.1.6
-
 ### 65535 Channels Per Connection
 
-amqp gem now allows for 65535 channels per connection and
+amqp gem now allows for	65535 channels per connection and
 not Ruby process.
 
 Contributed by Neo (http://neo.com) developers.
 
-
-## Changes Between 1.1.4 and 1.1.5
-
 ### channel.close is Delayed Until After Channel is Open
 
 This eliminates a race condition in some codebases that use
 very short lived channels.
 
-
-## Changes Between 1.1.3 and 1.1.4
-
 ### ConnectionClosedError is Back
 
-`ConnectionClosedError` is now defined again.
-
-
-## Changes Between 1.1.2 and 1.1.3
-
-### Fixed Exception in AMQP::Exchange#handle_declare_ok
+`ConnectionClosedError` from `amq-client` is now defined again.
 
-`AMQP::Exchange#handle_declare_ok` no longer raises an exception
-about undefined method.
-
-
-## Changes Between 1.1.1 and 1.1.2
 
 ### amq-protocol Update
 
 Minimum `amq-protocol` version is now `1.9.0`.
 
-
-## Changes Between 1.1.0 and 1.1.1
-
-### Fixed Exception in AMQP::Exchange#handle_declare_ok
+### Fixed Exceptions in AMQP::Exchange#handle_declare_ok
 
 `AMQP::Exchange#handle_declare_ok` no longer raises an exception
-about undefined method `#anonymous?`.
+about undefined methods `#anonymous?` and `#exchange`.
 
 
 ## Changes Between 1.0.0 and 1.1.0

data/README.md

@@ -220,7 +220,7 @@ AMQP gem is licensed under the [Ruby License](http://www.ruby-lang.org/en/LICENS
 * The Initial Developer of the Original Code is Aman Gupta.
 * Copyright (c) 2008 - 2010 [Aman Gupta](http://github.com/tmm1).
 * Contributions from [Jakub Stastny](http://github.com/botanicus) are Copyright (c) 2011-2012 VMware, Inc.
-* Copyright (c) 2010 — 2012 [ruby-amqp](https://github.com/ruby-amqp) group members.
+* Copyright (c) 2010 — 2014 [ruby-amqp](https://github.com/ruby-amqp) group members.
 
 Currently maintained by [ruby-amqp](https://github.com/ruby-amqp) group members
 Special thanks to Dmitriy Samovskiy, Ben Hood and Tony Garnock-Jones.
@@ -273,3 +273,7 @@ we do not expect this to change at this time.
 ### How does amqp gem relate to amq-client gem, amq-protocol and libraries like Bunny?
 
 See [this page about AMQP gems family](https://github.com/ruby-amqp/amq-client/blob/master/README.textile)
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ruby-amqp/amqp/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/amqp/channel.rb

@@ -295,7 +295,7 @@ module AMQP
             end # case
           end # if
 
-          self.prefetch(options[:prefetch], false) if options[:prefetch]
+          self.prefetch(@options[:prefetch], false) if @options[:prefetch]
         end # self.open
       end # @connection.on_open
     end
@@ -997,8 +997,10 @@ module AMQP
     # @api public
     def prefetch(count, global = false, &block)
       self.once_open do
-        # RabbitMQ as of 2.3.1 does not support prefetch_size.
+        # RabbitMQ does not support prefetch_size.
         self.qos(0, count, global, &block)
+
+        @options[:prefetch] = count
       end
 
       self

data/lib/amqp/channel_id_allocator.rb

@@ -1,7 +1,7 @@
 module AMQP
   module ChannelIdAllocator
 
-    MAX_CHANNELS_PER_CONNECTION = (2**16)
+    MAX_CHANNELS_PER_CONNECTION = (2**16) - 1
 
     # Resets channel allocator. This method is thread safe.
     # @api public

data/lib/amqp/session.rb

@@ -148,25 +148,6 @@ module AMQP
         settings[:logging] = boolean
       end
 
-
-      # Establishes connection to AMQ broker and returns it. New connection object is yielded to
-      # the block if it is given.
-      #
-      # @example Specifying adapter via the :adapter option
-      #   AMQP::Adapter.connect(:adapter => "socket")
-      # @example Specifying using custom adapter class
-      #   AMQP::SocketClient.connect
-      # @param [Hash] Connection parameters, including :adapter to use.
-      # @api public
-      def connect(settings = nil, &block)
-        @settings = Settings.configure(settings)
-
-        instance = self.new
-        instance.establish_connection(settings)
-        instance.register_connection_callback(&block)
-
-        instance
-      end
     end
 
 
@@ -533,15 +514,6 @@ module AMQP
       end
     end
 
-
-
-    # For EventMachine adapter, this is a no-op.
-    # @api public
-    def establish_connection(settings)
-      # Unfortunately there doesn't seem to be any sane way
-      # how to get EventMachine connect to the instance level.
-    end
-
     alias close disconnect
 
 
@@ -1056,6 +1028,12 @@ module AMQP
     # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.5.2.9)
     def handle_close(conn_close)
       closed!
+      # getting connection.close during connection negotiation means authentication
+      # has failed (RabbitMQ 3.2+):
+      # http://www.rabbitmq.com/auth-notification.html
+      if authenticating?
+        @on_possible_authentication_failure.call(@settings) if @on_possible_authentication_failure
+      end
       self.exec_callback_yielding_self(:error, conn_close)
     end
 

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '1.1.8'
+  VERSION = '1.2.0'
 end

data/spec/integration/queue_declaration_spec.rb

@@ -47,6 +47,7 @@ describe AMQP do
         it "uses server-assigned queue name" do
           @channel.queue("") do |queue, *args|
             queue.name.should_not be_empty
+            queue.should be_anonymous
             queue.delete
             done
           end

data/spec/unit/amqp/channel_id_allocation_spec.rb

@@ -9,7 +9,7 @@ describe AMQP::ChannelIdAllocator do
 
   describe "#next_channel_id" do
     subject do
-      ChannelAllocator.new()
+      ChannelAllocator.new
     end
 
     context "when there is a channel id available for allocation" do
@@ -20,7 +20,7 @@ describe AMQP::ChannelIdAllocator do
       end
     end
 
-    context "when THERE IS NOT channel id available for allocation" do
+    context "when THERE IS NO a channel id available for allocation" do
       it "raises an exception" do
         (ChannelAllocator::MAX_CHANNELS_PER_CONNECTION - 1).times do
           subject.next_channel_id
@@ -34,7 +34,7 @@ describe AMQP::ChannelIdAllocator do
 
   describe ".release_channel_id" do
     subject do
-      ChannelAllocator.new()
+      ChannelAllocator.new
     end
 
     it "releases that channel id" do
@@ -49,12 +49,12 @@ describe AMQP::ChannelIdAllocator do
 
   describe "each instance gets its own channel IDs" do
     it "has an allocator per instance" do
-      one = ChannelAllocator.new()
-      two = ChannelAllocator.new()
+      one = ChannelAllocator.new
+      two = ChannelAllocator.new
       one.next_channel_id.should == 1
       one.next_channel_id.should == 2
       two.next_channel_id.should == 1
       two.next_channel_id.should == 2
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Aman Gupta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine