modern_times 0.3.3 → 0.3.4

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gemspec.authors = ['Brad Pardee', 'Reid Morrison']
     gemspec.email = ['bradpardee@gmail.com', 'rubywmq@gmail.com']
     gemspec.homepage = 'http://github.com/ClarityServices/modern_times'
-    gemspec.add_dependency 'jruby-jms', ['>= 0.11.0']
+    gemspec.add_dependency 'jruby-jms', ['>= 0.11.2']
     gemspec.add_dependency 'jmx',  ['>= 0.6']
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/examples/jms.yml

@@ -3,7 +3,7 @@
 :require_jars:
   - <%= Dir.glob("#{ENV['ACTIVEMQ_HOME']}/activemq-all-*.jar")[0] %>
   #Uncomment the following for 5.5 version
-  #- <%= Dir.glob("#{ENV['ACTIVEMQ_HOME']}/lib/optional/slf4j-log4j*.jar")[0] %>
-  #- <%= Dir.glob("#{ENV['ACTIVEMQ_HOME']}/lib/optional/log4j-*.jar")[0] %>
+  - <%= Dir.glob("#{ENV['ACTIVEMQ_HOME']}/lib/optional/slf4j-log4j*.jar")[0] %>
+  - <%= Dir.glob("#{ENV['ACTIVEMQ_HOME']}/lib/optional/log4j-*.jar")[0] %>
 #:username: myuser
 #:password: mypassword

data/examples/requestor/request.rb

@@ -19,7 +19,7 @@ $sim_count   = (ARGV[3] || 1).to_i
 
 config = YAML.load(ERB.new(File.read(File.join(File.dirname(__FILE__), '..', 'jms.yml'))).result(binding))
 ModernTimes::JMS::Connection.init(config)
-$publisher = ModernTimes::JMS::Publisher.new(:queue_name => ReverseEchoWorker.default_name, :response =>true, :marshal => :string)
+$publisher = ModernTimes::JMS::Publisher.new(:queue_name => ReverseEchoWorker.default_name, :response_time_to_live => 10000, :marshal => :string)
 
 def make_request(ident='')
   puts "#{ident}Making request at #{Time.now.to_f}"

data/lib/modern_times/jms/publisher.rb

@@ -60,9 +60,9 @@ module ModernTimes
         start = Time.now
         message = nil
         Connection.session_pool.producer(@real_producer_options) do |session, producer|
-          producer.time_to_live = @time_to_live if @time_to_live
+          producer.time_to_live      = @time_to_live if @time_to_live
+          producer.delivery_mode_sym = @persistent_sym
           message = ModernTimes::JMS.create_message(session, @marshaler, object)
-          message.jms_delivery_mode_sym       = @persistent_sym
           message.jms_reply_to                = @reply_queue if @reply_queue
           message['mt:marshal']               = @marshal.to_s
           message['mt:response:time_to_live'] = @response_time_to_live_str if @response_time_to_live_str

data/lib/modern_times/jms/request_worker.rb

@@ -82,11 +82,11 @@ module ModernTimes
             persistent = (message['mt:response:persistent'] == 'true') if persistent.nil? && message['mt:response:persistent']
             # If persistent isn't set anywhere, then default to true unless time_to_live has been set
             persistent = !time_to_live if persistent.nil?
+            # The reply is persistent if we explicitly set it or if we don't expire
+            producer.delivery_mode_sym = persistent ? :persistent : :non_persistent
             producer.time_to_live = time_to_live.to_i if time_to_live
             reply_message = ModernTimes::JMS.create_message(session, marshaler, object)
             reply_message.jms_correlation_id = message.jms_message_id
-            # The reply is persistent if we explicitly set it or if we don't expire
-            reply_message.jms_delivery_mode_sym = persistent ? :persistent : :non_persistent
             reply_message['mt:marshal'] = marshal_type.to_s
             reply_message['mt:worker'] = self.name
             yield reply_message if block_given?

data/lib/modern_times/jms.rb

@@ -1,5 +1,4 @@
 require 'modern_times/jms/connection'
-require 'modern_times/jms/consumer'
 require 'modern_times/jms/publisher'
 require 'modern_times/jms/publish_handle'
 require 'modern_times/jms/supervisor_mbean'

metadata

@@ -2,7 +2,7 @@
 name: modern_times
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
   - Brad Pardee
@@ -22,7 +22,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.11.0
+            version: 0.11.2
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -66,7 +66,6 @@ files:
   - 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
   - examples/requestor/README
@@ -86,7 +85,6 @@ files:
   - lib/modern_times/base/worker.rb
   - 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
@@ -150,7 +148,6 @@ test_files:
   - examples/advanced_requestor/publish.rb
   - examples/advanced_requestor/reverse_worker.rb
   - examples/advanced_requestor/triple_worker.rb
-  - examples/consumer/consumer.rb
   - examples/requestor/manager.rb
   - examples/requestor/request.rb
   - examples/requestor/reverse_echo_worker.rb

data/examples/consumer/consumer.rb

@@ -1,24 +0,0 @@
-# Allow examples to be run in-place without requiring a gem install
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
-
-require 'rubygems'
-require 'erb'
-require 'modern_times'
-require 'yaml'
-
-if ARGV.size < 2
-  $stderr.puts "Usage: {$0} <message> <id>"
-end
-
-#ModernTimes::JMS::Publisher.setup_dummy_publishing([])
-#ModernTimes::JMS::Consumer.setup_dummy_receiving
-
-config = YAML.load(ERB.new(File.read(File.join(File.dirname(__FILE__), '..', 'jms.yml'))).result(binding))
-ModernTimes::JMS::Connection.init(config)
-publisher = ModernTimes::JMS::Publisher.new(:queue_name => 'Foo', :marshal => :string)
-consumer = ModernTimes::JMS::Consumer.new(:queue_name => 'Foo', :marshal => :string)
-
-publisher.publish(ARGV[0], :jms_correlation_id => ARGV[1])
-msg = consumer.receive(:jms_correlation_id => ARGV[1], :timeout => 30000)
-#msg = consumer.receive(:timeout => 1000)
-puts "msg=#{msg}"

data/lib/modern_times/jms/consumer.rb

@@ -1,76 +0,0 @@
-require 'jms'
-
-# Protocol independent class to handle Publishing
-module ModernTimes
-  module JMS
-    class Consumer
-      attr_reader :consumer_options, :persistent, :marshaler
-
-      # Parameters:
-      #   One of the following must be specified
-      #     :queue_name => String: Name of the Queue to publish to
-      #     :topic_name => String: Name of the Topic to publish to
-      #     :virtual_topic_name => String: Name of the Virtual Topic to publish to
-      #        (ActiveMQ only, see http://activemq.apache.org/virtual-destinations.html
-      #     :destination=> Explicit javax::Jms::Destination to use
-      #   Optional:
-      #     :persistent => true or false (defaults to false)
-      #     :marshal    => Symbol: One of :ruby, :string, or :json
-      #                 => Module: Module that defines marshal and unmarshal method
-      def initialize(options)
-        consumer_keys = [:queue_name, :topic_name, :virtual_topic_name, :destination]
-        @consumer_options = options.reject {|k,v| !consumer_keys.include?(k)}
-        raise "One of #{consumer_keys.join(',')} must be given in #{self.class.name}" if @consumer_options.empty?
-
-        # Save our @consumer_options for destination comparison when doing dummy_publish,
-        # but create the real options by translating virtual_topic_name to a real topic_name.
-        @real_consumer_options = @consumer_options.dup
-        virtual_topic_name = @real_consumer_options.delete(:virtual_topic_name)
-        @real_consumer_options[:topic_name] = "VirtualTopic.#{virtual_topic_name}" if virtual_topic_name
-        @marshaler = ModernTimes::MarshalStrategy.find(options[:marshal])
-      end
-
-      # Publish the given object to the address.
-      def receive(options={})
-        options = @real_consumer_options.merge(options)
-        correlation_id = options.delete(:jms_correlation_id)
-        options[:selector] = "JMSCorrelationID = '#{correlation_id}'" if correlation_id && !options[:selector]
-        timeout = options.delete(:timeout) || 0
-        obj = nil
-
-        Connection.session_pool.consumer(options) do |session, consumer|
-          message = consumer.get(:timeout => timeout)
-          obj = @marshaler.unmarshal(message.data) if message
-        end
-        return obj
-      end
-
-      # For non-configured Rails projects, The above publish method will be overridden to
-      # call this publish method instead which calls all the JMS workers that
-      # operate on the given address.
-      def dummy_receive(options={})
-        if correlation_id = options.delete(:jms_correlation_id)
-          return Publisher.dummy_cache(correlation_id)
-        else
-          # TODO: Pop off if no correlation id given
-        end
-      end
-
-      def to_s
-        "#{self.class.name}:#{@real_consumer_options.inspect}"
-      end
-
-      def self.setup_dummy_receiving
-        alias_method :real_receive, :receive
-        alias_method :receive, :dummy_receive
-      end
-
-      # For testing
-      def self.clear_dummy_receiving
-        alias_method :dummy_receive, :receive
-        alias_method :receive, :real_receive
-        #remove_method :real_receive
-      end
-    end
-  end
-end