torquebox-messaging 1.0.0-java → 1.0.1-java

data/lib/torquebox/messaging/ext/javax_jms_session.rb

@@ -89,8 +89,11 @@ module javax.jms::Session
   # client. If no block is given then request is returned as the
   # response.
   def receive_and_publish(destination, options = {})
+    selector = "synchronous = 'true'"
+    selector = "#{selector} and (#{options[:selector]})" if options[:selector]
     receive_options = options.merge(:decode => false,
-                                    :selector => "synchronous = 'true'")
+                                    :selector => selector)
+
     request = receive(destination, receive_options)
     unless request.nil?
       decoded_request = request.decode

data/lib/torquebox-messaging.rb

@@ -1,6 +1,6 @@
 module TorqueboxMessaging
-  VERSION = '1.0.0'
-  MAVEN_VERSION = '1.0.0'
+  VERSION = '1.0.1'
+  MAVEN_VERSION = '1.0.1'
 end
 begin
   require 'java'
@@ -21,7 +21,7 @@ begin
   require File.dirname(__FILE__) + '/activation-1.1.jar'
   require File.dirname(__FILE__) + '/jaxb-api-2.1.9.jar'
   require File.dirname(__FILE__) + '/torquebox-base-spi.jar'
-  require File.dirname(__FILE__) + '/jruby-complete-1.6.1.jar'
+  require File.dirname(__FILE__) + '/jruby-complete-1.6.2.jar'
   require File.dirname(__FILE__) + '/torquebox-base-metadata.jar'
   require File.dirname(__FILE__) + '/torquebox-base-core.jar'
   require File.dirname(__FILE__) + '/picketbox-bare-3.0.0.CR2.jar'

data/spec/destination_spec.rb

@@ -251,6 +251,34 @@ describe TorqueBox::Messaging::Destination do
         queue.destroy
         message.should eql( "PING" )
       end
+
+      it "should allow a selector to be passed" do
+        queue = TorqueBox::Messaging::Queue.new "/queues/publish_and_receive"
+        queue.start
+
+        response_thread = Thread.new {
+          queue.receive_and_publish( :timeout => 10000,
+                                     :selector => "age > 60 or tan = true" )
+        }
+
+        # Publish a non-synchronous message that should not match selector
+        queue.publish( "young and tan", :properties => { :age => 25, :tan => true } )
+        # Publish a synchronous message that should not match selector
+        queue.publish_and_receive( "young",
+                                   :timeout => 25,
+                                   :properties => { :age => 25 } )
+        # Publish a synchronous message that should match selector
+        message = queue.publish_and_receive( "wrinkled",
+                                             :timeout => 10000,
+                                             :properties => { :age => 65, :tan => true } )
+        message.should eql( "wrinkled" )
+        response_thread.join
+
+        # Drain any remaining messages off the queue
+        2.times { queue.receive(:timeout => 10) }
+
+        queue.destroy
+      end
     end
 
     context "destination not ready" do

metadata

@@ -2,7 +2,7 @@
 name: torquebox-messaging
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.0.1
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.0.1
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.0.1
     type: :development
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.0.1
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
@@ -96,7 +96,7 @@ files:
   - lib/activation-1.1.jar
   - lib/jaxb-api-2.1.9.jar
   - lib/torquebox-base-spi.jar
-  - lib/jruby-complete-1.6.1.jar
+  - lib/jruby-complete-1.6.2.jar
   - lib/torquebox-base-metadata.jar
   - lib/torquebox-base-core.jar
   - lib/picketbox-bare-3.0.0.CR2.jar