modern_times 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/modern_times/jms_requestor/worker.rb

@@ -10,18 +10,6 @@ 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)
@@ -41,17 +29,12 @@ 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, @reply_marshaler, response)
+          reply_message = ModernTimes::JMS.create_message(session, self.class.marshaler, response)
           reply_message.jms_correlation_id = message.jms_message_id
           producer.send(reply_message)
         end

data/lib/modern_times/manager.rb

@@ -114,9 +114,11 @@ module ModernTimes
       @worker_file = file
       if File.exist?(file)
         hash = YAML.load_file(file)
-        host = @dummy_host || Socket.gethostname
-        host.sub!(/\..*/, '')
-        config = hash[host]
+        config = @dummy_host && hash[@dummy_host]
+        unless config
+          host = Socket.gethostname.sub(/\..*/, '')
+          config = hash[host]
+        end
         return unless config
         # Don't save new states if the user never dynamically updates the workers
         # Then they can solely define the workers via this file and updates to the counts won't be ignored.

data/lib/modern_times/marshal_strategy.rb

@@ -37,7 +37,7 @@ module ModernTimes
                  when :json   then JSON
                  when :bson   then BSON
                  when :yaml   then YAML
-                 else raise "Invalid marshal strategy: #{options[:marshal]}"
+                 else raise "Invalid marshal strategy: #{marshal_option}"
                end
       elsif marshal_option.respond_to?(:marshal_type)
         return marshal_option

data/lib/modern_times/railsable.rb

@@ -6,9 +6,9 @@ module ModernTimes
     def init_rails
       # 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]
+      if @config = 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)
+        ModernTimes::JMS::Connection.init(@config)
         @is_jms_enabled = true
 
         # Need to start the JMS Server in this VM
@@ -21,7 +21,7 @@ module ModernTimes
           # Handle messages within this process
           @manager = ModernTimes::Manager.new
           # TODO: Formatting of configured workers in invm state with name and options
-          if worker_cfg = @cfg[:workers]
+          if worker_cfg = @config[:workers]
             worker_cfg.each do |klass, count|
               @manager.add(klass, count, {})
             end
@@ -52,14 +52,15 @@ module ModernTimes
     end
 
     def create_rails_manager
+      # Take advantage of nil and false values for boolean
       raise 'init_rails has not been called, modify your config/environment.rb to include this call' if @is_jms_enabled.nil?
       raise 'Messaging is not enabled, modify your config/jms.yml file' unless @is_jms_enabled
       manager = ModernTimes::Manager.new
       manager.stop_on_signal
       manager.allowed_workers = rails_workers
-      manager.persist_file = @cfg[:persist_file] || File.join(Rails.root, "log", "modern_times.persist")
-      manager.dummy_host = 'development' if Rails.env == 'development'
-      manager.worker_file = @cfg[:worker_file] || File.join(Rails.root, "config", "workers.yml")
+      manager.persist_file = @config[:persist_file] || File.join(Rails.root, "log", "modern_times.persist")
+      manager.dummy_host = Rails.env
+      manager.worker_file = @config[:worker_file] || File.join(Rails.root, "config", "workers.yml")
       return manager
     end
 
@@ -76,6 +77,10 @@ module ModernTimes
       #raise "No worker config file #{file}" unless File.exist?(file)
     end
 
+    def config
+      @config
+    end
+    
     def jms_enabled?
       @is_jms_enabled
     end

metadata

@@ -2,7 +2,7 @@
 name: modern_times
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
   - Brad Pardee
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -04:00
+date: 2011-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency