bps-stan 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd81b99b13cfa8b5be0f5d16ac87bfe1b1fadf2fbe15f7e64a35aa03b7738434
-  data.tar.gz: 981a5ffacde21e61b6e40e04d933cbc25ed684dfc8d2ed70829a088affa61890
+  metadata.gz: e6d0067ac2cf8b4ee41b4f7ff5f33c1ee6eff75304cd4c5775b753b1f126f100
+  data.tar.gz: 64c67e20c09fbe73f8e72512a4d9320551d518c962e2297f536a806270351748
 SHA512:
-  metadata.gz: 5df714f945e601d841a5bce43760b354494f83b97eb4544c8c515fecc87026de44ebb343ab657fed2910880f6beb9cf7d212e703a05ee4036b41a5d6e14f795d
-  data.tar.gz: 03cafb2a8283b7875f353f9c8ccef57752e1f5d4b18e165b85ff8e1cc4a16523c96f06c11aa1cd6ad409d1a9951b7ae700aa4bfd18661bb4aed15b921590b75b
+  metadata.gz: 80d8471eb192dd551615b1c0f8c8278dd3bc9e578dc4ebdf1a0844162a95a32c639eb3047572c692323756085b3bacb5d3c658dd4e1f73c27637e86335fda151
+  data.tar.gz: 3af18785c7eb3ab110dc0966e7800797fe1b387104311c6736f1ad91621152a4b2d27b628021d7bcbeae880dd39ea4d90b7a8053ebdf986928f31527d2360bf0

data/bps-stan.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'bps', s.version
-  s.add_dependency 'nats-streaming', '= 0.2.2'
+  s.add_dependency 'nats-streaming', '~> 0.2.2'
 end

data/lib/bps/publisher/stan.rb

@@ -28,6 +28,7 @@ module BPS
           reconnect_time_wait: :float,
           max_reconnect_attempts: :int,
           connect_timeout: :float,
+          tls_ca_file: :string,
           # TODO: review, list all of them: https://github.com/nats-io/nats.rb (there's tls config etc)
         },
       }.freeze
@@ -36,10 +37,10 @@ module BPS
         port = url.port&.to_s || '4222'
         servers = CGI.unescape(url.host).split(',').map do |host|
           addr = "nats://#{host}"
-          addr << ':' << port unless addr.match(/:\d+$/)
+          addr << ':' << port unless /:\d+$/.match?(addr)
           addr
         end
-        opts = CGI.parse(url.query).transform_values {|v| v.size == 1 ? v[0] : v }
+        opts = CGI.parse(url.query || '').transform_values {|v| v.size == 1 ? v[0] : v }
         cluster_id = opts.delete('cluster_id')
         client_id = opts.delete('client_id')
         [cluster_id, client_id, { nats: { servers: servers } }]
@@ -56,6 +57,14 @@ module BPS
       def initialize(cluster_id, client_id, nats: {}, **opts)
         super()
 
+        # handle TLS if CA file is provided:
+        if !nats[:tls] && nats[:tls_ca_file]
+          ctx = OpenSSL::SSL::SSLContext.new
+          ctx.set_params
+          ctx.ca_file = nats.delete(:tls_ca_file)
+          nats[:tls] = ctx
+        end
+
         @topics = {}
         @client = ::STAN::Client.new
         @client.connect(cluster_id, client_id, nats: nats, **opts.slice(*CLIENT_OPTS.keys))

data/spec/bps/stan_spec.rb

@@ -2,28 +2,29 @@ require 'bps/stan'
 require 'spec_helper'
 
 RSpec.describe 'STAN', stan: true do
-  context 'resolve addrs' do
-    let(:publisher) { double('BPS::Publisher::STAN') }
+  context 'with addr resolving' do
+    let(:publisher) { instance_double('BPS::Publisher::STAN') }
+
     before          { allow(BPS::Publisher::STAN).to receive(:new).and_return(publisher) }
 
-    it 'should resolve simple URLs' do
-      expect(BPS::Publisher::STAN)
+    it 'resolves simple URLs' do
+      allow(BPS::Publisher::STAN)
         .to receive(:new)
         .with('CLUSTER', 'CLIENT', nats: { servers: ['nats://test.host:4222'] })
         .and_return(publisher)
       BPS::Publisher.resolve(URI.parse('stan://test.host:4222?cluster_id=CLUSTER&client_id=CLIENT'))
     end
 
-    it 'should resolve URLs with multiple hosts' do
-      expect(BPS::Publisher::STAN)
+    it 'resolves URLs with multiple hosts' do
+      allow(BPS::Publisher::STAN)
         .to receive(:new)
         .with('CLUSTER', 'CLIENT', nats: { servers: ['nats://foo.host:4222', 'nats://bar.host:4222'] })
         .and_return(publisher)
       BPS::Publisher.resolve(URI.parse('stan://foo.host,bar.host:4222?cluster_id=CLUSTER&client_id=CLIENT'))
     end
 
-    it 'should resolve URLs with multiple hosts/ports' do
-      expect(BPS::Publisher::STAN)
+    it 'resolves URLs with multiple hosts/ports' do
+      allow(BPS::Publisher::STAN)
         .to receive(:new)
         .with('CLUSTER', 'CLIENT', nats: { servers: ['nats://foo.host:4223', 'nats://bar.host:4222'] })
         .and_return(publisher)
@@ -35,7 +36,7 @@ RSpec.describe 'STAN', stan: true do
     let(:cluster_id) { 'test-cluster' } # this is a default cluster for https://hub.docker.com/_/nats-streaming
     let(:client_id)  { 'bps-test' }
 
-    let(:nats_servers) { ENV.fetch('NATS_SERVERS', '127.0.0.1:4222').split(',') }
+    let(:nats_servers) { ENV.fetch('STAN_SERVERS', '127.0.0.1:4222').split(',') }
     let(:nats_servers_with_scheme) { nats_servers.map {|s| "nats://#{s}" } }
 
     let(:publisher_url) { "stan://#{CGI.escape(nats_servers.join(','))}/?cluster_id=#{cluster_id}&client_id=#{client_id}" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bps-stan
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Black Square Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bps
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: nats-streaming
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
 description: https://github.com/bsm/bps
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: BPS adapter for nats-streaming