RubyGems - stomper - Versions diffs - 1.0.0 → 2.0.0 - Mend

stomper 1.0.0 → 2.0.0

Files changed (152) hide show

data/.gitignore +5 -0
data/{spec/spec.opts → .rspec} +0 -2
data/Gemfile +4 -0
data/LICENSE +201 -201
data/README.md +130 -0
data/Rakefile +5 -0
data/examples/basic.rb +38 -0
data/examples/events.rb +54 -0
data/features/acking_messages.feature +147 -0
data/features/disconnecting.feature +12 -0
data/features/establish_connection.feature +44 -0
data/features/protocol_version_negotiation.feature +61 -0
data/features/receipts.feature +72 -0
data/features/scopes.feature +32 -0
data/features/secure_connections.feature +38 -0
data/features/send_and_message.feature +28 -0
data/features/steps/acking_messages_steps.rb +39 -0
data/features/steps/disconnecting_steps.rb +8 -0
data/features/steps/establish_connection_steps.rb +74 -0
data/features/steps/frame_transmission_steps.rb +35 -0
data/features/steps/protocol_version_negotiation_steps.rb +15 -0
data/features/steps/receipts_steps.rb +79 -0
data/features/steps/scopes_steps.rb +52 -0
data/features/steps/secure_connections_steps.rb +41 -0
data/features/steps/send_and_message_steps.rb +35 -0
data/features/steps/subscribing_steps.rb +36 -0
data/features/steps/threaded_receiver_steps.rb +8 -0
data/features/steps/transactions_steps.rb +0 -0
data/features/subscribing.feature +151 -0
data/features/support/env.rb +11 -0
data/features/support/header_helpers.rb +12 -0
data/features/support/ssl/README +6 -0
data/features/support/ssl/broker_cert.csr +17 -0
data/features/support/ssl/broker_cert.pem +72 -0
data/features/support/ssl/broker_key.pem +27 -0
data/features/support/ssl/client_cert.csr +17 -0
data/features/support/ssl/client_cert.pem +72 -0
data/features/support/ssl/client_key.pem +27 -0
data/features/support/ssl/demoCA/cacert.pem +17 -0
data/features/support/ssl/demoCA/index.txt +2 -0
data/features/support/ssl/demoCA/index.txt.attr +1 -0
data/features/support/ssl/demoCA/index.txt.attr.old +1 -0
data/features/support/ssl/demoCA/index.txt.old +1 -0
data/features/support/ssl/demoCA/newcerts/01.pem +72 -0
data/features/support/ssl/demoCA/newcerts/02.pem +72 -0
data/features/support/ssl/demoCA/private/cakey.pem +17 -0
data/features/support/ssl/demoCA/serial +1 -0
data/features/support/ssl/demoCA/serial.old +1 -0
data/features/support/test_stomp_server.rb +150 -0
data/features/threaded_receiver.feature +11 -0
data/features/transactions.feature +66 -0
data/lib/stomper.rb +30 -20
data/lib/stomper/connection.rb +442 -102
data/lib/stomper/errors.rb +59 -0
data/lib/stomper/extensions.rb +10 -0
data/lib/stomper/extensions/common.rb +258 -0
data/lib/stomper/extensions/events.rb +213 -0
data/lib/stomper/extensions/heartbeat.rb +101 -0
data/lib/stomper/extensions/scoping.rb +56 -0
data/lib/stomper/frame.rb +54 -0
data/lib/stomper/frame_serializer.rb +217 -0
data/lib/stomper/headers.rb +15 -0
data/lib/stomper/receipt_manager.rb +36 -0
data/lib/stomper/receivers.rb +7 -0
data/lib/stomper/receivers/threaded.rb +71 -0
data/lib/stomper/scopes.rb +9 -0
data/lib/stomper/scopes/header_scope.rb +49 -0
data/lib/stomper/scopes/receipt_scope.rb +44 -0
data/lib/stomper/scopes/transaction_scope.rb +109 -0
data/lib/stomper/sockets.rb +66 -28
data/lib/stomper/subscription_manager.rb +79 -0
data/lib/stomper/support.rb +68 -0
data/lib/stomper/support/1.8/frame_serializer.rb +53 -0
data/lib/stomper/support/1.8/headers.rb +183 -0
data/lib/stomper/support/1.9/frame_serializer.rb +64 -0
data/lib/stomper/support/1.9/headers.rb +172 -0
data/lib/stomper/support/ruby.rb +13 -0
data/lib/stomper/uris.rb +49 -0
data/lib/stomper/version.rb +7 -0
data/spec/spec_helper.rb +13 -9
data/spec/stomper/connection_spec.rb +712 -0
data/spec/stomper/extensions/common_spec.rb +187 -0
data/spec/stomper/extensions/events_spec.rb +78 -0
data/spec/stomper/extensions/heartbeat_spec.rb +103 -0
data/spec/stomper/extensions/scoping_spec.rb +21 -0
data/spec/stomper/frame_serializer_1.8_spec.rb +318 -0
data/spec/stomper/frame_serializer_spec.rb +316 -0
data/spec/stomper/frame_spec.rb +36 -0
data/spec/stomper/headers_spec.rb +224 -0
data/spec/stomper/receipt_manager_spec.rb +91 -0
data/spec/stomper/receivers/threaded_spec.rb +116 -0
data/spec/stomper/scopes/header_scope_spec.rb +42 -0
data/spec/stomper/scopes/receipt_scope_spec.rb +51 -0
data/spec/stomper/scopes/transaction_scope_spec.rb +183 -0
data/spec/stomper/sockets_spec.rb +113 -0
data/spec/stomper/subscription_manager_spec.rb +107 -0
data/spec/stomper/support_spec.rb +69 -0
data/spec/stomper/uris_spec.rb +54 -0
data/spec/stomper_spec.rb +9 -0
data/spec/support/custom_argument_matchers.rb +57 -0
data/spec/support/existential_frame_matchers.rb +19 -0
data/spec/support/frame_header_matchers.rb +10 -0
data/stomper.gemspec +30 -0
metadata +272 -97
data/AUTHORS +0 -21
data/CHANGELOG +0 -20
data/README.rdoc +0 -120
data/lib/stomper/client.rb +0 -34
data/lib/stomper/frame_reader.rb +0 -73
data/lib/stomper/frame_writer.rb +0 -21
data/lib/stomper/frames.rb +0 -39
data/lib/stomper/frames/abort.rb +0 -10
data/lib/stomper/frames/ack.rb +0 -25
data/lib/stomper/frames/begin.rb +0 -11
data/lib/stomper/frames/client_frame.rb +0 -89
data/lib/stomper/frames/commit.rb +0 -10
data/lib/stomper/frames/connect.rb +0 -10
data/lib/stomper/frames/connected.rb +0 -30
data/lib/stomper/frames/disconnect.rb +0 -10
data/lib/stomper/frames/error.rb +0 -21
data/lib/stomper/frames/message.rb +0 -48
data/lib/stomper/frames/receipt.rb +0 -19
data/lib/stomper/frames/send.rb +0 -10
data/lib/stomper/frames/server_frame.rb +0 -38
data/lib/stomper/frames/subscribe.rb +0 -42
data/lib/stomper/frames/unsubscribe.rb +0 -19
data/lib/stomper/open_uri_interface.rb +0 -41
data/lib/stomper/receipt_handlers.rb +0 -23
data/lib/stomper/receiptor.rb +0 -38
data/lib/stomper/subscriber.rb +0 -76
data/lib/stomper/subscription.rb +0 -128
data/lib/stomper/subscriptions.rb +0 -95
data/lib/stomper/threaded_receiver.rb +0 -59
data/lib/stomper/transaction.rb +0 -185
data/lib/stomper/transactor.rb +0 -50
data/lib/stomper/uri.rb +0 -55
data/spec/client_spec.rb +0 -29
data/spec/connection_spec.rb +0 -22
data/spec/frame_reader_spec.rb +0 -37
data/spec/frame_writer_spec.rb +0 -27
data/spec/frames/client_frame_spec.rb +0 -66
data/spec/frames/indirect_frame_spec.rb +0 -45
data/spec/frames/server_frame_spec.rb +0 -85
data/spec/open_uri_interface_spec.rb +0 -132
data/spec/receiptor_spec.rb +0 -35
data/spec/shared_connection_examples.rb +0 -79
data/spec/subscriber_spec.rb +0 -77
data/spec/subscription_spec.rb +0 -157
data/spec/subscriptions_spec.rb +0 -145
data/spec/threaded_receiver_spec.rb +0 -33
data/spec/transaction_spec.rb +0 -139
data/spec/transactor_spec.rb +0 -46

data/features/secure_connections.feature ADDED Viewed

@@ -0,0 +1,38 @@
+Feature: Secure connections
+  In order connect to an SSL protected broker
+  As a client
+  I want secure connections
+  Scenario: SSL connection without verifying broker
+    Given a Stomp 1.1 SSL broker
+    When a connection is created for the SSL broker
+    And no SSL verification is performed
+    And an SSL post connection check is not performed
+    And the connection is told to connect
+    Then the connection should be connected
+  Scenario: SSL connection verifying hostname
+    Given a Stomp 1.1 SSL broker
+    When a connection is created for the SSL broker
+    And no SSL verification is performed
+    And an SSL post connection check is performed on "My Broker"
+    And the connection is told to connect
+    Then the connection should be connected
+  Scenario: SSL connection verifying hostname failure
+    Given a Stomp 1.1 SSL broker
+    When a connection is created for the SSL broker
+    And the broker's host is "My Broker"
+    And no SSL verification is performed
+    And an SSL post connection check is performed on "Some Other Common Name"
+    Then connecting should raise an openssl error
+  Scenario: SSL broker certificate verification
+    Given a Stomp 1.1 SSL broker
+    When a connection is created for the SSL broker
+    And the broker's host is "My Broker"
+    And an SSL post connection check is performed on "My Broker"
+    And the broker's certificate is verified by CA
+    And SSL verification is performed
+    And the connection is told to connect
+    Then the connection should be connected

data/features/send_and_message.feature ADDED Viewed

@@ -0,0 +1,28 @@
+Feature: Send and message
+  In order exchange information
+  As a client
+  I want to be able to transmit SEND and receive MESSAGE frames
+  Scenario Outline: sending and receiving messages with content-types
+    Given a 1.1 connection between client and broker
+    And the client subscribes to <destination>
+    When the client sends a <content-type> <body> to <destination>
+    And the frame exchange is completed
+    Then the client should have received a <content-type> message of <body>
+    Examples:
+      | destination  | content-type      | body          |
+      | /queue/test1 | "text/plain"      | "hello world" |
+      | /queue/test2 | "application/xml" | "<xml></xml>" |
+  Scenario Outline: sending and receiving messages with encodings
+    Given a 1.1 connection between client and broker
+    And the client subscribes to <destination>
+    When the client sends a <body> encoded as <encoding> to <destination>
+    And the frame exchange is completed
+    Then the client should have received a <content-type> message of <body> encoded as <final encoding>
+    Examples:
+      | destination  | content-type | body          | encoding     | final encoding |
+      | /queue/test1 | "text/plain" | "hello world" | "UTF-8"      | "UTF-8"        |
+      | /queue/test2 | ""           | "hello world" | "ASCII-8BIT" | "ASCII-8BIT"   |

data/features/steps/acking_messages_steps.rb ADDED Viewed

@@ -0,0 +1,39 @@
+When /^the client acks a message by ID "([^"]*)"$/ do |message_id|
+  @connection.ack message_id
+end
+When /^the client acks the last MESSAGE$/ do
+  @connection.ack @received_frames.select { |f| f.command == "MESSAGE" }.last
+end
+Then /^the client nacking the last MESSAGE should raise an unsupported command error$/ do
+  lambda { @connection.nack @received_frames.select { |f| f.command == "MESSAGE" }.last }.should raise_error(Stomper::Errors::UnsupportedCommandError)
+end
+When /^the client acks a message by ID "([^"]*)" and subscription "([^"]*)"$/ do |message_id, subscription|
+  @connection.ack message_id, subscription
+end
+When /^the client nacks the last MESSAGE$/ do
+  @connection.nack @received_frames.select { |f| f.command == "MESSAGE" }.last
+end
+When /^the client nacks a message by ID "([^"]*)" and subscription "([^"]*)"$/ do |message_id, subscription|
+  @connection.nack message_id, subscription
+end
+Then /^the client acking a message by ID "([^"]*)" should raise an argument error$/ do |message_id|
+  lambda { @connection.ack message_id }.should raise_error(ArgumentError)
+end
+Then /^the client nacking a message by ID "([^"]*)" should raise an argument error$/ do |message_id|
+  lambda { @connection.nack message_id }.should raise_error(ArgumentError)
+end
+Then /^the client acking the last MESSAGE should raise an argument error$/ do
+  lambda { @connection.ack @received_frames.select { |f| f.command == "MESSAGE" }.last }.should raise_error(ArgumentError)
+end
+Then /^the client nacking the last MESSAGE should raise an argument error$/ do
+  lambda { @connection.nack @received_frames.select { |f| f.command == "MESSAGE" }.last }.should raise_error(ArgumentError)
+end

data/features/steps/disconnecting_steps.rb ADDED Viewed

@@ -0,0 +1,8 @@
+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 ADDED Viewed

@@ -0,0 +1,74 @@
+After do |s|
+  @connection && @connection.stop rescue nil
+  @broker && @broker.force_stop
+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 |c, f|
+    @sent_frames << f
+  end
+  @connection.after_receiving do |c, f|
+    @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 ADDED Viewed

@@ -0,0 +1,35 @@
+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

data/features/steps/protocol_version_negotiation_steps.rb ADDED Viewed

@@ -0,0 +1,15 @@
+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/receipts_steps.rb ADDED Viewed

@@ -0,0 +1,79 @@
+When /^the client sends a receipted message "([^"]*)" to "([^"]*)"$/ do |body, destination|
+  @receipts_received ||= {}
+  @connection.send(destination, body) do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end
+end
+Then /^the client should have received a receipt for the last "([^"]*)"$/ do |command|
+  fr = @sent_frames.select { |f| f.command == command }.last
+  (@receipts_received && @receipts_received[fr[:'receipt']]).should_not be_nil
+end
+When /^the client subscribes to "([^"]*)" with a receipt$/ do |destination|
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.subscribe(destination)
+end
+When /^the client unsubscribes from "([^"]*)" with a receipt$/ do |subscription|
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.unsubscribe(subscription)
+end
+When /^the client begins transaction "([^"]*)" with a receipt$/ do |tx|
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.begin(tx)
+end
+When /^the client aborts transaction "([^"]*)" with a receipt$/ do |tx|
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.abort(tx)
+end
+When /^the client commits transaction "([^"]*)" with a receipt$/ do |tx|
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.commit(tx)
+end
+When /^the client acks message "([^"]*)" from "([^"]*)" with a receipt$/ do |m_id, sub_id|
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.ack(m_id, sub_id)
+end
+When /^the client nacks message "([^"]*)" from "([^"]*)" with a receipt$/ do |m_id, sub_id|
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.nack(m_id, sub_id)
+end
+When /^the client disconnects with a receipt$/ do
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.disconnect
+end
+When /^the client connects with a receipt$/ do
+  @receipts_received ||= {}
+  @connection.with_receipt do |r|
+    @receipts_received[r[:'receipt-id']] = r
+  end.transmit(Stomper::Frame.new('CONNECT'))
+end
+Then /^the client should not have added a receipt header to the last "([^"]*)"$/ do |command|
+  fr = @sent_frames.select { |f| f.command == command }.last
+  fr[:receipt].should be_nil
+end

data/features/steps/scopes_steps.rb ADDED Viewed

@@ -0,0 +1,52 @@
+Given /^a header scope with headers$/ do |table|
+  headers = table_to_headers table
+  @scope = @connection.with_headers(headers)
+end
+When /^the client acks a message by ID "([^"]*)" and subscription "([^"]*)" within the scope$/ do |message_id, subscription|
+  @scope.ack message_id, subscription
+end
+When /^the client subscribes to "([^"]*)" with headers within the scope$/ do |dest, table|
+  @subscribe_frames ||= []
+  headers = table_to_headers table
+  @default_subscription_triggered = 0
+  @subscribe_frames << @scope.subscribe(dest, headers) do |m|
+    @default_subscription_triggered += 1
+  end
+end
+Given /^a transaction scope named "([^"]*)"$/ do |tx|
+  @scope = @connection.with_transaction(:transaction => tx)
+end
+When /^the client begins the transaction scope$/ do
+  @scope.begin
+end
+When /^the client nacks a message by ID "([^"]*)" and subscription "([^"]*)" within the scope$/ do |message_id, subscription|
+  @scope.nack message_id, subscription
+end
+When /^the client aborts the transaction scope$/ do
+  @scope.abort
+end
+When /^the client executes a successful transaction block named "([^"]*)"$/ do |tx|
+  @connection.with_transaction(:transaction => tx) do |t|
+    t.ack "message-id", "subscription-id"
+    t.send "/queue/transaction/test", "message"
+    t.nack "message-id-2", "subscription-id-2"
+  end
+end
+When /^the client executes an unsuccessful transaction block named "([^"]*)"$/ do |tx|
+  lambda do
+    @connection.with_transaction(:transaction => tx) do |t|
+      t.ack "message-id", "subscription-id"
+      t.send "/queue/transaction/test", "message"
+      t.nack "message-id-2", "subscription-id-2"
+      raise "transaction will now fail"
+    end
+  end.should raise_error("transaction will now fail")
+end

data/features/steps/secure_connections_steps.rb ADDED Viewed

@@ -0,0 +1,41 @@
+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)
+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 ADDED Viewed

@@ -0,0 +1,35 @@
+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