activemessaging 0.7.1 → 0.8.1

data/README

@@ -19,4 +19,10 @@ h1. Support
 
 Best bet is the google groups mailing list:
 
-http://groups.google.com/group/activemessaging-discuss
+http://groups.google.com/group/activemessaging-discuss
+
+h1. Fork Details
+
+This fork adds the ability to specify a dead letter queue prefix so instead of all messages going to 1 dead letter queue, each message will go to a dead letter queue that is based on the deadLetterQueuePrefix configuration property and the originating queue. 
+
+For example, if you specific a deadLetterQueuePrefix of "DLQ." in your broker.yml and the originating queue is /queue/myqueue then the dead letter queue will be /queue/DLQ.myqueue

data/Rakefile

@@ -26,7 +26,7 @@ begin
     # basic
     gemspec.name = "activemessaging"
     gemspec.summary = "Official activemessaging gem, now hosted on github.com/kookster. (kookster prefix temporary)"
-    gemspec.description = "ActiveMessaging is an attempt to bring the simplicity and elegance of rails development to the world of messaging. Messaging, (or event-driven architecture) is widely used for enterprise integration, with frameworks such as Java's JMS, and products such as ActiveMQ, Tibco, IBM MQSeries, etc."
+    gemspec.description = "ActiveMessaging is an attempt to bring the simplicity and elegance of rails development to the world of messaging. Messaging, (or event-driven architecture) is widely used for enterprise integration, with frameworks such as Java's JMS, and products such as ActiveMQ, Tibco, IBM MQSeries, etc. Now supporting Rails 3 as of version 0.8.0."
     gemspec.email = "activemessaging-discuss@googlegroups.com"
     gemspec.homepage = "http://github.com/kookster/activemessaging"
     gemspec.authors = ["Jon Tirsen", "Andrew Kuklewicz", "Olle Jonsson", "Sylvain Perez", "Cliff Moon", 'Uwe Kubosch']

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.8.1

data/activemessaging.gemspec

@@ -1,107 +1,107 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{activemessaging}
-  s.version = "0.7.1"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Tirsen", "Andrew Kuklewicz", "Olle Jonsson", "Sylvain Perez", "Cliff Moon", "Uwe Kubosch"]
-  s.date = %q{2010-04-08}
-  s.description = %q{ActiveMessaging is an attempt to bring the simplicity and elegance of rails development to the world of messaging. Messaging, (or event-driven architecture) is widely used for enterprise integration, with frameworks such as Java's JMS, and products such as ActiveMQ, Tibco, IBM MQSeries, etc.}
+  s.date = %q{2011-08-15}
+  s.description = %q{ActiveMessaging is an attempt to bring the simplicity and elegance of rails development to the world of messaging. Messaging, (or event-driven architecture) is widely used for enterprise integration, with frameworks such as Java's JMS, and products such as ActiveMQ, Tibco, IBM MQSeries, etc. Now supporting Rails 3 as of version 0.8.0.}
   s.email = %q{activemessaging-discuss@googlegroups.com}
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
     "README",
-     "Rakefile",
-     "VERSION",
-     "activemessaging.gemspec",
-     "generators/a13g_test_harness/a13g_test_harness_generator.rb",
-     "generators/a13g_test_harness/templates/active_messaging_test.rhtml",
-     "generators/a13g_test_harness/templates/active_messaging_test_controller.rb",
-     "generators/a13g_test_harness/templates/index.rhtml",
-     "generators/filter/USAGE",
-     "generators/filter/filter_generator.rb",
-     "generators/filter/templates/filter.rb",
-     "generators/filter/templates/filter_test.rb",
-     "generators/processor/USAGE",
-     "generators/processor/processor_generator.rb",
-     "generators/processor/templates/application.rb",
-     "generators/processor/templates/broker.yml",
-     "generators/processor/templates/jruby_poller",
-     "generators/processor/templates/messaging.rb",
-     "generators/processor/templates/poller",
-     "generators/processor/templates/poller.rb",
-     "generators/processor/templates/processor.rb",
-     "generators/processor/templates/processor_test.rb",
-     "generators/tracer/USAGE",
-     "generators/tracer/templates/controller.rb",
-     "generators/tracer/templates/helper.rb",
-     "generators/tracer/templates/index.rhtml",
-     "generators/tracer/templates/layout.rhtml",
-     "generators/tracer/templates/trace_processor.rb",
-     "generators/tracer/tracer_generator.rb",
-     "init.rb",
-     "lib/activemessaging.rb",
-     "lib/activemessaging/adapter.rb",
-     "lib/activemessaging/adapters/asqs.rb",
-     "lib/activemessaging/adapters/base.rb",
-     "lib/activemessaging/adapters/beanstalk.rb",
-     "lib/activemessaging/adapters/jms.rb",
-     "lib/activemessaging/adapters/reliable_msg.rb",
-     "lib/activemessaging/adapters/stomp.rb",
-     "lib/activemessaging/adapters/test.rb",
-     "lib/activemessaging/adapters/wmq.rb",
-     "lib/activemessaging/base_message.rb",
-     "lib/activemessaging/filter.rb",
-     "lib/activemessaging/gateway.rb",
-     "lib/activemessaging/message_sender.rb",
-     "lib/activemessaging/named_base.rb",
-     "lib/activemessaging/processor.rb",
-     "lib/activemessaging/support.rb",
-     "lib/activemessaging/test_helper.rb",
-     "lib/activemessaging/trace_filter.rb",
-     "poller.rb",
-     "tasks/start_consumers.rake",
-     "test/all_tests.rb",
-     "test/app/config/broker.yml",
-     "test/asqs_test.rb",
-     "test/config_test.rb",
-     "test/filter_test.rb",
-     "test/gateway_test.rb",
-     "test/jms_test.rb",
-     "test/reliable_msg_test.rb",
-     "test/stomp_test.rb",
-     "test/test_helper.rb",
-     "test/tracer_test.rb"
+    "Rakefile",
+    "VERSION",
+    "activemessaging.gemspec",
+    "generators/a13g_test_harness/a13g_test_harness_generator.rb",
+    "generators/a13g_test_harness/templates/active_messaging_test.rhtml",
+    "generators/a13g_test_harness/templates/active_messaging_test_controller.rb",
+    "generators/a13g_test_harness/templates/index.rhtml",
+    "generators/filter/USAGE",
+    "generators/filter/filter_generator.rb",
+    "generators/filter/templates/filter.rb",
+    "generators/filter/templates/filter_test.rb",
+    "generators/processor/USAGE",
+    "generators/processor/processor_generator.rb",
+    "generators/processor/templates/application.rb",
+    "generators/processor/templates/broker.yml",
+    "generators/processor/templates/jruby_poller",
+    "generators/processor/templates/messaging.rb",
+    "generators/processor/templates/poller",
+    "generators/processor/templates/poller.rb",
+    "generators/processor/templates/processor.rb",
+    "generators/processor/templates/processor_test.rb",
+    "generators/tracer/USAGE",
+    "generators/tracer/templates/controller.rb",
+    "generators/tracer/templates/helper.rb",
+    "generators/tracer/templates/index.rhtml",
+    "generators/tracer/templates/layout.rhtml",
+    "generators/tracer/templates/trace_processor.rb",
+    "generators/tracer/tracer_generator.rb",
+    "init.rb",
+    "lib/activemessaging.rb",
+    "lib/activemessaging/adapter.rb",
+    "lib/activemessaging/adapters/amqp.rb",
+    "lib/activemessaging/adapters/asqs.rb",
+    "lib/activemessaging/adapters/base.rb",
+    "lib/activemessaging/adapters/beanstalk.rb",
+    "lib/activemessaging/adapters/jms.rb",
+    "lib/activemessaging/adapters/reliable_msg.rb",
+    "lib/activemessaging/adapters/stomp.rb",
+    "lib/activemessaging/adapters/synch.rb",
+    "lib/activemessaging/adapters/test.rb",
+    "lib/activemessaging/adapters/wmq.rb",
+    "lib/activemessaging/base_message.rb",
+    "lib/activemessaging/filter.rb",
+    "lib/activemessaging/gateway.rb",
+    "lib/activemessaging/message_sender.rb",
+    "lib/activemessaging/named_base.rb",
+    "lib/activemessaging/processor.rb",
+    "lib/activemessaging/railtie.rb",
+    "lib/activemessaging/test_helper.rb",
+    "lib/activemessaging/trace_filter.rb",
+    "lib/tasks/start_consumers.rake",
+    "poller.rb",
+    "test/all_tests.rb",
+    "test/app/config/broker.yml",
+    "test/asqs_test.rb",
+    "test/config_test.rb",
+    "test/filter_test.rb",
+    "test/gateway_test.rb",
+    "test/jms_test.rb",
+    "test/reliable_msg_test.rb",
+    "test/stomp_test.rb",
+    "test/test_helper.rb",
+    "test/tracer_test.rb"
   ]
   s.homepage = %q{http://github.com/kookster/activemessaging}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Official activemessaging gem, now hosted on github.com/kookster. (kookster prefix temporary)}
   s.test_files = [
     "test/all_tests.rb",
-     "test/asqs_test.rb",
-     "test/config_test.rb",
-     "test/filter_test.rb",
-     "test/gateway_test.rb",
-     "test/jms_test.rb",
-     "test/reliable_msg_test.rb",
-     "test/stomp_test.rb",
-     "test/test_helper.rb",
-     "test/tracer_test.rb"
+    "test/asqs_test.rb",
+    "test/config_test.rb",
+    "test/filter_test.rb",
+    "test/gateway_test.rb",
+    "test/jms_test.rb",
+    "test/reliable_msg_test.rb",
+    "test/stomp_test.rb",
+    "test/test_helper.rb",
+    "test/tracer_test.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 1.0.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 1.0.0"])

data/generators/processor/templates/broker.yml

@@ -27,6 +27,55 @@ development:
     # If error still occurs after retryMax, send message to specified dead letter queue
     # deadLetterQueue: '/queue/activemessaging/deadletter'
 
+    
+    ###########################
+    # AMQP Adapter Properties #    
+    ###########################
+    # adapter: amqp
+ 
+    # properties below are defaults for this adapter
+    # host: localhost
+    # port: 5672
+    # user: guest
+    # pass: guest
+    # vhost: /
+    # ssl: false
+    # ssl_verify: 1  
+    # debug: 0
+    # queue_name: <autogenerated>
+    # queue_durable: false if queue_name is autogenerated, defaults to true otherwise
+    # queue_auto_delete: true if queue_name is autogenerated, defaults to false otherwise
+    # queue_exclusive: true if queue_name is autogenerated, defaults to true otherwise
+
+    # SSL:
+
+    # in order to use SSL you will need to use the following fork of the carrot project:
+    #
+    #   http://github.com/rabbitt/carrot
+    #
+    # If your certificate is self signed, you will want to set ssl_verify to 0 which corresponds to 
+    # OpenSSL::SSL::VERIFY_NONE. Otherwise, it defaults to 1 (OpenSSL::SSL::VERIFY_PEER).
+   
+    # QUEUE_*:
+
+    # queue_name is the name of the "inbox" queue that will be bound to all subscription keys (called queues
+    # or destinations here). In other words, you only have one queue where all messages end up using this 
+    # adapter, and it is bound to the relevant exchanges using routing keys and exchange information 
+    # you provide in your messages.rb and subscribes_to calls. For example,
+    #
+    # in messages.rb:
+    #   s.queue :hello_world, 'hello.world', :exchange_type => :direct, :exchange_name => 'amq.direct'
+    #
+    # in a processor:
+    #   subscribes_to :hello_world, :routing_key => 'hello.#'
+    # 
+    # in a model:
+    #   publish :hello_world, 'Hello world!', :routing_key => 'hello.world'
+
+   
+    # Note: in the event that you don't specify a routing_key on publish, the queue_name of the specified
+    # destination (as listed in messages.rb) will be used as the routing_key when publishing.
+
     ################################
     # Beanstalk Adapter Properties #
     ################################

data/init.rb

@@ -1,3 +1 @@
-require 'active_support'
-require 'ostruct'
 require 'activemessaging'

data/lib/activemessaging.rb

@@ -1,7 +1,13 @@
+require 'active_support'
+require 'ostruct'
+
+if defined?(Rails::Railtie)
+  require 'activemessaging/railtie.rb'
+end
+
 module ActiveMessaging
-  APP_ROOT = ENV['APP_ROOT'] || ENV['RAILS_ROOT'] || ((defined? RAILS_ROOT) && RAILS_ROOT) || File.dirname($0)
-  APP_ENV  = ENV['APP_ENV']  || ENV['RAILS_ENV']  || 'development'
-  ROOT     = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
   # Used to indicate that the processing for a thread shoud complete
   class StopProcessingException < Interrupt #:nodoc:
@@ -17,18 +23,27 @@ module ActiveMessaging
   class StopFilterException < Exception #:nodoc:
   end
 
-  def ActiveMessaging.logger
+  def self.logger
     @@logger = nil unless defined? @@logger
-    @@logger ||= RAILS_DEFAULT_LOGGER if defined? RAILS_DEFAULT_LOGGER
-    @@logger ||= ActiveRecord::Base.logger if defined? ActiveRecord
+    @@logger ||= Rails.logger if defined? Rails
     @@logger ||= Logger.new(STDOUT)
     @@logger
   end
 
-  # DEPRECATED, so I understand, but I'm using it nicely below.
+  def self.logger=(logger)
+    @@logger = logger
+  end
+
+  def self.app_root
+    @@app_root ||= (ENV['APP_ROOT'] || (defined?(::Rails) && ::Rails.root) || ENV['RAILS_ROOT'] || File.dirname($0))
+  end
+
+  def self.app_env
+    @@app_env  ||= (ENV['APP_ENV']  || (defined?(::Rails) && ::Rails.env)  || ENV['RAILS_ENV']  || 'development')
+  end
+
   def self.load_extensions
     require 'logger'
-    require 'activemessaging/support'
     require 'activemessaging/gateway'
     require 'activemessaging/adapter'
     require 'activemessaging/message_sender'
@@ -42,32 +57,28 @@ module ActiveMessaging
         adapter_name = File.basename(a, ".rb")
         require 'activemessaging/adapters/' + adapter_name
       rescue RuntimeError, LoadError => e
-        logger.debug "ActiveMessaging: adapter #{adapter_name} not loaded: #{ e.message }"
+        logger.warn "ActiveMessaging: adapter #{adapter_name} not loaded: #{ e.message }"
       end
     end
   end
 
   def self.load_config
-    path = File.expand_path("#{APP_ROOT}/config/messaging.rb")
+    path = File.expand_path("#{app_root}/config/messaging.rb")
     begin
       load path
     rescue MissingSourceFile
-      logger.debug "ActiveMessaging: no '#{path}' file to load"
+      logger.error "ActiveMessaging: no '#{path}' file to load"
     rescue
       raise $!, " ActiveMessaging: problems trying to load '#{path}': \n\t#{$!.message}"
     end
   end
 
   def self.load_processors(first=true)
-    #Load the parent processor.rb, then all child processor classes
-    load APP_ROOT + '/vendor/plugins/activemessaging/lib/activemessaging/message_sender.rb' unless defined?(ActiveMessaging::MessageSender)
-    load APP_ROOT + '/vendor/plugins/activemessaging/lib/activemessaging/processor.rb' unless defined?(ActiveMessaging::Processor)
-    load APP_ROOT + '/vendor/plugins/activemessaging/lib/activemessaging/filter.rb' unless defined?(ActiveMessaging::Filter)
-    logger.debug "ActiveMessaging: Loading #{APP_ROOT + '/app/processors/application.rb'}" if first
-    load APP_ROOT + '/app/processors/application.rb' if File.exist?("#{APP_ROOT}/app/processors/application.rb")
-    Dir[APP_ROOT + '/app/processors/*.rb'].each do |f|
+    logger.info "ActiveMessaging: Loading #{app_root}/app/processors/application.rb" if first
+    load "#{app_root}/app/processors/application.rb" if File.exist?("#{app_root}/app/processors/application.rb")
+    Dir["#{app_root}/app/processors/*.rb"].each do |f|
       unless f.match(/\/application.rb/)
-        logger.debug "ActiveMessaging: Loading #{f}" if first
+        logger.info "ActiveMessaging: Loading #{f}" if first
         load f
       end
     end
@@ -92,17 +103,20 @@ module ActiveMessaging
 
   def self.start
     if ActiveMessaging::Gateway.subscriptions.empty?
-      err_msg = <<EOM   
+      err_msg = <<-EOM
 
-ActiveMessaging Error: No subscriptions.
-If you have no processor classes in app/processors, add them using the command:
-  script/generate processor DoSomething"
+      ActiveMessaging Error: No subscriptions.
+      
+      If you have no processor classes in app/processors, add them using the command:
+        script/generate processor DoSomething"
 
-If you have processor classes, make sure they include in the class a call to 'subscribes_to':
-  class DoSomethingProcessor < ActiveMessaging::Processor
-    subscribes_to :do_something
+      If you have processor classes, make sure they include in the class a call to 'subscribes_to':
+        class DoSomethingProcessor < ActiveMessaging::Processor
+          subscribes_to :do_something
+          # ...
+        end
 
-EOM
+      EOM
       puts err_msg
       logger.error err_msg
       exit
@@ -112,19 +126,3 @@ EOM
   end
 
 end
-
-#load these once to start with
-ActiveMessaging.load_activemessaging
-
-# reload these on each Rails request - leveraging Dispatcher semantics for consistency
-if defined? Rails
-  ActiveMessaging.logger.info "Rails available: Adding dispatcher prepare callback."
-  require 'dispatcher' unless defined?(::Dispatcher)
-  
-  # add processors and config to on_prepare if supported (rails 1.2+)
-  if ::Dispatcher.respond_to? :to_prepare
-    ::Dispatcher.to_prepare :activemessaging do
-      ActiveMessaging.reload_activemessaging
-    end
-  end
-end

data/lib/activemessaging/adapter.rb

@@ -12,8 +12,7 @@ module ActiveMessaging
     end
 
     def logger()
-      @@logger = ActiveMessaging.logger unless defined?(@@logger)
-      @@logger
+      @@logger ||= ActiveMessaging.logger 
     end
 
   end

data/lib/activemessaging/adapters/amqp.rb

@@ -0,0 +1,215 @@
+require 'carrot'
+require 'digest/md5'
+require 'bert'
+
+# make sure ActiveMessaging::Processor is already loaded so we actually override it!
+require 'activemessaging/processor'
+require 'activemessaging/adapters/base'
+
+require 'emissary/message'
+
+module ActiveMessaging
+  class Processor
+    def self.subscribes_to destination_name, headers={}
+      # let's default to using the same exchange_type/exchange_name as defined in the messages.rb
+      # for the given destination. XXX: THIS IS A BIG TIME MONKEY PATCH! Might consider pushing a
+      # proper patch upstream instead of jury-rigging this.
+      d = ActiveMessaging::Gateway.find_destination(destination_name)
+      type, name = [ d.publish_headers[:exchange_type], d.publish_headers[:exchange_name] ]
+      ActiveMessaging::Gateway.subscribe_to destination_name, self, { :exchange_type => type, :exchange_name => name }.merge(headers)
+    end
+  end
+
+  module Adapters
+    module Amqp
+      class Connection
+        include ActiveMessaging::Adapter
+        register :amqp
+
+        SERVER_RETRY_MAX_ATTEMPTS = 10
+
+        DEFAULT_QUEUE_CONFIG = {
+          :durable     => true,
+          :auto_delete => false,
+          :exclusive   => true
+        }
+        
+        class InvalidExchangeType < ArgumentError; end
+        
+        def initialize config = {}
+          @connect_options = {
+            :user  => config[:user]  || 'guest',
+            :pass  => config[:pass]  || 'guest',
+            :host  => config[:host]  || 'localhost',
+            :port  => config[:port]  || (config[:ssl] ? 5671 : 5672),
+            :vhost => config[:vhost] || nil,
+            :ssl   => config[:ssl]   || false,
+            :ssl_verify => config[:ssl_verify] || OpenSSL::SSL::VERIFY_PEER,
+          }
+          
+          @debug = config[:debug].to_i rescue 0
+          
+          Carrot.logging = true unless @debug < 5
+          
+          @auto_generated_queue = false
+          unless config[:queue_name]
+            @queue_name = Digest::MD5.hexdigest Time.now.to_s
+            @auto_generated_queue = true
+          else
+            @queue_name = config[:queue_name]
+          end
+
+          @queue_config = DEFAULT_QUEUE_CONFIG
+          unless @auto_generated_queue
+            @queue_config.merge({
+              :durable     => !!config[:queue_durable],
+              :auto_delete => !!config[:queue_auto_delete],
+              :exclusive   => !!config[:queue_exclusive]
+            })
+          end
+        end
+        
+        def received message, headers = {}
+          puts "Received Message - ACK'ing with delivery_tag '#{message.headers[:delivery_tag]}'" if @debug > 0
+          client.server.send_frame(::Carrot::AMQP::Protocol::Basic::Ack.new(:delivery_tag => message.headers[:delivery_tag]))
+        end
+        
+        def unreceive message, headers = {}
+          puts "Un-Receiving Message - REJECTing with delivery_tag '#{message.headers[:delivery_tag]}'" if @debug > 0
+          client.server.send_frame(::Carrot::AMQP::Protocol::Basic::Reject.new(:delivery_tag => message.headers[:delivery_tag]))
+        end
+        
+        def receive
+          while true 
+            message = queue.pop(:ack => true)
+            unless message.nil?
+              message = AmqpMessage.decode(message).stamp_received! unless message.nil?
+              message.delivery_tag = queue.delivery_tag
+              puts "RECEIVE: #{message.inspect}" if @debug 
+              return message
+            end
+            sleep 0.2
+          end
+        end
+        
+        def send queue_name, data, headers = {}
+          headers[:routing_key] ||= queue_name
+          message = AmqpMessage.new({:headers => headers, :data => data}, queue_name)
+          
+          if @debug > 0
+            puts "Sending the following message: "; pp message
+          end
+          
+          begin
+            exchange(*exchange_info(headers)).publish(message.stamp_sent!.encode, :key => headers[:routing_key])
+          rescue ::Carrot::AMQP::Server::ServerDown
+            retry_attempts = retry_attempts.nil? ? 1 : retry_attempts + 1
+            sleep(retry_attempts * 0.25)
+            retry unless retry_attempts >= SERVER_RETRY_MAX_ATTEMPTS
+            raise e
+          end
+        end
+
+        def subscribe queue_name, headers = {}, subId = nil
+          if @debug > 1
+            puts "Begin Subscribe Request:"
+            puts "    Queue Name: #{queue_name.inspect}"
+            puts "       Headers: #{headers.inspect}"
+            puts "         subId: #{subId.inspect}"
+            puts "     EXCH INFO: #{exchange_info(headers).inspect}"
+            puts "End Subscribe Request."
+          end
+          
+          routing_key = headers[:routing_key] || queue_name
+          queue.bind(exchange(*exchange_info(headers)), :key => routing_key)
+        end
+        
+        def unsubscribe(queue_name, headers={}, subId=nil)
+          if @debug > 1
+            puts "Begin UNsubscribe Request:"
+            puts "    Queue Name: #{queue_name.inspect}"
+            puts "    Headers:    #{headers.inspect}"
+            puts "    subId:      #{subId.inspect}"
+            puts "End UNsubscribe Request."
+          end
+          
+          routing_key = headers[:routing_key] || queue_name
+          queue.unbind(exchange(*exchange_info(headers)), :key => routing_key)
+        end
+        
+        def disconnect(headers={})
+          @client.stop
+        end
+        
+        private
+
+        def exchange_info headers
+          [ (headers[:exchange_type].to_sym rescue nil) || :direct, headers[:exchange_name] || nil]
+        end
+        
+        def exchange type, name, *args
+          type = type.to_sym rescue nil
+          unless [:topic, :fanout, :direct].include? type
+            raise InvalidExchangeType, "The carrot library does not support an exchange type of '#{type.inspect}'"
+          end
+
+          name ||= "amq.#{type}"
+          puts "Exchange [#{type}::#{name}]: #{args.inspect}" if @debug > 3
+          (@exchanges||={})[name] ||= ::Carrot::AMQP::Exchange.new client, type, name, *args
+        end
+
+        def queue
+          return @queue unless @queue.nil?
+          puts "Queue [#{@queue_name}]: #{@queue_config.inspect}" if @debug > 0
+          @queue ||= client.queue(@queue_name, @queue_config)
+        end
+        
+        def client
+          return @client unless @client.nil?
+          puts "Client [amqp]: #{@connect_options.inspect}" if @debug > 0
+          @client ||= Carrot.new(@connect_options)
+        end
+
+      end
+      
+      class AmqpMessage < Emissary::Message
+        attr_reader :command
+        attr_accessor :destination, :delivery_tag
+        
+        def initialize(data, queue_name = nil)
+          data[:data] = data.delete(:body) unless (data[:data] && !data[:body])
+
+          super(data)
+          
+          @delivery_tag ||= (data[:headers][:delivery_tag] rescue nil)
+          @destination  ||= (data[:headers][:destination] rescue nil) || queue_name || routing_key
+          
+          @command = "MESSAGE"
+        end
+        
+        alias :body :data
+        
+        def headers
+          super.merge({
+            :destination  => routing_key,
+            :delivery_tag => @delivery_tag
+          })
+        end
+        
+        def matches_subscription?(subscription)
+          # use routing key first, otherwise, use the defined destination value
+          destination = subscription.subscribe_headers[:routing_key] || subscription.destination.value.to_s
+          
+          if destination.match(/(\#|\*)/)
+            dest_regex = ::Regexp.new(destination.gsub('.*', '[.][^.]+').gsub(/\.\#.*/, '[.].*'))
+            !!(headers[:destination].to_s =~ dest_regex)
+          else
+            !!(headers[:destination].to_s == destination)
+          end
+        end
+      end
+      
+    end
+  end
+end
+

data/lib/activemessaging/adapters/asqs.rb

@@ -6,6 +6,7 @@ require 'base64'
 require 'cgi'
 require 'time'
 require 'uri'
+require 'rexml/document'
 
 require 'activemessaging/adapters/base'
 
@@ -204,8 +205,7 @@ module ActiveMessaging
 
       		# Sign the string
       		sorted_params = params.sort_by { |key,value| key.downcase }
-      		joined_params = sorted_params.collect { |key, value| key.to_s + value.to_s }
-      		string_to_sign = joined_params.to_s
+      		string_to_sign = sorted_params.collect { |key, value| key.to_s + value.to_s }.join()
       		digest = OpenSSL::Digest::Digest.new('sha1')
           hmac = OpenSSL::HMAC.digest(digest, @secret_access_key, string_to_sign)
           params['Signature'] = Base64.encode64(hmac).chomp
@@ -417,4 +417,4 @@ module ActiveMessaging
    
     end
   end
-end
+end

data/lib/activemessaging/adapters/beanstalk.rb

@@ -22,7 +22,7 @@ module ActiveMessaging
           @host = cfg[:host] || 'localhost'
           @port = cfg[:port] || 11300
           
-          @connection = ::Beanstalk::Pool.new("#{@host}:#{@port}")
+          @connection = ::Beanstalk::Pool.new(["#{@host}:#{@port}"])
         end
         
         def disconnect

data/lib/activemessaging/adapters/stomp.rb

@@ -9,11 +9,12 @@ module ActiveMessaging
       class Connection < ActiveMessaging::Adapters::BaseConnection
         register :stomp
 
-        attr_accessor :stomp_connection, :retryMax, :deadLetterQueue, :configuration
+        attr_accessor :stomp_connection, :retryMax, :deadLetterQueue, :configuration, :deadLetterQueuePrefix
 
         def initialize(cfg)
           @retryMax = cfg[:retryMax] || 0
           @deadLetterQueue = cfg[:deadLetterQueue] || nil
+          @deadLetterQueuePrefix = cfg[:deadLetterQueuePrefix] || nil
         
           cfg[:login] ||= ""
           cfg[:passcode] ||= ""
@@ -31,7 +32,22 @@ module ActiveMessaging
           connect_headers['client-id'] = cfg[:clientId] if cfg[:clientId]
           @stomp_connection = ::Stomp::Connection.new(cfg[:login],cfg[:passcode],cfg[:host],cfg[:port].to_i,cfg[:reliable],cfg[:reconnectDelay], connect_headers)
         end
-      
+        
+        # Checks if the connection supports dead letter queues
+        def supports_dlq?
+          !@deadLetterQueue.nil? || !@deadLetterQueuePrefix.nil?
+        end
+
+        # add the dead letter queue prefix to the destination
+        def add_dlq_prefix(destination)
+            if (ri = destination.rindex("/"))
+                destination.clone.insert(ri + 1, @deadLetterQueuePrefix)
+            else
+                @deadLetterQueuePrefix + destination
+            end
+
+        end
+
         # called to cleanly get rid of connection
         def disconnect
           @stomp_connection.disconnect
@@ -80,10 +96,9 @@ module ActiveMessaging
           end
         end
 
-        def unreceive message, headers={} 
+        def unreceive message, headers={}
           retry_count = message.headers['a13g-retry-count'].to_i || 0
           transaction_id = "transaction-#{message.headers['message-id']}-#{retry_count}"
-
           # start a transaction, send the message back to the original destination
           @stomp_connection.begin(transaction_id)
           begin
@@ -91,11 +106,24 @@ module ActiveMessaging
             if @retryMax > 0
               retry_headers = message.headers.stringify_keys
               retry_headers['transaction']= transaction_id
-              retry_headers.delete('content-length')
-              retry_headers.delete('content-type')
-              
+              content_type_header = retry_headers.delete('content-type')
+              content_length_header = retry_headers.delete('content-length')
+              # If the content-length header in the original message is nil 
+              # then we need to set the :suppress_content_length option so 
+              # that the stomp client does not set the content-length of the 
+              # retried message. This option will allow ActiveMQ to interpret the 
+              # message as a TextMessage.
+              # This is somewhat of a hack because the setting of the :suppress_content_length 
+              # header is usually done in the messaging.rb and is removed by the time 
+              # the unreceive message is called. So I am making some assumptions here
+              # on whether or not to set the option
+              if content_type_header and content_type_header.include?('text/plain') && content_length_header.nil?
+                  retry_headers[:suppress_content_length] = true
+              end
+                           
               retry_destination = retry_headers.delete('destination')
-            
+              retry_destination = headers[:destination] if headers[:destination]
+
               if retry_count < @retryMax
                 # now send the message back to the destination
                 #  set the headers for message id, priginal message id, and retry count
@@ -108,15 +136,23 @@ module ActiveMessaging
                 retry_headers['a13g-retry-count'] = retry_count + 1
 
                 # send the updated message to retry in the same transaction
+                logger.warn "retrying message on #{retry_destination}"
                 self.stomp_publish(retry_destination, message.body, retry_headers)
 
-              elsif retry_count >= @retryMax && @deadLetterQueue
+              elsif retry_count >= @retryMax && supports_dlq?
                 # send the 'poison pill' message to the dead letter queue - make it persistent by default
-                retry_headers['a13g-original-destination'] = retry_headers.delete('destination')
+                retry_headers['a13g-original-destination'] = retry_destination #retry_headers.delete('destination')
                 retry_headers['persistent'] = true
                 retry_headers.delete('message-id')
-
-                self.stomp_publish(@deadLetterQueue, message.body, retry_headers)
+                
+                # If the prefix option is set then put the prefix after the /queue/ or /topic/
+                if (@deadLetterQueuePrefix)
+                    dlq = add_dlq_prefix(retry_destination)
+                else
+                    dlq = @deadLetterQueue
+                end
+                logger.warn "putting message on DLQ: #{dlq}"
+                self.stomp_publish(dlq, message.body, retry_headers)
               end
 
             end
@@ -164,4 +200,4 @@ module ActiveMessaging
 
     end
   end
-end
+end

data/lib/activemessaging/adapters/synch.rb

@@ -0,0 +1,94 @@
+# 
+# This is meant to avoid the need to use a broker in development, and generally make development mode easier
+# 
+module ActiveMessaging
+  module Adapters
+    module Synch
+    
+      class Connection  < ActiveMessaging::Adapters::BaseConnection
+        register :synch
+
+        #configurable params
+        attr_accessor :configuration, :max_process, :processing_pids, :use_fork
+
+        #generic init method needed by a13g
+        def initialize cfg
+          ActiveMessaging.logger.debug "ActiveMessaging::Adapters::Synch::Connection.initialize: #{cfg.inspect}"
+          @configuration = cfg
+          
+          @use_fork = !!@configuration[:use_fork]
+
+          # max at once
+          @max_process = 10
+          # keep track of the processes running
+          @processing_pids = {}
+
+          if use_fork
+            Thread.new {
+              watch_processes
+            }
+          end
+        end
+        
+        def watch_processes
+          while true
+            begin
+              pid = Process.wait(0, Process::WNOHANG)
+              if m = processing_pids.delete(pid)
+                ActiveMessaging.logger.debug "ActiveMessaging:synch - processing complete for pid (#{pid}):\n\t#{m}"
+              end
+              sleep(0.5)
+            rescue
+            end
+          end
+        end
+
+        def send destination_name, message_body, message_headers={}
+          message = Message.new(message_body, 'id', message_headers, destination_name, 'MESSAGE')
+          
+          if use_fork
+
+            if processing_pids.size > max_process
+              ActiveMessaging.logger.debug "ActiveMessaging:synch too many processes: #{processing_pids.size} > #{max_process}"
+              sleep(0.5)
+            end
+
+            pid = fork {
+              ActiveMessaging.logger.debug "\n-------------------- ActiveMessaging:synch start fork dispath (#{Process.pid}) --------------------"
+              ActiveMessaging::Gateway.prepare_application
+              ActiveMessaging::Gateway._dispatch(message)
+              ActiveMessaging::Gateway.reset_application
+              ActiveMessaging.logger.debug "-------------------- ActiveMessaging:synch end fork dispath (#{Process.pid})--------------------\n"
+            }
+
+            Process.detach(pid)
+            processing_pids[pid] = "Destination: #{destination_name}, Message: #{message_body}"
+
+          else
+
+            ActiveMessaging.logger.debug "\n-------------------- ActiveMessaging:synch before dispath --------------------"
+            ActiveMessaging::Gateway.prepare_application
+            ActiveMessaging::Gateway._dispatch(message)
+            ActiveMessaging::Gateway.reset_application
+            ActiveMessaging.logger.debug "-------------------- ActiveMessaging:synch after dispath --------------------\n"
+
+          end
+          
+        end
+
+      end
+
+      class Message < ActiveMessaging::BaseMessage
+        attr_accessor :command
+
+        def initialize body, id, headers, destination, command='MESSAGE'
+          # ActiveMessaging.logger.debug "Message headers:#{headers.inspect}, id:#{id}, body:#{body}, destination:#{destination}, command:#{command}"
+          @headers, @body, @destination, @command =  headers, body, destination, command
+          headers['destination'] = destination
+        end
+
+      end
+    
+    end
+  end
+end

data/lib/activemessaging/gateway.rb

@@ -111,7 +111,9 @@ module ActiveMessaging
       def connection broker_name='default'
         return @@connections[broker_name] if @@connections.has_key?(broker_name)
         config = load_connection_configuration(broker_name)
-        @@connections[broker_name] = Gateway.adapters[config[:adapter]].new(config)
+        adapter_class = Gateway.adapters[config[:adapter]]
+        raise "Unknown messaging adapter #{config[:adapter].inspect}!" if adapter_class.nil?
+        @@connections[broker_name] = adapter_class.new(config)
       end
 
       def register_adapter adapter_name, adapter_class
@@ -188,16 +190,12 @@ module ActiveMessaging
       end
 
       def prepare_application
-        if defined? Rails
-          # Dispatcher.prepare_application_for_dispatch
+        if defined? ActiveRecord
           ActiveRecord::Base.verify_active_connections!
         end
       end
 
       def reset_application
-        if defined? Rails
-          # Dispatcher.reset_application_after_dispatch
-        end
       end
       
       def dispatch(message)
@@ -210,6 +208,7 @@ module ActiveMessaging
             ActiveMessaging.logger.error exc.backtrace.join("\n\t")
             raise exc
           ensure
+            ActiveMessaging.logger.flush rescue nil
             reset_application
           end
         }
@@ -223,9 +222,9 @@ module ActiveMessaging
           if message.matches_subscription?(subscription) then
             processed = true
             routing = {
-              :receiver=>subscription.processor_class, 
-              :destination=>subscription.destination,
-              :direction => :incoming
+              :receiver    => subscription.processor_class, 
+              :destination => subscription.destination,
+              :direction   => :incoming
             }
             begin
               execute_filter_chain(:incoming, message, routing) do |m|
@@ -358,11 +357,11 @@ module ActiveMessaging
       end
       
       def load_connection_configuration(label='default')
-        @broker_yml = YAML::load(ERB.new(IO.read(File.join(APP_ROOT, 'config', 'broker.yml'))).result) if @broker_yml.nil?
+        @broker_yml = YAML::load(ERB.new(IO.read(File.join(ActiveMessaging.app_root, 'config', 'broker.yml'))).result) if @broker_yml.nil?
         if label == 'default'
-          config = @broker_yml[APP_ENV].symbolize_keys
+          config = @broker_yml[ActiveMessaging.app_env].symbolize_keys
         else
-          config = @broker_yml[APP_ENV][label].symbolize_keys
+          config = @broker_yml[ActiveMessaging.app_env][label].symbolize_keys
         end
         config[:adapter] = config[:adapter].to_sym if config[:adapter]
         config[:adapter] ||= :stomp

data/lib/activemessaging/processor.rb

@@ -13,8 +13,7 @@ module ActiveMessaging
     end
 
     def logger()
-      @@logger = ActiveMessaging.logger unless defined?(@@logger)
-      @@logger
+      @@logger ||= ActiveMessaging.logger
     end
     
     def on_message(message)
@@ -37,7 +36,7 @@ module ActiveMessaging
         logger.error "Processor:process! - AbortMessageException caught."
         raise rpe
       rescue Object=>ex
-        logger.error "Processor:process! - error in on_error, will propagate no further: #{ex.message}"
+        logger.error "Processor:process! - error in on_error, will propagate no further: #{ex.message}\n\t#{ex.backtrace.join("\n\t")}"
       end
     end
 

data/lib/activemessaging/railtie.rb

@@ -0,0 +1,22 @@
+require 'logger'
+require 'rails'
+require 'activemessaging'
+
+module ActiveMessaging
+  class Railtie < Rails::Railtie
+    
+    initializer 'activemessaging.initialize' do
+      
+      ActiveMessaging.load_activemessaging
+      
+      if defined? Rails
+        ActiveMessaging.logger.info "ActiveMessaging: Rails available: Adding dispatcher prepare callback."
+        ActionDispatch::Callbacks.to_prepare :activemessaging do
+          ActiveMessaging.reload_activemessaging
+        end
+      end
+
+    end
+    
+  end
+end

data/lib/activemessaging/trace_filter.rb

@@ -1,34 +1,34 @@
-class TraceFilter< ActiveMessaging::Filter
-  include ActiveMessaging::MessageSender
-  
-  def initialize(options)
-    @queue = options[:queue]
-    TraceFilter.publishes_to @queue
-  end
-  
-  def process message, routing
-    
-    unless ( routing[:destination].name == @queue ) then
-      ActiveMessaging.logger.debug "Trace: direction = #{routing[:direction]} publisher=#{routing[:publisher]} queue=#{routing[:destination].name} @queue=#{@queue}"
-      if routing[:direction].to_sym==:outgoing then
-        "trace from outgoing"
-        publish @queue, "<sent>"+
-                        "<from>#{routing[:publisher]}</from>" +        
-                        "<queue>#{routing[:destination].name}</queue>" +
-                        "<message>#{message.body}</message>" + 
-                        "</sent>"
-      end
-      if routing[:direction].to_sym==:incoming then
-        "trace from incoming"
-        publish @queue, "<received>"+
-                        "<by>#{routing[:receiver]}</by>" +        
-                        "<queue>#{routing[:destination].name}</queue>" +
-                        "<message>#{message.body}</message>" + 
-                        "</received>"
-      end
-    end
-
-  end
-  
-end
-
+class TraceFilter< ActiveMessaging::Filter
+  include ActiveMessaging::MessageSender
+  
+  def initialize(options)
+    @queue = options[:queue]
+    TraceFilter.publishes_to @queue
+  end
+  
+  def process message, routing
+    
+    unless ( routing[:destination].name == @queue ) then
+      ActiveMessaging.logger.debug "Trace: direction = #{routing[:direction]} publisher=#{routing[:publisher]} queue=#{routing[:destination].name} @queue=#{@queue}"
+      if routing[:direction].to_sym==:outgoing then
+        "trace from outgoing"
+        publish @queue, "<sent>"+
+                        "<from>#{routing[:publisher]}</from>" +        
+                        "<queue>#{routing[:destination].name}</queue>" +
+                        "<message>#{message.body}</message>" + 
+                        "</sent>"
+      end
+      if routing[:direction].to_sym==:incoming then
+        "trace from incoming"
+        publish @queue, "<received>"+
+                        "<by>#{routing[:receiver]}</by>" +        
+                        "<queue>#{routing[:destination].name}</queue>" +
+                        "<message>#{message.body}</message>" + 
+                        "</received>"
+      end
+    end
+
+  end
+  
+end
+

data/test/stomp_test.rb

@@ -69,11 +69,14 @@ class StompTest < Test::Unit::TestCase
           :port=> "61613",
           :reliable=>FALSE,
           :reconnectDelay=> 5,
-          :clientId=> 'cid' }
+          :clientId=> 'cid',
+          :deadLetterQueuePrefix=>"DLQ."}
 
     @connection = ActiveMessaging::Adapters::Stomp::Connection.new(i)
     assert_equal 4, @connection.retryMax
     assert_equal '/queue/dlq', @connection.deadLetterQueue
+    assert_equal "DLQ.", @connection.deadLetterQueuePrefix
+    assert_equal true, @connection.supports_dlq?
   end
 
   def test_disconnect
@@ -123,9 +126,30 @@ class StompTest < Test::Unit::TestCase
     @connection = ActiveMessaging::Adapters::Stomp::Connection.new({:retryMax=>4, :deadLetterQueue=>'/queue/dlq'})
     @connection.stomp_connection.receive = @message
     m = @connection.receive
+    m.headers["a13g-retry-count"] = 5
     @connection.unreceive m, {:ack=>'client'}
   end
 
+  def test_unreceive_with_dlq_prefix
+    @connection = ActiveMessaging::Adapters::Stomp::Connection.new({:retryMax=>4, :deadLetterQueuePrefix=>'DLQ.'})
+    @connection.stomp_connection.receive = @message
+    m = @connection.receive
+    m.headers["a13g-retry-count"] = 5
+    @connection.unreceive m, {:ack=>'client', :destination=>"/queue/myqueue"}
+  end
+
+  def test_add_dlq_prefix
+    @connection = ActiveMessaging::Adapters::Stomp::Connection.new({:deadLetterQueuePrefix=>'DLQ.'})
+    dlq = @connection.add_dlq_prefix("/queue/myqueue")
+    assert_equal "/queue/DLQ.myqueue", dlq
+    dlq = @connection.add_dlq_prefix("/queue/something/myqueue")
+    assert_equal "/queue/something/DLQ.myqueue", dlq
+    dlq = @connection.add_dlq_prefix("/topic/myqueue")
+    assert_equal "/topic/DLQ.myqueue", dlq
+    dlq = @connection.add_dlq_prefix("myqueue")
+    assert_equal "DLQ.myqueue", dlq
+  end
+
 end
 
 end # if loaded

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemessaging
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  hash: 61
+  prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Jon Tirsen
@@ -14,20 +20,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2011-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
-description: ActiveMessaging is an attempt to bring the simplicity and elegance of rails development to the world of messaging. Messaging, (or event-driven architecture) is widely used for enterprise integration, with frameworks such as Java's JMS, and products such as ActiveMQ, Tibco, IBM MQSeries, etc.
+  type: :runtime
+  version_requirements: *id001
+description: ActiveMessaging is an attempt to bring the simplicity and elegance of rails development to the world of messaging. Messaging, (or event-driven architecture) is widely used for enterprise integration, with frameworks such as Java's JMS, and products such as ActiveMQ, Tibco, IBM MQSeries, etc. Now supporting Rails 3 as of version 0.8.0.
 email: activemessaging-discuss@googlegroups.com
 executables: []
 
@@ -68,12 +80,14 @@ files:
 - init.rb
 - lib/activemessaging.rb
 - lib/activemessaging/adapter.rb
+- lib/activemessaging/adapters/amqp.rb
 - lib/activemessaging/adapters/asqs.rb
 - lib/activemessaging/adapters/base.rb
 - lib/activemessaging/adapters/beanstalk.rb
 - lib/activemessaging/adapters/jms.rb
 - lib/activemessaging/adapters/reliable_msg.rb
 - lib/activemessaging/adapters/stomp.rb
+- lib/activemessaging/adapters/synch.rb
 - lib/activemessaging/adapters/test.rb
 - lib/activemessaging/adapters/wmq.rb
 - lib/activemessaging/base_message.rb
@@ -82,11 +96,11 @@ files:
 - lib/activemessaging/message_sender.rb
 - lib/activemessaging/named_base.rb
 - lib/activemessaging/processor.rb
-- lib/activemessaging/support.rb
+- lib/activemessaging/railtie.rb
 - lib/activemessaging/test_helper.rb
 - lib/activemessaging/trace_filter.rb
+- lib/tasks/start_consumers.rake
 - poller.rb
-- tasks/start_consumers.rake
 - test/all_tests.rb
 - test/app/config/broker.yml
 - test/asqs_test.rb
@@ -103,26 +117,32 @@ homepage: http://github.com/kookster/activemessaging
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Official activemessaging gem, now hosted on github.com/kookster. (kookster prefix temporary)

data/lib/activemessaging/support.rb

@@ -1,17 +0,0 @@
-if defined? Rails
-  ActiveMessaging.logger.debug "Rails available: Adding reload hooks."
-  require 'dispatcher' unless defined?(::Dispatcher)
-  ::Dispatcher.class_eval do
-    
-    def self.prepare_application_for_dispatch
-      disp = new(STDOUT)
-      disp.run_callbacks :before_dispatch
-    end
-    
-    def self.reset_application_after_dispatch
-      disp = new(STDOUT)
-      disp.run_callbacks :after_dispatch, :enumerator => :reverse_each
-    end
-
-  end
-end