right_amqp 0.6.0 → 0.6.1

data/README.rdoc

@@ -20,6 +20,8 @@ documentation.
 Also use the built-in issues tracker (https://github.com/rightscale/right_amqp/issues)
 to report issues.
 
+Maintained by the RightScale Teal Team
+
 == Interface
 
 The focus here is on the interface provided by the RightAMQP::HABrokerClient class

data/lib/right_amqp/amqp.rb

@@ -112,4 +112,8 @@ module AMQP
       yield
     end
   end
+
+  def self.connected?
+    !!@conn
+  end
 end

data/lib/right_amqp/ha_client/broker_client.rb

@@ -264,6 +264,9 @@ module RightAMQP
             else
               receive(queue[:name], header, message, options, &block)
             end
+          rescue SystemExit
+            # Do not want to track exit exception that could occur during serialization
+            raise
           rescue Exception => e
             header.ack if options[:ack]
             logger.exception("Failed setting up to receive message from queue #{queue.inspect} " +
@@ -621,6 +624,9 @@ module RightAMQP
           header.ack
         end
         true
+      rescue SystemExit
+        # Do not want to track exit exception that could occur during serialization
+        raise
       rescue Exception => e
         header.ack if options[:ack]
         logger.exception("Failed receiving message from queue #{queue.inspect} on broker #{@alias}", e, :trace)
@@ -646,7 +652,7 @@ module RightAMQP
     def unserialize(queue, message, options = {})
       begin
         received_at = Time.now.to_f
-        packet = @serializer.load(message)
+        packet = @serializer.method(:load).arity.abs > 1 ? @serializer.load(message, queue) : @serializer.load(message)
         if options.key?(packet.class)
           unless options[:no_log] && logger.level != :debug
             re = "RE-" if packet.respond_to?(:tries) && !packet.tries.empty?
@@ -660,6 +666,9 @@ module RightAMQP
           logger.error("Received invalid #{category}packet type from queue #{queue} on broker #{@alias}: #{packet.class}\n" + caller.join("\n"))
           nil
         end
+      rescue SystemExit
+        # Do not want to track exit exception that could occur during serialization
+        raise
       rescue Exception => e
         # TODO Taking advantage of Serializer knowledge here even though out of scope
         trace = e.class.name =~ /SerializationError/ ? :caller : :trace

data/right_amqp.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_amqp'
-  spec.version   = '0.6.0'
-  spec.date      = '2012-12-10'
+  spec.version   = '0.6.1'
+  spec.date      = '2013-07-23'
   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

@@ -38,6 +38,8 @@ describe RightAMQP::BrokerClient do
     @serializer = flexmock("serializer")
     @serializer.should_receive(:dump).and_return(@message).by_default
     @serializer.should_receive(:load).with(@message).and_return(@packet).by_default
+    @load = flexmock("load method", :arity => 1).by_default
+    @serializer.should_receive(:method).with(:load).and_return(@load).by_default
     @exceptions = flexmock("exceptions")
     @exceptions.should_receive(:track).never.by_default
     @non_deliveries = flexmock("non-deliveries")
@@ -371,6 +373,14 @@ describe RightAMQP::BrokerClient do
       broker.__send__(:unserialize, "queue", @message, RequestMock => nil).should == @packet
     end
 
+    it "should pass queue to serializer load method if arity is greater than 1" do
+      @load.should_receive(:arity).and_return(2).once
+      @serializer.should_receive(:method).with(:load).and_return(@load).once
+      @serializer.should_receive(:load).with(@message, "queue").and_return(@packet).once
+      broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
+      broker.__send__(:unserialize, "queue", @message, RequestMock => nil).should == @packet
+    end
+
     it "should log an error if the message is not of the right type and return nil" do
       @logger.should_receive(:error).with(/Received invalid.*packet type/).once
       broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_amqp
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-10 00:00:00 -08:00
+date: 2013-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,9 +37,9 @@ dependencies:
         - 0
         version: "3.0"
   requirement: *id001
+  type: :runtime
   name: right_support
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -60,9 +60,9 @@ dependencies:
         - 0
         version: "2.0"
   requirement: *id002
+  type: :runtime
   name: eventmachine
   prerelease: false
-  type: :runtime
 description: |
   RightAMQP provides a high availability client for interfacing with the
   RightScale RabbitMQ broker using the AMQP protocol. The AMQP version on which