modern_times 0.1.2 → 0.2.0

data/test/jms_test.rb

@@ -0,0 +1,296 @@
+require 'modern_times'
+require 'shoulda'
+require 'test/unit'
+require 'fileutils'
+require 'erb'
+
+# NOTE: This test requires a running ActiveMQ server
+
+module WorkerHelper
+  @@workers = {}
+  @@mutex   = Mutex.new
+  def initialize(opts={})
+    super
+    @@mutex.synchronize do
+      @@workers[self.class.name] ||= []
+      @@workers[self.class.name] << self
+    end
+    @hash = Hash.new(0)
+  end
+
+  def self.workers(worker_klass)
+    @@workers[worker_klass.name]
+  end
+
+  def self.reset_workers
+    @@workers = {}
+  end
+
+  def add_message(i)
+    @hash[i] += 1
+  end
+
+  def message_count
+    puts "hash=#{@hash.inspect}"
+    @hash.values.reduce(:+)
+  end
+
+  def messages
+    @hash.keys
+  end
+end
+
+module HashTest
+  module ModuleMethods
+    def create_obj(i)
+      {
+          'foo' => 1,
+          'bar' => {
+              'message' => i,
+              'dummy'   => "Message #{i}"
+          },
+          # Only YAML will maintain symbols
+          :zulu => :rugger
+      }
+    end
+  end
+
+  def self.included(base)
+    base.extend(ModuleMethods)
+  end
+
+  def perform(obj)
+    add_message(obj['bar']['message'])
+  end
+end
+
+module BSONTest
+  extend ModernTimes::MarshalStrategy::BSON
+  include HashTest
+end
+
+module JSONTest
+  extend ModernTimes::MarshalStrategy::JSON
+  include HashTest
+end
+
+module RubyTest
+  extend ModernTimes::MarshalStrategy::Ruby
+
+  class MyClass
+    attr_reader :i
+    def initialize(i)
+      @i = i
+    end
+  end
+
+  def self.create_obj(i)
+    MyClass.new(i)
+  end
+
+  def perform(obj)
+    add_message(obj.i)
+  end
+end
+
+module StringTest
+  extend ModernTimes::MarshalStrategy::String
+
+  def self.create_obj(i)
+    "Message #{i}"
+  end
+
+  def perform(str)
+    if str =~ /^Message (\d+)$/
+      add_message($1.to_i)
+    else
+      raise "Unknown message: #{str}"
+    end
+  end
+end
+
+class DefaultWorker
+  include ModernTimes::JMS::Worker
+  include WorkerHelper
+end
+
+module Dummy
+  class DefaultWorker
+    include ModernTimes::JMS::Worker
+    include WorkerHelper
+  end
+end
+
+class SpecifiedQueueWorker
+  include ModernTimes::JMS::Worker
+  queue 'MyQueueName'
+  include WorkerHelper
+end
+
+class SpecifiedQueue2Worker
+  include ModernTimes::JMS::Worker
+  queue 'MyQueueName'
+  include WorkerHelper
+end
+
+class SpecifiedTopicWorker
+  include ModernTimes::JMS::Worker
+  virtual_topic 'MyTopicName'
+  include WorkerHelper
+end
+
+class SpecifiedTopic2Worker
+  include ModernTimes::JMS::Worker
+  virtual_topic 'MyTopicName'
+  include WorkerHelper
+end
+
+class JMSTest < Test::Unit::TestCase
+
+  @@server = JMX.simple_server
+  @@client = JMX.connect
+
+  def publish(marshal_module, range, options)
+    publisher = ModernTimes::JMS::Publisher.new(options.merge(:marshal => marshal_module))
+    puts "Publishing #{range} to #{publisher}"
+    range.each do |i|
+      obj = marshal_module.create_obj(i)
+      publisher.publish(obj)
+    end
+  end
+  
+  def assert_worker(domain, worker_klasses, mbean_names, worker_count, range, min, max, instance_count)
+    puts "Checking #{worker_klasses.inspect}"
+    worker_klasses = [worker_klasses] unless worker_klasses.kind_of?(Array)
+    mbean_names = [mbean_names] unless mbean_names.kind_of?(Array)
+    workers = []
+    worker_klasses.each {|klass| workers.concat(WorkerHelper.workers(klass))}
+
+    assert_equal worker_count, workers.size
+    all_messages = []
+    workers.each do |worker|
+      msg_count = worker.message_count
+      assert msg_count >= min, "#{msg_count} is not between #{min} and #{max}"
+      assert msg_count <= max, "#{msg_count} is not between #{min} and #{max}"
+      # Make sure no duplicate messages
+      assert msg_count == worker.messages.size, "#{msg_count} is not == #{worker.messages.size}"
+      all_messages.concat(worker.messages)
+    end
+    all_messages.sort!
+    assert_equal all_messages, (range.to_a*instance_count).sort
+
+    if domain
+      total_count = 0
+      mbean_names.each do |mbean_name|
+        bean = @@client[ModernTimes.supervisor_mbean_object_name(domain, mbean_name)]
+        bean.message_counts.each do |msg_count|
+          total_count += msg_count
+          assert msg_count >= min, "#{msg_count} is not between #{min} and #{max}"
+          assert msg_count <= max, "#{msg_count} is not between #{min} and #{max}"
+        end
+      end
+      assert_equal all_messages.size, total_count
+    end
+  end
+
+  context 'jms' do
+    setup do
+      config = YAML.load(ERB.new(File.read(File.join(File.dirname(__FILE__), 'jms.yml'))).result(binding))
+      ModernTimes::JMS::Connection.init(config)
+    end
+
+    teardown do
+    end
+
+    #[BSONTest, JSONTest, RubyTest, StringTest].each do |marshal_module|
+    [BSONTest, JSONTest, StringTest].each do |marshal_module|
+      marshal_module.name =~ /(.*)Test/
+      marshal_type = $1
+
+      context "marshaling with #{marshal_type}" do
+        setup do
+          @domain = "Uniquize_#{marshal_module.name}"
+          @manager = ModernTimes::Manager.new(:domain => @domain)
+        end
+
+        teardown do
+          if @manager
+            @manager.stop
+            @manager.join
+          end
+        end
+
+        should "operate on queues and topics" do
+          WorkerHelper.reset_workers
+          [DefaultWorker, Dummy::DefaultWorker, SpecifiedQueueWorker, SpecifiedQueue2Worker, SpecifiedTopicWorker, SpecifiedTopic2Worker].each do |worker_klass|
+            worker_klass.send(:include, marshal_module)
+            worker_klass.send(:marshal, marshal_module)
+          end
+          @manager.add(DefaultWorker, 3)
+          @manager.add(DefaultWorker, 2, :name => 'DefaultClone')
+          @manager.add(Dummy::DefaultWorker, 4)
+          @manager.add(SpecifiedQueueWorker, 3)
+          @manager.add(SpecifiedQueueWorker, 2, :name => 'SpecifiedQueueClone')
+          @manager.add(SpecifiedQueue2Worker, 2)
+          @manager.add(SpecifiedTopicWorker, 3)
+          @manager.add(SpecifiedTopicWorker, 2, :name => 'SpecifiedTopicClone')
+          @manager.add(SpecifiedTopic2Worker, 2)
+
+          sleep 1
+
+          publish(marshal_module, 100..199, :queue_name => 'Default')
+          publish(marshal_module, 200..299, :queue_name => 'Dummy_Default')
+          publish(marshal_module, 300..499, :queue_name => 'MyQueueName')
+          publish(marshal_module, 500..599, :virtual_topic_name => 'MyTopicName')
+
+          # Let the workers do their thing
+          sleep 5
+
+          # DefaultWorker should have 5 instances running with each worker handling between 10-30 messages in the range 100.199
+          assert_worker(@domain, DefaultWorker,                                ['Default', 'DefaultClone'],                                  5, 100..199, 10, 30, 1)
+          assert_worker(@domain, Dummy::DefaultWorker,                         'Dummy_Default',                                              4, 200..299, 15, 35, 1)
+          assert_worker(@domain, [SpecifiedQueueWorker,SpecifiedQueue2Worker], ['SpecifiedQueue', 'SpecifiedQueueClone', 'SpecifiedQueue2'], 7, 300..499, 20, 40, 1)
+          assert_worker(@domain, SpecifiedTopicWorker,                         ['SpecifiedTopic', 'SpecifiedTopicClone'],                    5, 500..599, 30, 60, 2)
+          assert_worker(@domain, SpecifiedTopic2Worker,                        'SpecifiedTopic2',                                            2, 500..599, 35, 65, 1)
+        end
+      end
+    end
+
+    context 'dummy publishing' do
+      setup do
+        workers = [
+          DefaultWorker,
+          Dummy::DefaultWorker,
+          SpecifiedQueueWorker,
+          SpecifiedQueue2Worker,
+          SpecifiedTopicWorker,
+          SpecifiedTopic2Worker,
+        ]
+        workers.each do |worker_klass|
+          worker_klass.send(:include, RubyTest)
+        end
+        WorkerHelper.reset_workers
+        ModernTimes::JMS::Publisher.setup_dummy_publishing(workers)
+      end
+
+      teardown do
+        ModernTimes::JMS::Publisher.clear_dummy_publishing
+      end
+
+      should "directly call applicable workers" do
+        publish(RubyTest, 100..199, :queue_name => 'Default')
+        publish(RubyTest, 200..299, :queue_name => 'Dummy_Default')
+        publish(RubyTest, 300..499, :queue_name => 'MyQueueName')
+        publish(RubyTest, 500..599, :virtual_topic_name => 'MyTopicName')
+
+        # DefaultWorker should have 5 instances running with each worker handling between 10-30 messages in the range 100.199
+        assert_worker(nil, DefaultWorker,         nil, 1, 100..199, 100, 100, 1)
+        assert_worker(nil, Dummy::DefaultWorker,  nil, 1, 200..299, 100, 100, 1)
+        assert_worker(nil, SpecifiedQueueWorker,  nil, 1, 300..499, 200, 200, 1)
+        assert_worker(nil, SpecifiedQueue2Worker, nil, 1, 300..499, 200, 200, 1)
+        assert_worker(nil, SpecifiedTopicWorker,  nil, 1, 500..599, 100, 100, 1)
+        assert_worker(nil, SpecifiedTopic2Worker, nil, 1, 500..599, 100, 100, 1)
+      end
+    end
+  end
+end

data/test/marshal_strategy_test.rb

@@ -0,0 +1,39 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+require 'modern_times'
+
+class Klass
+  def initialize(str)
+    @str = str
+  end
+  def hello
+    @str
+  end
+end
+
+class MarshalStrategyTest < Test::Unit::TestCase
+  context '' do
+    setup do
+      @bson   = Object.new
+      @json   = Object.new
+      @ruby   = Object.new
+      @string = Object.new
+      @bson.extend   ModernTimes::MarshalStrategy::BSON
+      @json.extend   ModernTimes::MarshalStrategy::JSON
+      @ruby.extend   ModernTimes::MarshalStrategy::Ruby
+      @string.extend ModernTimes::MarshalStrategy::String
+    end
+
+    should 'marshal and unmarshal correctly' do
+      hash = {'foo' => 42, 'bar' => 'zulu'}
+      str  = 'abcdef1234'
+      obj  = Klass.new('hello')
+      assert_equal hash, @bson.unmarshal(@bson.marshal(hash))
+      assert_equal hash, @json.unmarshal(@json.marshal(hash))
+      assert_equal hash, @ruby.unmarshal(@ruby.marshal(hash))
+      assert_equal str,  @string.unmarshal(@string.marshal(str))
+      assert_equal obj.hello,  @ruby.unmarshal(@ruby.marshal(obj)).hello
+    end
+  end
+end

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: modern_times
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+    - 0
+    - 2
+    - 0
+  version: 0.2.0
 platform: ruby
 authors: 
   - Brad Pardee
@@ -11,42 +15,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -04:00
+date: 2011-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: jruby-hornetq
+    name: jruby-jms
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.3.3
+            segments: 
+              - 0
+              - 11
+              - 0
+            version: 0.11.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: jmx
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 6
             version: "0.6"
     type: :runtime
     version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: json
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id003
 description: Generic asynchronous task library
 email: 
   - bradpardee@gmail.com
@@ -63,9 +61,10 @@ files:
   - README.rdoc
   - Rakefile
   - VERSION
+  - examples/README
+  - examples/jms.yml
   - examples/requestor/.gitignore
   - examples/requestor/README
-  - examples/requestor/hornetq.yml
   - examples/requestor/manager.rb
   - examples/requestor/request.rb
   - examples/requestor/reverse_echo_worker.rb
@@ -73,7 +72,6 @@ files:
   - examples/simple/README
   - examples/simple/bar_worker.rb
   - examples/simple/baz_worker.rb
-  - examples/simple/hornetq.yml
   - examples/simple/manager.rb
   - examples/simple/publish.rb
   - lib/modern_times.rb
@@ -82,29 +80,32 @@ files:
   - lib/modern_times/base/supervisor_mbean.rb
   - lib/modern_times/base/worker.rb
   - lib/modern_times/exception.rb
-  - lib/modern_times/hornetq.rb
-  - lib/modern_times/hornetq/client.rb
-  - lib/modern_times/hornetq/marshal_strategy.rb
-  - lib/modern_times/hornetq/marshal_strategy/json.rb
-  - lib/modern_times/hornetq/marshal_strategy/ruby.rb
-  - lib/modern_times/hornetq/marshal_strategy/string.rb
-  - lib/modern_times/hornetq/publisher.rb
-  - lib/modern_times/hornetq/supervisor.rb
-  - lib/modern_times/hornetq/supervisor_mbean.rb
-  - lib/modern_times/hornetq/worker.rb
-  - lib/modern_times/hornetq_requestor.rb
-  - lib/modern_times/hornetq_requestor/request_handle.rb
-  - lib/modern_times/hornetq_requestor/requestor.rb
-  - lib/modern_times/hornetq_requestor/worker.rb
+  - lib/modern_times/jms.rb
+  - lib/modern_times/jms/connection.rb
+  - lib/modern_times/jms/publisher.rb
+  - lib/modern_times/jms/supervisor.rb
+  - lib/modern_times/jms/supervisor_mbean.rb
+  - lib/modern_times/jms/worker.rb
+  - lib/modern_times/jms_requestor.rb
+  - lib/modern_times/jms_requestor/request_handle.rb
+  - lib/modern_times/jms_requestor/requestor.rb
+  - lib/modern_times/jms_requestor/supervisor.rb
+  - lib/modern_times/jms_requestor/supervisor_mbean.rb
+  - lib/modern_times/jms_requestor/worker.rb
   - lib/modern_times/loggable.rb
   - lib/modern_times/manager.rb
   - lib/modern_times/manager_mbean.rb
+  - lib/modern_times/marshal_strategy.rb
+  - lib/modern_times/marshal_strategy/bson.rb
+  - lib/modern_times/marshal_strategy/json.rb
+  - lib/modern_times/marshal_strategy/ruby.rb
+  - lib/modern_times/marshal_strategy/string.rb
   - lib/modern_times/railsable.rb
-  - lib/modern_times/thread.rb
-  - test/base/worker_test.rb
-  - test/worker_manager_test.rb
-  - test/messaging/worker_manager_test.rb
-  - test/messaging/worker_test.rb
+  - test/base_test.rb
+  - test/jms.yml
+  - test/jms_requestor_test.rb
+  - test/jms_test.rb
+  - test/marshal_strategy_test.rb
 has_rdoc: true
 homepage: http://github.com/ClarityServices/modern_times
 licenses: []
@@ -115,21 +116,23 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Asynchronous task library
@@ -141,7 +144,7 @@ test_files:
   - examples/simple/baz_worker.rb
   - examples/simple/manager.rb
   - examples/simple/publish.rb
-  - test/base/worker_test.rb
-  - test/messaging/worker_manager_test.rb
-  - test/messaging/worker_test.rb
-  - test/worker_manager_test.rb
+  - test/base_test.rb
+  - test/jms_requestor_test.rb
+  - test/jms_test.rb
+  - test/marshal_strategy_test.rb