onstomp 1.0.0 → 1.0.1

data/spec/onstomp/failover/failover_events_spec.rb

@@ -61,8 +61,7 @@ module OnStomp::Failover
         end
       end
       
-      [:connect_failure, :retries_exceeded,
-        :lost, :connected].each do |ev|
+      [:connect_failure, :lost, :connected].each do |ev|
         it "should have an event :on_failover_#{ev}" do
           triggered = false
           events.send(:"on_failover_#{ev}") { |*_| triggered = true }

data/spec/onstomp/failover/uri_spec.rb

@@ -4,16 +4,49 @@ require 'spec_helper'
 module OnStomp::Failover
   describe URI, :failover => true do
     describe "parsing failover: URIs" do
-      it "should parse the string and the internal URIs" do
-        uri = ::URI.parse('failover:(stomp://host.domain.tld,stomp+ssl:///?param=value&param2=value2,stomp://user:pass@other.host.tld)?param=blah&param2=testing')
+      def parse_failover_uri str
+        OnStomp::Failover::URI::FAILOVER.parse str
+      end
+      
+      it "should parse failover:(uri1,uri2...)?failoverParam1=..." do
+        uri = parse_failover_uri 'failover:(stomp://host.domain.tld,stomp+ssl:///?param=value&param2=value2,stomp://user:pass@other.host.tld)?param=blah&param2=testing'
+        uri.query.should == 'param=blah&param2=testing'
+        uri.failover_uris.map { |u| u.scheme }.should == ['stomp', 'stomp+ssl', 'stomp']
+        uri.failover_uris.map { |u| u.host }.should == ['host.domain.tld', nil, 'other.host.tld']
+        uri.failover_uris.map { |u| u.query }.should == [nil, 'param=value&param2=value2', nil]
+        uri.to_s.should == "failover:(stomp://host.domain.tld,stomp+ssl:///?param=value&param2=value2,stomp://user:pass@other.host.tld)?param=blah&param2=testing"
+      end
+      it "should parse failover://(uri1,uri2...)?failoverParam1=..." do
+        uri = parse_failover_uri 'failover://(stomp://host.domain.tld,stomp+ssl:///?param=value&param2=value2,stomp://user:pass@other.host.tld)?param=blah&param2=testing'
         uri.query.should == 'param=blah&param2=testing'
         uri.failover_uris.map { |u| u.scheme }.should == ['stomp', 'stomp+ssl', 'stomp']
         uri.failover_uris.map { |u| u.host }.should == ['host.domain.tld', nil, 'other.host.tld']
         uri.failover_uris.map { |u| u.query }.should == [nil, 'param=value&param2=value2', nil]
+        uri.to_s.should == "failover:(stomp://host.domain.tld,stomp+ssl:///?param=value&param2=value2,stomp://user:pass@other.host.tld)?param=blah&param2=testing"
+      end
+      it "should parse failover://uri1,uri2,..." do
+        uri = parse_failover_uri 'failover://stomp://host.domain.tld,stomp+ssl:///?param=value&param2=value2,stomp://user:pass@other.host.tld'
+        uri.query.should be_nil
+        uri.failover_uris.map { |u| u.scheme }.should == ['stomp', 'stomp+ssl', 'stomp']
+        uri.failover_uris.map { |u| u.host }.should == ['host.domain.tld', nil, 'other.host.tld']
+        uri.failover_uris.map { |u| u.query }.should == [nil, 'param=value&param2=value2', nil]
+        uri.to_s.should == "failover:(stomp://host.domain.tld,stomp+ssl:///?param=value&param2=value2,stomp://user:pass@other.host.tld)"
+      end
+      it "should parse an array of failover URIs" do
+        uris = [ "stomp://host.domain.tld",
+          ::URI.parse("stomp://user:pass@other.host.tld"),
+          "stomp+ssl:///?param=value&param2=value2"]
+        uri = parse_failover_uri uris
+        uri.query.should be_nil
+        uri.failover_uris.map { |u| u.scheme }.should == ['stomp', 'stomp', 'stomp+ssl']
+        uri.failover_uris.map { |u| u.host }.should == ['host.domain.tld', 'other.host.tld', nil]
+        uri.failover_uris.map { |u| u.query }.should == [nil, nil, 'param=value&param2=value2']
+        uri.to_s.should == "failover:(stomp://host.domain.tld,stomp://user:pass@other.host.tld,stomp+ssl:///?param=value&param2=value2)"
       end
-      it "should raise an error if the failover URI doesn't match regex" do
+      it "should raise an error if it doesn't match the regex and isn't an array" do
         lambda {
-          ::URI.parse('failover://stomp://host.domain.tld,stomp+ssl://sunday.after.you')
+          # The regex is pretty lax...
+          parse_failover_uri "failover:"
         }.should raise_error(OnStomp::Failover::InvalidFailoverURIError)
       end
     end

data/spec/onstomp/full_stacks/failover_spec.rb

@@ -3,53 +3,104 @@ require 'spec_helper'
 require File.expand_path('../test_broker', __FILE__)
 
 describe OnStomp::Failover, "full stack test", :fullstack => true, :failover => true do
-  let(:broker) {
-    TestBroker.new
+  let(:brokers) {
+    [TestBroker.new(10102),
+      TestBroker.new(10103)]
   }
   before(:each) do
-    broker.start
+    brokers.each &:start
   end
   after(:each) do
-    broker.stop
+    brokers.each &:stop
   end
   
-  describe "failing over" do
-    it "should do something worthwhile" do
+  describe "failing over with a Written buffer" do
+    # We wrote [stomp://localhost:10102]: CONNECT / {:"accept-version"=>"1.0,1.1", :host=>"localhost", :"heart-beat"=>"0,0", :login=>"", :passcode=>""}
+    # We wrote [stomp://localhost:10102]: SEND / {:"x-onstomp-real-client"=>"2156558740", :destination=>"/queue/onstomp/failover/test", :"content-length"=>"22"}
+    # We wrote [stomp://localhost:10102]: BEGIN / {:"x-onstomp-real-client"=>"2156558740", :transaction=>"t-1234"}
+    # We wrote [stomp://localhost:10102]: SEND / {:transaction=>"t-1234", :"x-onstomp-real-client"=>"2156558740", :destination=>"/queue/onstomp/failover/test", :"content-length"=>"15"}
+    # We wrote [stomp://localhost:10102]: SUBSCRIBE / {:id=>"1", :"x-onstomp-real-client"=>"2156558740", :ack=>"auto", :destination=>"/queue/onstomp/failover/test"}
+    # We wrote [stomp://localhost:10102]: SEND / {:"x-onstomp-real-client"=>"2156558740", :destination=>"/queue/onstomp/failover/test", :"content-length"=>"18"}
+    # We wrote [stomp://localhost:10103]: CONNECT / {:"accept-version"=>"1.0,1.1", :host=>"localhost", :"heart-beat"=>"0,0", :login=>"", :passcode=>""}
+    # We wrote [stomp://localhost:10103]: DISCONNECT / {:"x-onstomp-real-client"=>"2156556660"}
+    # Received: ["CONNECT", "SEND", "BEGIN", "SEND", "SUBSCRIBE"]We wrote [stomp://localhost:10103]: BEGIN / {:"x-onstomp-real-client"=>"2156558740", :transaction=>"t-1234", :"x-onstomp-failover-replay"=>"1"}
+    # 
+    # Transmitted: ["CONNECTED"]
+    # Received: ["CONNECT", "DISCONNECT"]
+    # Transmitted: ["CONNECTED"]
+    # 
+    it "should failover" do
+      # Occasionally generates: ["CONNECT", "DISCONNECT", "BEGIN", "SEND", "SUBSCRIBE", "SEND", "COMMIT"]
       committed = false
+      brokers.first.kill_on_command 'SUBSCRIBE'
       killed = false
       
-      client = OnStomp::Failover::Client.new('failover:(stomp:///,stomp:///)')      
-      client.on_commit do |c|
-        committed = true
+      client = OnStomp::Failover::Client.new('failover:(stomp://localhost:10102,stomp://localhost:10103)')
+      client.on_subscribe do |s, rc|
+        # This frame will almost always get written to the first broker before the hangup occurs
+        client.send '/queue/onstomp/failover/test', 'are you receiving?',
+          :'x-onstomp-real-client' => rc.uri
+      end
+      
+      client.connect
+      client.send '/queue/onstomp/failover/test', '4-3-2-1 Earth Below Me',
+        :'x-onstomp-real-client' => client.active_client.uri
+      client.begin 't-1234', :'x-onstomp-real-client' => client.active_client.uri
+      client.send '/queue/onstomp/failover/test', 'hello major tom',
+        :transaction => 't-1234', :'x-onstomp-real-client' => client.active_client.uri
+      client.subscribe('/queue/onstomp/failover/test', :'x-onstomp-real-client' => client.active_client.uri) do |m|
+      end
+      Thread.pass while client.connected?
+      
+      client.send '/queue/onstomp/failover/test', 'Are you receiving?',
+        :'x-onstomp-real-client' => client.active_client.uri
+      sub = client.subscribe('/queue/onstomp/failover/test2', :'x-onstomp-real-client' => client.active_client.uri) do |m|
       end
+      client.unsubscribe sub, :'x-onstomp-real-client' => client.active_client.uri
+      client.commit 't-1234', :'x-onstomp-real-client' => client.active_client.uri
+      
+      client.disconnect :'x-onstomp-real-client' => client.active_client.uri
+      brokers.each(&:join)
+      brokers.first.frames_received.map(&:command).should == ["CONNECT", "SEND", "BEGIN", "SEND", "SUBSCRIBE"]
+      brokers.last.frames_received.map(&:command).should == ["CONNECT", "BEGIN", "SEND", "SUBSCRIBE", "SEND", "COMMIT", "SEND", "DISCONNECT"]
+    end
+  end
+  describe "failing over with a Receipts buffer" do
+    it "should failover" do
+      committed = false
+      killed = false
+      brokers.first.kill_on_command 'SUBSCRIBE'
+      
+      client = OnStomp::Failover::Client.new('failover:(stomp://localhost:10102,stomp://localhost:10103)',
+        :buffer => OnStomp::Failover::Buffers::Receipts)
       client.on_subscribe do |s, rc|
-        broker.kill_sessions unless killed
-        killed = true
+        # This frame will get written, but the broker will hang up before
+        # a RECEIPT is given, so it will get repeated
         client.send '/queue/onstomp/failover/test', 'are you receiving?',
-          :'x-onstomp-real-client' => rc.object_id
+          :'x-onstomp-real-client' => rc.uri
       end
       
       client.connect
       client.send '/queue/onstomp/failover/test', '4-3-2-1 Earth Below Me',
-        :'x-onstomp-real-client' => client.active_client.object_id
-      client.begin 't-1234', :'x-onstomp-real-client' => client.active_client.object_id
+        :'x-onstomp-real-client' => client.active_client.uri
+      client.begin 't-1234', :'x-onstomp-real-client' => client.active_client.uri
       client.send '/queue/onstomp/failover/test', 'hello major tom',
-        :transaction => 't-1234', :'x-onstomp-real-client' => client.active_client.object_id
-      client.subscribe('/queue/onstomp/failover/test', :'x-onstomp-real-client' => client.active_client.object_id) do |m|
+        :transaction => 't-1234', :'x-onstomp-real-client' => client.active_client.uri
+      client.subscribe('/queue/onstomp/failover/test', :'x-onstomp-real-client' => client.active_client.uri) do |m|
       end
       Thread.pass while client.connected?
       
       client.send '/queue/onstomp/failover/test', 'Are you receiving?',
-        :'x-onstomp-real-client' => client.active_client.object_id
-      sub = client.subscribe('/queue/onstomp/failover/test2', :'x-onstomp-real-client' => client.active_client.object_id) do |m|
+        :'x-onstomp-real-client' => client.active_client.uri
+      sub = client.subscribe('/queue/onstomp/failover/test2', :'x-onstomp-real-client' => client.active_client.uri) do |m|
       end
-      client.unsubscribe sub, :'x-onstomp-real-client' => client.active_client.object_id
-      client.commit 't-1234', :'x-onstomp-real-client' => client.active_client.object_id
-      # This is not waiting for debuffering?
-      client.disconnect :'x-onstomp-real-client' => client.active_client.object_id
-      broker.join
-      killed.should be_true
-      committed.should be_true
+      client.unsubscribe sub, :'x-onstomp-real-client' => client.active_client.uri
+      client.commit 't-1234', :'x-onstomp-real-client' => client.active_client.uri
+      
+      client.disconnect :'x-onstomp-real-client' => client.active_client.uri
+      brokers.each(&:join)
+      brokers.first.frames_received.map(&:command).should == ["CONNECT", "SEND", "BEGIN", "SEND", "SUBSCRIBE"]
+      brokers.last.frames_received.map(&:command).should == ["CONNECT", "SEND", "BEGIN", "SEND", "SUBSCRIBE", "SEND", "SEND", "COMMIT", "SEND", "DISCONNECT"]
     end
   end
 end

data/spec/onstomp/full_stacks/onstomp_spec.rb

@@ -2,14 +2,58 @@
 require 'spec_helper'
 require File.expand_path('../test_broker', __FILE__)
 
-describe OnStomp::Client, "full stack test", :fullstack => true do
-  let(:broker) {
-    TestBroker.new
-  }
-  before(:each) do
-    broker.start
+describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
+  describe "STOMP 1.0" do
+    let(:broker) {
+      TestBroker.new 10101
+    }
+    before(:each) do
+      broker.start
+    end
+    after(:each) do
+      broker.stop
+    end
+  
+    describe "connecting" do
+      it "should connect to the broker given a CA path" do
+        client = OnStomp::Client.new('stomp://localhost:10101')
+        client.connect
+        client.send '/queue/test', 'my message body', {
+          "this:is\na \\fun\\ header" => 'blather matter'
+        }
+        client.send '/queue/test', "\x01\x02\x03\x04\x05\x06".encode('BINARY'),
+          :'content-type' => 'application/octet-stream'
+        client.disconnect
+        broker.join
+      end
+    end
   end
-  after(:each) do
-    broker.stop
+  describe "STOMP 1.1" do
+    let(:broker) {
+      TestBroker.new(10101).tap do |b|
+        b.session_class = TestBroker::Session11
+      end
+    }
+    before(:each) do
+      broker.start
+    end
+    after(:each) do
+      broker.stop
+    end
+  
+    describe "connecting" do
+      it "should connect to the broker given a CA path" do
+        client = OnStomp::Client.new('stomp://localhost:10101')
+        client.connect
+        client.send '/queue/test', 'my message body', {
+          "this:is\na \\fun\\ header" => 'blather matter'
+        }
+        client.send '/queue/test', "\x01\x02\x03\x04\x05\x06".encode('BINARY'),
+          :'content-type' => 'application/octet-stream'
+        client.disconnect
+        broker.join
+      end
+    end
   end
+
 end

data/spec/onstomp/full_stacks/onstomp_ssh_spec.rb

@@ -0,0 +1,83 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+require File.expand_path('../test_broker', __FILE__)
+
+describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
+  describe "STOMP 1.0" do
+    let(:broker) {
+      TestSSLBroker.new 10103
+    }
+    before(:each) do
+      broker.start
+    end
+    after(:each) do
+      broker.stop
+    end
+  
+    describe "connecting with SSL options" do
+      it "should connect to the broker given a CA path" do
+        client = OnStomp::Client.new('stomp+ssl://localhost:10103', :ssl => {
+          :ca_file => File.expand_path('../ssl/demoCA/cacert.pem', __FILE__),
+          :post_connection_check => 'My Broker'
+        })
+        client.connect
+        client.send '/queue/test', 'my message body', {
+          "this:is\na \\fun\\ header" => 'blather matter'
+        }
+        client.send '/queue/test', "\x01\x02\x03\x04\x05\x06".encode('BINARY'),
+          :'content-type' => 'application/octet-stream'
+        client.disconnect
+        broker.join
+      end
+      it "should fail when post connection check does not match CN" do
+        client = OnStomp::Client.new('stomp+ssl://localhost:10103', :ssl => {
+          :ca_file => File.expand_path('../ssl/demoCA/cacert.pem', __FILE__),
+          :post_connection_check => 'Sweet Brokerage'
+        })
+        lambda {
+          client.connect
+        }.should raise_error('hostname was not match with the server certificate')
+      end
+    end
+  end
+  describe "STOMP 1.1" do
+    let(:broker) {
+      TestSSLBroker.new(10103).tap do |b|
+        b.session_class = TestBroker::Session11
+      end
+    }
+    before(:each) do
+      broker.start
+    end
+    after(:each) do
+      broker.stop
+    end
+  
+    describe "connecting with SSL options" do
+      it "should connect to the broker given a CA path" do
+        client = OnStomp::Client.new('stomp+ssl://localhost:10103', :ssl => {
+          :ca_file => File.expand_path('../ssl/demoCA/cacert.pem', __FILE__),
+          :post_connection_check => 'My Broker'
+        })
+        client.connect
+        client.send '/queue/test', 'my message body', {
+          "this:is\na \\fun\\ header" => 'blather matter'
+        }
+        client.send '/queue/test', "\x01\x02\x03\x04\x05\x06".encode('BINARY'),
+          :'content-type' => 'application/octet-stream'
+        client.disconnect
+        broker.join
+      end
+      it "should fail when post connection check does not match CN" do
+        client = OnStomp::Client.new('stomp+ssl://localhost:10103', :ssl => {
+          :ca_file => File.expand_path('../ssl/demoCA/cacert.pem', __FILE__),
+          :post_connection_check => 'Sweet Brokerage'
+        })
+        lambda {
+          client.connect
+        }.should raise_error('hostname was not match with the server certificate')
+      end
+    end
+  end
+
+end

data/spec/onstomp/full_stacks/test_broker.rb

@@ -5,9 +5,13 @@
 class TestBroker
   class StopThread < StandardError; end
   
-  attr_reader :messages, :sessions
+  attr_reader :messages, :sessions, :mau_dib
+  attr_reader :frames_received, :frames_transmitted
+  attr_accessor :session_class
   
   def initialize(port=61613)
+    @frames_received = []
+    @frames_transmitted = []
     @sessions = []
     @messages = Hash.new { |h,k| h[k] = [] }
     @subscribes = Hash.new { |h,k| h[k] = [] }
@@ -21,14 +25,9 @@ class TestBroker
     end
     @session_class = Session10
   end
-  
-  def kill_sessions
-    @session_mutex.synchronize do
-      @sessions.each do |s|
-        s.kill
-      end
-      @sessions.clear
-    end
+    
+  def kill_on_command command
+    @mau_dib = command
   end
   
   def enqueue_message s
@@ -88,14 +87,15 @@ class TestBroker
     @listener = Thread.new do
       begin
         loop do
-          sess = @session_class.new(self, @socket.accept)
+          sock = @socket.accept
           @session_mutex.synchronize do
-            @sessions << sess
+            @sessions << @session_class.new(self, sock)
           end
         end
       rescue StopThread
       rescue Exception
         $stdout.puts "Listener failed: #{$!}"
+        $stdout.puts $!.backtrace
         stop
       end
     end
@@ -123,17 +123,11 @@ class TestBroker
       @socket = sock
       init_events
       init_connection
-      # CONNECT/CONNECTED handshake
-      connect_frame = connected_frame = nil
+      connect_frame = nil
       @connection.io_process_read do |f|
         connect_frame ||= f
       end until connect_frame
-      
-      transmit OnStomp::Components::Frame.new('CONNECTED')
-      @connection.io_process_write do |f|
-        connected_frame ||= f
-      end until connected_frame
-      @processor.start
+      reply_to_connect connect_frame
     end
     
     def init_connection
@@ -141,6 +135,15 @@ class TestBroker
       @processor = OnStomp::Components::ThreadedProcessor.new self
     end
     
+    def reply_to_connect connect_frame
+      connected_frame = nil
+      transmit OnStomp::Components::Frame.new('CONNECTED')
+      @connection.io_process_write do |f|
+        connected_frame ||= f
+      end until connected_frame
+      @processor.start
+    end
+    
     def connected?
       @connection.connected?
     end
@@ -165,7 +168,15 @@ class TestBroker
         @connection.close
       end
       
+      after_transmitting do |f,_|
+        @server.frames_transmitted << f
+      end
+      
       before_receiving do |f,_|
+        @server.frames_received << f
+        if @server.mau_dib && f.command == @server.mau_dib
+          kill
+        end
         if f.header? :receipt
           transmit OnStomp::Components::Frame.new('RECEIPT',
             :'receipt-id' => f[:receipt])
@@ -213,10 +224,19 @@ class TestBroker
     def init_events
       super
     end
-
-    def init_connection
-      @connection = OnStomp::Connections::Stomp_1_1.new(socket, self)
-      @processor = OnStomp::Components::ThreadedProcessor.new self
+    
+    def heartbeats; [3000, 10000]; end
+    
+    def reply_to_connect connect_frame
+      connected_frame = nil
+      transmit OnStomp::Components::Frame.new('CONNECTED',
+        :version => '1.1', :'heart-beat' => heartbeats)
+      @connection.io_process_write do |f|
+        connected_frame ||= f
+      end until connected_frame
+      @connection = OnStomp::Connections::Stomp_1_1.new(@connection.socket, self)
+      @connection.configure connect_frame, {}
+      @processor.start
     end
   end
   
@@ -233,8 +253,8 @@ class TestSSLBroker < TestBroker
   }
   
   def initialize(port=61612, certs=:default)
-    @port = port
-    @tcp_socket = TCPServer.new(@port)
+    super(port)
+    @tcp_socket = @socket
     @ssl_context = OpenSSL::SSL::SSLContext.new
     @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
     cert_files = SSL_CERT_FILES[certs]
@@ -243,9 +263,5 @@ class TestSSLBroker < TestBroker
     @socket = OpenSSL::SSL::SSLServer.new(@tcp_socket, @ssl_context)
     @socket.start_immediately = true
     @session = nil
-    @version = '1.1'
-    @session_class = StompSession
-    @sent_frames = []
-    @received_frames = []
   end
 end