stomper 2.0.1 → 2.0.2

data/spec/stomper_spec.rb

@@ -4,6 +4,5 @@ require 'spec_helper'
 describe Stomper do
   it "should define a version" do
     Stomper.const_defined?(:VERSION).should be_true
-    Stomper::VERSION.should == '2.0.0'
   end
 end

data/spec/support/frame_header_matchers.rb

@@ -8,3 +8,28 @@ end
 RSpec::Matchers.define :have_transaction_header do |expected|
   have_frame_header :transaction, expected
 end
+
+RSpec::Matchers.define :have_command do |expected|
+  match do |actual|
+    actual.command.should == expected
+  end
+end
+
+RSpec::Matchers.define :have_body_encoding do |expected|
+  if RUBY_VERSION >= "1.9"
+    match do |actual|
+      actual.body.encoding.name.should == expected
+    end
+  else
+    match do |actual|
+      true.should be_true
+    end
+  end
+end
+
+RSpec::Matchers.define :have_body do |expected, expected_no_encoding, encoding|
+  e_expected = (RUBY_VERSION >= '1.9') ? expected.encode(encoding) : expected_no_encoding
+  match do |actual|
+    actual.body.should == e_expected
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: stomper
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
+  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors: 
 - Ian D. Eccles
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
   type: :development
   version_requirements: *id002
@@ -55,10 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :development
   version_requirements: *id003
@@ -70,8 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -83,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -96,10 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 0
         version: 0.10.0
   type: :development
   version_requirements: *id006
@@ -115,6 +91,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -129,18 +106,12 @@ files:
 - features/scopes.feature
 - features/secure_connections.feature
 - features/send_and_message.feature
-- features/steps/acking_messages_steps.rb
-- features/steps/disconnecting_steps.rb
-- features/steps/establish_connection_steps.rb
-- features/steps/frame_transmission_steps.rb
-- features/steps/protocol_version_negotiation_steps.rb
-- features/steps/receipts_steps.rb
-- features/steps/scopes_steps.rb
-- features/steps/secure_connections_steps.rb
-- features/steps/send_and_message_steps.rb
-- features/steps/subscribing_steps.rb
-- features/steps/threaded_receiver_steps.rb
-- features/steps/transactions_steps.rb
+- features/steps/ack_and_nack_steps.rb
+- features/steps/broker_steps.rb
+- features/steps/client_steps.rb
+- features/steps/receipt_steps.rb
+- features/steps/scope_steps.rb
+- features/steps/subscription_steps.rb
 - features/subscribing.feature
 - features/support/env.rb
 - features/support/header_helpers.rb
@@ -198,7 +169,6 @@ files:
 - spec/stomper/extensions/events_spec.rb
 - spec/stomper/extensions/heartbeat_spec.rb
 - spec/stomper/extensions/scoping_spec.rb
-- spec/stomper/frame_serializer_1.8_spec.rb
 - spec/stomper/frame_serializer_spec.rb
 - spec/stomper/frame_spec.rb
 - spec/stomper/headers_spec.rb
@@ -230,23 +200,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: stomper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Client for message queues implementing the Stomp protocol interface.
@@ -259,18 +223,12 @@ test_files:
 - features/scopes.feature
 - features/secure_connections.feature
 - features/send_and_message.feature
-- features/steps/acking_messages_steps.rb
-- features/steps/disconnecting_steps.rb
-- features/steps/establish_connection_steps.rb
-- features/steps/frame_transmission_steps.rb
-- features/steps/protocol_version_negotiation_steps.rb
-- features/steps/receipts_steps.rb
-- features/steps/scopes_steps.rb
-- features/steps/secure_connections_steps.rb
-- features/steps/send_and_message_steps.rb
-- features/steps/subscribing_steps.rb
-- features/steps/threaded_receiver_steps.rb
-- features/steps/transactions_steps.rb
+- features/steps/ack_and_nack_steps.rb
+- features/steps/broker_steps.rb
+- features/steps/client_steps.rb
+- features/steps/receipt_steps.rb
+- features/steps/scope_steps.rb
+- features/steps/subscription_steps.rb
 - features/subscribing.feature
 - features/support/env.rb
 - features/support/header_helpers.rb
@@ -300,7 +258,6 @@ test_files:
 - spec/stomper/extensions/events_spec.rb
 - spec/stomper/extensions/heartbeat_spec.rb
 - spec/stomper/extensions/scoping_spec.rb
-- spec/stomper/frame_serializer_1.8_spec.rb
 - spec/stomper/frame_serializer_spec.rb
 - spec/stomper/frame_spec.rb
 - spec/stomper/headers_spec.rb

data/features/steps/disconnecting_steps.rb

@@ -1,8 +0,0 @@
-Given /^an established connection$/ do
-  @connection.connect
-end
-
-When /^the client disconnects$/ do
-  @connection.disconnect
-  @broker.stop
-end

data/features/steps/establish_connection_steps.rb

@@ -1,77 +0,0 @@
-After do |s|
-  begin
-    @connection && @connection.stop
-    @broker && @broker.force_stop
-  rescue Exception => ex
-  end
-end
-
-Given /^a (\d+\.\d+)?\s*connection between client and broker$/ do |version|
-  version ||= '1.0'
-  @broker_uri_string = "stomp:///"
-  @broker_uri = URI.parse(@broker_uri_string)
-  @broker = TestStompServer.new(version)
-  @broker.start
-  @connection = Stomper::Connection.new(@broker_uri)
-  @received_frames = []
-  @sent_frames = []
-  @connection.before_transmitting do |f, c|
-    @sent_frames << f
-  end
-  @connection.after_receiving do |f, c|
-    @received_frames << f
-  end
-  @connection.start
-end
-
-
-Given /^a Stomp (\d+\.\d+)?\s*broker$/ do |version|
-  version ||= '1.0'
-  @broker_uri_string = "stomp:///"
-  @broker_uri = URI.parse(@broker_uri_string)
-  @broker = TestStompServer.new(version)
-  @broker.start
-  @connection = Stomper::Connection.new(@broker_uri)
-end
-
-Given /^an erroring Stomp broker$/ do
-  @broker_uri_string = "stomp:///"
-  @broker_uri = URI.parse(@broker_uri_string)
-  @broker = TestStompServer.new('1.0')
-  @broker.session_class = TestStompServer::StompErrorOnConnectSession
-  @broker.start
-  @connection = Stomper::Connection.new(@broker_uri)
-end
-
-
-When /^a connection is created from the broker's URI$/ do
-  #@connection = Stomper::Connection.new(@broker_uri)
-end
-
-When /^a connection is created from the broker's URI string$/ do
-  @connection = Stomper::Connection.new(@broker_uri_string)
-end
-
-When /^the connection is told to connect$/ do
-  @connection.connect
-end
-
-Then /^the connection should be connected$/ do
-  @connection.connected?.should be_true
-end
-
-Then /^the connection should be using the (\d+\.\d+) protocol$/ do |version|
-  @connection.version.should == version
-end
-
-Then /^connecting should raise an unsupported protocol version error$/ do
-  lambda { @connection.connect }.should raise_error(Stomper::Errors::UnsupportedProtocolVersionError)
-end
-
-Then /^the (connection|client) should not be connected$/ do |arbitrary_name|
-  @connection.connected?.should be_false
-end
-
-Then /^connecting should raise an connect failed error$/ do
-  lambda { @connection.connect }.should raise_error(Stomper::Errors::ConnectFailedError)
-end

data/features/steps/frame_transmission_steps.rb

@@ -1,40 +0,0 @@
-Then /^the broker should have received an? "([^"]*)" frame$/ do |command|
-  Then "the broker should have received a \"#{command}\" frame with headers", table(%{
-    | header-name | header-value |
-  })
-end
-
-Then /^the broker should have received an? "([^"]*)" frame with headers$/ do |command, table|
-  headers = table_to_headers table
-  @broker.session.received_frames.any? do |f|
-    f.command == command && headers.all? { |(k,v)| headers[k] == f[k] }
-  end.should be_true
-end
-
-Then /^the client should have received an? "([^"]*)" frame with headers$/ do |command, table|
-  headers = table_to_headers table
-  @received_frames.any? do |f|
-    f.command == command && headers.all? { |(k,v)| headers[k] == f[k] }
-  end.should be_true
-end
-
-When /^the broker sends a "([^"]*)" frame with headers$/ do |command, table|
-  headers = table_to_headers table
-  @broker.session.send_frame command, headers
-end
-
-When /^the frame exchange is completed$/ do
-  @connection.disconnect(:receipt => 'TERMINATE_POLITELY_12345')
-  @connection.stop
-  @broker.stop
-end
-
-When /^the frame exchange is completed without client disconnect$/ do
-  @connection.stop
-  @broker.stop
-end
-
-When /^the client waits for (\d+) "([^"]*)" frames?$/ do |count, command|
-  count = count.to_i
-  Thread.pass while @received_frames.select { |f| f.command == command }.size < count
-end

data/features/steps/protocol_version_negotiation_steps.rb

@@ -1,15 +0,0 @@
-When /^a connection is established$/ do
-  @connection.connect
-end
-
-Given /^an unversioned Stomp broker$/ do
-  @broker_uri_string = "stomp:///"
-  @broker_uri = URI.parse(@broker_uri_string)
-  @broker = TestStompServer.new(nil)
-  @broker.start
-  @connection = Stomper::Connection.new(@broker_uri)
-end
-
-When /^the client protocol version is "([^"]*)"$/ do |arg1|
-  @connection.versions = arg1.split(",")
-end

data/features/steps/secure_connections_steps.rb

@@ -1,43 +0,0 @@
-Given /^a Stomp (\d+\.\d+)?\s*SSL broker$/ do |version|
-  @broker = TestSSLStompServer.new(version)
-  @broker.start
-end
-
-When /^a connection is created for the SSL broker$/ do
-  @connection = Stomper::Connection.new("stomp+ssl:///")
-end
-
-When /^the broker's host is "([^"]*)"$/ do |hostname|
-  @connection.host = hostname
-end
-
-When /^no SSL verification is performed$/ do
-  @connection.ssl[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
-end
-
-When /^SSL verification is performed$/ do
-  @connection.ssl[:verify_mode] = ::OpenSSL::SSL::VERIFY_PEER | ::OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
-end
-
-When /^an SSL post connection check is performed on "([^"]*)"$/ do |host|
-  @connection.ssl[:post_connection_check] = host
-end
-
-Then /^connecting should raise an openssl error$/ do
-  lambda { @connection.connect }.should raise_error(OpenSSL::SSL::SSLError)
-  # It is problematic that this is needed...
-  @broker.stop
-end
-
-When /^an SSL post connection check is not performed$/ do
-  @connection.ssl[:post_connection_check] = false
-end
-
-When /^the broker's certificate is verified by CA$/ do  
-  @connection.ssl[:ca_file] = File.expand_path('../../support/ssl/demoCA/cacert.pem', __FILE__)
-end
-
-When /^the client's certificate and key are specified$/ do
-  @connection.ssl[:cert] = OpenSSL::X509::Certificate.new(File.read(File.expand_path('../../support/ssl/client_cert.pem', __FILE__)))
-  @connection.ssl[:key] = OpenSSL::PKey::RSA.new(File.read(File.expand_path('../../support/ssl/client_key.pem', __FILE__)))
-end

data/features/steps/send_and_message_steps.rb

@@ -1,35 +0,0 @@
-Given /^the client subscribes to (\/.*)$/ do |dest|
-  @messages_for_subscription ||= []
-  @connection.subscribe(dest) do |m|
-    sub = m[:subscription]
-    @messages_for_subscription << m
-  end
-end
-
-When /^the client sends a "([^"]*)" "([^"]*)" to (\/.*)$/ do |ct, body, dest|
-  @connection.send(dest, body, :'content-type' => ct)
-end
-
-Then /^the client should have received a "([^"]*)" message of "([^"]*)"$/ do |ct, body|
-  @messages_for_subscription.any? do |m|
-    m.content_type == ct && m.body == body
-  end.should be_true
-end
-
-When /^the client sends a "([^"]*)" encoded as "([^"]*)" to (\/.*)$/ do |body, enc, dest|
-  body.force_encoding(enc) if body.respond_to?(:force_encoding)
-  @connection.send(dest, body)
-end
-
-Then /^the client should have received a "([^"]*)" message of "([^"]*)" encoded as "([^"]*)"$/ do |ct, body, enc|
-  @messages_for_subscription.any? do |m|
-    ct_check = (m.content_type == ct || m.content_type.nil? && ct.empty?)
-    b_check = body == m.body
-    if body.respond_to?(:encoding)
-      ct_check && b_check && m.body.encoding.name == enc
-    else
-      ct_check && b_check
-    end
-  end.should be_true
-end
-

data/features/steps/subscribing_steps.rb

@@ -1,36 +0,0 @@
-When /^the client subscribes to "([^"]*)" with headers$/ do |dest, table|
-  @subscribe_frames ||= []
-  headers = table_to_headers table
-  @default_subscription_triggered = 0
-  @subscribe_frames << @connection.subscribe(dest, headers) do |m|
-    @default_subscription_triggered += 1
-  end
-end
-
-Then /^the default subscription callback should have been triggered( (\d+) times?)?$/ do |full, times|
-  if times.nil? || times.empty?
-    @default_subscription_triggered.should >= 1
-  else
-    @default_subscription_triggered.should == times.to_i
-  end
-end
-
-Then /^the default subscription callback should not have been triggered$/ do
-  @default_subscription_triggered.should == 0
-end
-
-When /^the client unsubscribes by ID$/ do
-  @connection.unsubscribe(@subscribe_frames.last[:id])
-end
-
-When /^the client unsubscribes by destination$/ do
-  @connection.unsubscribe(@subscribe_frames.last[:destination])
-end
-
-When /^the client unsubscribes by frame$/ do
-  @connection.unsubscribe(@subscribe_frames.last)
-end
-
-When /^the client unsubscribes from destination "([^"]*)"$/ do |destination|
-  @connection.unsubscribe(destination)
-end

data/features/steps/threaded_receiver_steps.rb

@@ -1,8 +0,0 @@
-When /^the broker closes the connection unexpectedly$/ do
-  @broker.force_stop
-end
-
-Then /^after (\d+\.\d+) seconds, the receiver should no longer be running$/ do |sleep_for|
-  sleep sleep_for.to_f
-  @connection.running?.should be_false
-end