stomp 1.1.6 → 1.1.7

data/CHANGELOG.rdoc

@@ -1,4 +1,9 @@
-== ?
+== 1.1.7 2010-09-01
+
+* Binary parse of raw STOMP frame
+* Fix broken tests on Ruby 1.9.2
+
+== 1.1.6 2010-10-06
 
 * Fixed multi-thread app hanging
 

data/Rakefile

@@ -15,7 +15,7 @@ $:.unshift(File.dirname(__FILE__) + "/lib")
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require "stomp/version"
 
 begin
@@ -34,7 +34,7 @@ begin
     gem.email = ["brianm@apache.org", 'marius@stones.com', 'morellon@gmail.com']
     gem.homepage = "http://stomp.codehaus.org/"
     gem.authors = ["Brian McCallister", 'Marius Mathiesen', 'Thiago Morello']
-    gem.add_development_dependency "rspec"
+    gem.add_development_dependency "rspec", '>= 2.3'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -42,14 +42,14 @@ rescue LoadError
 end
 
 desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--colour --format specdoc --loadby mtime --reverse']
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.spec_opts = ['--colour']
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 desc "Rspec : run all with RCov"
-Spec::Rake::SpecTask.new('spec:rcov') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
+RSpec::Core::RakeTask.new('spec:rcov') do |t|
+  t.pattern = 'spec/**/*_spec.rb'
   t.rcov = true
   t.rcov_opts = ['--exclude', 'gems', '--exclude', 'spec']
 end

data/lib/stomp/message.rb

@@ -4,32 +4,50 @@ module Stomp
   class Message
     attr_accessor :command, :headers, :body, :original
 
-    def initialize(message)
+		@@allowed_commands = [ 'CONNECTED', 'MESSAGE', 'RECEIPT', 'ERROR' ]
+
+    def initialize(frame)
+			# p frame
       # Set default empty values
       self.command = ''
       self.headers = {}
       self.body = ''
-      self.original = message
-      return self if is_blank?(message)
-
-      # Parse the format of the received stomp message
-      parse = message.match /^(CONNECTED|MESSAGE|RECEIPT|ERROR)\n(.*?)\n\n(.*)\0\n?$/m
-      raise Stomp::Error::InvalidFormat if parse.nil?
+      self.original = frame
+      return self if is_blank?(frame)
+			# Figure out where individual parts of the frame begin and end.
+			command_index = frame.index("\n")
+			raise Stomp::Error::InvalidFormat, 'command index' unless command_index
+			#
+			headers_index = frame.index("\n\n", command_index+1)
+			raise Stomp::Error::InvalidFormat, 'headers index' unless headers_index
+			#
+			lastnull_index = frame.rindex("\0")
+			raise Stomp::Error::InvalidFormat, 'lastnull index' unless lastnull_index
 
-      # Set the message values
-      self.command = parse[1]
-      self.headers = {}
-      parse[2].split("\n").map do |value|
+			# Extract working copies of each frame part
+			work_command = frame[0..command_index-1]
+			raise Stomp::Error::InvalidFormat, 'nil command' unless @@allowed_commands.include?(work_command)
+			#
+			work_headers = frame[command_index+1..headers_index-1]
+			raise Stomp::Error::InvalidFormat, 'nil headers' unless work_headers
+			#
+			work_body = frame[headers_index+2..lastnull_index-1]
+			raise Stomp::Error::InvalidFormat, 'nil body' unless work_body
+      # Set the frame values
+      self.command = work_command
+      work_headers.split("\n").map do |value|
         parsed_value = value.match /^([\w|-]*):(.*)$/
+				raise Stomp::Error::InvalidFormat, 'parsed header value' unless parsed_value
         self.headers[parsed_value[1].strip] = parsed_value[2].strip if parsed_value
       end
 
       body_length = -1
+		
       if self.headers['content-length']
         body_length = self.headers['content-length'].to_i
-        raise Stomp::Error::InvalidMessageLength if parse[3].length != body_length
+        raise Stomp::Error::InvalidMessageLength if work_body.length != body_length
       end
-      self.body = parse[3][0..body_length]
+      self.body = work_body[0..body_length]
     end
 
     def to_s
@@ -47,3 +65,4 @@ module Stomp
   end
 
 end
+

data/lib/stomp/version.rb

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

data/spec/client_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'client_shared_examples'
 
+
 describe Stomp::Client do
 
   before(:each) do

data/spec/spec_helper.rb

@@ -1,14 +1,6 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  #gem 'rspec'
-  require 'spec'
-end
-
+require 'rspec'
 dir = File.dirname(__FILE__)
 lib_path = File.expand_path("#{dir}/../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
 require 'stomp'
-

data/stomp.gemspec

@@ -1,78 +1,78 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{stomp}
-  s.version = "1.1.6"
+  s.version = "1.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian McCallister", "Marius Mathiesen", "Thiago Morello"]
-  s.date = %q{2010-06-10}
+  s.date = %q{2011-01-14}
   s.description = %q{Ruby client for the Stomp messaging protocol}
   s.email = ["brianm@apache.org", "marius@stones.com", "morellon@gmail.com"]
   s.executables = ["catstomp", "stompcat"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "bin/catstomp",
-     "bin/stompcat",
-     "examples/consumer.rb",
-     "examples/publisher.rb",
-     "lib/stomp.rb",
-     "lib/stomp/client.rb",
-     "lib/stomp/connection.rb",
-     "lib/stomp/errors.rb",
-     "lib/stomp/ext/hash.rb",
-     "lib/stomp/message.rb",
-     "lib/stomp/version.rb",
-     "spec/client_shared_examples.rb",
-     "spec/client_spec.rb",
-     "spec/connection_spec.rb",
-     "spec/message_spec.rb",
-     "spec/spec_helper.rb",
-     "stomp.gemspec",
-     "test/test_client.rb",
-     "test/test_connection.rb",
-     "test/test_helper.rb"
+    "CHANGELOG.rdoc",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "bin/catstomp",
+    "bin/stompcat",
+    "examples/consumer.rb",
+    "examples/publisher.rb",
+    "lib/stomp.rb",
+    "lib/stomp/client.rb",
+    "lib/stomp/connection.rb",
+    "lib/stomp/errors.rb",
+    "lib/stomp/ext/hash.rb",
+    "lib/stomp/message.rb",
+    "lib/stomp/version.rb",
+    "spec/client_shared_examples.rb",
+    "spec/client_spec.rb",
+    "spec/connection_spec.rb",
+    "spec/message_spec.rb",
+    "spec/spec_helper.rb",
+    "stomp.gemspec",
+    "test/test_client.rb",
+    "test/test_connection.rb",
+    "test/test_helper.rb",
+    "test/test_message.rb"
   ]
   s.homepage = %q{http://stomp.codehaus.org/}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby client for the Stomp messaging protocol}
   s.test_files = [
+    "examples/consumer.rb",
+    "examples/publisher.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",
-     "examples/consumer.rb",
-     "examples/publisher.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::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.3"])
     else
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.3"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.3"])
   end
 end
 

data/test/test_client.rb

@@ -181,44 +181,47 @@ class TestClient < Test::Unit::TestCase
 
   def test_unsubscribe
     message = nil
+    dest = destination
+    to_send = message_text
     client = Stomp::Client.new(user, passcode, host, port, true)
     assert_nothing_raised {
-      client.subscribe(destination, :ack => 'client') { |m| message = m }
-      @client.publish destination, message_text
+      client.subscribe(dest, :ack => 'client') { |m| message = m }
+      @client.publish dest, to_send
       Timeout::timeout(4) do
         sleep 0.01 until message
       end
     }
-    assert_equal message_text, message.body
+    assert_equal to_send, message.body, "first body check"
     assert_nothing_raised {
-      client.unsubscribe destination # was throwing exception on unsub at one point
+      client.unsubscribe dest # was throwing exception on unsub at one point
       client.close
     }
     #  Same message should remain on the queue.  Receive it again with ack=>auto.
     message_copy = nil
     client = Stomp::Client.new(user, passcode, host, port, true)
     assert_nothing_raised {
-      client.subscribe(destination, :ack => 'auto') { |m| message_copy = m }
+      client.subscribe(dest, :ack => 'auto') { |m| message_copy = m }
       Timeout::timeout(4) do
         sleep 0.01 until message_copy
       end
     }
-    assert_equal message_text, message_copy.body
-    assert_equal message.headers['message-id'], message_copy.headers['message-id']
+    assert_equal to_send, message_copy.body, "second body check"
+    assert_equal message.headers['message-id'], message_copy.headers['message-id'], "header check"
   end
 
   def test_thread_one_subscribe
     msg = nil
+    dest = destination
     Thread.new(@client) do |acli|
       assert_nothing_raised {
-        acli.subscribe(destination) { |m| msg = m }
+        acli.subscribe(dest) { |m| msg = m }
         Timeout::timeout(4) do
           sleep 0.01 until msg
         end
       }
     end
     #
-    @client.publish(destination, message_text)
+    @client.publish(dest, message_text)
     sleep 1
     assert_not_nil msg
   end
@@ -227,11 +230,12 @@ class TestClient < Test::Unit::TestCase
     #
     lock = Mutex.new
     msg_ctr = 0
+    dest = destination
     1.upto(@max_threads) do |tnum|
       # Threads within threads .....
       Thread.new(@client) do |acli|
         assert_nothing_raised {
-          acli.subscribe(destination) { |m| 
+          acli.subscribe(dest) { |m| 
             msg = m
             lock.synchronize do
               msg_ctr += 1
@@ -245,7 +249,7 @@ class TestClient < Test::Unit::TestCase
     #
     1.upto(@max_msgs) do |mnum|
       msg = Time.now.to_s + " #{mnum}"
-      @client.publish(destination, message_text)
+      @client.publish(dest, message_text)
     end
     #
     max_sleep=5
@@ -262,10 +266,12 @@ class TestClient < Test::Unit::TestCase
 
   private
     def message_text
+      name = caller_method_name unless name
       "test_client#" + name
     end
 
     def destination
+      name = caller_method_name unless name
       "/queue/test/ruby/client/" + name
     end
 end

data/test/test_connection.rb

@@ -148,6 +148,7 @@ class TestStomp < Test::Unit::TestCase
   def test_multi_thread_receive
     lock = Mutex.new
     msg_ctr = 0
+    dest = make_destination
     #
     1.upto(@max_threads) do |tnum|
       Thread.new(@conn) do |amq|
@@ -162,10 +163,10 @@ class TestStomp < Test::Unit::TestCase
       end
     end
     #
-    @conn.subscribe( make_destination )
+    @conn.subscribe( dest )
     1.upto(@max_msgs) do |mnum|
       msg = Time.now.to_s + " #{mnum}"
-      @conn.publish(make_destination, msg)
+      @conn.publish(dest, msg)
     end
     #
     max_sleep=5
@@ -184,6 +185,7 @@ class TestStomp < Test::Unit::TestCase
     #
     lock = Mutex.new
     msg_ctr = 0
+    dest = make_destination
     #
     1.upto(@max_threads) do |tnum|
       Thread.new(@conn) do |amq|
@@ -203,10 +205,10 @@ class TestStomp < Test::Unit::TestCase
       end
     end
     #
-    @conn.subscribe( make_destination )
+    @conn.subscribe( dest )
     1.upto(@max_msgs) do |mnum|
       msg = Time.now.to_s + " #{mnum}"
-      @conn.publish(make_destination, msg)
+      @conn.publish(dest, msg)
     end
     #
     max_sleep=5
@@ -223,6 +225,7 @@ class TestStomp < Test::Unit::TestCase
 
   private
     def make_destination
+      name = caller_method_name unless name
       "/queue/test/ruby/stomp/" + name
     end
 

data/test/test_helper.rb

@@ -20,5 +20,19 @@ module TestBase
   def port
     (ENV['STOMP_PORT'] || 61613).to_i
   end
+  # Helper for minitest on 1.9
+  def caller_method_name
+    parse_caller(caller(2).first).last
+  end
+  # Helper for minitest on 1.9
+  def parse_caller(at)
+    if /^(.+?):(\d+)(?::in `(.*)')?/ =~ at
+      file = Regexp.last_match[1]
+      line = Regexp.last_match[2].to_i
+      method = Regexp.last_match[3]
+      method.gsub!(" ","_")
+      [file, line, method]
+    end
+  end
 end
 

data/test/test_message.rb

@@ -0,0 +1,114 @@
+$:.unshift(File.dirname(__FILE__))
+#
+# Test Ruby 1.8 with $KCODE='U'
+#
+require 'test_helper'
+#
+class TestMessageKcode < Test::Unit::TestCase
+  include TestBase
+  #
+  def setup
+		$KCODE = 'U' if RUBY_VERSION =~ /1\.8/
+    @conn = Stomp::Connection.open(user, passcode, host, port)
+    # Message body data
+		@messages = [
+			"normal text message",
+			"bad byte: \372",
+			"\004\b{\f:\tbody\"\001\207\004\b{\b:\016statusmsg\"\aOK:\017statuscodei\000:\tdata{\t:\voutput\"3Enabled, not running, last run 693 seconds ago:\frunningi\000:\fenabledi\006:\flastrunl+\aE\021\022M:\rsenderid\"\032xx.xx.xx.xx:\016requestid\"%849d647bbe3e421ea19ac9f947bbdde4:\020senderagent\"\fpuppetd:\016msgtarget\"%/topic/mcollective.puppetd.reply:\thash\"\001\257ZdQqtaDmmdD0jZinnEcpN+YbkxQDn8uuCnwsQdvGHau6d+gxnnfPLUddWRSb\nZNMs+sQUXgJNfcV1eVBn1H+Z8QQmzYXVDMqz7J43jmgloz5PsLVbN9K3PmX/\ngszqV/WpvIyAqm98ennWqSzpwMuiCC4q2Jr3s3Gm6bUJ6UkKXnY=\n:\fmsgtimel+\a\372\023\022M"
+		]
+		#
+  end
+
+  def teardown
+    @conn.disconnect if @conn # allow tests to disconnect
+  end
+
+	# Various message bodies, including the failing test case reported
+  def test_kcode_001
+		#
+		dest = make_destination
+    @conn.subscribe dest
+		@messages.each do |abody|
+		  @conn.publish dest, abody
+			msg = @conn.receive
+			assert_instance_of Stomp::Message , msg, "type check for #{abody}"
+			assert_equal abody, msg.body, "equal check for #{abody}"
+		end
+  end
+
+	# All possible byte values
+  def test_kcode_002
+		#
+		abody = ""
+		"\000".upto("\377") {|abyte| abody << abyte } 
+		#
+		dest = make_destination
+    @conn.subscribe dest
+	  @conn.publish dest, abody
+		msg = @conn.receive
+		assert_instance_of Stomp::Message , msg, "type check for #{abody}"
+		assert_equal abody, msg.body, "equal check for #{abody}"
+  end
+
+	# A single byte at a time
+  def test_kcode_003
+		#
+		dest = make_destination
+    @conn.subscribe dest
+		#
+		"\000".upto("\377") do |abody|
+			@conn.publish dest, abody
+			msg = @conn.receive
+			assert_instance_of Stomp::Message , msg, "type check for #{abody}"
+			assert_equal abody, msg.body, "equal check for #{abody}"
+		end
+  end
+
+	#
+	def test_kcode_004
+		#
+		assert_raise(Stomp::Error::InvalidFormat) {
+			aframe = Stomp::Message.new("junk")
+		}
+		#
+		assert_raise(Stomp::Error::InvalidFormat) {
+			aframe = Stomp::Message.new("command\njunk")
+		}
+		#
+		assert_raise(Stomp::Error::InvalidFormat) {
+			aframe = Stomp::Message.new("command\nheaders\n\njunk")
+		}
+		#
+		assert_raise(Stomp::Error::InvalidFormat) {
+			aframe = Stomp::Message.new("junkcommand\nheaders\n\njunk\0\n\n")
+		}
+		#
+		assert_raise(Stomp::Error::InvalidFormat) {
+			aframe = Stomp::Message.new("ERROR\nbadheaders\n\njunk\0\n\n")
+		}
+		#
+		assert_nothing_raised {
+			aframe = Stomp::Message.new("CONNECTED\nh1:val1\n\njunk\0\n")
+		}
+		#
+		assert_nothing_raised {
+			aframe = Stomp::Message.new("MESSAGE\nh1:val1\n\njunk\0\n")
+		}
+		#
+		assert_nothing_raised {
+			aframe = Stomp::Message.new("RECEIPT\nh1:val1\n\njunk\0\n")
+		}
+		#
+		assert_nothing_raised {
+			aframe = Stomp::Message.new("ERROR\nh1:val1\n\njunk\0\n")
+		}
+
+	end
+
+  private
+    def make_destination
+      name = caller_method_name unless name
+      "/queue/test/rubyk01/stomp/" + name
+    end
+end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: stomp
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Brian McCallister
@@ -11,19 +16,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -03:00
+date: 2011-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
+  type: :development
+  version_requirements: *id001
 description: Ruby client for the Stomp messaging protocol
 email: 
 - brianm@apache.org
@@ -38,7 +47,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
@@ -63,35 +71,42 @@ files:
 - test/test_client.rb
 - test/test_connection.rb
 - test/test_helper.rb
+- test/test_message.rb
 has_rdoc: true
 homepage: http://stomp.codehaus.org/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby client for the Stomp messaging protocol
 test_files: 
+- examples/consumer.rb
+- examples/publisher.rb
 - spec/client_shared_examples.rb
 - spec/client_spec.rb
 - spec/connection_spec.rb
@@ -100,5 +115,4 @@ test_files:
 - test/test_client.rb
 - test/test_connection.rb
 - test/test_helper.rb
-- examples/consumer.rb
-- examples/publisher.rb
+- test/test_message.rb

data/.gitignore

@@ -1,3 +0,0 @@
-pkg/*
-doc/*
-coverage/*