right_amqp 0.8.5 → 0.8.6

data/README.rdoc

@@ -1,3 +1,5 @@
+"master" branch: {<img src="https://travis-ci.org/rightscale/right_amqp.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/rightscale/right_amqp]
+
 = RightAMQP
 
 = DESCRIPTION

data/Rakefile

@@ -25,12 +25,20 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'rake'
-require 'rdoc/task'
 require 'rubygems/package_task'
 require 'rake/clean'
 require 'rspec/core/rake_task'
 require 'bacon'
 
+# These dependencies can be omitted using "bundle install --without"; tolerate their absence.
+['rdoc/task'].each do |optional|
+  begin
+    require optional
+  rescue LoadError
+    # ignore
+  end
+end
+
 desc "Run unit tests"
 task :default => 'spec'
 
@@ -52,19 +60,24 @@ namespace :spec do
   end
 end
 
-desc 'Generate documentation for the right_amqp gem'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'doc/rdocs'
-  rdoc.title = 'RightAMQP'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+if defined?(Rake::RDocTask)
+  desc 'Generate documentation for the right_amqp gem'
+  Rake::RDocTask.new(:rdoc) do |rdoc|
+    rdoc.rdoc_dir = 'doc/rdocs'
+    rdoc.title = 'RightAMQP'
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README.rdoc')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
 end
 CLEAN.include('doc/rdocs')
 
 desc "Build right_amqp gem"
-Gem::PackageTask.new(Gem::Specification.load("right_amqp.gemspec")) do |package|
-  package.need_zip = true
-  package.need_tar = true
+Gem::PackageTask.new(Gem::Specification.load("right_amqp.gemspec")) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
 end
 CLEAN.include('pkg')
+
+require 'right_develop'
+RightDevelop::CI::RakeTask.new

data/lib/right_amqp/amqp/client.rb

@@ -26,8 +26,11 @@ module AMQP
                                                  'en_US')
 
         when Protocol::Connection::Tune
+          # Use frame_max received from broker so that adapt properly to RabbitMQ 2.4.1
+          # expecting 131,072 and RabbitMQ 3.4.1 that is configured to 0 meaning unlimited
+          # because it will otherwise reject requests larger than this and fail the connection
           send Protocol::Connection::TuneOk.new(:channel_max => 0,
-                                                :frame_max => 131072,
+                                                :frame_max => method.frame_max,
                                                 :heartbeat => @settings[:heartbeat] || 0)
 
           send Protocol::Connection::Open.new(:virtual_host => @settings[:vhost],

data/lib/right_amqp/ha_client/broker_client.rb

@@ -99,7 +99,7 @@ module RightAMQP
     #   :prefetch(Integer):: Maximum number of messages the AMQP broker is to prefetch for the agent
     #     before it receives an ack. Value 1 ensures that only last unacknowledged gets redelivered
     #     if the agent crashes. Value 0 means unlimited prefetch.
-    #   :fiber_pool(NB::FiberPool):: Pool of initialized fibers to be used for asynchronous message
+    #   :fiber_pool(FiberPool):: Pool of initialized fibers to be used for asynchronous message
     #     processing (can be overridden with subscribe option)
     #   :exception_on_receive_callback(Proc):: Callback activated on a receive exception with parameters
     #     message(Object):: Message received
@@ -216,7 +216,7 @@ module RightAMQP
     #   :no_log(Boolean):: Disable receive logging unless debug level
     #   :exchange2(Hash):: Additional exchange to which same queue is to be bound
     #   :brokers(Array):: Identity of brokers for which to subscribe, defaults to all usable if nil or empty
-    #   :fiber_pool(NB::FiberPool):: Pool of initialized fibers to be used for asynchronous message
+    #   :fiber_pool(FiberPool):: Pool of initialized fibers to be used for asynchronous message
     #     processing (non-nil value will override constructor option setting)
     #
     # === Block
@@ -416,7 +416,7 @@ module RightAMQP
         false
       end
     end
-3
+
     # Delete queue
     #
     # === Parameters
@@ -438,7 +438,7 @@ module RightAMQP
           unless deleted
             # Allowing declare to happen since queue may not exist and do not want NOT_FOUND
             # failure to cause AMQP channel to close
-            @channel.queue(name, options).delete
+            @channel.queue(name, options.merge(:no_declare => true)).delete
             deleted = true
           end
         rescue StandardError => e

data/right_amqp.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_amqp'
-  spec.version   = '0.8.5'
-  spec.date      = '2014-10-02'
+  spec.version   = '0.8.6'
+  spec.date      = '2014-11-12'
   spec.authors   = ['Lee Kirchhoff']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_amqp'

data/spec/ha_client/broker_client_spec.rb

@@ -898,11 +898,23 @@ describe RightAMQP::BrokerClient do
       @queue.should_receive(:delete).once
       broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
       broker.subscribe({:name => "queue1"}, {:type => :direct, :name => "exchange"}) {|_, _|}
+      @channel.should_receive(:queue).with("queue1", on { |arg| arg[:no_declare] }).and_return(@queue).once
       broker.queues.should == [@queue]
       broker.delete("queue1").should be_true
       broker.queues.should == []
     end
 
+    it "should delete the named queue even if not it is not a currently open queue" do
+      queue2 = flexmock("queue2", :bind => @bind, :name => "queue2")
+      queue2.should_receive(:delete).once
+      broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
+      broker.subscribe({:name => "queue1"}, {:type => :direct, :name => "exchange"}) {|_, _|}
+      @channel.should_receive(:queue).with("queue2", on { |arg| arg[:no_declare] }).and_return(queue2).once
+      broker.queues.should == [@queue]
+      broker.delete("queue2").should be_true
+      broker.queues.should == [@queue]
+    end
+
     it "should return false if the client is not usable" do
       @queue.should_receive(:delete).never
       broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)

data/spec/spec_helper.rb

@@ -23,8 +23,9 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'flexmock'
 require 'rspec'
+require 'flexmock'
+require 'simplecov'
 
 RSpec.configure do |c|
   c.mock_with(:flexmock)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_amqp
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
-  requirement: &2160810180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,18 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160810180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2160809020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,7 +46,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160809020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: ! 'RightAMQP provides a high availability client for interfacing with
   the
 
@@ -120,10 +136,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1112736972796387367
+      hash: -4034513993207482869
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.26
 signing_key: 
 specification_version: 3
 summary: Client for interfacing to RightScale RabbitMQ broker using AMQP