onstomp 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,4 +1,20 @@
 # Changes
 
+## 1.0.2
+* allow failover clients to be constructed from regular OnStomp::Client
+  instances, allowing fully configured SSL connections.
+
+## 1.0.1
+* improved failover buffer handling
+* added RECEIPT driven failover buffer handling - more reliable, but slower
+  as it requests receipts for nearly all frames.
+
+## 1.0.0
+* initial release
+* support for STOMP 1.0 and STOMP 1.1 protocols
+* fully featured client with event bindings and non-blocking IO
+* experimental support for open-uri STOMP interface
+* experimental support for failover/reliable connection handling
+
 ## 1.0pre - 2011-03-30
 * initial pre-release

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in onstomp.gemspec
 gemspec
+
+group :development do
+  gem 'rdiscount'
+end

data/README.md

@@ -48,9 +48,9 @@ style API for working with message brokers.
 
 ## Further Reading
 
-* A {file:docs/UserNarrative.md User's Narrative}
-* A {file:docs/DeveloperNarrative.md Developers's Narrative}
-* A {file:docs/CHANGELOG.md History of Changes}
+* A {file:extra_doc/UserNarrative.md User's Narrative}
+* A {file:extra_doc/DeveloperNarrative.md Developers's Narrative}
+* A {file:extra_doc/CHANGELOG.md History of Changes}
 
 ## License
 

data/lib/onstomp/failover/client.rb

@@ -32,13 +32,20 @@ class OnStomp::Failover::Client
   # @return [true,false]
   attr_configurable_bool :randomize, :default => false
   
-  attr_reader :uri, :client_pool, :active_client, :frame_buffer, :connection
+  attr_reader :uri, :hosts,
+    :client_pool, :active_client, :frame_buffer, :connection
   
   def initialize(uris, options={})
-    @uri = OnStomp::Failover::URI::FAILOVER.parse uris
+    if uris.is_a? Array
+      @uri = OnStomp::Failover::URI::FAILOVER.new [], nil
+      @hosts = uris
+    else
+      @uri = OnStomp::Failover::URI::FAILOVER.parse uris
+      @hosts = @uri.failover_uris
+    end
     @client_mutex = Mutex.new
     configure_configurable options
-    create_client_pool
+    create_client_pool hosts
     @active_client = nil
     @connection = nil
     @frame_buffer = buffer.new self
@@ -118,8 +125,8 @@ class OnStomp::Failover::Client
     sleep(retry_delay) if retry_delay > 0 && attempt > 1
   end
     
-  def create_client_pool
-    @client_pool = pool.new(uri.failover_uris)
+  def create_client_pool hosts
+    @client_pool = pool.new hosts
     on_connection_closed do |client, *_|
       unless @disconnecting
         trigger_failover_event(:lost, :on, active_client)

data/lib/onstomp/failover/pools/base.rb

@@ -8,9 +8,9 @@ class OnStomp::Failover::Pools::Base
   
   # Creates a new client pool by mapping an array of URIs into an array of
   # {OnStomp::Client clients}.
-  def initialize uris
-    @clients = uris.map do |u|
-      OnStomp::Client.new u
+  def initialize hosts
+    @clients = hosts.map do |h|
+      h.is_a?(OnStomp::Client) ? h : OnStomp::Client.new(h)
     end
   end
   

data/lib/onstomp/failover/uri.rb

@@ -12,9 +12,7 @@ module OnStomp::Failover::URI
     
     attr_reader :failover_uris
     def initialize uris, query
-      @failover_uris = uris.map do |u|
-        u.is_a?(::URI) ? u : ::URI.parse(u.strip)
-      end
+      @failover_uris = uris
       super 'failover', nil, nil, nil, nil, '', "(#{uris.join(',')})", query, nil
     end
     
@@ -42,12 +40,10 @@ module OnStomp::Failover::URI
       #   @param [Array<String or URI>] uri_arr
       #   @return [FAILOVER]
       def parse uri_str
-        if uri_str.is_a? Array
-          self.new uri_str, nil
-        elsif uri_str =~ FAILOVER_REG
+        if uri_str =~ FAILOVER_REG
           self.new $1.split(','), $2
         else
-          raise OnStomp::Failover::InvalidFailoverURIError, uri_str
+          raise OnStomp::Failover::InvalidFailoverURIError, uri_str.inspect
         end
       end
     end

data/lib/onstomp/version.rb

@@ -7,7 +7,7 @@ module OnStomp
   # Minor / feature version
   MINOR = 0
   # Patch version
-  PATCH = 1
+  PATCH = 2
   # Complete version
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 end

data/spec/onstomp/failover/client_spec.rb

@@ -13,6 +13,20 @@ module OnStomp::Failover
         c.stub(:active_client => active_client)
       end
     }
+    describe "initialize" do
+      it "should be initialized by string" do
+        c = Client.new('failover:(stomp:///,stomp+ssl:///)')
+        c.uri.to_s.should == 'failover:(stomp:///,stomp+ssl:///)'
+        c.hosts.should == ['stomp:///', 'stomp+ssl:///']
+      end
+      it "should be initialized by array" do
+        real_client = OnStomp::Client.new('stomp+ssl:///')
+        c = Client.new(['stomp:///', real_client])
+        c.uri.to_s.should == 'failover:()'
+        c.hosts.should == ['stomp:///', real_client]
+      end
+    end
+    
     describe ".connected?" do
       it "should be connected if it has an active client that's connected" do
         active_client.stub(:connected? => true)
@@ -67,7 +81,7 @@ module OnStomp::Failover
         # Get the hooks installed on our mocks
         active_client.stub(:connection => connection)
         client.stub(:client_pool => client_pool)
-        client.__send__ :create_client_pool
+        client.__send__ :create_client_pool, []
       end
       it "should do nothing special if there is no active client" do
         client.stub(:active_client => nil)

data/spec/onstomp/failover/uri_spec.rb

@@ -11,42 +11,24 @@ module OnStomp::Failover
       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.failover_uris.should == ['stomp://host.domain.tld', 'stomp+ssl:///?param=value&param2=value2', 'stomp://user:pass@other.host.tld']
         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.failover_uris.should == ['stomp://host.domain.tld', 'stomp+ssl:///?param=value&param2=value2', 'stomp://user:pass@other.host.tld']
         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.failover_uris.should == ['stomp://host.domain.tld', 'stomp+ssl:///?param=value&param2=value2', 'stomp://user:pass@other.host.tld']
         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 it doesn't match the regex and isn't an array" do
         lambda {
-          # The regex is pretty lax...
-          parse_failover_uri "failover:"
+          parse_failover_uri ["some", "array"]
         }.should raise_error(OnStomp::Failover::InvalidFailoverURIError)
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: onstomp
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ian D. Eccles
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -04:00
+date: 2011-04-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency