stomp 1.1.9 → 1.1.10

data/lib/stomp/connection.rb

@@ -330,7 +330,7 @@ module Stomp
     # Return a pending message if one is available, otherwise
     # return nil
     def poll
-      # No need for a read lock here.  The receive method eventually fullfills
+      # No need for a read lock here.  The receive method eventually fulfills
       # that requirement.
       return nil if @socket.nil? || !@socket.ready?
       receive
@@ -338,7 +338,7 @@ module Stomp
 
     # Receive a frame, block until the frame is received
     def __old_receive
-      # The recive my fail so we may need to retry.
+      # The receive may fail so we may need to retry.
       while TRUE
         begin
           used_socket = socket
@@ -358,7 +358,7 @@ module Stomp
 
     def receive
       super_result = __old_receive
-      if super_result.nil? && @reliable
+      if super_result.nil? && @reliable && !closed?
         errstr = "connection.receive returning EOF as nil - resetting connection.\n"
         if @logger && @logger.respond_to?(:on_miscerr)
           @logger.on_miscerr(log_params, errstr)
@@ -375,18 +375,24 @@ module Stomp
 
       def _receive( read_socket )
         @read_semaphore.synchronize do
-          line = read_socket.gets
-
-          return nil if line.nil?
+          # Throw away leading newlines, which are actually trailing
+          # newlines from the preceding message.
+          begin
+            last_char = read_socket.getc
+            return nil if last_char.nil?
+          end until parse_char(last_char) != "\n"
+          read_socket.ungetc(last_char)
 
           # If the reading hangs for more than X seconds, abort the parsing process.
           # X defaults to 5.  Override allowed in connection hash parameters.
           Timeout::timeout(@parse_timeout, Stomp::Error::PacketParsingTimeout) do
             # Reads the beginning of the message until it runs into a empty line
             message_header = ''
+            line = ''
             begin
-              message_header += line
+              message_header << line
               line = read_socket.gets
+              return nil if line.nil?
             end until line =~ /^\s?\n$/
 
             # Checks if it includes content_length header
@@ -400,24 +406,8 @@ module Stomp
               raise Stomp::Error::InvalidMessageLength unless parse_char(read_socket.getc) == "\0"
             # Else reads, the rest of the message until the first \0
             else
-              message_body += char while (char = parse_char(read_socket.getc)) != "\0"
-            end
-
-            # If the buffer isn't empty, reads trailing new lines.
-            # Note: experiments with JRuby seem to show that .ready? never
-            # returns true.  This means that this code to drain trailing new
-            # lines never runs using JRuby.
-            while read_socket.ready?
-              last_char = read_socket.getc
-              break unless last_char
-              if parse_char(last_char) != "\n"
-                read_socket.ungetc(last_char)
-                break
-              end
+              message_body << char while (char = parse_char(read_socket.getc)) != "\0"
             end
-            # And so, a JRuby hack.  Remove any new lines at the start of the 
-            # next buffer.
-            message_header.gsub!(/^\n?/, "")
 
             # Adds the excluded \n and \0 and tries to create a new message with it
             Message.new(message_header + "\n" + message_body + "\0")
@@ -507,15 +497,19 @@ module Stomp
         ssl.connect
         ssl
       end
-      
+
       def close_socket
         begin
-          @socket.close
+          # Need to set @closed = true before closing the socket
+          # within the @read_semaphore thread
+          @closed = true
+          @read_semaphore.synchronize do
+            @socket.close
+          end
         rescue
           #Ignoring if already closed
         end
-
-        @closed = true
+        @closed
       end
 
       def open_socket

data/lib/stomp/version.rb

@@ -2,7 +2,7 @@ module Stomp
   module Version  #:nodoc: all
     MAJOR = 1
     MINOR = 1
-    PATCH = 9
+    PATCH = 10
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/stomp.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stomp}
-  s.version = "1.1.9"
+  s.version = "1.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Brian McCallister}, %q{Marius Mathiesen}, %q{Thiago Morello}, %q{Guy M. Allard}]
-  s.date = %q{2011-06-16}
+  s.authors = ["Brian McCallister", "Marius Mathiesen", "Thiago Morello", "Guy M. Allard"]
+  s.date = %q{2011-11-07}
   s.description = %q{Ruby client for the Stomp messaging protocol}
-  s.email = [%q{brianm@apache.org}, %q{marius@stones.com}, %q{morellon@gmail.com}, %q{allard.guy.m@gmail.com}]
-  s.executables = [%q{catstomp}, %q{stompcat}]
+  s.email = ["brianm@apache.org", "marius@stones.com", "morellon@gmail.com", "allard.guy.m@gmail.com"]
+  s.executables = ["catstomp", "stompcat"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -47,11 +47,27 @@ Gem::Specification.new do |s|
     "test/test_message.rb"
   ]
   s.homepage = %q{https://rubygems.org/gems/stomp}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby client for the Stomp messaging protocol}
+  s.test_files = [
+    "examples/consumer.rb",
+    "examples/logexamp.rb",
+    "examples/publisher.rb",
+    "examples/slogger.rb",
+    "spec/client_shared_examples.rb",
+    "spec/client_spec.rb",
+    "spec/connection_spec.rb",
+    "spec/message_spec.rb",
+    "spec/spec_helper.rb",
+    "test/test_client.rb",
+    "test/test_connection.rb",
+    "test/test_helper.rb",
+    "test/test_message.rb"
+  ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/test_client.rb

@@ -17,10 +17,10 @@ class TestClient < Test::Unit::TestCase
   end
 
   def test_ack_api_works
-    @client.publish destination, message_text, {:suppress_content_length => true}
+    @client.publish make_destination, message_text, {:suppress_content_length => true}
 
     received = nil
-    @client.subscribe(destination, {:ack => 'client'}) {|msg| received = msg}
+    @client.subscribe(make_destination, {:ack => 'client'}) {|msg| received = msg}
     sleep 0.01 until received
     assert_equal message_text, received.body
 
@@ -28,22 +28,22 @@ class TestClient < Test::Unit::TestCase
     @client.acknowledge(received) {|r| receipt = r}
     sleep 0.01 until receipt
     assert_not_nil receipt.headers['receipt-id']
-  end
+  end unless ENV['STOMP_RABBIT']
 
   def test_asynch_subscribe
     received = false
-    @client.subscribe(destination) {|msg| received = msg}
-    @client.publish destination, message_text
+    @client.subscribe(make_destination) {|msg| received = msg}
+    @client.publish make_destination, message_text
     sleep 0.01 until received
 
     assert_equal message_text, received.body
   end
 
   def test_noack
-    @client.publish destination, message_text
+    @client.publish make_destination, message_text
 
     received = nil
-    @client.subscribe(destination, :ack => :client) {|msg| received = msg}
+    @client.subscribe(make_destination, :ack => :client) {|msg| received = msg}
     sleep 0.01 until received
     assert_equal message_text, received.body
     @client.close
@@ -52,21 +52,21 @@ class TestClient < Test::Unit::TestCase
 
     @client = Stomp::Client.new(user, passcode, host, port)
     received2 = nil
-    @client.subscribe(destination) {|msg| received2 = msg}
+    @client.subscribe(make_destination) {|msg| received2 = msg}
     sleep 0.01 until received2
 
     assert_equal message_text, received2.body
     assert_equal received.body, received2.body
-    assert_equal received.headers['message-id'], received2.headers['message-id']
+    assert_equal received.headers['message-id'], received2.headers['message-id'] unless ENV['STOMP_RABBIT']
   end
 
   def test_receipts
     receipt = false
-    @client.publish(destination, message_text) {|r| receipt = r}
+    @client.publish(make_destination, message_text) {|r| receipt = r}
     sleep 0.1 until receipt
 
     message = nil
-    @client.subscribe(destination) {|m| message = m}
+    @client.subscribe(make_destination) {|m| message = m}
     sleep 0.1 until message
     assert_equal message_text, message.body
   end
@@ -82,9 +82,9 @@ class TestClient < Test::Unit::TestCase
   end
 
   def test_publish_then_sub
-    @client.publish destination, message_text
+    @client.publish make_destination, message_text
     message = nil
-    @client.subscribe(destination) {|m| message = m}
+    @client.subscribe(make_destination) {|m| message = m}
     sleep 0.01 until message
 
     assert_equal message_text, message.body
@@ -92,17 +92,17 @@ class TestClient < Test::Unit::TestCase
 
   def test_subscribe_requires_block
     assert_raise(RuntimeError) do
-      @client.subscribe destination
+      @client.subscribe make_destination
     end
   end
 
   def test_transactional_publish
     @client.begin 'tx1'
-    @client.publish destination, message_text, :transaction => 'tx1'
+    @client.publish make_destination, message_text, :transaction => 'tx1'
     @client.commit 'tx1'
 
     message = nil
-    @client.subscribe(destination) {|m| message = m}
+    @client.subscribe(make_destination) {|m| message = m}
     sleep 0.01 until message
 
     assert_equal message_text, message.body
@@ -110,25 +110,25 @@ class TestClient < Test::Unit::TestCase
 
   def test_transaction_publish_then_rollback
     @client.begin 'tx1'
-    @client.publish destination, "first_message", :transaction => 'tx1'
+    @client.publish make_destination, "first_message", :transaction => 'tx1'
     @client.abort 'tx1'
 
     @client.begin 'tx1'
-    @client.publish destination, "second_message", :transaction => 'tx1'
+    @client.publish make_destination, "second_message", :transaction => 'tx1'
     @client.commit 'tx1'
 
     message = nil
-    @client.subscribe(destination) {|m| message = m}
+    @client.subscribe(make_destination) {|m| message = m}
     sleep 0.01 until message
     assert_equal "second_message", message.body
   end
 
   def test_transaction_ack_rollback_with_new_client
-    @client.publish destination, message_text
+    @client.publish make_destination, message_text
 
     @client.begin 'tx1'
     message = nil
-    @client.subscribe(destination, :ack => 'client') {|m| message = m}
+    @client.subscribe(make_destination, :ack => 'client') {|m| message = m}
     sleep 0.01 until message
     assert_equal message_text, message.body
     @client.acknowledge message, :transaction => 'tx1'
@@ -138,7 +138,7 @@ class TestClient < Test::Unit::TestCase
     # lets recreate the connection
     teardown
     setup
-    @client.subscribe(destination, :ack => 'client') {|m| message = m}
+    @client.subscribe(make_destination, :ack => 'client') {|m| message = m}
 
     Timeout::timeout(4) do
       sleep 0.01 until message
@@ -151,8 +151,8 @@ class TestClient < Test::Unit::TestCase
     @client.commit 'tx2'
   end
 
-  def test_raise_on_multiple_subscriptions_to_same_destination
-    subscribe_dest = destination
+  def test_raise_on_multiple_subscriptions_to_same_make_destination
+    subscribe_dest = make_destination
     @client.subscribe(subscribe_dest) {|m| nil }
     assert_raise(RuntimeError) do
       @client.subscribe(subscribe_dest) {|m| nil }
@@ -160,7 +160,7 @@ class TestClient < Test::Unit::TestCase
   end
 
   def test_raise_on_multiple_subscriptions_to_same_id
-    subscribe_dest = destination
+    subscribe_dest = make_destination
     @client.subscribe(subscribe_dest, {'id' => 'myid'}) {|m| nil }
     assert_raise(RuntimeError) do
       @client.subscribe(subscribe_dest, {'id' => 'myid'}) {|m| nil }
@@ -168,7 +168,7 @@ class TestClient < Test::Unit::TestCase
   end
 
   def test_raise_on_multiple_subscriptions_to_same_id_mixed
-    subscribe_dest = destination
+    subscribe_dest = make_destination
     @client.subscribe(subscribe_dest, {'id' => 'myid'}) {|m| nil }
     assert_raise(RuntimeError) do
       @client.subscribe(subscribe_dest, {:id => 'myid'}) {|m| nil }
@@ -176,7 +176,7 @@ class TestClient < Test::Unit::TestCase
   end
 
   def  test_asterisk_wildcard_subscribe
-    queue_base_name = destination
+    queue_base_name = make_destination
     queue1 = queue_base_name + ".a"
     queue2 = queue_base_name + ".b"
     send_message = message_text
@@ -206,7 +206,7 @@ class TestClient < Test::Unit::TestCase
   end unless ENV['STOMP_NOWILD']
 
   def test_greater_than_wildcard_subscribe
-    queue_base_name = destination + "."
+    queue_base_name = make_destination + "."
     queue1 = queue_base_name + "foo.a"
     queue2 = queue_base_name + "bar.a"
     queue3 = queue_base_name + "foo.b"
@@ -236,14 +236,14 @@ class TestClient < Test::Unit::TestCase
       end
     end
     assert results.all?{|a| a == true }
-  end unless ENV['STOMP_NOWILD'] || ENV['STOMP_APOLLO']
+  end unless ENV['STOMP_NOWILD'] || ENV['STOMP_DOTQUEUE']
 
   def test_transaction_with_client_side_redelivery
-    @client.publish destination, message_text
+    @client.publish make_destination, message_text
 
     @client.begin 'tx1'
     message = nil
-    @client.subscribe(destination, :ack => 'client') { |m| message = m }
+    @client.subscribe(make_destination, :ack => 'client') { |m| message = m }
 
     sleep 0.1 while message.nil?
 
@@ -261,14 +261,14 @@ class TestClient < Test::Unit::TestCase
     @client.acknowledge message, :transaction => 'tx2'
     @client.commit 'tx2'
   end
-  
+
   def test_connection_frame
   	assert_not_nil @client.connection_frame
   end
 
   def test_unsubscribe
     message = nil
-    dest = destination
+    dest = make_destination
     to_send = message_text
     client = Stomp::Client.new(user, passcode, host, port, true)
     assert_nothing_raised {
@@ -293,12 +293,12 @@ class TestClient < Test::Unit::TestCase
       end
     }
     assert_equal to_send, message_copy.body, "second body check"
-    assert_equal message.headers['message-id'], message_copy.headers['message-id'], "header check"
+    assert_equal message.headers['message-id'], message_copy.headers['message-id'], "header check" unless ENV['STOMP_RABBIT']
   end
 
   def test_thread_one_subscribe
     msg = nil
-    dest = destination
+    dest = make_destination
     Thread.new(@client) do |acli|
       assert_nothing_raised {
         acli.subscribe(dest) { |m| msg = m }
@@ -317,7 +317,7 @@ class TestClient < Test::Unit::TestCase
     #
     lock = Mutex.new
     msg_ctr = 0
-    dest = destination
+    dest = make_destination
     1.upto(@max_threads) do |tnum|
       # Threads within threads .....
       Thread.new(@client) do |acli|
@@ -356,9 +356,4 @@ class TestClient < Test::Unit::TestCase
       name = caller_method_name unless name
       "test_client#" + name
     end
-
-    def destination
-      name = caller_method_name unless name
-      qname = ENV['STOMP_APOLLO'] ? "/queue/test.ruby.stomp." + name : "/queue/test/ruby/stomp/" + name
-    end
 end

data/test/test_connection.rb

@@ -32,7 +32,7 @@ class TestStomp < Test::Unit::TestCase
       { :suppress_content_length => true }
     msg2 = @conn.receive
     assert_equal "test_stomp#test_", msg2.body
-  end
+  end unless ENV['STOMP_RABBIT']
 
   def test_explicit_receive
     @conn.subscribe make_destination
@@ -248,31 +248,21 @@ class TestStomp < Test::Unit::TestCase
     assert_equal "", msg.body    
   end
 
-  private
-    def make_destination
-      name = caller_method_name unless name
-      qname = ENV['STOMP_APOLLO'] ? "/queue/test.ruby.stomp." + name : "/queue/test/ruby/stomp/" + name
-    end
-
-    def _test_transaction
-      @conn.subscribe make_destination
+  def test_transaction
+    @conn.subscribe make_destination
 
-      # Drain the destination.
-      sleep 0.01 while
-      sleep 0.01 while @conn.poll!=nil
+    @conn.begin "txA"
+    @conn.publish make_destination, "txn message", 'transaction' => "txA"
 
-      @conn.begin "tx1"
-      @conn.publish make_destination, "txn message", 'transaction' => "tx1"
+    @conn.publish make_destination, "first message"
 
-      @conn.publish make_destination, "first message"
+    msg = @conn.receive
+    assert_equal "first message", msg.body
 
-      sleep 0.01
-      msg = @conn.receive
-      assert_equal "first message", msg.body
+    @conn.commit "txA"
+    msg = @conn.receive
+    assert_equal "txn message", msg.body
+  end
 
-      @conn.commit "tx1"
-      msg = @conn.receive
-      assert_equal "txn message", msg.body
-    end
 end
 

data/test/test_helper.rb

@@ -7,10 +7,10 @@ require 'stomp'
 # Helper routines
 module TestBase
   def user
-    ENV['STOMP_USER'] || "test"
+    ENV['STOMP_USER'] || "guest"
   end
   def passcode
-    ENV['STOMP_PASSCODE'] || "user"
+    ENV['STOMP_PASSCODE'] || "guest"
   end
   # Get host
   def host
@@ -34,5 +34,13 @@ module TestBase
       [file, line, method]
     end
   end
+
+  # Test helper methods
+
+  def make_destination
+    name = caller_method_name unless name
+    qname = ENV['STOMP_DOTQUEUE'] ? "/queue/test.ruby.stomp." + name : "/queue/test/ruby/stomp/" + name
+  end
+
 end
 

data/test/test_message.rb

@@ -109,10 +109,5 @@ class TestMessageKcode < Test::Unit::TestCase
 
 	end
 
-  private
-    def make_destination
-      name = caller_method_name unless name
-      qname = ENV['STOMP_APOLLO'] ? "/queue/test.rubyk01.stomp." + name : "/queue/test/rubyk01/stomp/" + name
-    end
 end
 

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: stomp
-version: !ruby/object:Gem::Version
-  version: 1.1.9
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 7
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 10
+  version: 1.1.10
 platform: ruby
-authors:
+authors: 
 - Brian McCallister
 - Marius Mathiesen
 - Thiago Morello
@@ -12,33 +17,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-07 00:00:00 -02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &18191140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
   type: :development
-  prerelease: false
-  version_requirements: *18191140
+  version_requirements: *id001
 description: Ruby client for the Stomp messaging protocol
-email:
+email: 
 - brianm@apache.org
 - marius@stones.com
 - morellon@gmail.com
 - allard.guy.m@gmail.com
-executables:
+executables: 
 - catstomp
 - stompcat
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.rdoc
-files:
+files: 
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
@@ -66,28 +78,51 @@ files:
 - test/test_connection.rb
 - test/test_helper.rb
 - test/test_message.rb
+has_rdoc: true
 homepage: https://rubygems.org/gems/stomp
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby client for the Stomp messaging protocol
-test_files: []
+test_files: 
+- examples/consumer.rb
+- examples/logexamp.rb
+- examples/publisher.rb
+- examples/slogger.rb
+- spec/client_shared_examples.rb
+- spec/client_spec.rb
+- spec/connection_spec.rb
+- spec/message_spec.rb
+- spec/spec_helper.rb
+- test/test_client.rb
+- test/test_connection.rb
+- test/test_helper.rb
+- test/test_message.rb