activemessaging 0.11.0 → 0.12.0

data/.travis.yml

@@ -0,0 +1,40 @@
+language: ruby
+gemfile:
+  - gemfiles/activesupport23.gemfile
+  - gemfiles/activesupport30.gemfile
+  - gemfiles/activesupport31.gemfile
+  - gemfiles/activesupport32.gemfile
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - rbx-18mode
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+    - rvm: ruby-head
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/activesupport23.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/activesupport23.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/activesupport23.gemfile
+    - rvm: jruby-head
+      gemfile: gemfiles/activesupport23.gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/activesupport23.gemfile
+notifications:
+  recipients:
+    - matt.campbell@vibes.com
+    - lance.cooper@vibes.com

data/Appraisals

@@ -0,0 +1,19 @@
+appraise "activesupport23" do
+  gem "activesupport", "~> 2.3.11"
+end
+
+appraise "activesupport30" do
+  gem "activesupport", "~> 3.0.8"
+  gem "i18n"
+end
+
+appraise "activesupport31" do
+  gem "activesupport", "~> 3.1.2"
+  gem "i18n"
+end
+
+appraise "activesupport32" do
+  gem "activesupport", "~> 3.2.2"
+end
+
+# vim: filetype=ruby

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# We group everything into test because while a default bundle install
+# pulls in this group, Jeweler does not include it when consulting the
+# Gemfile for dependencies.
+# The short syntax isn't used because the appraisal gem does not support it.
+gem 'reliable-msg', '~>1.1', :group => :test, :platform => :ruby if RUBY_VERSION < '1.9'
+gem 'jruby-activemq', :group => :test, :platform => :jruby
+gem 'appraisal', :group => :test
+
+gemspec :development_group => :test

data/Gemfile.lock

@@ -0,0 +1,46 @@
+PATH
+  remote: .
+  specs:
+    activemessaging (0.11.0)
+      activemessaging
+      activesupport (>= 2.3.11)
+      celluloid
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.7)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    celluloid (0.11.1)
+      timers (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    jruby-activemq (5.5.1-java)
+    json (1.7.4)
+    json (1.7.4-java)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    stomp (1.2.4)
+    timers (1.0.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activemessaging!
+  appraisal
+  jeweler
+  jruby-activemq
+  stomp

data/Rakefile

@@ -1,7 +1,11 @@
+require 'rubygems'
+require 'bundler/setup'
+
 require 'rake'
 require 'rake/testtask'
 require 'rdoc/rdoc'
-require 'rake/gempackagetask'
+
+require 'appraisal'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -29,12 +33,17 @@ begin
     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']
+    gemspec.authors = ["Jon Tirsen", "Andrew Kuklewicz", "Olle Jonsson", "Sylvain Perez", "Cliff Moon", 'Uwe Kubosch', 'Lance Cooper', 'Matt Campbell']
 
     # added
-    gemspec.add_dependency('activesupport', '>= 1.0.0')
+    gemspec.add_dependency('activesupport', '>= 2.3.11')
     gemspec.add_dependency('celluloid')
-    
+
+    gemspec.add_development_dependency('jeweler')
+    gemspec.add_development_dependency('stomp')
+    gemspec.add_development_dependency('appraisal')
+    #gemspec.add_development_dependency('reliable-msg')
+
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -66,8 +75,3 @@ end
 #   s.add_dependency(%q<rubigen>, [">= 1.5.2"])
 #   #s.add_dependency(%q<common-pool-cliffmoon>, [">= 0.0.3"])
 # end
-
-# desc 'Generate ActiveMessaging gem.'
-# Rake::GemPackageTask.new(gem_spec) do |pkg|
-# end
-

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.12.0

data/activemessaging.gemspec

@@ -5,10 +5,10 @@
 
 Gem::Specification.new do |s|
   s.name = "activemessaging"
-  s.version = "0.11.0"
+  s.version = "0.12.0"
 
   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.authors = ["Jon Tirsen", "Andrew Kuklewicz", "Olle Jonsson", "Sylvain Perez", "Cliff Moon", "Uwe Kubosch", "Lance Cooper", "Matt Campbell"]
   s.date = "2012-08-07"
   s.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."
   s.email = "activemessaging-discuss@googlegroups.com"
@@ -16,10 +16,22 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".travis.yml",
+    "Appraisals",
+    "Gemfile",
+    "Gemfile.lock",
     "README.md",
     "Rakefile",
     "VERSION",
     "activemessaging.gemspec",
+    "gemfiles/activesupport23.gemfile",
+    "gemfiles/activesupport23.gemfile.lock",
+    "gemfiles/activesupport30.gemfile",
+    "gemfiles/activesupport30.gemfile.lock",
+    "gemfiles/activesupport31.gemfile",
+    "gemfiles/activesupport31.gemfile.lock",
+    "gemfiles/activesupport32.gemfile",
+    "gemfiles/activesupport32.gemfile.lock",
     "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",
@@ -30,7 +42,7 @@ Gem::Specification.new do |s|
     "generators/filter/templates/filter_test.rb",
     "generators/processor/USAGE",
     "generators/processor/processor_generator.rb",
-    "generators/processor/templates/application.rb",
+    "generators/processor/templates/application_processor.rb",
     "generators/processor/templates/broker.yml",
     "generators/processor/templates/jruby_poller",
     "generators/processor/templates/messaging.rb",
@@ -104,15 +116,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<activemessaging>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.11"])
       s.add_runtime_dependency(%q<celluloid>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<stomp>, [">= 0"])
+      s.add_development_dependency(%q<appraisal>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 1.0.0"])
+      s.add_dependency(%q<activemessaging>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.11"])
       s.add_dependency(%q<celluloid>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<stomp>, [">= 0"])
+      s.add_dependency(%q<appraisal>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 1.0.0"])
+    s.add_dependency(%q<activemessaging>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.11"])
     s.add_dependency(%q<celluloid>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<stomp>, [">= 0"])
+    s.add_dependency(%q<appraisal>, [">= 0"])
   end
 end
 

data/gemfiles/activesupport23.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "reliable-msg", "~>1.1", :group=>:test, :platform=>:ruby
+gem "jruby-activemq", :group=>:test, :platform=>:jruby
+gem "appraisal", :group=>:test
+gem "activesupport", "~> 2.3.11"
+
+gemspec :path=>"../", :development_group=>:test

data/gemfiles/activesupport23.gemfile.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: /Users/LCooper/src/activemessaging
+  specs:
+    activemessaging (0.10.0)
+      activemessaging
+      activesupport (>= 2.3.11)
+      celluloid
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (2.3.14)
+    appraisal (0.4.1)
+      bundler
+      rake
+    celluloid (0.11.1)
+      timers (>= 1.0.0)
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    jruby-activemq (5.5.1-java)
+    json (1.7.4)
+    json (1.7.4-java)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    reliable-msg (1.1.0)
+      uuid (>= 1.0.0)
+    stomp (1.2.4)
+    systemu (2.5.2)
+    timers (1.0.1)
+    uuid (2.3.5)
+      macaddr (~> 1.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activemessaging!
+  activesupport (~> 2.3.11)
+  appraisal
+  jeweler
+  jruby-activemq
+  reliable-msg (~> 1.1)
+  stomp

data/gemfiles/activesupport30.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "reliable-msg", "~>1.1", :group=>:test, :platform=>:ruby
+gem "jruby-activemq", :group=>:test, :platform=>:jruby
+gem "appraisal", :group=>:test
+gem "activesupport", "~> 3.0.8"
+gem "i18n"
+
+gemspec :path=>"../", :development_group=>:test

data/gemfiles/activesupport30.gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: /Users/LCooper/src/activemessaging
+  specs:
+    activemessaging (0.10.0)
+      activemessaging
+      activesupport (>= 2.3.11)
+      celluloid
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.16)
+    appraisal (0.4.1)
+      bundler
+      rake
+    celluloid (0.11.1)
+      timers (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    jruby-activemq (5.5.1-java)
+    json (1.7.4)
+    json (1.7.4-java)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    reliable-msg (1.1.0)
+      uuid (>= 1.0.0)
+    stomp (1.2.4)
+    systemu (2.5.2)
+    timers (1.0.1)
+    uuid (2.3.5)
+      macaddr (~> 1.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activemessaging!
+  activesupport (~> 3.0.8)
+  appraisal
+  i18n
+  jeweler
+  jruby-activemq
+  reliable-msg (~> 1.1)
+  stomp

data/gemfiles/activesupport31.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "reliable-msg", "~>1.1", :group=>:test, :platform=>:ruby
+gem "jruby-activemq", :group=>:test, :platform=>:jruby
+gem "appraisal", :group=>:test
+gem "activesupport", "~> 3.1.2"
+gem "i18n"
+
+gemspec :path=>"../", :development_group=>:test

data/gemfiles/activesupport31.gemfile.lock

@@ -0,0 +1,55 @@
+PATH
+  remote: /Users/LCooper/src/activemessaging
+  specs:
+    activemessaging (0.10.0)
+      activemessaging
+      activesupport (>= 2.3.11)
+      celluloid
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.1.7)
+      multi_json (>= 1.0, < 1.3)
+    appraisal (0.4.1)
+      bundler
+      rake
+    celluloid (0.11.1)
+      timers (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    jruby-activemq (5.5.1-java)
+    json (1.7.4)
+    json (1.7.4-java)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    multi_json (1.2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    reliable-msg (1.1.0)
+      uuid (>= 1.0.0)
+    stomp (1.2.4)
+    systemu (2.5.2)
+    timers (1.0.1)
+    uuid (2.3.5)
+      macaddr (~> 1.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activemessaging!
+  activesupport (~> 3.1.2)
+  appraisal
+  i18n
+  jeweler
+  jruby-activemq
+  reliable-msg (~> 1.1)
+  stomp

data/gemfiles/activesupport32.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "reliable-msg", "~>1.1", :group=>:test, :platform=>:ruby
+gem "jruby-activemq", :group=>:test, :platform=>:jruby
+gem "appraisal", :group=>:test
+gem "activesupport", "~> 3.2.2"
+
+gemspec :path=>"../", :development_group=>:test

data/gemfiles/activesupport32.gemfile.lock

@@ -0,0 +1,55 @@
+PATH
+  remote: /Users/LCooper/src/activemessaging
+  specs:
+    activemessaging (0.10.0)
+      activemessaging
+      activesupport (>= 2.3.11)
+      celluloid
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.7)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    celluloid (0.11.1)
+      timers (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    jruby-activemq (5.5.1-java)
+    json (1.7.4)
+    json (1.7.4-java)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    reliable-msg (1.1.0)
+      uuid (>= 1.0.0)
+    stomp (1.2.4)
+    systemu (2.5.2)
+    timers (1.0.1)
+    uuid (2.3.5)
+      macaddr (~> 1.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activemessaging!
+  activesupport (~> 3.2.2)
+  appraisal
+  jeweler
+  jruby-activemq
+  reliable-msg (~> 1.1)
+  stomp

data/generators/processor/processor_generator.rb

@@ -19,7 +19,7 @@ class ProcessorGenerator < NamedBase
 
       m.template 'messaging.rb', File.join('config', "messaging.rb")
       m.file 'broker.yml', File.join('config', "broker.yml")
-      m.file 'application.rb', File.join(path, "application.rb")
+      m.file 'application_processor.rb', File.join(path, "application_processor.rb")
       m.file 'poller.rb', File.join('lib', "poller.rb")
       if defined?(JRUBY_VERSION)
         m.file 'jruby_poller', File.join('script', "jruby_poller"), { :chmod => 0755 }

data/generators/processor/templates/poller

@@ -2,16 +2,16 @@
 
 ENV['APP_ROOT'] ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
 APP_ROOT = ENV['APP_ROOT']
+ENV['APP_NAME'] ||= "poller"
+APP_NAME = ENV['APP_NAME']
 script_file = File.join(APP_ROOT, 'lib', 'poller.rb')
 tmp_dir = File.join(APP_ROOT, 'tmp')
 
 require 'rubygems'
 require 'daemons'
-require 'activesupport'
-require 'activemessaging'
 
 options = {
-  :app_name   => "poller",
+  :app_name   => APP_NAME,
   :dir_mode   => :normal,
   :dir        => tmp_dir,
   :multiple   => true,

data/generators/processor/templates/poller.rb

@@ -3,6 +3,9 @@
 STDOUT.sync = true; STDOUT.flush
 STDERR.sync = true; STDERR.flush
 
+# The daemons gem sets our cwd to /, which Rails doesn't work well with.
+Dir.chdir APP_ROOT
+
 #Try to Load Merb
 merb_init_file = File.expand_path(File.dirname(__FILE__)+'/../config/merb_init')
 if File.exists? merb_init_file
@@ -17,8 +20,7 @@ else
   require File.join(RAILS_ROOT, 'config', 'environment')
 end
 
-# Load ActiveMessaging processors
-#ActiveMessaging::load_processors
-
 # Start it up!
-ActiveMessaging::start
+require 'activemessaging'
+ActiveMessaging.load_activemessaging
+ActiveMessaging.start

data/lib/activemessaging/adapters/jms.rb

@@ -1,6 +1,7 @@
 if defined?(JRUBY_VERSION)
 #require 'java'
 include Java
+require 'activemq'
 
 begin
   java_import javax.naming.InitialContext
@@ -239,4 +240,4 @@ module ActiveMessaging
   end
 end
 
-end
+end

data/lib/activemessaging/base_message.rb

@@ -6,14 +6,23 @@ module ActiveMessaging
     def initialize(body=nil, id=nil, headers={}, destination=nil)
       @body, @id, @headers, @destination = body, id, headers, destination
     end
-    
+
     def matches_subscription?(subscription)
       self.destination.to_s == subscription.destination.value.to_s
     end
 
+    def dup
+      super.tap do |copy|
+        [:body, :id, :headers, :destination].each do |field_name|
+          value = send field_name
+          copy.send "#{field_name}=", (value.duplicable? ? value.dup : value)
+        end
+      end
+    end
+
     def to_s      
       "<#{self.class.name} id='#{id}' headers='#{headers.inspect}' body='#{body}' >"
     end
   end
 
-end
+end

data/lib/activemessaging/gateway.rb

@@ -234,7 +234,7 @@ module ActiveMessaging
               :direction   => :incoming
             }
             begin
-              execute_filter_chain(:incoming, message, routing) do |m|
+              execute_filter_chain(:incoming, message.dup, routing) do |m|
                 result = subscription.processor_class.new.process!(m)
               end
             rescue ActiveMessaging::AbortMessageException

data/lib/activemessaging/test_helper.rb

@@ -24,12 +24,12 @@ module ActiveMessaging #:nodoc:
     def self.reset
       unsubscribe
       disconnect
-      @@filters = []
-      @@subscriptions = {}
-      @@named_destinations = {}
-      @@processor_groups = {}
-      @@current_processor_group = nil
-      @@connections = {}
+      @filters = []
+      @subscriptions = {}
+      @named_destinations = {}
+      @processor_groups = {}
+      @current_processor_group = nil
+      @connections = {}
     end    
   end
   

data/lib/activemessaging/threaded_poller.rb

@@ -3,7 +3,7 @@
 
 # This owes no small debt to sidekiq for showing how to use celluloid for polling for messages.
 # https://github.com/mperham/sidekiq/blob/poller/lib/sidekiq/manager.rb
-
+if RUBY_VERSION.to_f >= 1.9 # Celluloid requires fibers support, which is not available on 1.8
 require 'celluloid'
 
 module ActiveMessaging
@@ -205,4 +205,5 @@ module ActiveMessaging
     
   end
 
-end
+end
+end # if RUBY_VERSION

data/test/gateway_test.rb

@@ -14,10 +14,7 @@ class InitializeFilter
 end
 
 class GatewayTest < Test::Unit::TestCase
-
-
   class ClassFilter
-    
     def initialize
       raise "Don't try and construct one of these please"
     end
@@ -35,6 +32,17 @@ class GatewayTest < Test::Unit::TestCase
     end
   end
 
+  class MessageManglingFilter
+    class << self
+      def process(message, details={})
+        message.body.upcase!
+        message.id.upcase!
+        message.headers['the-mangler'] = 'run'
+        message.destination.gsub! '/', '#'
+      end
+    end
+  end
+
   class TestProcessor < ActiveMessaging::Processor
     include ActiveMessaging::MessageSender
     #subscribes_to :testqueue
@@ -171,6 +179,23 @@ class GatewayTest < Test::Unit::TestCase
     assert_equal msg, ActiveMessaging::Gateway.connection.unreceived_messages.first
   end
 
+  def test_aborted_messages_retry_original_message
+    ActiveMessaging::Gateway.destination :hello_world, '/queue/helloWorld'
+    ActiveMessaging::Gateway.filter 'gateway_test/message_mangling_filter'
+    ActiveMessaging::Gateway.subscribe_to :hello_world, TestRetryProcessor, headers={}
+
+    message_body = "message_body"
+    message_id = "55-a-msg"
+    message_headers = { 'x-my-header' => 'value' }
+    message_destination = '/queue/helloWorld'
+    msg = ActiveMessaging::Adapters::Test::Message.new(message_body.dup, message_id.dup, message_headers.dup, message_destination.dup)
+    ActiveMessaging::Gateway.dispatch(msg)
+    assert_equal message_body, ActiveMessaging::Gateway.connection.unreceived_messages.first.body
+    assert_equal message_id, ActiveMessaging::Gateway.connection.unreceived_messages.first.id
+    assert_equal message_headers, ActiveMessaging::Gateway.connection.unreceived_messages.first.headers
+    assert_equal message_destination, ActiveMessaging::Gateway.connection.unreceived_messages.first.destination
+  end
+
   def test_receive
     ActiveMessaging::Gateway.destination :hello_world, '/queue/helloWorld'
     ActiveMessaging::Gateway.publish :hello_world, "test_publish body", self.class, headers={}, timeout=10

data/test/jms_test.rb

@@ -2,14 +2,16 @@ require File.dirname(__FILE__) + '/test_helper'
 
 if defined?(JRUBY_VERSION)
 
+require 'activemessaging/adapters/jms'
+
 class JmsTest < Test::Unit::TestCase
 
   def setup
     @test_txt = 'Yo Homie!'
     @isolation_const = rand(99999999)
-    @connection = ActiveMessaging::Adapters::Jms::Connection.new(:url => 'tcp://localhost:61616',
-      :login => '', 
-      :passcode => '', 
+    @connection = ActiveMessaging::Adapters::Jms::Connection.new(:url => 'vm://jms_test',
+      :login => '',
+      :passcode => '',
       :connection_factory => 'org.apache.activemq.ActiveMQConnectionFactory')
   end
   
@@ -40,6 +42,7 @@ class JmsTest < Test::Unit::TestCase
   
   def test_one_off_receive
     @connection.send "/queue/OneOff#{@isolation_const}", "one off message"
+    sleep 2
     message = @connection.receive "/queue/OneOff#{@isolation_const}"
     assert_equal "one off message", message.body
     assert_equal "MESSAGE", message.command
@@ -58,4 +61,4 @@ class JmsTest < Test::Unit::TestCase
   
 end
 
-end
+end

data/test/reliable_msg_test.rb

@@ -1,6 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper'
-require 'activemessaging/adapters/reliable_msg'
-
 loaded = true
 begin
   require 'reliable-msg'
@@ -9,6 +7,8 @@ rescue Object => e
 end
 if loaded 
 
+require 'activemessaging/adapters/reliable_msg'
+
 class ReliableMsgTest < Test::Unit::TestCase
 
   def setup
@@ -80,4 +80,4 @@ class ReliableMsgTest < Test::Unit::TestCase
   
 end
 
-end # if loaded
+end # if loaded

data/test/stomp_test.rb

@@ -60,6 +60,18 @@ class StompTest < Test::Unit::TestCase
     @connection.stomp_connection.receive = @message
   end
 
+  def sent_command
+    @connection.stomp_connection.socket.sent_messages[0]
+  end
+
+  def sent_headers
+    @connection.stomp_connection.socket.sent_messages.drop(1).take_while { |line| !line.empty? }
+  end
+
+  def sent_body
+    (@connection.stomp_connection.socket.sent_messages.drop_while {|line| !line.empty?}).drop(1).first
+  end
+
   def test_initialize
     i = { :retryMax => 4, 
           :deadLetterQueue=>'/queue/dlq',
@@ -81,34 +93,35 @@ class StompTest < Test::Unit::TestCase
 
   def test_disconnect
     @connection.disconnect
-    assert_equal "DISCONNECT", @connection.stomp_connection.socket.sent_messages[0]
+    assert_equal "DISCONNECT", sent_command
   end
 
   def test_subscribe
     @connection.subscribe @d, {}
-    assert_equal "SUBSCRIBE", @connection.stomp_connection.socket.sent_messages[0]
-    # assert_equal "content-length:0", @connection.stomp_connection.socket.sent_messages[1]
-    assert_equal "destination:#{@d}", @connection.stomp_connection.socket.sent_messages[1]
+    assert_equal "SUBSCRIBE", sent_command
+    assert sent_headers.include?("content-length:0"), "No content-length header was sent"
+    assert sent_headers.include?("destination:#{@d}"), "No destination header was sent"
     assert_equal 1, @connection.stomp_connection.subscriptions.count
-    assert_equal({'content-length'=>'0', :destination=>@d}, @connection.stomp_connection.subscriptions[@d])
+    assert_equal({:'content-type'=>'text/plain; charset=UTF-8', :'content-length'=>'0', :destination=>@d}, @connection.stomp_connection.subscriptions[@d])
   end
 
   def test_unsubscribe
     @connection.subscribe @d, {}
     @connection.stomp_connection.socket.sent_messages = []
     @connection.unsubscribe @d, {}
-    assert_equal "UNSUBSCRIBE", @connection.stomp_connection.socket.sent_messages[0]
-    # assert_equal "content-length:0", @connection.stomp_connection.socket.sent_messages[1]
-    assert_equal "destination:#{@d}", @connection.stomp_connection.socket.sent_messages[1]
+    assert_equal "UNSUBSCRIBE", sent_command
+    assert sent_headers.include?("content-length:0"), "No content-length header was sent"
+    assert sent_headers.include?("destination:#{@d}"), "No destination header was sent"
     assert_equal 0, @connection.stomp_connection.subscriptions.count
   end
   
   def test_send
     @connection.send(@d, @message, {})
-    assert_equal 'SEND', @connection.stomp_connection.socket.sent_messages[0]
-    # assert_equal "content-length:#{@message.length}", @connection.stomp_connection.socket.sent_messages[1]
-    assert_equal "destination:#{@d}", @connection.stomp_connection.socket.sent_messages[1]
-    assert_equal @message, @connection.stomp_connection.socket.sent_messages[5]
+    assert_equal 'SEND', sent_command
+    assert sent_headers.include?("content-length:#{@message.length}"), "No content-length header was sent"
+    assert sent_headers.include?("destination:#{@d}"), "No destination header was sent"
+#    assert_equal @message, @connection.stomp_connection.socket.sent_messages[5]
+    assert_equal @message, sent_body
   end
 
   def test_receive

data/test/test_helper.rb

@@ -3,19 +3,31 @@ rails_environtment_file = File.expand_path(File.dirname(__FILE__) + "/../../../.
 if File.exists? rails_environtment_file
   require rails_environment_file
   APP_ROOT = RAILS_ROOT
+  APP_ENV = Rails.env
 else
   ENV['APP_ENV'] = 'test'
   APP_ENV = 'test'
+  APP_ROOT = File.dirname(__FILE__) + '/app'
   
   $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
   require 'rubygems'
-  require 'active_support'
+  require 'active_support/all'
+
+  module ActiveMessaging
+    def self.app_root
+      APP_ROOT
+    end
+
+    def self.app_env
+      APP_ENV
+    end
+  end
+
   require 'activemessaging/message_sender'
   require 'activemessaging/processor'
   require 'activemessaging/gateway'
   require 'activemessaging/filter'
   require 'activemessaging/adapters/test'
-  APP_ROOT = File.dirname(__FILE__) + '/app'
 end
   
 # load other libraries

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemessaging
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,29 @@ authors:
 - Sylvain Perez
 - Cliff Moon
 - Uwe Kubosch
+- Lance Cooper
+- Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemessaging
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -23,7 +41,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +49,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.3.11
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -48,6 +66,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stomp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -59,10 +125,22 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- .travis.yml
+- Appraisals
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - VERSION
 - activemessaging.gemspec
+- gemfiles/activesupport23.gemfile
+- gemfiles/activesupport23.gemfile.lock
+- gemfiles/activesupport30.gemfile
+- gemfiles/activesupport30.gemfile.lock
+- gemfiles/activesupport31.gemfile
+- gemfiles/activesupport31.gemfile.lock
+- gemfiles/activesupport32.gemfile
+- gemfiles/activesupport32.gemfile.lock
 - 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
@@ -73,7 +151,7 @@ files:
 - generators/filter/templates/filter_test.rb
 - generators/processor/USAGE
 - generators/processor/processor_generator.rb
-- generators/processor/templates/application.rb
+- generators/processor/templates/application_processor.rb
 - generators/processor/templates/broker.yml
 - generators/processor/templates/jruby_poller
 - generators/processor/templates/messaging.rb
@@ -149,6 +227,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 115054191085730340
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: