stomper 0.4 → 1.0.0

data/spec/shared_connection_examples.rb

@@ -2,27 +2,27 @@ shared_examples_for "All Client Connections" do
   describe "connection initializers" do
     describe "from uri" do
       it "should accept the stomp:/// uri (no host specified)" do
-        lambda { @connection.class.new("stomp:///", :connect_now => false) }.should_not raise_error
+        lambda { @connection.class.new("stomp:///") }.should_not raise_error
       end
 
       it "should accept a uri specifying just the host" do
-        lambda { @connection.class.new("stomp://localhost/", :connect_now => false) }.should_not raise_error
+        lambda { @connection.class.new("stomp://localhost/") }.should_not raise_error
       end
 
       it "should accept a uri specifying host and port" do
-        lambda { @connection.class.new("stomp://localhost:61613/", :connect_now => false) }.should_not raise_error
+        lambda { @connection.class.new("stomp://localhost:61613/") }.should_not raise_error
       end
 
       it "should accept a uri specifying host, port and credentials" do
-        lambda { @connection.class.new("stomp://test_user:s3cr3tz@localhost:61613/", :connect_now => false) }.should_not raise_error
+        lambda { @connection.class.new("stomp://test_user:s3cr3tz@localhost:61613/") }.should_not raise_error
       end
 
       it "should accept a uri specifying a secure connection" do
-        lambda { @connection.class.new("stomp+ssl://localhost", :connect_now => false) }.should_not raise_error
+        lambda { @connection.class.new("stomp+ssl://localhost") }.should_not raise_error
       end
 
       it "should not accept a bogus URI" do
-        lambda { @connection.class.new("stomp://localhost:garbage", :connect_now => false) }.should raise_error
+        lambda { @connection.class.new("stomp://localhost:garbage") }.should raise_error
       end
 
     end
@@ -67,18 +67,13 @@ shared_examples_for "All Client Connections" do
     end
   end
 
-  describe "secure connection" do
-    before(:each) do
-      @secure_connection = @connection.class.new("stomp+ssl:///", :connect_now => false)
+  describe "exception handling" do
+    it "should close and propagate when an exception is raised on transmit" do
+      pending
     end
-    it "should transmit frames" do
-      @connection.connect
-      @frame = nil
-      @connection.transmit(Stomper::Frames::Subscribe.new("/topic/test_topic"))
-      @connection.transmit(Stomper::Frames::Send.new("/topic/test_topic", "hello"))
-      @frame = @connection.receive while @frame.nil?
-      @frame.should be_an_instance_of(Stomper::Frames::Message)
-      @frame.body.should == "hello"
+
+    it "should close and propagate when an exception is raised on receive" do
+      pending
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,12 @@
 #  #gem 'rspec'
 #  require 'spec'
 #end
+if RUBY_VERSION >= '1.9.0'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+end
 
 require 'stomper'
 

data/spec/subscriber_spec.rb

@@ -0,0 +1,77 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+
+module Stomper
+  describe Subscriber do
+    class MockConcreteSubscriber
+      include Stomper::Subscriber
+    end
+
+    before(:each) do
+      @client = MockConcreteSubscriber.new
+    end
+    
+    describe "expected interface" do
+      it "should provide a subscribe method" do
+        @client.should respond_to(:subscribe)
+        @client.should_receive(:transmit).with(an_instance_of(Stomper::Frames::Subscribe)).twice.and_return(nil)
+        @client.subscribe("/queue/to", {:additional => 'header'})
+        @client.subscribe("/queue/to")
+      end
+      it "should provide an unsubscribe method" do
+        @client.should respond_to(:unsubscribe)
+        @client.should_receive(:transmit).with(an_instance_of(Stomper::Frames::Subscribe)).twice.and_return(nil)
+        @client.subscribe("/queue/to", {:id => 'subscription-id'})
+        @client.subscribe("/queue/to")
+        @client.should_receive(:transmit).with(an_instance_of(Stomper::Frames::Unsubscribe)).twice.and_return(nil)
+        @client.unsubscribe("/queue/to", 'subscription-id')
+        @client.unsubscribe("/queue/to")
+      end
+    end
+
+    describe "subscribing to queue" do
+      before(:each) do
+        @message_sent = Stomper::Frames::Message.new({:destination => "/queue/test"}, "test message")
+        @client.should_receive(:connected?).any_number_of_times.and_return(true)
+        @client.should_receive(:transmit).with(a_kind_of(Stomper::Frames::ClientFrame)).at_least(:once).and_return(nil)
+      end
+
+      it "should subscribe to a destination with a block" do
+        @client.should_receive(:receive_without_message_dispatch).once.and_return(@message_sent)
+        @message_received = nil
+        @client.subscribe("/queue/test") do |msg|
+          @message_received = msg
+        end
+        @client.receive_with_message_dispatch
+        @message_received.should == @message_sent
+      end
+
+      it "should not unsubscribe from all destinations when a subscription id is provided" do
+        @client.subscribe("/queue/test", { :id => 'subscription-1' }) do |msg|
+          @message_received = msg
+        end
+        @client.subscribe("/queue/test") do |msg|
+          @message_received = msg
+        end
+        @client.subscribe("/queue/test", :id => 'subscription-2') do |msg|
+          @message_received = msg
+        end
+        @client.unsubscribe("/queue/test", 'subscription-1')
+        @client.subscriptions.size.should == 2
+      end
+
+      it "should not unsubscribe from non-naive subscriptions when only a destination is supplied" do
+        @client.subscribe("/queue/test", { :id => 'subscription-1' }) do |msg|
+          @message_received = msg
+        end
+        @client.subscribe("/queue/test") do |msg|
+          @message_received = msg
+        end
+        @client.subscribe("/queue/test") do |msg|
+          @message_received = msg
+        end
+        @client.unsubscribe("/queue/test")
+        @client.subscriptions.size.should == 1
+      end
+    end
+  end
+end

data/spec/subscription_spec.rb

@@ -60,7 +60,7 @@ module Stomper
       it "should accept a message without a subscription header only when the subscription is 'naive'" do
         @matching_subscription_1 = Subscription.new("/queue/test/1")
         @matching_subscription_2 = Subscription.new("/queue/test/1", nil, :auto)
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1'},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1'},"test message")
         @subscription.accepts?(@message).should be_false
         @matching_subscription_1.accepts?(@message).should be_true
         @matching_subscription_2.accepts?(@message).should be_true
@@ -68,34 +68,34 @@ module Stomper
 
       it "should be able to accept messages by destination" do
         @non_matching_subscription = Subscription.new("/queue/test/another")
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1', 'subscription' => @subscription.id},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1', :subscription => @subscription.id},"test message")
         @subscription.accepts?(@message).should be_true
         @non_matching_subscription.accepts?(@message).should be_false
       end
 
       it "should accept messages only if the same destination and subscription" do
         @alternate_subscription = Subscription.new("/queue/test/1", 'subscription-2')
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1', 'subscription' => @subscription.id},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1', :subscription => @subscription.id},"test message")
         @subscription.accepts?(@message).should be_true
         @alternate_subscription.accepts?(@message).should be_false
       end
 
       it "should accept messages by the subscription id if the message has a subscription" do
         @non_matching_subscription = Subscription.new("/queue/test/1")
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1', 'subscription' => @subscription.id},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1', :subscription => @subscription.id},"test message")
         @subscription.accepts?(@message).should be_true
         @non_matching_subscription.accepts?(@message).should be_false
       end
 
       it "should not accept messages with the same destination when its ack mode is not 'auto' and no subscription header was specified" do
         @non_matching_subscription = Subscription.new("/queue/test/1", nil, 'client')
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1'},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1'},"test message")
         @non_matching_subscription.accepts?(@message).should be_false
       end
 
       it "should not accept messages with the same destination when it has a selector and no subscription header was specified" do
         @non_matching_subscription = Subscription.new("/queue/test/1", nil, 'auto', 'rating > 3.0')
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1'},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1'},"test message")
         @non_matching_subscription.accepts?(@message).should be_false
       end
 
@@ -107,7 +107,7 @@ module Stomper
         # To test this without insisting that the #id field be equivalent to the subscribe frame's header
         # go this way:
 
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1', 'subscription' => @non_matching_subscription.id},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1', :subscription => @non_matching_subscription.id},"test message")
         @non_matching_subscription.accepts?(@message).should be_true
       end
     end
@@ -118,14 +118,14 @@ module Stomper
         @subscription_with_block = Subscription.new("/queue/test/1", 'subscription-test') do |msg|
           called_back = (msg == @message)
         end
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1', 'subscription' => @subscription_with_block.id},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1', :subscription => @subscription_with_block.id},"test message")
         @subscription_with_block.perform(@message)
         called_back.should be_true
       end
 
       it "should not call its callback when given a message for a different destination" do
         called_back = false
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1'},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1'},"test message")
         @subscription_with_block = Subscription.new("/queue/test/another", 'subscription-test') do |msg|
           called_back = (msg == @message)
         end
@@ -138,14 +138,14 @@ module Stomper
         @subscription_with_block = Subscription.new("/queue/test/another", 'subscription-test') do |msg|
           called_back = (msg == @message)
         end
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1', 'subscription' => @subscription_with_block.id},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1', :subscription => @subscription_with_block.id},"test message")
         @subscription_with_block.perform(@message)
         called_back.should be_true
       end
 
       it "should not call its callback when a message arrives for its subscription id, even on the same " do
         called_back = false
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1', 'subscription' => 'subscription-not-test'},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1', :subscription => 'subscription-not-test'},"test message")
         @subscription_with_block = Subscription.new("/queue/test/another", 'subscription-test') do |msg|
           called_back = (msg == @message)
         end

data/spec/subscriptions_spec.rb

@@ -48,14 +48,11 @@ module Stomper
         @subscriptions << Subscription.new("/queue/test/1")
         @subscriptions << Subscription.new("/queue/test/2")
         @subscriptions << Subscription.new("/queue/test/3")
-        Thread.new { sleep(0.1); @subscriptions.remove("/queue/test/1") }
-        # In general, this next step should execute before the thread has a chance to
-        # but the sleep in the map should mean that our thread gets woken up before
-        # map finishes.  However, destinations should NEVER contain "/queue/test/4"
-        # because map should be synchronized.
+        sync_thread = Thread.new { sleep(0.1); @subscriptions.remove("/queue/test/1") }
         destinations = @subscriptions.map { |sub| sleep(0.1); sub.destination }
         destinations.size.should == 3
         destinations.should == ['/queue/test/1', '/queue/test/2', '/queue/test/3']
+        sync_thread.join
         @subscriptions.size.should == 2
         @subscriptions.first.destination.should == "/queue/test/2"
       end
@@ -70,7 +67,7 @@ module Stomper
         @subscriptions << Subscription.new("/queue/test/1") { |msg| received_1 = true }
         @subscriptions << Subscription.new("/queue/test/1", 'subscription-2') { |msg| received_2 = true }
         @subscriptions << Subscription.new("/queue/test/2") { |msg| received_3 = true }
-        @message = Stomper::Frames::Message.new({'destination' => '/queue/test/1'},"test message")
+        @message = Stomper::Frames::Message.new({:destination => '/queue/test/1'},"test message")
         @subscriptions.perform(@message)
         received_1.should be_true
         received_2.should be_false

data/spec/threaded_receiver_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+module Stomper
+  describe ThreadedReceiver do
+    before(:each) do
+      @connection = mock("connection")
+      @connection.extend Stomper::ThreadedReceiver
+    end
+    
+    describe "expected interface" do
+      it "should provide a start method" do
+        @connection.should respond_to(:start)
+      end
+      
+      it "should provide a stop method" do
+        @connection.should respond_to(:stop)
+      end
+    end
+    
+    describe "reading on a thread" do
+      it "should start receiving when started, and stop when stopped." do
+        @connection.should_receive(:connected?).once.and_return(false)
+        @connection.should_receive(:connect).once.and_return(true)
+        @connection.should_receive(:connected?).any_number_of_times.and_return(true)
+        @connection.should_receive(:receive).at_least(:once).and_return(nil)
+        @connection.start
+        sleep(0.5)
+        @connection.stop
+        @connection.should_not_receive(:receive)
+      end
+    end
+  end
+end

data/spec/transaction_spec.rb

@@ -35,7 +35,7 @@ module Stomper
       before(:each) do
         @transaction_name = "tx-test"
         @mock_client.should_receive(:begin).once.with(@transaction_name).and_return(nil)
-        @mock_client.should_receive(:send).once.with("/queue/test/1","test message", hash_including("transaction" => @transaction_name)).and_return(nil)
+        @mock_client.should_receive(:send).once.with("/queue/test/1","test message", hash_including(:transaction => @transaction_name)).and_return(nil)
         @mock_client.should_receive(:commit).once.with(@transaction_name).and_return(nil)
       end
 
@@ -50,7 +50,7 @@ module Stomper
       before(:each) do
         @transaction_name = "tx-test-2"
         @mock_client.should_receive(:begin).once.with(@transaction_name).and_return(nil)
-        @mock_client.should_receive(:send).once.with("/queue/test/1","test message", hash_including("transaction" => @transaction_name)).and_return(nil)
+        @mock_client.should_receive(:send).once.with("/queue/test/1","test message", hash_including(:transaction => @transaction_name)).and_return(nil)
       end
 
       it "should abort when an exception is raised" do
@@ -97,8 +97,8 @@ module Stomper
         @inner_inner_transaction_name = "#{@transaction_name}-inner-inner"
         @mock_client.should_receive(:begin).with(@transaction_name).once.and_return(nil)
         @mock_client.should_receive(:begin).with(@inner_transaction_name).once.and_return(nil)
-        @mock_client.should_receive(:send).with("/queue/test/1","test message", hash_including("transaction" => @transaction_name)).once.and_return(nil)
-        @mock_client.should_receive(:send).with("/queue/test/2","inner message", hash_including("transaction" => @inner_transaction_name)).once.and_return(nil)
+        @mock_client.should_receive(:send).with("/queue/test/1","test message", hash_including(:transaction => @transaction_name)).once.and_return(nil)
+        @mock_client.should_receive(:send).with("/queue/test/2","inner message", hash_including(:transaction => @inner_transaction_name)).once.and_return(nil)
       end
       it "no transaction should succeed when an inner one fails" do
         @mock_client.should_receive(:abort).once.with(@transaction_name).and_return(nil)
@@ -116,7 +116,7 @@ module Stomper
       end
       it "no transaction should succeed when an inner one is explicitly aborted" do
         @mock_client.should_receive(:begin).with(@inner_inner_transaction_name).once.and_return(nil)
-        @mock_client.should_receive(:send).with("/queue/test/3","inner-inner message", hash_including("transaction" => @inner_inner_transaction_name)).once.and_return(nil)
+        @mock_client.should_receive(:send).with("/queue/test/3","inner-inner message", hash_including(:transaction => @inner_inner_transaction_name)).once.and_return(nil)
         @mock_client.should_receive(:abort).once.with(@transaction_name).and_return(nil)
         @mock_client.should_receive(:abort).once.with(@inner_transaction_name).and_return(nil)
         @mock_client.should_receive(:abort).once.with(@inner_inner_transaction_name).and_return(nil)

data/spec/transactor_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+
+module Stomper
+  describe Transactor do
+    class MockConcreteTransactor
+      include Stomper::Transactor
+    end
+
+    before(:each) do
+      @client = MockConcreteTransactor.new
+    end
+    
+    describe "expected interface" do
+      it "should provide a transaction method" do
+        @client.should respond_to(:transaction)
+      end
+      it "should provide a begin method" do
+        @client.should respond_to(:begin)
+        @client.should_receive(:transmit).with(an_instance_of(Stomper::Frames::Begin)).once.and_return(nil)
+        @client.begin("tx-001")
+      end
+      it "should proivde an abort method" do
+        @client.should respond_to(:abort)
+        @client.should_receive(:transmit).with(an_instance_of(Stomper::Frames::Abort)).once.and_return(nil)
+        @client.abort("tx-001")
+      end
+      it "should provide a commit method" do
+        @client.should respond_to(:commit)
+        @client.should_receive(:transmit).with(an_instance_of(Stomper::Frames::Commit)).once.and_return(nil)
+        @client.commit("tx-001")
+      end
+    end
+
+    describe "transactions" do
+      it "should provide a transaction method that generates a new Transaction" do
+        @client.should_receive(:begin)
+        @client.should_receive(:commit)
+        @evaluated = false
+        @client.transaction do |t|
+          @evaluated = true
+        end
+        @evaluated.should be_true
+      end
+    end
+  end
+end

metadata

@@ -3,9 +3,10 @@ name: stomper
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 4
-  version: "0.4"
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Ian D. Eccles
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -04:00
+date: 2010-09-27 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -30,10 +31,18 @@ extra_rdoc_files:
 - LICENSE
 - AUTHORS
 files: 
+- lib/stomper/receiptor.rb
 - lib/stomper/subscription.rb
+- lib/stomper/transactor.rb
+- lib/stomper/receipt_handlers.rb
+- lib/stomper/frame_reader.rb
 - lib/stomper/frames.rb
+- lib/stomper/subscriber.rb
 - lib/stomper/transaction.rb
+- lib/stomper/threaded_receiver.rb
+- lib/stomper/sockets.rb
 - lib/stomper/subscriptions.rb
+- lib/stomper/uri.rb
 - lib/stomper/frames/send.rb
 - lib/stomper/frames/receipt.rb
 - lib/stomper/frames/ack.rb
@@ -46,23 +55,31 @@ files:
 - lib/stomper/frames/begin.rb
 - lib/stomper/frames/unsubscribe.rb
 - lib/stomper/frames/connect.rb
-- lib/stomper/frames/headers.rb
 - lib/stomper/frames/abort.rb
 - lib/stomper/frames/commit.rb
 - lib/stomper/frames/subscribe.rb
+- lib/stomper/frame_writer.rb
 - lib/stomper/client.rb
 - lib/stomper/connection.rb
+- lib/stomper/open_uri_interface.rb
 - lib/stomper.rb
+- spec/threaded_receiver_spec.rb
+- spec/open_uri_interface_spec.rb
+- spec/frame_writer_spec.rb
 - spec/subscriptions_spec.rb
+- spec/frame_reader_spec.rb
 - spec/spec_helper.rb
+- spec/transactor_spec.rb
 - spec/shared_connection_examples.rb
 - spec/spec.opts
+- spec/receiptor_spec.rb
 - spec/frames/server_frame_spec.rb
 - spec/frames/client_frame_spec.rb
-- spec/frames/headers_spec.rb
+- spec/frames/indirect_frame_spec.rb
 - spec/connection_spec.rb
 - spec/subscription_spec.rb
 - spec/client_spec.rb
+- spec/subscriber_spec.rb
 - spec/transaction_spec.rb
 - README.rdoc
 - CHANGELOG
@@ -107,14 +124,21 @@ signing_key:
 specification_version: 3
 summary: Ruby client for the stomp messaging protocol derived from the original stomp gem
 test_files: 
+- spec/threaded_receiver_spec.rb
+- spec/open_uri_interface_spec.rb
+- spec/frame_writer_spec.rb
 - spec/subscriptions_spec.rb
+- spec/frame_reader_spec.rb
 - spec/spec_helper.rb
+- spec/transactor_spec.rb
 - spec/shared_connection_examples.rb
 - spec/spec.opts
+- spec/receiptor_spec.rb
 - spec/frames/server_frame_spec.rb
 - spec/frames/client_frame_spec.rb
-- spec/frames/headers_spec.rb
+- spec/frames/indirect_frame_spec.rb
 - spec/connection_spec.rb
 - spec/subscription_spec.rb
 - spec/client_spec.rb
+- spec/subscriber_spec.rb
 - spec/transaction_spec.rb