bps-kafka 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68826145fba6a103c652c008207089c913a18999a41acdcc35082d526a8979b1
-  data.tar.gz: f14e9f89c8ff5d968b744483e381abb41f6b1265d6d696688a31439f0fdbf591
+  metadata.gz: dc71e376289d57e6341560ddefd86c3c44d77b5fe3963ca658bfa44c4124d31f
+  data.tar.gz: 9ac605f652d7ec7a4a2f3f6460e476d6639b705021ad064240ea8cc2ac03f51b
 SHA512:
-  metadata.gz: b9b4d9ae93a101c874f0cd2f0a5f07b7b577e6526de8a3ccc978cd346344d768e354202aa6b4652589334e0a1c56d5a556c1053929b2e3c1a1152d9556911571
-  data.tar.gz: 52d62b30b81d2f18a1098a47eff1314406aef6b371293ca0ef9ae10b17c8fa1a53043e5c21d7490b10717255fbb9408fa1df67879eab36e947cf06fe27782500
+  metadata.gz: f7d2cc289e5d7f82ce2dba5538b7f071f5259ee7fd9f9077cf0a2334d157a2bcf00d4b787a86fc733142e1ff17ce7b7f2bfcc1f4db761825de6492d53825eb51
+  data.tar.gz: dfdb6747738ed57a359e71cd4455203c3da130d8ec31516ddfaf6b4e93f08e1f1f51d74d304ca8d3dfc99a83906c9acb3be540acb83aacf81a0b2e1eefda5561

data/lib/bps/kafka.rb

@@ -6,13 +6,11 @@ require 'bps/publisher/kafka_async'
 module BPS
   module Publisher
     register('kafka+sync') do |url, **opts|
-      addrs = CGI.unescape(url.host).split(',')
-      Kafka.new(addrs, **Kafka.coercer.coerce(opts))
+      Kafka.new(url, **Kafka.coercer.coerce(opts))
     end
 
     register('kafka') do |url, **opts|
-      addrs = CGI.unescape(url.host).split(',')
-      KafkaAsync.new(addrs, **Kafka.coercer.coerce(opts))
+      KafkaAsync.new(url, **Kafka.coercer.coerce(opts))
     end
   end
 end

data/lib/bps/publisher/kafka.rb

@@ -76,14 +76,15 @@ module BPS
         @coercer ||= BPS::Coercer.new(CLIENT_OPTS.merge(PRODUCER_OPTS)).freeze
       end
 
-      # @param [Array<String>] brokers the seed broker addresses.
+      # @param [Array<String>,URI] brokers the seed broker addresses.
       # @param [Hash] opts the options.
       # @see https://www.rubydoc.info/gems/ruby-kafka/Kafka/Client#initialize-instance_method
       def initialize(broker_addrs, **opts)
         super()
 
-        @topics   = {}
-        @client   = ::Kafka.new(broker_addrs, **opts.slice(*CLIENT_OPTS.keys))
+        broker_addrs = parse_url(broker_addrs) if broker_addrs.is_a?(URI)
+        @topics = {}
+        @client = ::Kafka.new(broker_addrs, **opts.slice(*CLIENT_OPTS.keys))
         @producer = init_producer(**opts.slice(*PRODUCER_OPTS.keys))
       end
 
@@ -98,6 +99,14 @@ module BPS
 
       private
 
+      def parse_url(url)
+        port = url.port&.to_s || '9092'
+        CGI.unescape(url.host).split(',').map do |addr|
+          addr << ':' << port unless addr.match(/:\d+$/)
+          addr
+        end
+      end
+
       def init_producer(**opts)
         @producer = @client.producer(**opts)
       end

data/spec/bps/kafka_spec.rb

@@ -27,12 +27,44 @@ helper = proc do
   end
 end
 
-RSpec.describe 'Kafka', if: run_spec do
-  context BPS::Publisher::Kafka do
-    it_behaves_like 'publisher', url: "kafka+sync://#{kafka_addrs.join(',')}/", &helper
+RSpec.describe 'Kafka' do
+  context 'resolve addrs' do
+    let(:client) { double('Kafka', producer: nil) }
+    before       { allow(::Kafka).to receive(:new).and_return(client) }
+
+    it 'should resolve simple URLs' do
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
+        expect(::Kafka).to receive(:new).with(['test.host:9092'], {}).and_return(client)
+      else
+        expect(::Kafka).to receive(:new).with(['test.host:9092']).and_return(client)
+      end
+      BPS::Publisher.resolve(URI.parse('kafka+sync://test.host:9092'))
+    end
+
+    it 'should resolve URLs with multiple hosts' do
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
+        expect(::Kafka).to receive(:new).with(['foo.host:9092', 'bar.host:9092'], {}).and_return(client)
+      else
+        expect(::Kafka).to receive(:new).with(['foo.host:9092', 'bar.host:9092']).and_return(client)
+      end
+      BPS::Publisher.resolve(URI.parse('kafka+sync://foo.host,bar.host:9092'))
+    end
+
+    it 'should resolve URLs with multiple hosts/ports' do
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
+        expect(::Kafka).to receive(:new).with(['foo.host:9093', 'bar.host:9092'], {}).and_return(client)
+      else
+        expect(::Kafka).to receive(:new).with(['foo.host:9093', 'bar.host:9092']).and_return(client)
+      end
+      BPS::Publisher.resolve(URI.parse('kafka+sync://foo.host%3A9093,bar.host'))
+    end
+  end
+
+  context BPS::Publisher::Kafka, if: run_spec do
+    it_behaves_like 'publisher', url: "kafka+sync://#{CGI.escape(kafka_addrs.join(','))}/", &helper
   end
 
-  context BPS::Publisher::KafkaAsync do
-    it_behaves_like 'publisher', url: "kafka://#{kafka_addrs.join(',')}/", &helper
+  context BPS::Publisher::KafkaAsync, if: run_spec do
+    it_behaves_like 'publisher', url: "kafka://#{CGI.escape(kafka_addrs.join(','))}/", &helper
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bps-kafka
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Black Square Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bps
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: ruby-kafka
   requirement: !ruby/object:Gem::Requirement