amqp 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c75b12b09ec783fd8d5b1e953b2ad36d348401f7
-  data.tar.gz: 3a2e57b606aa0563c2b94ff911a4fd32cacac18a
+  metadata.gz: 480856b9abfa322113dabee60f290c0763e80691
+  data.tar.gz: 20c5d50f24be734b8f45261d10c608aea26cb005
 SHA512:
-  metadata.gz: f7956da40b93fb3aca23c1a3c318c9bc343761e4bf2265019957dfb48a8a482284fc52118fa4b5dea46b9b8ac6b4d0fbc8af76d1605cc6b3d7921dd148af8688
-  data.tar.gz: 87f9aa52d4ccbbec0cf3893d62534a6bf4f6c31facc379c19b555b6010cf258b663462ccd0026ee0b45338ed22d499a324e99d89f13d0d3fd718831ea9525c9b
+  metadata.gz: 3942ea6fea956c33bf53e531acab4c9fea1e6366e14483b935550c125b4db7217e45c677e650b85db67ed92810b77dcd730cdaf6c9b8e6ba2af1d1e725d398d4
+  data.tar.gz: ebf78c68c6a188c5d7583dd93c5213d52d82671845650b76b6dabf3743dd4b69b1c06257a85e6294bdc8df69a144539b74306e15c341b9a4737a6203b866e11d

data/.travis.yml

@@ -20,6 +20,7 @@ notifications:
 branches:
   only:
     - master
+    - 1.1.x-stable
     - 1.0.x-stable
 matrix:
   allow_failures:

data/ChangeLog.md

@@ -1,6 +1,34 @@
+## Changes Between 1.1.5 and 1.1.6
+
+### 65535 Channels Per Connection
+
+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
 
-No changes yet.
+### Fixed Exception in AMQP::Exchange#handle_declare_ok
+
+`AMQP::Exchange#handle_declare_ok` no longer raises an exception
+about undefined method.
 
 
 ## Changes Between 1.1.1 and 1.1.2

data/lib/amqp/channel.rb

@@ -231,19 +231,19 @@ module AMQP
     #
     # @see AMQP::Channel#prefetch
     # @api public
-    def initialize(connection = nil, id = self.class.next_channel_id, options = {}, &block)
+    def initialize(connection = nil, id = nil, options = {}, &block)
       raise 'AMQP can only be used from within EM.run {}' unless EM.reactor_running?
 
       @connection = connection || AMQP.connection || AMQP.start
       # this means 2nd argument is options
       if id.kind_of?(Hash)
         options = options.merge(id)
-        id      = self.class.next_channel_id
+        id      = @connection.next_channel_id
       end
 
       super(@connection)
 
-      @id        = id
+      @id        = id || @connection.next_channel_id
       @exchanges = Hash.new
       @queues    = Hash.new
       @consumers = Hash.new
@@ -264,8 +264,8 @@ module AMQP
                       65536
                     end
 
-      if channel_max != 0 && !(0..channel_max).include?(id)
-        raise ArgumentError.new("Max channel for the connection is #{channel_max}, given: #{id}")
+      if channel_max != 0 && !(0..channel_max).include?(@id)
+        raise ArgumentError.new("Max channel for the connection is #{channel_max}, given: #{@id}")
       end
 
       # we need this deferrable to mimic what AMQP gem 0.7 does to enable
@@ -344,7 +344,7 @@ module AMQP
       # must release after we allocate a new id, otherwise we will end up
       # with the same value. MK.
       @id    = self.class.next_channel_id
-      self.class.release_channel_id(old_id)
+      @connection.release_channel_id(old_id)
 
       @channel_is_open_deferrable.fail
       @channel_is_open_deferrable = AMQP::Deferrable.new
@@ -1174,67 +1174,10 @@ module AMQP
       self.exec_callback_yielding_self(:after_connection_interruption)
       self.reset_state!
 
-      self.class.release_channel_id(@id) unless auto_recovering?
+      @connection.release_channel_id(@id) unless auto_recovering?
       @channel_is_open_deferrable = AMQP::Deferrable.new
     end
 
-
-    # @private
-    # @api private
-    def self.channel_id_mutex
-      @channel_id_mutex ||= Mutex.new
-    end
-
-    # Returns next available channel id. This method is thread safe.
-    #
-    # @return [Fixnum]
-    # @api public
-    # @see Channel.release_channel_id
-    # @see Channel.reset_channel_id_allocator
-    def self.next_channel_id
-      channel_id_mutex.synchronize do
-        self.initialize_channel_id_allocator
-
-        @int_allocator.allocate
-      end
-    end
-
-    # Releases previously allocated channel id. This method is thread safe.
-    #
-    # @param [Fixnum] Channel id to release
-    # @api public
-    # @see Channel.next_channel_id
-    # @see Channel.reset_channel_id_allocator
-    def self.release_channel_id(i)
-      channel_id_mutex.synchronize do
-        self.initialize_channel_id_allocator
-
-        @int_allocator.release(i)
-      end
-    end # self.release_channel_id(i)
-
-    # Resets channel allocator. This method is thread safe.
-    # @api public
-    # @see Channel.next_channel_id
-    # @see Channel.release_channel_id
-    def self.reset_channel_id_allocator
-      channel_id_mutex.synchronize do
-        initialize_channel_id_allocator
-
-        @int_allocator.reset
-      end
-    end # self.reset_channel_id_allocator
-
-
-    # @private
-    def self.initialize_channel_id_allocator
-      # TODO: ideally, this should be in agreement with agreed max number of channels of the connection,
-      #       but it is possible that value either not yet available. MK.
-      max_channel     =  (1 << 16) - 1
-      @int_allocator ||= IntAllocator.new(1, max_channel)
-    end # self.initialize_channel_id_allocator
-
-
     # @return [Boolean] true if this channel uses automatic recovery mode
     def auto_recovering?
       @auto_recovery
@@ -1534,7 +1477,7 @@ module AMQP
       self.connection.clear_frames_on(self.id)
       self.exec_callback_once_yielding_self(:close, close_ok)
 
-      self.class.release_channel_id(@id)
+      @connection.release_channel_id(@id)
     end
 
     # @api plugin

data/lib/amqp/channel_id_allocator.rb

@@ -0,0 +1,58 @@
+module AMQP
+  module ChannelIdAllocator
+
+    MAX_CHANNELS_PER_CONNECTION = (2**16)
+
+    # Resets channel allocator. This method is thread safe.
+    # @api public
+    # @see Channel.next_channel_id
+    # @see Channel.release_channel_id
+    def reset_channel_id_allocator
+      channel_id_mutex.synchronize do
+        int_allocator.reset
+      end
+    end
+
+    # Releases previously allocated channel id. This method is thread safe.
+    #
+    # @param [Fixnum] Channel id to release
+    # @api public
+    # @see Channel.next_channel_id
+    # @see Channel.reset_channel_id_allocator
+    def release_channel_id(i)
+      channel_id_mutex.synchronize do
+        int_allocator.release(i)
+      end
+    end
+
+    # Returns next available channel id. This method is thread safe.
+    #
+    # @return [Fixnum]
+    # @api public
+    # @see Channel.release_channel_id
+    # @see Channel.reset_channel_id_allocator
+    def next_channel_id
+      channel_id_mutex.synchronize do
+        result = int_allocator.allocate
+        raise "No further channels available. Please open a new connection." if result < 0
+        result
+      end
+    end
+
+    private
+
+    # @private
+    # @api private
+    def channel_id_mutex
+      @channel_id_mutex ||= Mutex.new
+    end
+
+    # @private
+    def int_allocator
+      # TODO: ideally, this should be in agreement with agreed max number of channels of the connection,
+      #       but it is possible that value either not yet available. MK.
+      @int_allocator ||= IntAllocator.new(1, MAX_CHANNELS_PER_CONNECTION)
+    end
+
+  end
+end

data/lib/amqp/session.rb

@@ -6,6 +6,7 @@ require "amqp/auth_mechanism_adapter"
 require "amqp/broker"
 
 require "amqp/channel"
+require "amqp/channel_id_allocator"
 
 module AMQP
   # AMQP session represents connection to the broker. Session objects let you define callbacks for
@@ -33,7 +34,7 @@ module AMQP
   #
   # @api public
   class Session < EM::Connection
-
+  include AMQP::ChannelIdAllocator
 
     #
     # Behaviours

data/lib/amqp/version.rb

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

data/spec/integration/automatic_recovery_predicate_spec.rb

@@ -46,7 +46,7 @@ describe AMQP::Channel, "options hash" do
 
 
   it "can be passed as the 3rd constructor argument" do
-    ch = AMQP::Channel.new(AMQP.connection, AMQP::Channel.next_channel_id, :auto_recovery => true)
+    ch = AMQP::Channel.new(AMQP.connection, nil, :auto_recovery => true)
     ch.auto_recovery.should be_true
     ch.auto_recovery = false
     ch.auto_recovery.should be_false

data/spec/unit/amqp/channel_id_allocation_spec.rb

@@ -1,40 +1,60 @@
 # encoding: utf-8
 
 require "spec_helper"
+describe AMQP::ChannelIdAllocator do
 
-describe AMQP::Channel do
-  describe ".next_channel_id" do
-    before :all do
-      described_class.reset_channel_id_allocator
+  class ChannelAllocator
+    include AMQP::ChannelIdAllocator
+  end
+
+  describe "#next_channel_id" do
+    subject do
+      ChannelAllocator.new()
     end
 
     context "when there is a channel id available for allocation" do
       it "returns that channel id" do
-        1024.times { described_class.next_channel_id }
+        1024.times { subject.next_channel_id }
 
-        described_class.next_channel_id.should == 1025
+        subject.next_channel_id.should == 1025
       end
     end
 
     context "when THERE IS NOT channel id available for allocation" do
-      it "raises an exception"
+      it "raises an exception" do
+        (ChannelAllocator::MAX_CHANNELS_PER_CONNECTION - 1).times do
+          subject.next_channel_id
+        end
+
+        lambda { subject.next_channel_id }.should raise_error
+      end
     end
   end
 
 
-
   describe ".release_channel_id" do
-    before :all do
-      described_class.reset_channel_id_allocator
+    subject do
+      ChannelAllocator.new()
     end
 
     it "releases that channel id" do
-      1024.times { described_class.next_channel_id }
-      described_class.next_channel_id.should == 1025
+      1024.times { subject.next_channel_id }
+      subject.next_channel_id.should == 1025
+
+      subject.release_channel_id(128)
+      subject.next_channel_id.should == 128
+      subject.next_channel_id.should == 1026
+    end
+  end
 
-      described_class.release_channel_id(128)
-      described_class.next_channel_id.should == 128
-      described_class.next_channel_id.should == 1026
+  describe "each instance gets its own channel IDs" do
+    it "has an allocator per instance" do
+      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.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Aman Gupta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -234,6 +234,7 @@ files:
 - lib/amqp/broker.rb
 - lib/amqp/callbacks.rb
 - lib/amqp/channel.rb
+- lib/amqp/channel_id_allocator.rb
 - lib/amqp/compatibility/ruby187_patchlevel_check.rb
 - lib/amqp/consumer.rb
 - lib/amqp/consumer_tag_generator.rb
@@ -298,11 +299,9 @@ files:
 - spec/integration/tx_commit_spec.rb
 - spec/integration/tx_rollback_spec.rb
 - spec/spec_helper.rb
-- spec/unit/amqp/bit_set_spec.rb
 - spec/unit/amqp/channel_id_allocation_spec.rb
 - spec/unit/amqp/client_spec.rb
 - spec/unit/amqp/connection_spec.rb
-- spec/unit/amqp/int_allocator_spec.rb
 homepage: http://rubyamqp.info
 licenses:
 - Ruby

data/spec/unit/amqp/bit_set_spec.rb

@@ -1,127 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-require "amqp/bit_set"
-
-
-describe AMQP::BitSet do
-
-  #
-  # Environment
-  #
-
-  let(:nbits) { (1 << 16) - 1 }
-
-
-  #
-  # Examples
-  #
-
-  describe "#get, #[]" do
-    describe "when bit at given position is set" do
-      subject do
-        o = described_class.new(nbits)
-        o.set(3)
-        o
-      end
-
-      it "returns true" do
-        subject.get(3).should be_true
-      end # it
-    end # describe
-
-    describe "when bit at given position is off" do
-      subject do
-        described_class.new(nbits)
-      end
-
-      it "returns false" do
-        subject.get(5).should be_false
-      end # it
-    end # describe
-  end # describe
-
-
-  describe "#set" do
-    describe "when bit at given position is set" do
-      subject do
-        described_class.new(nbits)
-      end
-
-      it "has no effect" do
-        subject.set(3)
-        subject.get(3).should be_true
-        subject.set(3)
-        subject[3].should be_true
-      end # it
-    end
-
-    describe "when bit at given position is off" do
-      subject do
-        described_class.new(nbits)
-      end
-
-      it "sets that bit" do
-        subject.set(3)
-        subject.get(3).should be_true
-
-        subject.set(33)
-        subject.get(33).should be_true
-
-        subject.set(3387)
-        subject.get(3387).should be_true
-      end
-    end # describe
-  end # describe
-
-
-  describe "#unset" do
-    describe "when bit at a given position is set" do
-      subject do
-        described_class.new(nbits)
-      end
-
-      it "unsets that bit" do
-        subject.set(3)
-        subject.get(3).should be_true
-        subject.unset(3)
-        subject.get(3).should be_false
-      end # it
-    end # describe
-
-
-    describe "when bit at a given position is off" do
-      subject do
-        described_class.new(nbits)
-      end
-
-      it "has no effect" do
-        subject.get(3).should be_false
-        subject.unset(3)
-        subject.get(3).should be_false
-      end # it
-    end # describe
-  end # describe
-
-
-
-  describe "#clear" do
-    subject do
-      described_class.new(nbits)
-    end
-
-    it "clears all bits" do
-      subject.set(3)
-      subject.get(3).should be_true
-
-      subject.set(7668)
-      subject.get(7668).should be_true
-
-      subject.clear
-
-      subject.get(3).should be_false
-      subject.get(7668).should be_false
-    end
-  end
-end

data/spec/unit/amqp/int_allocator_spec.rb

@@ -1,116 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-require "amqp/int_allocator"
-
-describe AMQP::IntAllocator do
-
-  #
-  # Environment
-  #
-
-  subject do
-    described_class.new(1, 5)
-  end
-
-
-  # ...
-
-
-  #
-  # Examples
-  #
-
-  describe "#number_of_bits" do
-    it "returns number of bits available for allocation" do
-      subject.number_of_bits.should == 4
-    end
-  end
-
-
-  describe "#hi" do
-    it "returns upper bound of the allocation range" do
-      subject.hi.should == 5
-    end
-  end
-
-  describe "#lo" do
-    it "returns lower bound of the allocation range" do
-      subject.lo.should == 1
-    end
-  end
-
-
-  describe "#allocate" do
-    context "when integer in the range is available" do
-      it "returns allocated integer" do
-        subject.allocate.should == 1
-        subject.allocate.should == 2
-        subject.allocate.should == 3
-        subject.allocate.should == 4
-
-        subject.allocate.should == -1
-      end
-    end
-
-    context "when integer in the range IS NOT available" do
-      it "returns -1" do
-        4.times { subject.allocate }
-
-        subject.allocate.should == -1
-        subject.allocate.should == -1
-        subject.allocate.should == -1
-        subject.allocate.should == -1
-      end
-    end
-  end
-
-
-  describe "#free" do
-    context "when the integer WAS allocated" do
-      it "returns frees that integer" do
-        4.times { subject.allocate }
-        subject.allocate.should == -1
-
-        subject.free(1)
-        subject.allocate.should == 1
-        subject.allocate.should == -1
-        subject.free(2)
-        subject.allocate.should == 2
-        subject.allocate.should == -1
-        subject.free(3)
-        subject.allocate.should == 3
-        subject.allocate.should == -1
-      end
-    end
-
-    context "when the integer WAS NOT allocated" do
-      it "has no effect" do
-        32.times { subject.free(1) }
-        subject.allocate.should == 1
-      end
-    end
-  end
-
-
-  describe "#allocated?" do
-    context "when given position WAS allocated" do
-      it "returns true" do
-        3.times { subject.allocate }
-
-        subject.allocated?(1).should be_true
-        subject.allocated?(2).should be_true
-        subject.allocated?(3).should be_true
-      end
-    end
-
-    context "when given position WAS NOT allocated" do
-      it "returns false" do
-        2.times { subject.allocate }
-
-        subject.allocated?(3).should be_false
-        subject.allocated?(4).should be_false
-      end
-    end
-  end
-end