stomper 0.3.1 → 0.3.2

data/README.rdoc

@@ -64,5 +64,5 @@ API compatibility with the original gem, and thus Stomper was conceived.
 
 Primary Author:: Ian D. Eccles
 Source Repository:: http://github.com/iande/stomper
-Current Version:: 0.3.1
-Last Updated:: 2010-03-04
+Current Version:: 0.3.2
+Last Updated:: 2010-03-05

data/lib/stomper/client.rb

@@ -191,24 +191,30 @@ module Stomper
     # incur some performance penalties depending upon which
     # Ruby environment this library is used with.  The receiver
     # thread may be stopped by calling the +stop+ instance method.
+    # If the receiver is set to non-blocking (default behavior), the
+    # receiving thread will sleep for a number of seconds specified by the
+    # :receive_delay option between receive calls.
+    #
+    # The +opts+ parameter is a hash of options, and can include:
+    #
+    # [:block] Sets the receiver to either blocking if true (default: false)
+    # [:receive_delay] Sets the delay in seconds between receive calls when the receiver is non-blocking (default: 0.2)
     #
     # See also: stop, receiving?
-    def start
+    def start(opts={})
       @connection.connect unless connected?
-      return self if receiving?
-      start_thread = false
+      do_start = false
       @receiver_lock.synchronize do
-        @receiving = true
-        start_thread = @run_thread.nil?
+        do_start = !receiving?
       end
-      if start_thread
-        @run_thread = Thread.new do
+      if do_start
+        blocking = opts.delete(:block) { false }
+        sleep_time = opts.delete(:receive_delay) { 0.2 }
+        @receiving = true
+        @run_thread = Thread.new(blocking) do |block|
           while receiving?
-            # This was running a little too tightly...
-            # still not terribly happy with this approach, event driven
-            # receiving would be better than polling.
-            receive
-            sleep(1.0)
+            receive(block)
+            sleep(sleep_time) unless block
           end
         end
       end
@@ -227,13 +233,14 @@ module Stomper
     #
     # See also: start, receiving?
     def stop
-      return self unless receiving?
+      do_stop = false
       @receiver_lock.synchronize do
-        if receiving?
-          @receiving = false
-          @run_thread.join
-          @run_thread = nil
-        end
+        do_stop = receiving?
+      end
+      if do_stop
+        @receiving = false
+        @run_thread.join
+        @run_thread = nil
       end
       self
     end
@@ -260,8 +267,8 @@ module Stomper
     # stomp broker.
     #
     # See also: Stomper::Subscription
-    def receive
-      msg = @receive_lock.synchronize { @connection.receive }
+    def receive(block=false)
+      msg = @receive_lock.synchronize { @connection.receive(block) }
       @subscriptions.perform(msg) if msg.is_a?(Stomper::Frames::Message)
       msg
     end

data/lib/stomper/connection.rb

@@ -29,14 +29,16 @@ module Stomper
     def initialize(uri, opts = {})
       connect_now = opts.delete(:connect_now) { true }
       @uri = (uri.is_a?(URI) && uri) || URI.parse(uri)
-      @uri.port = (@uri.scheme == "stomp+ssl") ? 61612 : 61613 if @uri.port.nil?
-      @uri.host = 'localhost' if @uri.host.nil?
-      @uri.freeze
       @use_ssl = (@uri.scheme == "stomp+ssl")
+      @uri.host ||= 'localhost'
       if @use_ssl
+        @uri.port ||= 61612
         @ssl_context = OpenSSL::SSL::SSLContext.new
         @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      else
+        @uri.port ||= 61613
       end
+      @uri.freeze
       @connected = false
       connect if connect_now
     end
@@ -48,13 +50,13 @@ module Stomper
     #
     # See also: new
     def connect
-      s = TCPSocket.open(@uri.host, @uri.port)
+      stomp_socket = TCPSocket.open(@uri.host, @uri.port)
       if @use_ssl
-        s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-        s.sync_close = true
-        s.connect
+        stomp_socket = OpenSSL::SSL::SSLSocket.new(stomp_socket, @ssl_context)
+        stomp_socket.sync_close = true
+        stomp_socket.connect
       end
-      @socket = s
+      @socket = stomp_socket
       transmit Stomper::Frames::Connect.new(@uri.user, @uri.password)
       # Block until the first frame is received
       connect_frame = receive(true)
@@ -155,22 +157,11 @@ module Stomper
     end
 
     def socket_c_to_i(c)
-      if c.respond_to?(:ord)
-        def socket_c_to_i(char); char.ord; end
-        c.ord
-      else
-        def socket_c_to_i(char); char; end
-        c
-      end
+      (c.respond_to?(:ord)) ? c.ord : c
     end
+
     def socket_c_to_chr(c)
-      if c.respond_to?(:chr)
-        def socket_c_to_chr(char); char.chr; end
-        c.chr
-      else
-        def socket_c_to_chr(char); char; end
-        c
-      end
+      (c.respond_to?(:chr)) ? c.chr : c
     end
   end
 end

data/spec/client_spec.rb

@@ -83,6 +83,16 @@ module Stomper
         @client.stop
         @client.receiving?.should be_false
       end
+      it "should allow for a blocking threaded receiver" do
+        @mock_connection.should_receive(:receive).with(true).at_least(:once).and_return(nil)
+        @mock_connection.should_receive(:connected?).any_number_of_times.and_return(true)
+        @client.receiving?.should be_false
+        @client.start(:block => true)
+        @client.receiving?.should be_true
+        @client.stop
+        @client.receiving?.should be_false
+      end
+
     end
 
     describe "subscribing to queue" do

data/spec/connection_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'shared_connection_ex
 module Stomper
   describe Connection do
     before(:each) do
-      @connection = Connection.new("stomp:///")
+      @connection = Connection.new("stomp:///", :connect_now => false)
     end
     
     it_should_behave_like "All Client Connections"

data/spec/shared_connection_examples.rb

@@ -2,27 +2,27 @@ shared_examples_for "All Client Connections" do
   describe "connection initializers" do
     describe "from uri" do
       it "should accept the stomp:/// uri (no host specified)" do
-        lambda { @connection.class.new("stomp:///") }.should_not raise_error
+        lambda { @connection.class.new("stomp:///", :connect_now => false) }.should_not raise_error
       end
 
       it "should accept a uri specifying just the host" do
-        lambda { @connection.class.new("stomp://localhost/") }.should_not raise_error
+        lambda { @connection.class.new("stomp://localhost/", :connect_now => false) }.should_not raise_error
       end
 
       it "should accept a uri specifying host and port" do
-        lambda { @connection.class.new("stomp://localhost:61613/") }.should_not raise_error
+        lambda { @connection.class.new("stomp://localhost:61613/", :connect_now => false) }.should_not raise_error
       end
 
       it "should accept a uri specifying host, port and credentials" do
-        lambda { @connection.class.new("stomp://test_user:s3cr3tz@localhost:61613/") }.should_not raise_error
+        lambda { @connection.class.new("stomp://test_user:s3cr3tz@localhost:61613/", :connect_now => false) }.should_not raise_error
       end
 
       it "should accept a uri specifying a secure connection" do
-        lambda { @connection.class.new("stomp+ssl://localhost") }.should_not raise_error
+        lambda { @connection.class.new("stomp+ssl://localhost", :connect_now => false) }.should_not raise_error
       end
 
       it "should not accept a bogus URI" do
-        lambda { @connection.class.new("stomp://localhost:garbage") }.should raise_error
+        lambda { @connection.class.new("stomp://localhost:garbage", :connect_now => false) }.should raise_error
       end
 
     end
@@ -69,7 +69,7 @@ shared_examples_for "All Client Connections" do
 
   describe "secure connection" do
     before(:each) do
-      @secure_connection = @connection.class.new("stomp+ssl:///")
+      @secure_connection = @connection.class.new("stomp+ssl:///", :connect_now => false)
     end
     it "should transmit frames" do
       @connection.connect

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ian D. Eccles
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -05:00
+date: 2010-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: []