right_amqp 0.3.3 → 0.5.2

data/spec/ha_client/ha_broker_client_spec.rb

@@ -34,6 +34,7 @@ describe RightAMQP::HABrokerClient do
   before(:each) do
     setup_logger
     @exceptions = RightSupport::Stats::Exceptions
+    @non_deliveries = RightSupport::Stats::Activity
     @message = "message"
     @packet = flexmock("packet", :class => RequestMock, :to_s => true, :version => [12, 12]).by_default
     @serializer = flexmock("serializer")
@@ -75,6 +76,13 @@ describe RightAMQP::HABrokerClient do
       context.failed.should == []
     end
 
+    it "should store identity of failed brokers" do
+      context = RightAMQP::HABrokerClient::Context.new(@packet1, @options, @brokers)
+      context.record_failure("rs-broker-1-1")
+      context.record_failure("rs-broker-2-2")
+      context.failed.should == ["rs-broker-1-1", "rs-broker-2-2"]
+    end
+
   end
 
   describe "Caching" do
@@ -163,35 +171,42 @@ describe RightAMQP::HABrokerClient do
       @identity = "rs-broker-localhost-5672"
       @address = {:host => "localhost", :port => 5672, :index => 0}
       @broker = flexmock("broker_client", :identity => @identity, :usable? => true)
-      @broker.should_receive(:return_message).by_default
       @broker.should_receive(:update_status).by_default
       flexmock(RightAMQP::BrokerClient).should_receive(:new).and_return(@broker).by_default
     end
 
     it "should create a broker client for default host and port" do
       flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity, @address, @serializer,
-              @exceptions, Hash, nil).and_return(@broker).once
+              @exceptions, @non_deliveries, Hash, nil).and_return(@broker).once
       ha = RightAMQP::HABrokerClient.new(@serializer)
       ha.brokers.should == [@broker]
     end
 
     it "should create broker clients for specified hosts and ports and assign index in order of creation" do
       address1 = {:host => "first", :port => 5672, :index => 0}
-      broker1 = flexmock("broker_client1", :identity => "rs-broker-first-5672", :usable? => true, :return_message => true)
+      broker1 = flexmock("broker_client1", :identity => "rs-broker-first-5672", :usable? => true)
       flexmock(RightAMQP::BrokerClient).should_receive(:new).with("rs-broker-first-5672", address1, @serializer,
-              @exceptions, Hash, nil).and_return(broker1).once
+              @exceptions, @non_deliveries, Hash, nil).and_return(broker1).once
       address2 = {:host => "second", :port => 5672, :index => 1}
-      broker2 = flexmock("broker_client2", :identity => "rs-broker-second-5672", :usable? => true, :return_message => true)
+      broker2 = flexmock("broker_client2", :identity => "rs-broker-second-5672", :usable? => true)
       flexmock(RightAMQP::BrokerClient).should_receive(:new).with("rs-broker-second-5672", address2, @serializer,
-              @exceptions, Hash, nil).and_return(broker2).once
+              @exceptions, @non_deliveries, Hash, nil).and_return(broker2).once
       ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second", :port => 5672)
       ha.brokers.should == [broker1, broker2]
     end
 
-    it "should setup to receive returned messages from each usable broker client" do
-      @broker.should_receive(:return_message).twice
-      flexmock(RightAMQP::BrokerClient).should_receive(:new).and_return(@broker).twice
-      RightAMQP::HABrokerClient.new(@serializer, :host => "first, second", :port => 5672)
+    it "should setup to receive status updates from each broker client" do
+      broker = flexmock("broker_client", :identity => "rs-broker-first-5672")
+      flexmock(RightAMQP::BrokerClient).should_receive(:new).with("rs-broker-first-5672", Hash, @serializer,
+              @exceptions, @non_deliveries, on { |arg| arg[:update_status_callback].is_a?(Proc) }, nil).and_return(broker).once
+      RightAMQP::HABrokerClient.new(@serializer, :host => "first", :port => 5672)
+    end
+
+    it "should setup to receive returned messages from each broker client" do
+      broker = flexmock("broker_client", :identity => "rs-broker-first-5672")
+      flexmock(RightAMQP::BrokerClient).should_receive(:new).with("rs-broker-first-5672", Hash, @serializer,
+              @exceptions, @non_deliveries, on { |arg| arg[:return_message_callback].is_a?(Proc) }, nil).and_return(broker).once
+      RightAMQP::HABrokerClient.new(@serializer, :host => "first", :port => 5672)
     end
 
   end # when initializing
@@ -282,24 +297,24 @@ describe RightAMQP::HABrokerClient do
     before(:each) do
       @address1 = {:host => "first", :port => 5672, :index => 0}
       @identity1 = "rs-broker-first-5672"
-      @broker1 = flexmock("broker_client1", :identity => @identity1, :usable? => true, :return_message => true,
+      @broker1 = flexmock("broker_client1", :identity => @identity1, :usable? => true,
                           :alias => "b0", :host => "first", :port => 5672, :index => 0)
       flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity1, @address1, @serializer,
-              @exceptions, Hash, nil).and_return(@broker1).by_default
+              @exceptions, @non_deliveries, Hash, nil).and_return(@broker1).by_default
 
       @address2 = {:host => "second", :port => 5672, :index => 1}
       @identity2 = "rs-broker-second-5672"
-      @broker2 = flexmock("broker_client2", :identity => @identity2, :usable? => true, :return_message => true,
+      @broker2 = flexmock("broker_client2", :identity => @identity2, :usable? => true,
                           :alias => "b1", :host => "second", :port => 5672, :index => 1)
       flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity2, @address2, @serializer,
-              @exceptions, Hash, nil).and_return(@broker2).by_default
+              @exceptions, @non_deliveries, Hash, nil).and_return(@broker2).by_default
 
       @address3 = {:host => "third", :port => 5672, :index => 2}
       @identity3 = "rs-broker-third-5672"
-      @broker3 = flexmock("broker_client3", :identity => @identity3, :usable? => true, :return_message => true,
+      @broker3 = flexmock("broker_client3", :identity => @identity3, :usable? => true,
                           :alias => "b2", :host => "third", :port => 5672, :index => 2)
       flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity3, @address3, @serializer,
-              @exceptions, Hash, nil).and_return(@broker3).by_default
+              @exceptions, @non_deliveries, Hash, nil).and_return(@broker3).by_default
     end
 
     it "should use host and port to uniquely identity broker in AgentIdentity format" do
@@ -399,9 +414,8 @@ describe RightAMQP::HABrokerClient do
         eval("@broker#{k}.should_receive(:usable?).and_return(true).by_default")
         eval("@broker#{k}.should_receive(:connected?).and_return(true).by_default")
         eval("@broker#{k}.should_receive(:subscribe).and_return(true).by_default")
-        eval("@broker#{k}.should_receive(:return_message).and_return(true).by_default")
         eval("flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity#{k}, @address#{k}, " +
-                       "@serializer, @exceptions, Hash, nil).and_return(@broker#{k}).by_default")
+                       "@serializer, @exceptions, @non_deliveries, Hash, nil).and_return(@broker#{k}).by_default")
       end
     end
   
@@ -412,7 +426,7 @@ describe RightAMQP::HABrokerClient do
         ha.brokers.size.should == 1
         ha.brokers[0].alias == "b0"
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity2, @address2, @serializer,
-                 @exceptions, Hash, nil).and_return(@broker2).once
+                 @exceptions, @non_deliveries, Hash, nil).and_return(@broker2).once
         res = ha.connect("second", 5672, 1)
         res.should be_true
         ha.brokers.size.should == 2
@@ -425,7 +439,7 @@ describe RightAMQP::HABrokerClient do
         @broker1.should_receive(:usable?).and_return(false)
         @broker1.should_receive(:close).and_return(true).once
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity1, @address1, @serializer,
-                 @exceptions, Hash, ha.brokers[0]).and_return(@broker1).once
+                 @exceptions, @non_deliveries, Hash, ha.brokers[0]).and_return(@broker1).once
         res = ha.connect("first", 5672, 0)
         res.should be_true
         ha.brokers.size.should == 2
@@ -440,7 +454,7 @@ describe RightAMQP::HABrokerClient do
         @broker1.should_receive(:status).and_return(:connected).once
         @broker1.should_receive(:close).and_return(true).never
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity1, @address1, @serializer,
-                 @exceptions, Hash, ha.brokers[0]).and_return(@broker1).never
+                 @exceptions, @non_deliveries, Hash, ha.brokers[0]).and_return(@broker1).never
         res = ha.connect("first", 5672, 0)
         res.should be_false
         ha.brokers.size.should == 2
@@ -454,7 +468,7 @@ describe RightAMQP::HABrokerClient do
         ha.brokers.size.should == 2
         @broker1.should_receive(:close).and_return(true).once
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity1, @address1, @serializer,
-                 @exceptions, Hash, ha.brokers[0]).and_return(@broker1).once
+                 @exceptions, @non_deliveries, Hash, ha.brokers[0]).and_return(@broker1).once
         res = ha.connect("first", 5672, 0, nil, force = true)
         res.should be_true
         ha.brokers.size.should == 2
@@ -467,7 +481,7 @@ describe RightAMQP::HABrokerClient do
         ha.brokers.size.should == 2
         @broker1.should_receive(:close).and_return(true).once
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity3, @address3.merge(:index => 0),
-                 @serializer, @exceptions, Hash, nil).and_return(@broker3).once
+                 @serializer, @exceptions, @non_deliveries, Hash, nil).and_return(@broker3).once
         res = ha.connect("third", 5672, 0)
         res.should be_true
         ha.brokers.size.should == 2
@@ -755,34 +769,6 @@ describe RightAMQP::HABrokerClient do
         @broker3.should_receive(:publish).and_return(true).by_default
       end
 
-      it "should invoke return block" do
-        ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second, third")
-        @broker1.should_receive(:return_message).and_yield("exchange", "NO_CONSUMERS", @message).once
-        called = 0
-        ha.return_message do |id, reason, message, to, context|
-          called += 1
-          id.should == @identity1
-          reason.should == "NO_CONSUMERS"
-          message.should == @message
-          to.should == "exchange"
-        end
-        called.should == 1
-      end
-
-      it "should record failure in message context if there is message context" do
-        ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second, third")
-        ha.publish({:type => :direct, :name => "exchange", :options => {:durable => true}},
-                   @packet, :mandatory => true).should == [@identity1]
-        @broker1.should_receive(:return_message).and_yield("exchange", "NO_CONSUMERS", @message).once
-        ha.return_message do |id, reason, message, to, context|
-          id.should == @identity1
-          reason.should == "NO_CONSUMERS"
-          message.should == @message
-          to.should == "exchange"
-        end
-        ha.instance_variable_get(:@published).fetch(@message).failed.should == [@identity1]
-      end
-
       context "when non-delivery" do
 
         it "should store non-delivery block for use by return handler" do
@@ -799,83 +785,79 @@ describe RightAMQP::HABrokerClient do
         before(:each) do
           @options = {}
           @brokers = [@identity1, @identity2]
+          @ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second")
           @context = RightAMQP::HABrokerClient::Context.new(@packet, @options, @brokers)
+          flexmock(@ha.instance_variable_get(:@published)).should_receive(:fetch).with(@message).and_return(@context).by_default
         end
 
         it "should republish using a broker not yet tried if possible and log that re-routing" do
           @logger.should_receive(:info).with(/RE-ROUTE/).once
           @logger.should_receive(:info).with(/RETURN reason/).once
-          ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second")
-          @context.record_failure(@identity1)
           @broker2.should_receive(:publish).and_return(true).once
-          ha.__send__(:handle_return, @identity1, "reason", @message, "to", @context)
+          @context.record_failure(@identity1)
+          @ha.__send__(:handle_return, @identity1, "to", "reason", @message)
         end
 
         it "should republish to same broker without mandatory if message is persistent and no other brokers available" do
           @logger.should_receive(:info).with(/RE-ROUTE/).once
           @logger.should_receive(:info).with(/RETURN reason/).once
-          ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second")
           @context.record_failure(@identity1)
           @context.record_failure(@identity2)
           @packet.should_receive(:persistent).and_return(true)
           @broker1.should_receive(:publish).and_return(true).once
-          ha.__send__(:handle_return, @identity2, "NO_CONSUMERS", @message, "to", @context)
+          @ha.__send__(:handle_return, @identity2, "to", "NO_CONSUMERS", @message)
         end
 
         it "should republish to same broker without mandatory if message is one-way and no other brokers available" do
           @logger.should_receive(:info).with(/RE-ROUTE/).once
           @logger.should_receive(:info).with(/RETURN reason/).once
-          ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second")
           @context.record_failure(@identity1)
           @context.record_failure(@identity2)
           @packet.should_receive(:one_way).and_return(true)
           @broker1.should_receive(:publish).and_return(true).once
-          ha.__send__(:handle_return, @identity2, "NO_CONSUMERS", @message, "to", @context)
+          @ha.__send__(:handle_return, @identity2, "to", "NO_CONSUMERS", @message)
         end
 
         it "should update status to :stopping if message returned because access refused" do
           @logger.should_receive(:info).with(/RE-ROUTE/).once
           @logger.should_receive(:info).with(/RETURN reason/).once
-          ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second")
           @context.record_failure(@identity1)
           @broker2.should_receive(:publish).and_return(true).once
           @broker1.should_receive(:update_status).with(:stopping).and_return(true).once
-          ha.__send__(:handle_return, @identity1, "ACCESS_REFUSED", @message, "to", @context)
+          @ha.__send__(:handle_return, @identity1, "to", "ACCESS_REFUSED", @message)
         end
 
         it "should log info and make non-delivery call even if persistent when returned because of no queue" do
           @logger.should_receive(:info).with(/NO ROUTE/).once
           @logger.should_receive(:info).with(/RETURN reason/).once
-          ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second")
           called = 0
-          ha.non_delivery { |reason, type, token, from, to| called += 1 }
+          @ha.non_delivery { |reason, type, token, from, to| called += 1 }
           @context.record_failure(@identity1)
           @context.record_failure(@identity2)
           @packet.should_receive(:persistent).and_return(true)
           @broker1.should_receive(:publish).and_return(true).never
           @broker2.should_receive(:publish).and_return(true).never
-          ha.__send__(:handle_return, @identity2, "NO_QUEUE", @message, "to", @context)
+          @ha.__send__(:handle_return, @identity2, "to", "NO_QUEUE", @message)
           called.should == 1
         end
 
         it "should log info and make non-delivery call if no route can be found" do
           @logger.should_receive(:info).with(/NO ROUTE/).once
           @logger.should_receive(:info).with(/RETURN reason/).once
-          ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second")
           called = 0
-          ha.non_delivery { |reason, type, token, from, to| called += 1 }
+          @ha.non_delivery { |reason, type, token, from, to| called += 1 }
           @context.record_failure(@identity1)
           @context.record_failure(@identity2)
           @broker1.should_receive(:publish).and_return(true).never
           @broker2.should_receive(:publish).and_return(true).never
-          ha.__send__(:handle_return, @identity2, "any reason", @message, "to", @context)
+          @ha.__send__(:handle_return, @identity2, "to", "any reason", @message)
           called.should == 1
         end
 
         it "should log info if no message context available for re-routing it" do
           @logger.should_receive(:info).with(/Dropping/).once
-          ha = RightAMQP::HABrokerClient.new(@serializer, :host => "first, second")
-          ha.__send__(:handle_return, @identity2, "any reason", @message, "to", nil)
+          flexmock(@ha.instance_variable_get(:@published)).should_receive(:fetch).with(@message).and_return(nil).once
+          @ha.__send__(:handle_return, @identity2, "to", "any reason", @message)
         end
 
       end
@@ -999,7 +981,6 @@ describe RightAMQP::HABrokerClient do
         @broker.should_receive(:usable?).and_return(true).by_default
         @broker.should_receive(:connected?).and_return(true).by_default
         @broker.should_receive(:subscribe).and_return(true).by_default
-        @broker.should_receive(:return_message).and_return(true).by_default
         flexmock(RightAMQP::BrokerClient).should_receive(:new).and_return(@broker).by_default
         @broker1.should_receive(:failed?).and_return(false).by_default
         @broker2.should_receive(:failed?).and_return(false).by_default
@@ -1083,6 +1064,7 @@ describe RightAMQP::HABrokerClient do
         ha.stats.should == {"brokers" => ["stats1", "stats2", "stats3"],
                             "exceptions" => nil,
                             "heartbeat" => nil,
+                            "non-deliveries" => nil,
                             "returns" => nil}
       end
 
@@ -1205,7 +1187,7 @@ describe RightAMQP::HABrokerClient do
 
       it "should provide connection status callback only once when one-off is requested" do
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity, @address, @serializer,
-                @exceptions, Hash, nil).and_return(@broker).once
+                @exceptions, @non_deliveries, Hash, nil).and_return(@broker).once
         ha = RightAMQP::HABrokerClient.new(@serializer)
         called = 0
         ha.connection_status(:one_off => 10) { |_| called += 1 }
@@ -1221,7 +1203,7 @@ describe RightAMQP::HABrokerClient do
         flexmock(EM::Timer).should_receive(:new).and_return(@timer).once
         @timer.should_receive(:cancel).once
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity, @address, @serializer,
-                @exceptions, Hash, nil).and_return(@broker).once
+                @exceptions, @non_deliveries, Hash, nil).and_return(@broker).once
         ha = RightAMQP::HABrokerClient.new(@serializer)
         called = 0
         ha.connection_status(:one_off => 10) { |_| called += 1 }
@@ -1233,7 +1215,7 @@ describe RightAMQP::HABrokerClient do
         flexmock(EM::Timer).should_receive(:new).and_return(@timer).and_yield.once
         @timer.should_receive(:cancel).never
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity, @address, @serializer,
-                @exceptions, Hash, nil).and_return(@broker).once
+                @exceptions, @non_deliveries, Hash, nil).and_return(@broker).once
         ha = RightAMQP::HABrokerClient.new(@serializer)
         called = 0
         ha.connection_status(:one_off => 10) { |status| called += 1; status.should == :timeout }
@@ -1242,7 +1224,7 @@ describe RightAMQP::HABrokerClient do
 
       it "should be able to have multiple connection status callbacks" do
         flexmock(RightAMQP::BrokerClient).should_receive(:new).with(@identity, @address, @serializer,
-                @exceptions, Hash, nil).and_return(@broker).once
+                @exceptions, @non_deliveries, Hash, nil).and_return(@broker).once
         ha = RightAMQP::HABrokerClient.new(@serializer)
         called1 = 0
         called2 = 0

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ module RightAMQP
 
   module SpecHelper
 
-    # Setup mocking of logger such that need to override :error and :warning
+    # Setup mocking of logger such that need to override :error and :warn
     # in specs that are expected to require use of these methods
     # Do not mock :exception because that gets eaten by Log::Mixin and results
     # in :error call
@@ -46,7 +46,7 @@ module RightAMQP
       @logger.should_receive(:level).and_return(:info).by_default
       @logger.should_receive(:exception).by_default.and_return { |m| raise m }
       @logger.should_receive(:error).by_default.and_return { |m| raise m }
-      @logger.should_receive(:warning).by_default.and_return { |m| raise m }
+      @logger.should_receive(:warn).by_default.and_return { |m| raise m }
       @logger.should_receive(:info).by_default
       @logger.should_receive(:debug).by_default
       RightSupport::Log::Mixin.default_logger = @logger

metadata

@@ -2,7 +2,7 @@
 name: right_amqp
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.5.2
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-30 00:00:00 Z
+date: 2012-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: right_support
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3853339962188716916
+      hash: -2478325882145006722
       segments: 
       - 0
       version: "0"