modern_times 0.2.11 → 0.3.0

data/test/marshal_strategy_test.rb

@@ -22,7 +22,7 @@ module SpockMarshalStrategy
     (i.to_i * 24).to_s
   end
 
-  # Change days to hours
+  # Change hours to days
   def self.unmarshal(str)
     str.to_i / 24
   end
@@ -39,7 +39,6 @@ class MarshalStrategyTest < Test::Unit::TestCase
       @string = ModernTimes::MarshalStrategy.find(:string)
       @yaml   = ModernTimes::MarshalStrategy.find(:string)
       @spock  = ModernTimes::MarshalStrategy.find(:spock)
-      @spock2 = ModernTimes::MarshalStrategy.find(SpockMarshalStrategy)
     end
 
     should 'marshal and unmarshal correctly' do
@@ -53,7 +52,6 @@ class MarshalStrategyTest < Test::Unit::TestCase
       assert_equal str,  @string.unmarshal(@string.marshal(str))
       assert_equal obj.hello,  @ruby.unmarshal(@ruby.marshal(obj)).hello
       assert_equal i, @spock.unmarshal(@spock.marshal(i))
-      assert_equal i, @spock2.unmarshal(@spock2.marshal(i))
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: modern_times
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors: 
   - Brad Pardee
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -04:00
+date: 2011-05-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -53,6 +53,17 @@ files:
   - Rakefile
   - VERSION
   - examples/README
+  - examples/advanced_requestor/README
+  - examples/advanced_requestor/base_request_worker.rb
+  - examples/advanced_requestor/char_count_worker.rb
+  - examples/advanced_requestor/exception_raiser_worker.rb
+  - examples/advanced_requestor/length_worker.rb
+  - examples/advanced_requestor/manager.rb
+  - examples/advanced_requestor/modern_times.yml
+  - examples/advanced_requestor/print_worker.rb
+  - examples/advanced_requestor/publish.rb
+  - examples/advanced_requestor/reverse_worker.rb
+  - examples/advanced_requestor/triple_worker.rb
   - examples/consumer/consumer.rb
   - examples/jms.yml
   - examples/requestor/.gitignore
@@ -74,16 +85,12 @@ files:
   - lib/modern_times/jms.rb
   - lib/modern_times/jms/connection.rb
   - lib/modern_times/jms/consumer.rb
+  - lib/modern_times/jms/publish_handle.rb
   - lib/modern_times/jms/publisher.rb
+  - lib/modern_times/jms/request_worker.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
@@ -95,14 +102,14 @@ files:
   - lib/modern_times/marshal_strategy/yaml.rb
   - lib/modern_times/railsable.rb
   - lib/modern_times/remote_exception.rb
+  - lib/modern_times/time_track.rb
   - test/base_test.rb
   - test/jms.yml
+  - test/jms_failure_test.rb
+  - test/jms_requestor_block_test.rb
   - test/jms_requestor_test.rb
   - test/jms_test.rb
   - test/marshal_strategy_test.rb
-  - examples/exception_test/bar_worker.rb
-  - examples/exception_test/base_worker.rb
-  - examples/exception_test/manager.rb
 has_rdoc: true
 homepage: http://github.com/ClarityServices/modern_times
 licenses: []
@@ -132,10 +139,16 @@ signing_key:
 specification_version: 3
 summary: Asynchronous task library
 test_files: 
+  - examples/advanced_requestor/base_request_worker.rb
+  - examples/advanced_requestor/char_count_worker.rb
+  - examples/advanced_requestor/exception_raiser_worker.rb
+  - examples/advanced_requestor/length_worker.rb
+  - examples/advanced_requestor/manager.rb
+  - examples/advanced_requestor/print_worker.rb
+  - examples/advanced_requestor/publish.rb
+  - examples/advanced_requestor/reverse_worker.rb
+  - examples/advanced_requestor/triple_worker.rb
   - examples/consumer/consumer.rb
-  - examples/exception_test/bar_worker.rb
-  - examples/exception_test/base_worker.rb
-  - examples/exception_test/manager.rb
   - examples/requestor/manager.rb
   - examples/requestor/request.rb
   - examples/requestor/reverse_echo_worker.rb
@@ -144,6 +157,8 @@ test_files:
   - examples/simple/manager.rb
   - examples/simple/publish.rb
   - test/base_test.rb
+  - test/jms_failure_test.rb
+  - test/jms_requestor_block_test.rb
   - test/jms_requestor_test.rb
   - test/jms_test.rb
   - test/marshal_strategy_test.rb

data/examples/exception_test/bar_worker.rb

@@ -1,8 +0,0 @@
-require 'base_worker'
-
-class BarWorker < BaseWorker
-
-  def perform
-    raise "Raising my exception #{self.class.name}"
-  end
-end

data/examples/exception_test/base_worker.rb

@@ -1,23 +0,0 @@
-class BaseWorker
-  include ModernTimes::Base::Worker
-
-  def start
-    while true do
-      sleep 1
-      perform
-    end
-  rescue Exception => e
-    puts "Caught #{e.inspect}"
-  end
-
-  def perform
-    raise "Need to override perform method in #{self.class.name}"
-  end
-
-  def stop
-  end
-
-  def status
-    "Need to override status method in #{self.class.name}"
-  end
-end

data/examples/exception_test/manager.rb

@@ -1,11 +0,0 @@
-# Allow examples to be run in-place without requiring a gem install
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
-
-require 'rubygems'
-require 'modern_times'
-require 'bar_worker'
-
-manager = ModernTimes::Manager.new
-manager.stop_on_signal
-manager.add(BarWorker, 2, {})
-manager.join

data/lib/modern_times/jms_requestor.rb

@@ -1,10 +0,0 @@
-require 'modern_times/jms_requestor/request_handle'
-require 'modern_times/jms_requestor/requestor'
-require 'modern_times/jms_requestor/supervisor_mbean'
-require 'modern_times/jms_requestor/supervisor'
-require 'modern_times/jms_requestor/worker'
-
-module ModernTimes
-  module JMSRequestor
-  end
-end

data/lib/modern_times/jms_requestor/request_handle.rb

@@ -1,42 +0,0 @@
-require 'timeout'
-require 'yaml'
-
-module ModernTimes
-  module JMSRequestor
-    class RequestHandle
-      def initialize(requestor, jms_message_id, start, timeout, &reconstruct_block)
-        @requestor         = requestor
-        @reply_queue       = requestor.reply_queue
-        @jms_message_id    = jms_message_id
-        @start             = start
-        @timeout           = timeout
-        @reconstruct_block = reconstruct_block
-      end
-
-      def read_response
-        response = nil
-        opts = { :destination => @reply_queue, :selector => "JMSCorrelationID = '#{@jms_message_id}'" }
-        #opts = { :destination => @reply_queue }
-        #opts = {:queue_name => 'foobarzulu'}
-        ModernTimes::JMS::Connection.session_pool.consumer(opts) do |session, consumer|
-          leftover_timeout = ((@start + @timeout - Time.now) * 1000).to_i
-          if leftover_timeout > 100
-            response = consumer.receive(leftover_timeout)
-          else
-            #response = consumer.receive_no_wait
-            response = consumer.receive(100)
-          end
-        end
-        raise Timeout::Error, "Timeout waiting for for response from message #{@jms_message_id} on queue #{@reply_queue}" unless response
-        if error_yaml = response['Exception']
-          raise ModernTimes::RemoteException.from_hash(YAML.load(error_yaml))
-        end
-        response = @requestor.marshaler.unmarshal(response.data)
-        if @reconstruct_block
-          response = @reconstruct_block.call(response)
-        end
-        return response
-      end
-    end
-  end
-end

data/lib/modern_times/jms_requestor/requestor.rb

@@ -1,56 +0,0 @@
-module ModernTimes
-  module JMSRequestor
-    class Requestor < ModernTimes::JMS::Publisher
-      attr_reader :reply_queue
-
-      @@dummy_requesting = false
-
-      def initialize(options)
-        super
-        return if @@dummy_requesting
-        raise "ModernTimes::JMS::Connection has not been initialized" unless ModernTimes::JMS::Connection.inited?
-        ModernTimes::JMS::Connection.session_pool.session do |session|
-          @reply_queue = session.create_destination(:queue_name => :temporary)
-        end
-      end
-      
-      def request(object, timeout, &reconstruct_block)
-        start = Time.now
-        jms_message_id = publish(object, :jms_reply_to => @reply_queue)
-        return RequestHandle.new(self, jms_message_id, start, timeout, &reconstruct_block)
-      end
-
-      # For non-configured Rails projects, The above request method will be overridden to
-      # call this request method instead which calls all the JMS workers that
-      # operate on the given address.
-      def dummy_request(object, timeout, &reconstruct_block)
-        @@worker_instances.each do |worker|
-          if worker.kind_of?(Worker) && ModernTimes::JMS.same_destination?(producer_options, worker.class.destination_options)
-            ModernTimes.logger.debug "Dummy requesting #{object} to #{worker}"
-            response = worker.request(object)
-            if reconstruct_block
-              response = reconstruct_block.call(response)
-            end
-            return OpenStruct.new(:read_response => response)
-          end
-        end
-        raise "No worker to handle #{address} request of #{object}"
-      end
-
-      def self.setup_dummy_requesting(workers)
-        require 'ostruct'
-        @@dummy_requesting = true
-        @@worker_instances = workers.map {|worker| worker.new}
-        alias_method :real_request, :request
-        alias_method :request, :dummy_request
-      end
-
-      # For testing
-      def self.clear_dummy_requesting
-        @@dummy_requesting = false
-        alias_method :dummy_request, :request
-        alias_method :request, :real_request
-      end
-    end
-  end
-end

data/lib/modern_times/jms_requestor/supervisor.rb

@@ -1,45 +0,0 @@
-module ModernTimes
-  module JMSRequestor
-    class Supervisor < ModernTimes::JMS::Supervisor
-
-      def initialize(manager, worker_name, supervisor_options, worker_options)
-        super
-      end
-
-      def average_response_time
-        count = 0
-        total = 0.0
-        workers.each do |w|
-          pair = w.total_time
-          count += pair.first
-          total += pair.last
-        end
-        return 0.0 if count == 0
-        return total / count
-      end
-
-      def min_response_time
-        min_time = nil
-        workers.each do |w|
-          wmin_time = w.min_time
-          min_time = wmin_time if wmin_time && (!min_time || wmin_time < min_time)
-        end
-        return min_time || 0.0
-      end
-
-      def max_response_time
-        max_time = 0.0
-        workers.each do |w|
-          wmax_time = w.max_time
-          max_time = wmax_time if wmax_time > max_time
-        end
-        return max_time
-      end
-
-      # Make JMSRequestor::SupervisorMBean our mbean
-      def create_mbean(domain)
-        SupervisorMBean.new(mbean_name(domain), mbean_description, self, {})
-      end
-    end
-  end
-end

data/lib/modern_times/jms_requestor/supervisor_mbean.rb

@@ -1,21 +0,0 @@
-module ModernTimes
-  module JMSRequestor
-    class SupervisorMBean < ModernTimes::JMS::SupervisorMBean
-      r_attribute :average_response_time, :float, 'Average response time', :average_response_time
-      r_attribute :min_response_time,     :float, 'Minimum response time', :min_response_time
-      r_attribute :max_response_time,     :float, 'Maximum response time', :max_response_time
-
-      def average_response_time
-        supervisor.average_response_time
-      end
-
-      def min_response_time
-        supervisor.min_response_time
-      end
-
-      def max_response_time
-        supervisor.max_response_time
-      end
-    end
-  end
-end