onstomp 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba24fe177cfa2ac236c6ceaed731d0b9d9f55720a9cf092a7c3501335c8d879
-  data.tar.gz: 5e57ed6e6afa49e937df80f66c1dcc09ff4dd41a41e51dd5bec913fd93a52e15
+  metadata.gz: 1e7dbfd893a6b95f5f4ccd27d0cd52e020bc1bd18b860240e96f76ad4e68ab75
+  data.tar.gz: 18e70c1771dbe700fce021658c73197ffc59e4fcb163fdea06dd999283f136f6
 SHA512:
-  metadata.gz: a64c0d26233c4fda27dd86145fc5a7055c88716551aec493d48530f311d5cd3825fb1a904e5c91055ea21daf0bdaeaca3a8b6227fa58721014e9f79abc5df3ce
-  data.tar.gz: d2283694042fc1cc619bae2a0c05b64508a69de94f4b861460d2ffcfb79414d02663881793759e8592e63312ee00b9b426ee03fe438122e6cc5a5ee3025322f5
+  metadata.gz: 0d781f70aa092cda65cfb396ff5ae07e8fb547e7e292c9bfdd5bda5f4fb33aba4127d799c9ede0b0ea16b60ad1682c31d51d6c5f02082e1a74a8bb0b056e1bfe
+  data.tar.gz: 7d0a63dce9fa5257feb44593e684febc3010953750efbb71e1939b6480751472cc4a867f17d9c2b3a7cc6f936d16c2673510f1e5992821f9d045cf0e8c719053

data/.travis.yml

@@ -1,10 +1,6 @@
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.2
-  - jruby-18mode
-  - jruby-19mode
-
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+  - jruby-head
 bundler_args: --without docs

data/lib/onstomp/client.rb

@@ -9,7 +9,7 @@ class OnStomp::Client
   include OnStomp::Interfaces::ReceiptManager
   include OnStomp::Interfaces::SubscriptionManager
   include OnStomp::Components::Scopes
-  
+
   # The `URI` reference to the STOMP broker
   # @return [String]
   attr_reader :uri
@@ -19,51 +19,52 @@ class OnStomp::Client
   # Connection object specific to the established STOMP protocol version
   # @return [OnStomp::Connections::Base]
   attr_reader :connection
-  
+
   # The protocol versions to allow for this connection
   # @return [Array<String>]
   attr_configurable_protocols :versions
-  
+
   # The client-side heartbeat settings to allow for this connection
   # @return [Array<Fixnum>]
   attr_configurable_client_beats :heartbeats
-  
+
   # The host header value to send to the broker when connecting. This allows
   # the client to inform the server which host it wishes to connect with
   # when multiple brokers may share an IP address through virtual hosting.
   # @return [String]
   attr_configurable_str :host, :default => 'localhost', :uri_attr => :host
-  
+
   # The login header value to send to the broker when connecting.
   # @return [String]
   attr_configurable_str :login, :default => '', :uri_attr => :user
-  
+
   # The passcode header value to send to the broker when connecting.
   # @return [String]
   attr_configurable_str :passcode, :default => '', :uri_attr => :password
-  
+
   # The class to use when instantiating a new IO processor for the connection.
   # Defaults to {OnStomp::Components::ThreadedProcessor}
   # @return [Class]
   attr_configurable_processor :processor
-  
+
   # The number of seconds to wait before a write-blocked connection is
   # considered dead. Defaults to 120 seconds.
   # @return [Fixnum]
   attr_configurable_int :write_timeout, :default => 120
-  
+
   # The number of seconds to wait before a connection that is read-blocked
   # during the {OnStomp::Connections::Base#connect connect} phase is
   # considered dead. Defaults to 120 seconds.
   # @return [Fixnum]
   attr_configurable_int :read_timeout, :default => 120
-  
+
   # @api gem:1 STOMP:1.0,1.1
   # Creates a new client for the specified uri and optional hash of options.
   # @param [String,URI] uri
   # @param [{Symbol => Object}] options
   def initialize uri, options={}
     @uri = uri.is_a?(::URI) ? uri : ::URI.parse(uri)
+    options = options.dup
     @ssl = options.delete(:ssl)
     configure_configurable options
     configure_subscription_management
@@ -72,7 +73,7 @@ class OnStomp::Client
       close unless f[:receipt]
     end
   end
-  
+
   # @api gem:1 STOMP:1.0,1.1
   # Connects to the STOMP broker referenced by {#uri}. Includes optional
   # headers in the CONNECT frame, if specified.
@@ -91,7 +92,7 @@ class OnStomp::Client
     self
   end
   alias :open :connect
-  
+
   # @api gem:1 STOMP:1.0,1.1
   # Sends a DISCONNECT frame to the broker and blocks until the connection
   # has been closed. This method ensures that all frames not yet sent to
@@ -106,14 +107,14 @@ class OnStomp::Client
   end
   alias :disconnect_without_flush :disconnect
   alias :disconnect :disconnect_with_flush
-  
+
   # @api gem:1 STOMP:1.0,1.1
   # Returns true if a connection to the broker exists and itself is connected.
   # @return [true,false]
   def connected?
     connection && connection.connected?
   end
-  
+
   # @api gem:1 STOMP:1.0,1.1
   # Forces the connection between broker and client closed.
   # @note Use of this method may result in frames never being sent to the
@@ -125,9 +126,9 @@ class OnStomp::Client
     processor_inst.stop
     self
   end
-  
+
   # @group Methods you ought not use directly.
-  
+
   # Ultimately sends a {OnStomp::Components::Frame frame} to the STOMP broker.
   # This method should not be invoked directly. Use the frame methods provided
   # by the {OnStomp::Interfaces:FrameMethod} interface.
@@ -139,32 +140,32 @@ class OnStomp::Client
       connection && connection.write_frame_nonblock(frame)
     end
   end
-  
+
   # Called by {#connection} when a frame has been read from the socket
   # connection to the STOMP broker.
   def dispatch_received frame
     trigger_before_receiving frame
     trigger_after_receiving frame
   end
-  
+
   # Called by {#connection} when a frame has been written to the socket
   # connection to the STOMP broker.
   def dispatch_transmitted frame
     trigger_after_transmitting frame
   end
-  
+
   # @endgroup
-  
+
   private
   def register_callbacks f, cbs
     cbs[:subscribe] && add_subscription(f, cbs[:subscribe])
     cbs[:receipt] && add_receipt(f, cbs[:receipt])
   end
-  
+
   def processor_inst
     @processor_inst ||= processor.new(self)
   end
-  
+
   def close
     connection && connection.close
     clear_subscriptions

data/lib/onstomp/version.rb

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

data/spec/onstomp/failover/client_spec.rb

@@ -54,6 +54,19 @@ module OnStomp::Failover
           login: 'user_name'
         })
       end
+
+      it 'passes the ssl settings to both clients in the pool' do
+        c = Client.new('failover:(stomp:///,stomp+ssl:///)', {
+          buffer: 'OnStomp::Failover::DummyBuffer',
+          retry_attempts: 2,
+          ssl: { ca_file: 'ca.crt' },
+          login: 'user_name'
+        })
+
+        c.client_pool.clients.count.should == 2
+        c.client_pool.clients[0].ssl.should == { ca_file: 'ca.crt' }
+        c.client_pool.clients[1].ssl.should == { ca_file: 'ca.crt' }
+      end
     end
 
     describe ".connected?" do
@@ -70,7 +83,7 @@ module OnStomp::Failover
         client.connected?.should be_false
       end
     end
-    
+
     describe ".connect" do
       it "should call reconnect" do
         client.should_receive(:reconnect).and_return(true)
@@ -94,7 +107,7 @@ module OnStomp::Failover
         triggered.should be_true
       end
     end
-    
+
     describe ".disconnect" do
       let(:connection) {
         mock('connection').tap do |m|
@@ -132,7 +145,7 @@ module OnStomp::Failover
           Thread.pass while t.alive?
           actual_disconnect.call *args
         end
-        
+
         active_client.should_receive(:disconnect).with(:header1 => 'value 1')
         client.disconnect :header1 => 'value 1'
       end
@@ -158,7 +171,7 @@ module OnStomp::Failover
         client.disconnect :header1 => 'value 1'
       end
     end
-    
+
     describe ".transmit" do
       it "should transmit on the active client if there is one" do
         active_client.should_receive(:transmit).with('test', :coming => 'home')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onstomp
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Ian D. Eccles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec