amqp-boilerplate 1.0.0 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,12 @@
+= version 1.1.0
+
+  * [FEATURE] Added on_unhandled_consumer_exception option to allow for more
+  flexible exception handling (consumer exceptions)
+
+= version 1.0.0
+
+First stable release
+
 = version 0.0.8
 
   * [FEATURE] Do not start consumers when server type is unknown

data/README.rdoc

@@ -21,6 +21,7 @@ Add a initializer +amqp.rb+ to your config/initializer folder with the following
     config.logger = ::Rails.logger
     config.consumer_paths += %W( #{Rails.root}/app/consumers )
     config.connection_options = { :host => "localhost", :port => 5672, :vhost => Rails.env }
+    config.on_unhandled_exception = Proc.new { |exception| puts "Do something with exceptions: #{exception}" }
   end
 
   # Require all files that are no longer auto-loaded when Rails is in thread-safe mode

data/lib/amqp/boilerplate.rb

@@ -61,6 +61,7 @@ module AMQP
     #     config.logger = ::Rails.logger
     #     config.consumer_paths += %W( #{Rails.root}/app/consumers )
     #     config.connection_options = { :host => "localhost", :port => 5672, :vhost => Rails.env }
+    #     config.on_unhandled_exception = Proc.new { |exception| puts "Do something with exceptions: #{exception}" }
     #   end
     def self.configure
       yield self if block_given?
@@ -77,6 +78,16 @@ module AMQP
       @connection_options = options
     end
 
+    def self.on_unhandled_consumer_exception
+      @on_unhandled_consumer_exception
+    end
+
+    # Pass a +Proc+ object to this option that will function as a handler for
+    # uncaught exceptions in a consumer.
+    def self.on_unhandled_consumer_exception=(handler)
+      @on_unhandled_consumer_exception = handler
+    end
+
     def self.start
       AMQP.start self.connection_options
     end

data/lib/amqp/boilerplate/consumer.rb

@@ -88,16 +88,14 @@ module AMQP
       def handle_message_wrapper(metadata, payload)
         AMQP::Boilerplate.logger.debug("[#{self.class}#handle_message_wrapper] Received message: #{payload}")
         handle_message(metadata, payload)
-      rescue StandardError => e
-        message = <<-MSG
-[#{self.class}] An exception occurred while processing a message
-  Payload: #{payload}
-  Exception: #{e.message}
-  Backtrace: #{e.backtrace.join("\n")}
-        MSG
-
-        AMQP::Boilerplate.logger.error(message)
+      rescue Exception => e
+        if AMQP::Boilerplate.on_unhandled_consumer_exception.is_a?(Proc)
+          AMQP::Boilerplate.on_unhandled_consumer_exception.call(e)
+        else
+          raise e
+        end
       end
+
     end
   end
 end

data/lib/amqp/boilerplate/version.rb

@@ -1,5 +1,5 @@
 module AMQP
   module Boilerplate
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/amqp/boilerplate/consumer_spec.rb

@@ -144,32 +144,34 @@ describe AMQP::Boilerplate::Consumer do
       @consumer.handle_message_wrapper(@metadata, @payload)
     end
 
-    describe "when a StandardError-like error is raised" do
-      before(:each) do
-        @consumer.stub(:handle_message).and_raise(StandardError)
+    context "when on_unhandled_consumer_exception option set" do
+      before do
+        AMQP::Boilerplate.stub(:on_unhandled_consumer_exception).and_return(Proc.new { |e|
+          AMQP::Boilerplate.logger.error("foo: #{e.message}")
+        })
       end
 
-      it "should be caught" do
+      it "should not raise the exception" do
         expect {
           @consumer.handle_message_wrapper(@metadata, @payload)
         }.to_not raise_error
       end
 
-      it "should log" do
+      it "should yield the on_unhandled_consumer_exception" do
         AMQP::Boilerplate.logger.should_receive(:error)
         @consumer.handle_message_wrapper(@metadata, @payload)
       end
     end
 
-    describe "when a NotImplementedError is raised" do
-      before(:each) do
-        @consumer.stub(:handle_message).and_raise(NotImplementedError)
+    context "when on_unhandled_consumer_exception option set" do
+      before do
+        AMQP::Boilerplate.stub(:on_unhandled_consumer_exception).and_return(nil)
       end
 
-      it "should not be caught" do
+      it "should re-raise the exception" do
         expect {
           @consumer.handle_message_wrapper(@metadata, @payload)
-        }.to raise_error(NotImplementedError)
+        }.to raise_error
       end
     end
   end

data/spec/amqp/boilerplate_spec.rb

@@ -132,6 +132,12 @@ describe AMQP::Boilerplate do
       AMQP::Boilerplate.configure { |config| config.connection_options = connection_options }
       AMQP::Boilerplate.connection_options.should == connection_options
     end
+
+    it "should let us set a handler for uncaught exceptions" do
+      on_unhandled_consumer_exception = Proc.new {}
+      AMQP::Boilerplate.configure { |config| config.on_unhandled_consumer_exception = on_unhandled_consumer_exception }
+      AMQP::Boilerplate.on_unhandled_consumer_exception.should == on_unhandled_consumer_exception
+    end
   end
 
   describe ".start" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp-boilerplate
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Patrick Baselier
@@ -16,10 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-20 00:00:00 Z
+date: 2012-05-08 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,10 +33,10 @@ dependencies:
         - 9
         version: "0.9"
   type: :development
-  prerelease: false
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,10 +48,10 @@ dependencies:
         - 6
         version: "2.6"
   type: :development
-  prerelease: false
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,10 +63,10 @@ dependencies:
         - 7
         version: "0.7"
   type: :development
-  prerelease: false
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: amqp
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,7 +78,6 @@ dependencies:
         - 8
         version: "0.8"
   type: :runtime
-  prerelease: false
   requirement: *id004
 description: Collection of modules that aid in setting up AMQP producers and consumers.
 email: 
@@ -113,6 +114,7 @@ files:
 - spec/amqp/boilerplate_spec.rb
 - spec/fixtures/consumers/dummy_consumer.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -142,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amqp-boilerplate
-rubygems_version: 1.8.22
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Helper modules for quickly setting up AMQP producers/consumers
@@ -155,4 +157,3 @@ test_files:
 - spec/amqp/boilerplate_spec.rb
 - spec/fixtures/consumers/dummy_consumer.rb
 - spec/spec_helper.rb
-has_rdoc: