modern_times 0.2.4 → 0.2.5

data/README.rdoc

@@ -10,13 +10,11 @@ Very much alpha stage at this point.
 
 == Features/Problems:
 
-* Ruby marshaling doesn't work
-* jms_test doesn't exit
+* jms_test issues (doesn't exit, doesn't work when doing more than 1 type of marshaling)
 * jms_requestor needs testing for dummy requesting
 * Allow options (durable queues, etc)
 * Railsable needs testing
 * Fail options (fail queues, etc.)
-* Return exception for jms_requestor
 * Currently tested only for ActiveMQ
 
 == Install:

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/modern_times/jms/worker.rb

@@ -96,29 +96,10 @@ module ModernTimes
         return options
       end
 
-      def on_message(message)
-        @message = message
-        object = self.class.marshaler.unmarshal(message.data)
-        ModernTimes.logger.debug "#{self}: Received Object: #{object}" if ModernTimes.logger.debug?
-        perform(object)
-        ModernTimes.logger.debug "#{self}: Finished processing message" if ModernTimes.logger.debug?
-        ModernTimes.logger.flush if ModernTimes.logger.respond_to?(:flush)
-      rescue Exception => e
-        ModernTimes.logger.error "#{self}: Messaging Exception: #{e.inspect}\n#{e.backtrace.inspect}"
-      rescue java.lang.Exception => e
-        ModernTimes.logger.error "#{self}: Java Messaging Exception: #{e.inspect}\n#{e.backtrace.inspect}"
-      end
-
-      def perform(object)
-        raise "#{self}: Need to override perform method in #{self.class.name} in order to act on #{object}"
-      end
-
-      def to_s
-        "#{real_destination_options.to_a.join('=>')}:#{index}"
-      end
-
       # Start the event loop for handling messages off the queue
       def start
+        # Grab this to prevent lookup with every message
+        @message_marshaler = self.class.marshaler
         @session = Connection.create_consumer_session
         @consumer = @session.consumer(real_destination_options)
         @session.start
@@ -154,6 +135,27 @@ module ModernTimes
         @session.close if @session
       end
 
+      def on_message(message)
+        @message = message
+        object = @message_marshaler.unmarshal(message.data)
+        ModernTimes.logger.debug "#{self}: Received Object: #{object}" if ModernTimes.logger.debug?
+        perform(object)
+        ModernTimes.logger.debug "#{self}: Finished processing message" if ModernTimes.logger.debug?
+        ModernTimes.logger.flush if ModernTimes.logger.respond_to?(:flush)
+      rescue Exception => e
+        ModernTimes.logger.error "#{self}: Messaging Exception: #{e.inspect}\n#{e.backtrace.inspect}"
+      rescue java.lang.Exception => e
+        ModernTimes.logger.error "#{self}: Java Messaging Exception: #{e.inspect}\n#{e.backtrace.inspect}"
+      end
+
+      def perform(object)
+        raise "#{self}: Need to override perform method in #{self.class.name} in order to act on #{object}"
+      end
+
+      def to_s
+        "#{real_destination_options.to_a.join('=>')}:#{index}"
+      end
+
       #########
       protected
       #########

data/lib/modern_times/jms_requestor/request_handle.rb

@@ -4,12 +4,13 @@ require 'yaml'
 module ModernTimes
   module JMSRequestor
     class RequestHandle
-      def initialize(requestor, message, start, timeout)
-        @requestor   = requestor
-        @reply_queue = requestor.reply_queue
-        @message     = message
-        @start       = start
-        @timeout     = timeout
+      def initialize(requestor, message, start, timeout, &reconstruct_block)
+        @requestor         = requestor
+        @reply_queue       = requestor.reply_queue
+        @message           = message
+        @start             = start
+        @timeout           = timeout
+        @reconstruct_block = reconstruct_block
       end
 
       def read_response
@@ -30,7 +31,11 @@ module ModernTimes
         if error_yaml = response['Exception']
           raise ModernTimes::RemoteException.from_hash(YAML.load(error_yaml))
         end
-        return @requestor.marshaler.unmarshal(response.data)
+        response = @requestor.marshaler.unmarshal(response.data)
+        if @reconstruct_block
+          response = @reconstruct_block.call(response)
+        end
+        return response
       end
     end
   end

data/lib/modern_times/jms_requestor/requestor.rb

@@ -14,26 +14,31 @@ module ModernTimes
         end
       end
       
-      def request(object, timeout)
+      def request(object, timeout, &reconstruct_block)
         start = Time.now
         message = publish(object, :jms_reply_to => @reply_queue)
-        return RequestHandle.new(self, message, start, timeout)
+        return RequestHandle.new(self, message, 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)
+      def dummy_request(object, timeout, &reconstruct_block)
         @@worker_instances.each do |worker|
-          if worker.kind_of?(Worker) && ModernTimes::JMS.same_destination?(producer_options, worker.destination_options)
+          if worker.kind_of?(Worker) && ModernTimes::JMS.same_destination?(producer_options, worker.class.destination_options)
             ModernTimes.logger.debug "Dummy requesting #{object} to #{worker}"
-            return new OpenStruct(:read_response => worker.request(object))
+            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

data/lib/modern_times/jms_requestor/worker.rb

@@ -10,6 +10,18 @@ module ModernTimes
         def create_supervisor(manager, worker_options)
           Supervisor.new(manager, self, {}, worker_options)
         end
+
+        def request_marshal(option)
+          marshal(option)
+        end
+
+        def response_marshal(option)
+          @response_marshaler = ModernTimes::MarshalStrategy.find(option)
+        end
+
+        def response_marshaler
+          @response_marshaler || marshaler
+        end
       end
 
       def self.included(base)
@@ -29,12 +41,17 @@ module ModernTimes
         @total_time  = 0.0
       end
 
+      def start
+        @reply_marshaler = self.class.response_marshaler
+        super
+      end
+
       def perform(object)
         start_time = Time.now
         response = request(object)
         response_time = Time.now - start_time
         session.producer(:destination => message.reply_to) do |producer|
-          reply_message = ModernTimes::JMS.create_message(session, self.class.marshaler, response)
+          reply_message = ModernTimes::JMS.create_message(session, @reply_marshaler, response)
           reply_message.jms_correlation_id = message.jms_message_id
           producer.send(reply_message)
         end

data/lib/modern_times/railsable.rb

@@ -4,7 +4,9 @@ require 'erb'
 module ModernTimes
   module Railsable
     def init_rails
-      if @cfg = YAML.load(ERB.new(File.read(File.join(Rails.root, "config", "jms.yml"))).result(binding))[Rails.env]
+      # Allow user to use JMS w/o modifying jms.yml which could be checked in and hose other users
+      env = ENV['MODERN_TIMES_JMS_ENV'] || Rails.env
+      if @cfg = YAML.load(ERB.new(File.read(File.join(Rails.root, "config", "jms.yml"))).result(binding))[env]
         ModernTimes.logger.info "Messaging Enabled"
         ModernTimes::JMS::Connection.init(@cfg)
         @is_jms_enabled = true

data/test/jms_test.rb

@@ -203,6 +203,7 @@ class JMSTest < Test::Unit::TestCase
     end
 
     [BSONTest, JSONTest, RubyTest, StringTest].each do |marshal_module|
+    #[RubyTest].each do |marshal_module|
     #[BSONTest, JSONTest, StringTest].each do |marshal_module|
       marshal_module.name =~ /(.*)Test/
       marshal_type = $1

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: modern_times
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 2
-    - 4
-  version: 0.2.4
+  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors: 
   - Brad Pardee
@@ -15,20 +11,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-jms
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 11
-              - 0
             version: 0.11.0
     type: :runtime
     version_requirements: *id001
@@ -36,12 +29,10 @@ dependencies:
     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
@@ -107,6 +98,9 @@ files:
   - 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: []
@@ -117,23 +111,21 @@ 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.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Asynchronous task library