onstomp 1.0.8 → 1.0.9

data/lib/onstomp/connections/stomp_1.rb

@@ -54,7 +54,7 @@ module OnStomp::Connections::Stomp_1
   
   def create_frame command, layered_headers, body=nil
     headers = layered_headers.inject({}) do |final, h|
-      h = OnStomp.keys_to_sym(h).delete_if { |k,v| final.key?(k) && (v.nil? || v.empty?) }
+      h = OnStomp.keys_to_sym(h).delete_if { |k,v| v.nil? || v.empty? }
       final.merge!(h)
       final
     end

data/lib/onstomp/failover/client.rb

@@ -45,7 +45,7 @@ class OnStomp::Failover::Client
     end
     @client_mutex = Mutex.new
     configure_configurable options
-    create_client_pool hosts
+    create_client_pool hosts, options
     @active_client = nil
     @connection = nil
     @frame_buffer = buffer.new self
@@ -129,8 +129,12 @@ class OnStomp::Failover::Client
     sleep(retry_delay) if retry_delay > 0 && attempt > 1
   end
     
-  def create_client_pool hosts
-    @client_pool = pool.new hosts
+  def create_client_pool hosts, options
+    client_options = options.dup
+    client_options.delete_if { |k,_|
+      self.class.config_attributes.keys.include?(k)
+    }
+    @client_pool = pool.new hosts, client_options
     on_connection_closed do |client, *_|
       if client == active_client
         unless @disconnecting

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 hosts
+  def initialize hosts, options = {}
     @clients = hosts.map do |h|
-      h.is_a?(OnStomp::Client) ? h : OnStomp::Client.new(h)
+      h.is_a?(OnStomp::Client) ? h : OnStomp::Client.new(h, options)
     end
   end
   

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

@@ -3,7 +3,7 @@
 # A round-robin client pool. Clients are processed sequentially, and once
 # all clients have been processed, the pool cycles back to the beginning.
 class OnStomp::Failover::Pools::RoundRobin < OnStomp::Failover::Pools::Base
-  def initialize uris
+  def initialize uris, options = {}
     super
     @index = -1
   end

data/lib/onstomp/version.rb

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

data/spec/onstomp/failover/client_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 
 module OnStomp::Failover
   describe Client, :failover => true do
+    let(:client_options) { Hash.new }
     let(:active_client) {
       mock('active client').tap do |m|
         m.extend OnStomp::Interfaces::ClientEvents
@@ -13,20 +14,48 @@ module OnStomp::Failover
         c.stub(:active_client => active_client)
       end
     }
+
+    class DummyBuffer
+      def initialize *args
+      end
+    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
+
+      it 'passes other options on to the client pool' do
+        # We really only need to verify that the failover client is passing
+        # the appropriate hash to the pool, because we have a spec that ensures
+        # the pool is passing the options hash on to the underlying clients.
+        # However, even performing this simple test requires an impressive
+        # amount of legwork. This design is far too muddy.
+
+        m_client = mock('client', on_connection_closed: "ignore me!")
+        Pools::Base.should_receive(:new).with([ 'stomp:///', 'stomp+ssl:///' ], {
+          ssl: { ca_file: 'ca.crt' },
+          login: 'user_name'
+        }).and_return([ m_client ])
+
+        c = Client.new('failover:(stomp:///,stomp+ssl:///)', {
+          buffer: 'OnStomp::Failover::DummyBuffer',
+          retry_attempts: 2,
+          ssl: { ca_file: 'ca.crt' },
+          login: 'user_name'
+        })
+      end
     end
-    
+
     describe ".connected?" do
       it "should be connected if it has an active client that's connected" do
         active_client.stub(:connected? => true)
@@ -81,7 +110,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/pools/base_spec.rb

@@ -12,10 +12,10 @@ module OnStomp::Failover::Pools
 
     describe ".initialize" do
       it "should create a new Client for each URI" do
-        OnStomp::Client.should_receive(:new).with('1').and_return('c 1')
-        OnStomp::Client.should_receive(:new).with('2').and_return('c 2')
-        OnStomp::Client.should_receive(:new).with('3').and_return('c 3')
-        new_pool = Base.new ['1', '2', '3']
+        OnStomp::Client.should_receive(:new).with('1', { option: true }).and_return('c 1')
+        OnStomp::Client.should_receive(:new).with('2', { option: true }).and_return('c 2')
+        OnStomp::Client.should_receive(:new).with('3', { option: true }).and_return('c 3')
+        new_pool = Base.new ['1', '2', '3'], { option: true }
         new_pool.clients.should =~ ['c 1', 'c 2', 'c 3']
       end
     end

data/spec/onstomp/full_stacks/onstomp_spec.rb

@@ -95,6 +95,26 @@ describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
         broker.join
         blocked_up.should be_false
       end
+
+      it 'should include login/passcode headers that are not empty' do
+        client = OnStomp::Client.new('stomp://localhost:10101', login: 'user', passcode: 'secr3t')
+        client.connect
+        client.disconnect
+        broker.join
+        broker.frames_received.first.command.should == 'CONNECT'
+        broker.frames_received.first.headers['login'].should == 'user' 
+        broker.frames_received.first.headers['passcode'].should == 'secr3t'
+      end
+
+      it 'should not include login/passcode headers that are empty' do
+        client = OnStomp::Client.new('stomp://localhost:10101')
+        client.connect
+        client.disconnect
+        broker.join
+        broker.frames_received.first.command.should == 'CONNECT'
+        broker.frames_received.first.headers.set?('login').should == false 
+        broker.frames_received.first.headers.set?('passcode').should == false
+      end
       
       it "should block on write" do
         blocked_up = false

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: onstomp
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
+  prerelease: 
 platform: ruby
 authors:
 - Ian D. Eccles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,43 +30,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Client library for message passing with brokers that support the Stomp
@@ -205,26 +214,30 @@ files:
 - yard_extensions.rb
 homepage: http://github.com/meadvillerb/onstomp
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2397510086146937216
 requirements: []
 rubyforge_project: onstomp-core
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Client for message queues implementing the Stomp protocol interface.
 test_files:
 - spec/onstomp/client_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5f0fcfaa300e31031e10003e4c2b4ba86bffe72d
-  data.tar.gz: 2358bc943063271535dee0bfbfa4a5c88fd0603b
-SHA512:
-  metadata.gz: bb71c53a00f2cf4e8ed8916035d2f51f81baf1d50da0e13fc94c4f2c9e6cf6db085a9b6198b2cb35121258a39c7ef99d71f2a9d4dd26b9c005e62c34ee1fd749
-  data.tar.gz: 154804957105f06e82adc9db3f4c95897b9b2a233d9937e8c46711f0d9326b7cb3920a397564b858fe809837757b5aa5125c18c2e123c99cf730a954d90f7ddb