amqp 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874debae660cecf12b5b3ab56da8b3ecad56e8c2
-  data.tar.gz: 8adca4a912463f82d37ed9674a7eb64a471a1d0c
+  metadata.gz: 295580888e256dddab5dd149bc16b54f367922cd
+  data.tar.gz: 25c9292b53dac56faf7f23d3ca225c3d22f31a64
 SHA512:
-  metadata.gz: 583f5936ad4cf31153c113e34514ac898715cc6003100bdc0476fffbfcb5d3b8e2f6d379c7855bad7a12112ec7962ef2f78751061cdbaf1664b3e85ea53bad1b
-  data.tar.gz: aff6a45180b60e9a3d84444359b0f5baa2a4c3a3ff1b029655e5239d760e27f1f4e398b2d125d7aaa7018f96cc429e342f6911ad6be3e183d0c2e064754c15b8
+  metadata.gz: 02da49654ab2a957b28a3a14a613615aa41e7a1863af3c4d37d0c3743b0821d14c85b33ceef5dd4b597ac9d63dffc76a0379d5d5733dd8c0bd5cb3c3f4ecc88d
+  data.tar.gz: 829533a07552a181e202d782f442d7356a83e106c095f2a14a41279017f9db72940904df340d9ed9a5e559c2a8e7fe941e8b09256aa09b6515c35f8ecf2f1f61

data/.ruby-version

@@ -1 +1 @@
-2.0.0@rabbitmq
+2.2

data/ChangeLog.md

@@ -1,13 +1,8 @@
-## Changes Between 1.5.2 and 1.5.3 (Apr 4th, 2016)
-
-### Correct amq-protocol Dependency
-
-`1.5.2` was bumped to depend on `amq-protocol` 2.x, which
-has a different Ruby version support matrix. This change has been
-reverted in `1.5.3`.
+## Changes Between 1.5.x and 1.6.0 (Apr 4th, 2016)
 
+### amq-protocol Update
 
-## Changes Between 1.5.0 and 1.5.2 (Apr 4th, 2016)
+Minimum `amq-protocol` version is now `2.0.1`.
 
 ### Provide More Details in TCP Connection Failure Exception
 
@@ -30,14 +25,6 @@ Contributed by Michael Lutsiuk.
 GH issue: [#218](https://github.com/ruby-amqp/amqp/issues/218)
 
 
-## Changes Betweem 1.5.0 and 1.5.1 (Aug 26th, 2015)
-
-### Upgrade amq-protocol to 1.9
-
-This library now depends on amq-protocol `~> 1.9`.
-
-
-
 
 ## Changes Between 1.4.x and 1.5.0
 

data/README.md

@@ -203,13 +203,6 @@ We cover Web application integration for multiple Ruby Web servers in [Connectin
 
 
 
-## Migration from amqp gem 0.6.x and 0.7.x
-
-Upgrading from amqp gem 0.6.x and 0.7.x to 0.8.0+ is straightforward, please see [amqp gem 0.8.0 migration guide](http://rubyamqp.info/articles/08_migration/).
-The same guide explains amqp gem versions history and why you would want to upgrade.
-
-
-
 ## Maintainer Information
 
 amqp gem is maintained by [Michael Klishin](http://twitter.com/michaelklishin).

data/amqp.gemspec

@@ -10,8 +10,7 @@ Gem::Specification.new do |s|
   s.authors = ["Aman Gupta", "Jakub Stastny aka botanicus", "Michael S. Klishin"]
   s.homepage = "http://rubyamqp.info"
   s.summary = "Mature EventMachine-based RabbitMQ client"
-  # RubyGems will emit warnings if summary is the same as description. I have no idea why but lets trick it. MK.
-  s.description = "Mature EventMachine-based RabbitMQ client"
+  s.description = "Mature EventMachine-based RabbitMQ client."
   s.email = ["bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=\n", "c3Rhc3RueUAxMDFpZGVhcy5jeg==\n"].map { |i| Base64.decode64(i) }
   s.licenses = ["Ruby"]
 
@@ -24,7 +23,7 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "eventmachine"
-  s.add_dependency "amq-protocol", "~> 1.9"
+  s.add_dependency "amq-protocol", ">= 2.0.1"
 
   s.rubyforge_project = "amqp"
 end

data/lib/amqp/channel.rb

@@ -342,7 +342,7 @@ module AMQP
       old_id = @id
       # must release after we allocate a new id, otherwise we will end up
       # with the same value. MK.
-      @id    = self.class.next_channel_id
+      @id    = @connection.next_channel_id
       @connection.release_channel_id(old_id)
 
       @channel_is_open_deferrable.fail
@@ -1184,14 +1184,10 @@ module AMQP
       @consumers
     end # consumers
 
-    # @return  [Array<Queue>]   Collection of queues that were declared on this channel.
-    def queues
-      @queues.values
-    end
 
-    # @return  [Array<Exchange>]  Collection of exchanges that were declared on this channel.
+    # @return  [Hash<Exchange>]  Collection of exchanges that were declared on this channel.
     def exchanges
-      @exchanges.values
+      @exchanges
     end
 
 
@@ -1414,7 +1410,7 @@ module AMQP
     end
 
 
-    RECOVERY_EVENTS = [:after_connection_interruption, :before_recovery, :after_recovery].freeze
+    RECOVERY_EVENTS = [:after_connection_interruption, :before_recovery, :after_recovery, :error].freeze
 
 
     # @api plugin

data/lib/amqp/session.rb

@@ -930,12 +930,9 @@ module AMQP
       @frames[frame.channel] << frame
 
       if frameset_complete?(@frames[frame.channel])
-        begin
-          receive_frameset(@frames[frame.channel])
-        ensure # Ensure that frames always will be cleared
-          # for channel.close, frame.channel will be nil. MK.
-          clear_frames_on(frame.channel) if @frames[frame.channel]
-        end
+        receive_frameset(@frames[frame.channel])
+        # for channel.close, frame.channel will be nil. MK.
+        clear_frames_on(frame.channel) if @frames[frame.channel]
       end
     end
 

data/lib/amqp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Aman Gupta
@@ -30,17 +30,17 @@ dependencies:
   name: amq-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
-description: Mature EventMachine-based RabbitMQ client
+        version: 2.0.1
+description: Mature EventMachine-based RabbitMQ client.
 email:
 - michael@novemberain.com
 - stastny@101ideas.cz