stomp 1.2.8 → 1.2.9

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 1.2.9 20130328
+
+* Refactoring and documentation updates (glennr)
+* Fix test encoding for Ruby 2.0+
+* Fixes to tests due to :suppress_content_length fix
+* Issue #50 Stomp::Client reconnects fail
+* Correctly honor :suppress_content_length with 1.1 (JP Hastings-Spital)
+* Fix reference to client.publish rather than client.send (JP Hastings-Spital)
+
 == 1.2.8 20121228
 
 * Fix inverted encode / decode logic (fairly major 1.1+ bug)

data/README.rdoc

@@ -10,6 +10,7 @@ An implementation of the Stomp protocol for Ruby. See:
 
 ===New
 
+* Gem version 1.2.9. Miscellaneous fixes and changes. See _CHANGELOG.rdoc_ for details.
 * Gem version 1.2.8. Stomp 1.1+ header codec inversion fix, test refactoring. See _CHANGELOG.rdoc_ for details.
 * Gem version 1.2.7. Stomp 1.2 support and miscellaneous fixes. See _CHANGELOG.rdoc_ for details.
 * Gem version 1.2.6. Miscellaneous fixes and changes. See _CHANGELOG.rdoc_ for details.
@@ -30,7 +31,7 @@ See _CHANGELOG.rdoc_ for details.
         {:login => "login1", :passcode => "passcode1", :host => "remotehost1", :port => 61612, :ssl => true},
         # First failover connect is to remotehost2
         {:login => "login2", :passcode => "passcode2", :host => "remotehost2", :port => 61613, :ssl => false},
-        
+
       ],
       # These are the default parameters and do not need to be set
       :reliable => true,                  # reliable (use failover)
@@ -50,17 +51,17 @@ See _CHANGELOG.rdoc_ for details.
       :stompconn => false,                # Use STOMP instead of CONNECT
       :usecrlf => false,                  # Use CRLF command and header line ends (1.2+)
     }
-    
+
     # for client
     client = Stomp::Client.new(hash)
-    
+
     # for connection
     connection = Stomp::Connection.new(hash)
-    
+
 ===Positional Parameter Usage
 
-    client = Stomp::Client.new("test", "user", "localhost", 61613)
-    client.send("/queue/mine", "hello world!")
+    client = Stomp::Client.new("user", "pass", "localhost", 61613)
+    client.publish("/queue/mine", "hello world!")
     client.subscribe("/queue/mine") do |msg|
       p msg
     end
@@ -74,16 +75,16 @@ See _CHANGELOG.rdoc_ for details.
     stomp://host.domain.tld:port
     stomp://login:passcode@host:port
     stomp://login:passcode@host.domain.tld:port
-   
+
     e.g. c = Stomp::Client.new(urlstring)
 
 ===Failover + SSL Example URL Usage
 
     options = "initialReconnectDelay=5000&randomize=false&useExponentialBackOff=false"
-    
+
     # remotehost1 uses SSL, remotehost2 doesn't
     client = Stomp::Client.new("failover:(stomp+ssl://login1:passcode1@remotehost1:61612,stomp://login2:passcode2@remotehost2:61613)?#{options}")
-    
+
     client.publish("/queue/mine", "hello world!")
     client.subscribe("/queue/mine") do |msg|
       p msg
@@ -91,7 +92,7 @@ See _CHANGELOG.rdoc_ for details.
 
 ===Historical Information
 
-Up until March 2009 the project was maintained and primarily developed by Brian McCallister. 
+Up until March 2009 the project was maintained and primarily developed by Brian McCallister.
 
 ===Source Code and Project URLs
 
@@ -107,7 +108,7 @@ The following people have contributed to Stomp:
 
 * Brian McCallister
 * Glenn Rempe <glenn@rempe.us>
-* jstrachan 
+* jstrachan
 * Marius Mathiesen <marius.mathiesen@gmail.com>
 * Johan S√∏rensen <johan@johansorensen.com>
 * Thiago Morello
@@ -129,4 +130,6 @@ The following people have contributed to Stomp:
 * Craig
 * Tommy Bishop
 * Jeremy Gailor
+* JP Hastings-Spital
+* Glenn Roberts
 

data/lib/client/utils.rb

@@ -9,6 +9,66 @@ module Stomp
 
     private
 
+    def parse_hash_params(params)
+      return false unless params.is_a?(Hash)
+
+      @parameters = params
+      first_host = @parameters[:hosts][0]
+      @login = first_host[:login]
+      @passcode = first_host[:passcode]
+      @host = first_host[:host]
+      @port = first_host[:port] || Connection::default_port(first_host[:ssl])
+      @reliable = true
+      true
+    end
+    private :parse_hash_params
+
+    def parse_stomp_url(login)
+      regexp = /^stomp:\/\/#{url_regex}/ # e.g. stomp://login:passcode@host:port or stomp://host:port
+      return false unless login =~ regexp
+
+      @login = $2 || ""
+      @passcode = $3 || ""
+      @host = $4
+      @port = $5.to_i
+      @reliable = false
+      true
+    end
+    private :parse_stomp_url
+
+    # e.g. failover://(stomp://login1:passcode1@localhost:61616,stomp://login2:passcode2@remotehost:61617)?option1=param
+    def parse_failover_url(login)
+      regexp = /^failover:(\/\/)?\(stomp(\+ssl)?:\/\/#{url_regex}(,stomp(\+ssl)?:\/\/#{url_regex}\))+(\?(.*))?$/
+      return false unless login =~ regexp
+
+      first_host = {}
+      first_host[:ssl] = !$2.nil?
+      @login = first_host[:login] = $4 || ""
+      @passcode = first_host[:passcode] = $5 || ""
+      @host = first_host[:host] = $6
+      @port = first_host[:port] = $7.to_i || Connection::default_port(first_host[:ssl])
+      options = $16 || ""
+      parts = options.split(/&|=/)
+      options = Hash[*parts]
+      hosts = [first_host] + parse_hosts(login)
+      @parameters = {}
+      @parameters[:hosts] = hosts
+      @parameters.merge! filter_options(options)
+      @reliable = true
+      true
+    end
+    private :parse_failover_url
+
+    def parse_positional_params(login, passcode, host, port, reliable)
+      @login = login
+      @passcode = passcode
+      @host = host
+      @port = port.to_i
+      @reliable = reliable
+      true
+    end
+    private :parse_positional_params
+
     # Set a subscription id in the headers hash if one does not already exist.
     # For simplicities sake, all subscriptions have a subscription ID.
     # setting an id in the SUBSCRIPTION header is described in the stomp protocol docs:
@@ -97,13 +157,15 @@ module Stomp
       @listener_thread = Thread.start do
         while true
           message = @connection.receive
-          if message.command == Stomp::CMD_MESSAGE
-            if listener = find_listener(message)
-              listener.call(message)
-            end
-          elsif message.command == Stomp::CMD_RECEIPT
-            if listener = @receipt_listeners[message.headers['receipt-id']]
-              listener.call(message)
+          if message # AMQ specific?, nil message on multiple reconnects
+            if message.command == Stomp::CMD_MESSAGE
+              if listener = find_listener(message)
+                listener.call(message)
+              end
+            elsif message.command == Stomp::CMD_RECEIPT
+              if listener = @receipt_listeners[message.headers['receipt-id']]
+                listener.call(message)
+              end
             end
           end
         end # while true

data/lib/connection/utf8.rb

@@ -263,7 +263,7 @@ module Stomp
           end
         else
           vs = v.to_s
-          eh[Stomp::HeaderCodec::encode(ks)] = Stomp::HeaderCodec::encode(vs)
+          eh[Stomp::HeaderCodec::encode(ks).to_sym] = Stomp::HeaderCodec::encode(vs)
         end
       end
       eh

data/lib/stomp/client.rb

@@ -12,8 +12,6 @@ module Stomp
   # in that thread if you have much message volume.
   class Client
 
-    public
-
     # The login ID used by the client.
     attr_reader :login
 
@@ -81,69 +79,31 @@ module Stomp
     #   e.g. c = Stomp::Client.new(urlstring)
     #
     def initialize(login = '', passcode = '', host = 'localhost', port = 61613, reliable = false, autoflush = false)
-
-      # Parse stomp:// URL's or set params
-      if login.is_a?(Hash)
-        @parameters = login
-
-        first_host = @parameters[:hosts][0]
-
-        @login = first_host[:login]
-        @passcode = first_host[:passcode]
-        @host = first_host[:host]
-        @port = first_host[:port] || Connection::default_port(first_host[:ssl])
-
-        @reliable = true
-      elsif login =~ /^stomp:\/\/#{url_regex}/ # e.g. stomp://login:passcode@host:port or stomp://host:port
-        @login = $2 || ""
-        @passcode = $3 || ""
-        @host = $4
-        @port = $5.to_i
-        @reliable = false
-      elsif login =~ /^failover:(\/\/)?\(stomp(\+ssl)?:\/\/#{url_regex}(,stomp(\+ssl)?:\/\/#{url_regex}\))+(\?(.*))?$/ 
-        # e.g. failover://(stomp://login1:passcode1@localhost:61616,stomp://login2:passcode2@remotehost:61617)?option1=param
-        first_host = {}
-        first_host[:ssl] = !$2.nil?
-        @login = first_host[:login] = $4 || ""
-        @passcode = first_host[:passcode] = $5 || ""
-        @host = first_host[:host] = $6
-        @port = first_host[:port] = $7.to_i || Connection::default_port(first_host[:ssl])
-
-        options = $16 || ""
-        parts = options.split(/&|=/)
-        options = Hash[*parts]
-
-        hosts = [first_host] + parse_hosts(login)
-
-        @parameters = {}
-        @parameters[:hosts] = hosts
-
-        @parameters.merge! filter_options(options)
-
-        @reliable = true
-      else
-        @login = login
-        @passcode = passcode
-        @host = host
-        @port = port.to_i
-        @reliable = reliable
-      end
+      parse_hash_params(login) ||
+        parse_stomp_url(login) ||
+        parse_failover_url(login) ||
+        parse_positional_params(login, passcode, host, port, reliable)
 
       check_arguments!()
 
       @id_mutex = Mutex.new()
       @ids = 1
 
+      create_connection(autoflush)
+
+      start_listeners()
+
+    end
+
+    def create_connection(autoflush)
       if @parameters
         @connection = Connection.new(@parameters)
       else
         @connection = Connection.new(@login, @passcode, @host, @port, @reliable)
         @connection.autoflush = autoflush
       end
-
-      start_listeners()
-
     end
+    private :create_connection
 
     # open is syntactic sugar for 'Client.new', see 'initialize' for usage.
     def self.open(login = '', passcode = '', host = 'localhost', port = 61613, reliable = false)

data/lib/stomp/version.rb

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

data/stomp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stomp}
-  s.version = "1.2.8"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian McCallister", "Marius Mathiesen", "Thiago Morello", "Guy M. Allard"]
-  s.date = %q{2012-12-28}
+  s.date = %q{2013-03-28}
   s.description = %q{Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge.}
   s.email = ["brianm@apache.org", "marius@stones.com", "morellon@gmail.com", "allard.guy.m@gmail.com"]
   s.executables = ["catstomp", "stompcat"]

data/test/test_connection.rb

@@ -51,11 +51,7 @@ class TestConnection < Test::Unit::TestCase
     @conn.publish make_destination, "test_stomp#test_\000_length",
       { :suppress_content_length => true }
     msg2 = @conn.receive
-    if @conn.protocol == Stomp::SPL_10
-      assert_equal "test_stomp#test_", msg2.body
-    else
-      assert_equal "test_stomp#test_\000_length", msg2.body
-    end
+    assert_equal "test_stomp#test_", msg2.body
     checkEmsg(@conn)
   end unless ENV['STOMP_RABBIT']
 

data/test/test_connection1p.rb

@@ -339,7 +339,7 @@ class TestConnection1P < Test::Unit::TestCase
     hb_asserts_both(conn)
   end if ENV['STOMP_HB11LONG']
 
-  # Test very encoding / decoding of headers
+  # Test very basic encoding / decoding of headers
   def test_conn_1p_0200
     @conn.disconnect
     #
@@ -369,6 +369,24 @@ class TestConnection1P < Test::Unit::TestCase
     conn.disconnect
   end unless ENV['STOMP_RABBIT']
 
+  # Test that 1.1+ connections do not break suppress_content_length
+  # (Issue #52)
+  def test_conn_1p_0210
+    msg = "payload: #{Time.now.to_f}"
+    dest = make_destination
+    shdrs = { :suppress_content_length => true }
+    assert_nothing_raised {
+      @conn.publish dest, msg, shdrs
+    }
+    #
+    sid = @conn.uuid()
+    @conn.subscribe dest, :id => sid
+    #
+    received = @conn.receive
+    assert_equal msg, received.body
+    assert_nil received.headers["content-length"], "No content length expected."
+  end if ENV['STOMP_AMQ11']
+
 private
 
   def hb_asserts_both(conn)

data/test/test_message.rb

@@ -1,9 +1,12 @@
+# -*- encoding: us-ascii -*-
+
 #
 # !!!!
 #
 # This can *NOT* currently be marked as UTF-8 encoded. It uses invalid UTF-8
 # sequences for testing.  Tests will fail under 1.9.x+ if this file is marked
-# as UTF-8 encoded.
+# as UTF-8 encoded.  Tests will fail under 2.0.0 if this file is *NOT* marked 
+# as US-ASCII.
 #
 
 if Kernel.respond_to?(:require_relative)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stomp
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 2
-  - 8
-  version: 1.2.8
+  - 9
+  version: 1.2.9
 platform: ruby
 authors: 
 - Brian McCallister
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-28 00:00:00 -05:00
+date: 2013-03-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency