torquebox-messaging 2.1.0-java → 2.1.1-java

data/lib/gem_hook.rb

@@ -41,9 +41,11 @@ require 'torquebox/messaging/xa_connection_factory'
 require 'torquebox/messaging/xa_connection'
 require 'torquebox/messaging/xa_session'
 
+require 'torquebox/messaging/processor_middleware/chain'
+require 'torquebox/messaging/processor_middleware/with_transaction'
 require 'torquebox/messaging/message_processor'
 require 'torquebox/messaging/task'
 require 'torquebox/messaging/backgroundable'
-require 'torquebox/messaging/processor_wrapper'
 
-require 'torquebox/messaging/datamapper_marshaling.rb'
+
+require 'torquebox/messaging/datamapper_marshaling'

data/lib/torquebox-messaging.rb

@@ -1,6 +1,6 @@
 module TorqueboxMessaging
-  VERSION = '2.1.0'
-  MAVEN_VERSION = '2.1.0'
+  VERSION = '2.1.1'
+  MAVEN_VERSION = '2.1.1'
 end
 begin
   require 'java'

data/lib/torquebox/messaging/backgroundable.rb

@@ -14,7 +14,7 @@
 # License along with this software; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
+ 
 require 'torquebox/messaging/queue'
 require 'torquebox/messaging/future'
 require 'torquebox/messaging/task'
@@ -27,6 +27,7 @@ module TorqueBox
     # Backgroundable provides mechanism for executing an object's
     # methods asynchronously.
     module Backgroundable
+      MUTEX = Mutex.new
 
       def self.included(base)
         base.extend(ClassMethods)
@@ -82,13 +83,20 @@ module TorqueBox
         end
 
         def __enable_backgroundable_newrelic_tracing(method)
+          method = method.to_s
           if Backgroundable.newrelic_available?
-           include(NewRelic::Agent::Instrumentation::ControllerInstrumentation) unless
-              include?(NewRelic::Agent::Instrumentation::ControllerInstrumentation)
-            begin
-              add_transaction_tracer(method, :name => method.sub("__sync_", ""), :category => :task)
-            rescue Exception => e
-              TorqueBox::Logger.new( Backgroundable ).error "Error loading New Relic for backgrounded method #{method.sub("__sync_", "")}: #{e}"
+            TorqueBox::Messaging::Backgroundable::MUTEX.synchronize do
+              @__enabled_bg_tracing_methods ||= {}
+              if !@__enabled_bg_tracing_methods[method]
+                include(NewRelic::Agent::Instrumentation::ControllerInstrumentation) unless
+                  include?(NewRelic::Agent::Instrumentation::ControllerInstrumentation)
+                begin
+                  add_transaction_tracer(method, :name => method.sub("__sync_", ""), :category => :task)
+                rescue Exception => e
+                  TorqueBox::Logger.new( Backgroundable ).error "Error loading New Relic for backgrounded method #{method.sub("__sync_", "")}: #{e}"
+                end
+                @__enabled_bg_tracing_methods[method] = true
+              end
             end
           end
         end

data/lib/torquebox/messaging/backgroundable_processor.rb

@@ -42,6 +42,11 @@ module TorqueBox
         end
       end
 
+      # Do not begin a transaction before invoking a Backgroundable method
+      def middleware
+        super.remove(TorqueBox::Messaging::ProcessorMiddleware::WithTransaction)
+      end
+
       private
       def self.log
         @logger ||= TorqueBox::Logger.new( self )

data/lib/torquebox/messaging/destination.rb

@@ -75,10 +75,17 @@ module TorqueBox
         end
       end
 
-      def receive(options = {})
+      def receive(options = {}, &block)
         wait_for_destination(options[:startup_timeout]) do
-          with_session(options) do |session|
-            session.receive self, options
+          func = lambda do
+            with_session(options) do |session|
+              session.receive self, options, &block
+            end
+          end
+          if block
+            TorqueBox.transaction &func
+          else
+            func.call
           end
         end
       end

data/lib/torquebox/messaging/echo_processor.rb

@@ -0,0 +1,17 @@
+# A message processor that echos any messages sent to it back to
+# another queue specified by the response_queue configuration option
+module Torquebox
+  module Messaging
+    class EchoProcessor < TorqueBox::Messaging::MessageProcessor
+
+      def initialize(options={})
+        @response_queue = TorqueBox::Messaging::Queue.new(options['response_queue'])
+      end
+
+      def on_message(body)
+        @response_queue.publish(body)
+      end
+
+    end
+  end
+end

data/lib/torquebox/messaging/message_processor.rb

@@ -15,10 +15,13 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'torquebox/messaging/processor_middleware/default_middleware'
+
 module TorqueBox
   module Messaging
     class MessageProcessor
-
+      include ProcessorMiddleware::DefaultMiddleware
+      
       attr_accessor :message
 
       def initialize

data/lib/torquebox/messaging/processor_middleware/chain.rb

@@ -0,0 +1,88 @@
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+module TorqueBox
+  module Messaging
+    module ProcessorMiddleware
+      class Chain
+
+        def prepend(klass, *args)
+          chain.unshift(MWare.new(klass, args)) unless locate(klass)
+          self
+        end
+
+        def append(klass, *args)
+          chain << MWare.new(klass, args) unless locate(klass)
+          self
+        end
+
+        alias_method :add, :append
+
+        def remove(klass)
+          loc = locate(klass)
+          chain.delete_at(loc) if loc
+          self
+        end
+
+        def inspect
+          chain.map(&:klass).inspect
+        end
+        
+        def invoke(session, message, processor)
+          realized_chain = realize
+          walker = lambda do
+            mware = realized_chain.shift
+            if mware
+              mware.call(session, message, &walker)
+            else
+              processor.process!(message)
+            end
+          end
+          walker.call
+        end
+
+        protected
+
+        def chain
+          @chain ||= []
+        end
+
+        def locate(klass)
+          chain.index { |m| m.klass == klass }
+        end
+
+        def realize
+          chain.map(&:instance)
+        end
+      end
+
+      class MWare
+        attr_reader :klass
+
+        def initialize(klass, args)
+          @klass = klass
+          @args = args
+        end
+
+        def instance
+          @klass.new(*@args)
+        end
+      end
+      
+    end
+  end
+end

data/lib/torquebox/messaging/processor_middleware/default_middleware.rb

@@ -0,0 +1,38 @@
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'torquebox/messaging/processor_middleware/chain'
+require 'torquebox/messaging/processor_middleware/with_transaction'
+
+module TorqueBox
+  module Messaging
+    module ProcessorMiddleware
+      module DefaultMiddleware
+
+        def self.default
+          ProcessorMiddleware::Chain.new.append(WithTransaction)
+        end
+        
+        def middleware
+          @middleware ||= DefaultMiddleware.default
+        end
+        
+      end
+    end
+  end
+end
+

data/lib/torquebox/messaging/{processor_wrapper.rb → processor_middleware/with_transaction.rb}

@@ -19,18 +19,21 @@ require 'torquebox/transactions'
 
 module TorqueBox
   module Messaging
-    class ProcessorWrapper
+    module ProcessorMiddleware
+      class WithTransaction
       
-      def initialize(target, session, message)
-        @target = target
-        @session = session
-        @message = message
-      end
-
-      def process!
-        TorqueBox.transaction( @session ) do
-          @target.process!( @message )
+        def call(session, message)
+          if session
+            begin
+              TorqueBox.transaction( session ) { yield }
+            rescue Exception => ex
+              $stderr.puts("Unable to process inbound message", ex)
+            end
+          else
+            yield
+          end
         end
+        
       end
       
     end

data/lib/torquebox/messaging/session.rb

@@ -72,7 +72,8 @@ module TorqueBox
         begin
           jms_message = consumer.receive( timeout )
           if jms_message
-            decode ? Message.new( jms_message ).decode : jms_message
+            message = decode ? Message.new( jms_message ).decode : jms_message
+            block_given? ? yield(message) : message
           end
         ensure
           consumer.close unless consumer.nil?

data/lib/torquebox/messaging/task.rb

@@ -19,12 +19,14 @@ require 'torquebox/messaging/queue'
 require 'torquebox/messaging/future_responder'
 require 'torquebox/messaging/future'
 require 'torquebox/messaging/future_status'
+require 'torquebox/messaging/processor_middleware/default_middleware'
 
 module TorqueBox
   module Messaging
     
-    class Task
+    class Task 
       include FutureStatus
+      include ProcessorMiddleware::DefaultMiddleware
       
       def self.queue_name( name = self.name[0...-4] )
         suffix = org.torquebox.core.util.StringUtils.underscore(name)

data/spec/chain_spec.rb

@@ -0,0 +1,160 @@
+require 'torquebox/messaging/processor_middleware/chain'
+
+class MockMWare
+  def initialize(*args)
+    @log = args.first unless args.empty?
+  end
+  
+  def call(session, message)
+    @log << self.class if @log
+    yield
+  end
+end
+
+class MockMWare2 < MockMWare; end
+
+
+class TorqueBox::Messaging::ProcessorMiddleware::MWare
+  attr_reader :args
+end
+
+class TorqueBox::Messaging::ProcessorMiddleware::Chain
+  def get_chain
+    chain
+  end
+end
+  
+describe TorqueBox::Messaging::ProcessorMiddleware::Chain do
+  before(:each) do
+    @chain = TorqueBox::Messaging::ProcessorMiddleware::Chain.new
+  end
+
+  describe "#prepend" do
+    it "should work when the chain is empty" do
+      @chain.prepend(MockMWare)
+      @chain.get_chain.first.klass.should == MockMWare
+    end
+
+    it "should work when the chain is not empty" do
+      @chain.prepend(MockMWare)
+      @chain.prepend(MockMWare2)
+      @chain.get_chain.first.klass.should == MockMWare2
+    end
+
+    it "should not add the same class twice" do
+      @chain.prepend(MockMWare)
+      @chain.prepend(MockMWare)
+      @chain.get_chain.first.klass.should == MockMWare
+      @chain.get_chain.length.should == 1
+    end
+
+    it "should work with args" do
+      @chain.prepend(MockMWare, :arg1, :arg2)
+      mware = @chain.get_chain.first
+      mware.args.should == [:arg1, :arg2]
+    end
+
+    it "should return the chain" do
+      @chain.prepend(MockMWare).should == @chain
+    end
+    
+
+  end
+
+  describe "#append" do
+    it "should work when the chain is empty" do
+      @chain.append(MockMWare)
+      @chain.get_chain.first.klass.should == MockMWare
+    end
+
+    it "should work when the chain is not empty" do
+      @chain.append(MockMWare)
+      @chain.append(MockMWare2)
+      @chain.get_chain.last.klass.should == MockMWare2
+    end
+
+    it "should not add the same class twice" do
+      @chain.append(MockMWare)
+      @chain.append(MockMWare)
+      @chain.get_chain.first.klass.should == MockMWare
+      @chain.get_chain.length.should == 1
+    end
+
+    it "should return the chain" do
+      @chain.append(MockMWare).should == @chain
+    end
+
+  end
+
+  describe "#remove" do
+    it "should work" do
+      @chain.append(MockMWare)
+      @chain.remove(MockMWare)
+      @chain.get_chain.should be_empty
+    end
+
+    it "should not barf if the class isn't present" do
+      lambda do
+        @chain.remove(MockMWare)
+      end.should_not raise_error
+    end
+
+    it "should only remove the given class" do
+      @chain.append(MockMWare)
+      @chain.append(MockMWare2)
+      @chain.remove(MockMWare)
+      @chain.get_chain.first.klass.should == MockMWare2
+      @chain.get_chain.length.should == 1
+    end
+
+    it "should return the chain" do
+      @chain.remove(MockMWare).should == @chain
+    end
+
+  end
+  
+  describe '#invoke' do
+    before(:each) do 
+      @processor = mock('processor')
+      @log = []
+      @processor.stub(:process!) do
+        @log << :processor
+      end.with("message") 
+    end
+
+    describe "when the chain is empty" do
+      it "should call the processor" do
+        @chain.invoke("session", "message", @processor)
+      end
+    end
+
+    describe "when the chain is not empty" do      
+      it "should call the processor" do
+        @chain.append(MockMWare)
+        @chain.invoke("session", "message", @processor)
+      end
+
+      it "should call the chain first" do
+        @chain.append(MockMWare, @log)
+        @chain.invoke("session", "message", @processor)
+        @log.should == [MockMWare, :processor]
+      end
+
+      it "should call the chain in order" do
+        @chain.append(MockMWare, @log)
+        @chain.append(MockMWare2, @log)
+        @chain.invoke("session", "message", @processor)
+        @log.should == [MockMWare, MockMWare2, :processor]
+      end
+    end
+  end
+
+  describe "#inspect" do
+    it "should work" do
+      @chain.append(MockMWare)
+      @chain.inspect.should == "[MockMWare]"
+    end
+  end
+  
+end
+

data/spec/default_middleware_spec.rb

@@ -0,0 +1,21 @@
+require 'torquebox/messaging/processor_middleware/default_middleware'
+
+class Thing
+  include TorqueBox::Messaging::ProcessorMiddleware::DefaultMiddleware
+end
+
+
+describe TorqueBox::Messaging::ProcessorMiddleware::DefaultMiddleware do
+
+  before(:each) do
+    @thing = Thing.new
+  end
+  
+  describe "#middleware" do
+    it "should return the default middleware" do
+      @thing.middleware.inspect.should == "[TorqueBox::Messaging::ProcessorMiddleware::WithTransaction]"
+    end
+  end
+  
+
+end

data/spec/message_processor_spec.rb

@@ -51,4 +51,11 @@ describe TorqueBox::Messaging::MessageProcessor do
     @processor.body.should eql(payload)
   end
 
+  describe "#middleware" do
+    it "should return the default middleware" do
+      @processor.middleware.inspect.should == "[TorqueBox::Messaging::ProcessorMiddleware::WithTransaction]"
+    end
+  end
+  
+
 end

metadata

@@ -2,7 +2,7 @@
 name: torquebox-messaging
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.0
+  version: 2.1.1
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: torquebox-core
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.1.0
+            version: 2.1.1
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.1.0
+            version: 2.1.1
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -85,45 +85,50 @@ files:
   - lib/hornetq-core-2.2.18.Final.jar
   - lib/hornetq-jms-2.2.18.Final.jar
   - lib/netty-3.2.6.Final.jar
-  - lib/gem_hook.rb
   - lib/org.torquebox.messaging-client.rb
+  - lib/gem_hook.rb
   - lib/torquebox/messaging.rb
-  - lib/torquebox/messaging/clojure_message.rb
-  - lib/torquebox/messaging/connection.rb
-  - lib/torquebox/messaging/processor_wrapper.rb
-  - lib/torquebox/messaging/destination.rb
-  - lib/torquebox/messaging/session.rb
-  - lib/torquebox/messaging/connection_factory.rb
+  - lib/torquebox/messaging/marshal_message.rb
   - lib/torquebox/messaging/core.rb
   - lib/torquebox/messaging/xa_session.rb
-  - lib/torquebox/messaging/message_processor.rb
-  - lib/torquebox/messaging/marshal_message.rb
-  - lib/torquebox/messaging/future.rb
-  - lib/torquebox/messaging/topic.rb
+  - lib/torquebox/messaging/connection.rb
+  - lib/torquebox/messaging/future_responder.rb
   - lib/torquebox/messaging/backgroundable_processor.rb
-  - lib/torquebox/messaging/queue.rb
+  - lib/torquebox/messaging/message_processor.rb
+  - lib/torquebox/messaging/future_status.rb
+  - lib/torquebox/messaging/connection_factory.rb
   - lib/torquebox/messaging/xa_connection_factory.rb
-  - lib/torquebox/messaging/future_responder.rb
-  - lib/torquebox/messaging/text_message.rb
   - lib/torquebox/messaging/message.rb
-  - lib/torquebox/messaging/task.rb
-  - lib/torquebox/messaging/json_message.rb
+  - lib/torquebox/messaging/datamapper_marshaling.rb
+  - lib/torquebox/messaging/topic.rb
+  - lib/torquebox/messaging/marshal_base64_message.rb
+  - lib/torquebox/messaging/text_message.rb
   - lib/torquebox/messaging/backgroundable.rb
+  - lib/torquebox/messaging/json_message.rb
+  - lib/torquebox/messaging/destination.rb
+  - lib/torquebox/messaging/echo_processor.rb
+  - lib/torquebox/messaging/future.rb
+  - lib/torquebox/messaging/clojure_message.rb
+  - lib/torquebox/messaging/task.rb
+  - lib/torquebox/messaging/session.rb
+  - lib/torquebox/messaging/queue.rb
   - lib/torquebox/messaging/const_missing.rb
-  - lib/torquebox/messaging/datamapper_marshaling.rb
-  - lib/torquebox/messaging/future_status.rb
   - lib/torquebox/messaging/xa_connection.rb
-  - lib/torquebox/messaging/marshal_base64_message.rb
+  - lib/torquebox/messaging/processor_middleware/chain.rb
+  - lib/torquebox/messaging/processor_middleware/default_middleware.rb
+  - lib/torquebox/messaging/processor_middleware/with_transaction.rb
   - lib/torquebox/messaging/ext/javax_jms_queue_browser.rb
-  - spec/task_spec.rb
-  - spec/datamapper_marshaling_spec.rb
-  - spec/future_spec.rb
-  - spec/json_message_spec.rb
-  - spec/message_processor_spec.rb
-  - spec/future_responder_spec.rb
   - spec/backgroundable_spec.rb
+  - spec/future_responder_spec.rb
+  - spec/default_middleware_spec.rb
+  - spec/message_processor_spec.rb
+  - spec/chain_spec.rb
+  - spec/future_spec.rb
   - spec/message_spec.rb
   - spec/destination_spec.rb
+  - spec/datamapper_marshaling_spec.rb
+  - spec/task_spec.rb
+  - spec/json_message_spec.rb
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -152,12 +157,14 @@ signing_key:
 specification_version: 3
 summary: TorqueBox Messaging Client
 test_files: 
-  - spec/task_spec.rb
-  - spec/datamapper_marshaling_spec.rb
-  - spec/future_spec.rb
-  - spec/json_message_spec.rb
-  - spec/message_processor_spec.rb
-  - spec/future_responder_spec.rb
   - spec/backgroundable_spec.rb
+  - spec/future_responder_spec.rb
+  - spec/default_middleware_spec.rb
+  - spec/message_processor_spec.rb
+  - spec/chain_spec.rb
+  - spec/future_spec.rb
   - spec/message_spec.rb
   - spec/destination_spec.rb
+  - spec/datamapper_marshaling_spec.rb
+  - spec/task_spec.rb
+  - spec/json_message_spec.rb