torquebox-messaging 1.1.1-java → 2.0.0.beta1-java

data/spec/future_responder_spec.rb

@@ -5,7 +5,7 @@ include TorqueBox::Messaging
 describe TorqueBox::Messaging::FutureResponder do
   def self.it_should_publish(message, priority=nil, &block)
     it "should publish with #{message.inspect}#{priority ? ' and priority :' + priority.to_s : ''}" do
-      opts = { :correlation_id => 'ham-biscuit', :ttl => 1234 }
+      opts = { :correlation_id => 'ham-biscuit', :ttl => 1234, :encoding => :marshal }
       opts[:priority] = priority if priority
       queue = mock('queue')
       responder = FutureResponder.new(queue, 'ham-biscuit', 1234)

data/spec/json_message_spec.rb

@@ -0,0 +1,50 @@
+require 'torquebox/messaging/message'
+require 'torquebox/messaging/json_message'
+
+include TorqueBox::Messaging
+
+class MockMessage
+  include javax.jms::Message
+
+  attr_accessor :text
+  def get_string_property(_)
+    "json"
+  end
+end
+
+def define_JSON
+  klass = Class.new {
+    def self.fast_generate(_)
+    end
+  }
+  Object.const_set(:JSON, klass)
+end
+
+
+describe TorqueBox::Messaging::JSONMessage do
+  before(:each) do
+    @message = Message.new( MockMessage.new )
+  end
+
+  after(:each) do
+    Object.send(:remove_const, :JSON) if defined?(JSON)
+  end
+
+  context "requiring json" do
+    it "should raise if json isn't available" do
+      @message.should_receive(:require).with('json').and_raise(LoadError.new)
+      lambda { @message.encode( 'abc' ) }.should raise_error( RuntimeError )
+    end
+
+    it "should not raise if json is available" do
+      @message.should_receive(:require).with('json').and_return { define_JSON }
+      lambda { @message.encode( 'abc' ) }.should_not raise_error
+    end
+
+    it "should only require json once" do
+      @message.should_receive(:require).once.with('json').and_return { define_JSON }
+      @message.encode( 'abc' )
+      @message.encode( 'abc' )
+    end
+  end
+end

data/spec/message_processor_spec.rb

@@ -0,0 +1,54 @@
+require 'torquebox/messaging/message_processor'
+require 'torquebox/messaging/message'
+require 'torquebox/messaging/marshal_base64_message'
+
+class MyTestMessage
+  include javax.jms::TextMessage
+  attr_accessor :text
+  def initialize 
+    @properties = {}
+  end
+  def set_string_property k, v
+    @properties[k] = v
+  end
+  def get_string_property k
+    @properties[k]
+  end
+end
+
+class MyTestSession
+  include javax.jms::Session
+
+  def create_text_message
+    MyTestMessage.new
+  end
+end
+
+class MyTestProcessor < TorqueBox::Messaging::MessageProcessor
+  attr_accessor :body
+  def on_message(body)
+    self.body = body
+  end
+end
+
+describe TorqueBox::Messaging::MessageProcessor do
+  
+  before :each do
+    @processor = MyTestProcessor.new
+    @jms_session = MyTestSession.new
+  end
+
+  it "should process text messages" do
+    @message = TorqueBox::Messaging::Message.new(@jms_session, "foo", :marshal_base64)
+    @processor.process! @message
+    @processor.body.should eql("foo")
+  end
+
+  it "should process non-text messages" do
+    payload = {:foo => "foo", :sym => :sym, "bar" => :bar}
+    @message = TorqueBox::Messaging::Message.new(@jms_session, payload, :marshal_base64)
+    @processor.process! @message
+    @processor.body.should eql(payload)
+  end
+
+end

data/spec/message_spec.rb

@@ -0,0 +1,114 @@
+require 'torquebox/messaging/message'
+
+include TorqueBox::Messaging
+
+class DummyMessage < Message
+  ENCODING = :dummy
+end
+
+Message.register_encoding( DummyMessage )
+
+def mock_message
+  msg = mock( 'JMSMessage' )
+  msg.stub( :get_string_property ).and_return( 'dummy' )
+  msg
+end
+
+describe TorqueBox::Messaging::Message do
+
+  describe "message property population" do
+
+    it "should do nothing if no properties are submitted" do
+      jms_message = mock_message
+      jms_message.should_not_receive(:setStringProperty)
+
+      Message.new(jms_message).populate_message_properties nil
+    end
+
+    it "should register properties with String keys" do
+      properties = {'abc' => 'def'}
+
+      jms_message = mock_message
+      jms_message.should_receive(:set_string_property).with('abc', 'def')
+
+      Message.new(jms_message).populate_message_properties properties
+    end
+
+    it "should register properties with Symbol keys" do
+      properties = {:abc => :def}
+
+      jms_message = mock_message
+      jms_message.should_receive(:set_string_property).with('abc', 'def')
+
+      Message.new(jms_message).populate_message_properties properties
+    end
+
+    it "should register true as a boolean" do
+      properties = {:abc => true}
+
+      jms_message = mock_message
+      jms_message.should_receive(:set_boolean_property).with('abc', true)
+
+      Message.new(jms_message).populate_message_properties properties
+    end
+
+    it "should register false as a boolean" do
+      properties = {:abc => false}
+
+      jms_message = mock_message
+      jms_message.should_receive(:set_boolean_property).with('abc', false)
+
+      Message.new(jms_message).populate_message_properties properties
+    end
+
+    it "should register 5 as an long" do
+      properties = {:abc => 5}
+
+      jms_message = mock_message
+      jms_message.should_receive(:set_long_property).with('abc', 5)
+
+      Message.new(jms_message).populate_message_properties properties
+    end
+
+    it "should register 5.5 as a double" do
+      properties = {:abc => 5.5}
+
+      jms_message = mock_message
+      jms_message.should_receive(:set_double_property).with('abc', 5.5)
+
+      Message.new(jms_message).populate_message_properties properties
+    end
+  end
+
+  describe 'encodings' do
+    before(:each) do
+      @class = mock("MessageSubClass", :new => nil)
+      @session = mock("Session", :is_a? => true)
+    end
+
+    it 'should use the default encoding if none provided' do
+      Message.should_receive(:class_for_encoding).with(Message::DEFAULT_ENCODE_ENCODING).and_return(@class)
+      Message.new(@session)
+    end
+
+    it 'should use the given encoding if provided' do
+      Message.should_receive(:class_for_encoding).with(:biscuit).and_return(@class)
+      Message.new(@session, nil, :biscuit)
+    end
+
+    it 'should use the encoding from the env if set and no encoding is passed to the constructor' do
+      ENV['DEFAULT_MESSAGE_ENCODING'] = 'ham'
+      Message.should_receive(:class_for_encoding).with(:ham).and_return(@class)
+      Message.new(@session)
+      ENV['DEFAULT_MESSAGE_ENCODING'] = nil
+    end
+
+    it 'should ignore the encoding from the env if set and an encoding is passed to the constructor' do
+      ENV['DEFAULT_MESSAGE_ENCODING'] = 'ham'
+      Message.should_receive(:class_for_encoding).with(:biscuit).and_return(@class)
+      Message.new(@session, nil, :biscuit)
+      ENV['DEFAULT_MESSAGE_ENCODING'] = nil
+    end
+  end
+
+end

data/spec/task_spec.rb

@@ -1,6 +1,6 @@
 require 'torquebox/messaging/future_responder'
 require 'torquebox/messaging/future'
-require 'torquebox/messaging/destination'
+require 'torquebox/messaging/queue'
 require 'torquebox/messaging/task'
 
 class MyTestTask < TorqueBox::Messaging::Task
@@ -29,14 +29,14 @@ describe TorqueBox::Messaging::Task do
     end
 
     it "should send payload correctly" do
-      expectation = [{:method => :payload=, :payload => {:foo => 'bar'}, :future_id => '1234', :future_queue => MyTestTask.queue_name}, { }]
+      expectation = [{:method => :payload=, :payload => {:foo => 'bar'}, :future_id => '1234', :future_queue => MyTestTask.queue_name('my_test')}, anything]
       @send_queue.should_receive(:publish).with(*expectation)
       
       MyTestTask.async(:payload=, :foo => 'bar')
     end
 
     it "should handle nil payload as empty hash" do
-      @send_queue.should_receive(:publish).with(hash_including(:payload => {}), {})
+      @send_queue.should_receive(:publish).with(hash_including(:payload => {}), anything)
 
       MyTestTask.async(:payload=)
     end
@@ -45,11 +45,17 @@ describe TorqueBox::Messaging::Task do
       result = MyTestTask.async(:payload=)
       result.is_a?(TorqueBox::Messaging::Future).should be_true
     end
+
+    it "should always use the :marshal encoding" do
+      @send_queue.should_receive(:publish).with(anything, hash_including(:encoding => :marshal))
+
+      MyTestTask.async(:payload=)
+    end
   end
 
   describe "#process!" do
     it "should process payload correctly" do
-      expectation = {:method => :payload=, :payload => {:foo => 'bar'}, :future_id => '1234', :future_queue => MyTestTask.queue_name}
+      expectation = {:method => :payload=, :payload => {:foo => 'bar'}, :future_id => '1234', :future_queue => MyTestTask.queue_name('my_test')}
       message = mock("message")
       message.should_receive(:decode).and_return(expectation)
 
@@ -58,7 +64,7 @@ describe TorqueBox::Messaging::Task do
       task.payload[:foo].should == 'bar'
     end
   end
-  
+
   describe 'the future proxy' do
     it "should be available inside a task method" do
       TorqueBox::Messaging::FutureResponder.should_receive(:status=).with(1)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-messaging
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.1
+  prerelease: 6
+  version: 2.0.0.beta1
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,64 +10,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -04:00
-default_executable: 
+date: 2011-12-02 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: torquebox-naming
+    name: torquebox-core
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 2.0.0.beta1
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: torquebox-naming-container
+    name: torquebox-transactions
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
-    type: :development
+            version: 2.0.0.beta1
+    type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: torquebox-messaging-container
+    name: rspec
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 2.7.0
     type: :development
     version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: torquebox-base
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.1.1
-    type: :runtime
-    version_requirements: *id004
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.3.0
-    type: :development
-    version_requirements: *id005
 description: ""
 email: 
   - torquebox-dev@torquebox.org
@@ -81,60 +58,43 @@ files:
   - licenses/lgpl-2.1.txt
   - lib/torquebox-messaging.jar
   - lib/torquebox-messaging.rb
-  - lib/jboss-jms-api_1.1_spec-1.0.0.Final.jar
-  - lib/hornetq-core-2.1.2.Final.jar
-  - lib/hornetq-jms-client-2.1.2.Final.jar
-  - lib/netty-3.2.1.Final.jar
-  - lib/hornetq-logging-2.1.2.Final.jar
-  - lib/jboss-logging-3.0.0.Beta4.jar
-  - lib/jnp-client-5.0.5.Final.jar
-  - lib/jboss-common-core-2.2.17.GA.jar
-  - lib/jboss-reflect-2.2.0.GA.jar
-  - lib/jbossxb-2.0.3.GA.jar
-  - lib/xml-apis-1.3.04.jar
-  - lib/xercesImpl-2.9.1.jar
-  - lib/dtdparser-1.21.jar
-  - lib/activation-1.1.jar
-  - lib/jaxb-api-2.1.9.jar
-  - lib/torquebox-base-spi.jar
-  - lib/jruby-complete-1.6.3.jar
-  - lib/torquebox-base-metadata.jar
-  - lib/torquebox-base-core.jar
-  - lib/picketbox-bare-3.0.0.CR2.jar
-  - lib/identity-spi-3.0.0.CR2.jar
-  - lib/authorization-spi-3.0.0.CR2.jar
-  - lib/acl-spi-3.0.0.CR2.jar
-  - lib/jbosssx-bare-3.0.0.CR2.jar
-  - lib/picketbox-identity-impl-3.0.0.CR2.jar
-  - lib/picketbox-spi-bare-3.0.0.CR2.jar
-  - lib/picketbox-acl-impl-3.0.0.CR2.jar
-  - lib/jbossxacml-2.0.5.CR1.jar
-  - lib/torquebox-mc-support.jar
-  - lib/torquebox-messaging-core.jar
   - lib/gem_hook.rb
   - lib/org.torquebox.messaging-client.rb
   - lib/torquebox/messaging.rb
   - lib/torquebox/messaging/backgroundable.rb
-  - lib/torquebox/messaging/client.rb
+  - lib/torquebox/messaging/backgroundable_processor.rb
+  - lib/torquebox/messaging/connection.rb
+  - lib/torquebox/messaging/connection_factory.rb
+  - lib/torquebox/messaging/const_missing.rb
+  - lib/torquebox/messaging/core.rb
   - lib/torquebox/messaging/destination.rb
   - lib/torquebox/messaging/future.rb
   - lib/torquebox/messaging/future_responder.rb
   - lib/torquebox/messaging/future_status.rb
+  - lib/torquebox/messaging/json_message.rb
+  - lib/torquebox/messaging/marshal_base64_message.rb
+  - lib/torquebox/messaging/marshal_message.rb
+  - lib/torquebox/messaging/message.rb
+  - lib/torquebox/messaging/message_processor.rb
+  - lib/torquebox/messaging/processor_wrapper.rb
+  - lib/torquebox/messaging/queue.rb
+  - lib/torquebox/messaging/session.rb
   - lib/torquebox/messaging/task.rb
+  - lib/torquebox/messaging/text_message.rb
+  - lib/torquebox/messaging/topic.rb
+  - lib/torquebox/messaging/xa_connection.rb
+  - lib/torquebox/messaging/xa_connection_factory.rb
+  - lib/torquebox/messaging/xa_session.rb
   - lib/torquebox/messaging/ext/javax_jms_queue_browser.rb
-  - lib/torquebox/messaging/ext/javax_jms_session.rb
   - spec/backgroundable_spec.rb
-  - spec/client_spec.rb
   - spec/destination_spec.rb
-  - spec/dispatcher-queues.yml
-  - spec/dispatcher_not_running.rb
   - spec/future_responder_spec.rb
   - spec/future_spec.rb
-  - spec/queues.yml
+  - spec/json_message_spec.rb
+  - spec/message_processor_spec.rb
+  - spec/message_spec.rb
   - spec/task_spec.rb
-  - spec/ext/java_jmx_session_spec.rb
-has_rdoc: true
-homepage: http://www.torquebox.org/client-parent/torquebox-messaging/
+homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-messaging/
 licenses: 
   - lgpl
 post_install_message: 
@@ -151,21 +111,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: TorqueBox Messaging Client
 test_files: 
   - spec/backgroundable_spec.rb
-  - spec/client_spec.rb
   - spec/destination_spec.rb
   - spec/future_responder_spec.rb
   - spec/future_spec.rb
+  - spec/json_message_spec.rb
+  - spec/message_processor_spec.rb
+  - spec/message_spec.rb
   - spec/task_spec.rb
-  - spec/ext/java_jmx_session_spec.rb