pulsar-client 2.6.1.pre.beta.1 → 2.6.1.pre.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0812c85307bcd4017c169592a1547e8249a4193f2d381b0f845f6ce27ab637ec'
-  data.tar.gz: a5581a355348dc9eec95184dfe1a1ff92f2a0858e871c22d6f7cd97f513f50da
+  metadata.gz: 40d7a5b7897e334ba7dcf34b17f5514ef342b9e8fba1ac1dfa54da846f0d5fe1
+  data.tar.gz: 91645d571180036f94d33c1d1a42e3e01425af4a4877fed79258ac7d52356e32
 SHA512:
-  metadata.gz: 76e1855a6cfc363fafe991fbe2e5bd99c9e8f844f7107c79d2494a65185703ea32f30f7b626bcbf0bd26d38227cc7b42f66baee2d15c023fc8d1ea8a115f8f21
-  data.tar.gz: 51cb6884e39d20e8806d17a4ae76954c30b14ef7f19e7c49540ec15411c60845d8c871b03bd0afbf18f17982c2329af60db77a4f4d6ab772b320cba263ad3be7
+  metadata.gz: 81dcc960831f5831aebd4eacdd83c0a3b30a19ae69c821a68b925feda627e79b77eea477ba79c0f10170ed43e5f68d14c6f2592c286a18b2f6eaf5c3f49699e4
+  data.tar.gz: 7f3208848c5f2e993dc3a0798a53071982d6f956babd1b4ab02ce1fe7655c4f2412326aabce142e3e98dea119097efeb918d70c6a9dd919888af5e15c5f442b5

data/.travis.yml

@@ -1,5 +1,7 @@
 dist: bionic # ubuntu 18.04
 sudo: false
+services:
+  - docker
 language: ruby
 rvm:
   - 2.4.9 # oldest pre-install on bionic
@@ -12,5 +14,14 @@ install:
   - sudo apt-get -y install ./apache-pulsar-client-dev.deb
   - gem install bundler -v 1.16.1
   - bundle install
+before_script:
+  - docker run --name pulsar -d -p 6650:6650 -p 8080:8080 apachepulsar/pulsar:latest bin/pulsar standalone
+  - docker exec pulsar bash -c 'ready (){ (exec > /dev/tcp/$1/$2); }; i=0; while ! ready localhost 8080; do sleep 1; i=$((i+1)); [[ $i -gt 10 ]] && break; done'
+  - docker exec pulsar bin/pulsar-admin tenants create ruby-client
+  - docker exec pulsar bin/pulsar-admin namespaces create ruby-client/tests
+env:
+  global:
+    PULSAR_BROKER_URI: pulsar://localhost:6650
+    PULSAR_CLIENT_RUBY_TEST_NAMESPACE: ruby-client/tests
 script:
   - rake

data/Gemfile.lock

@@ -1,31 +1,31 @@
 PATH
   remote: .
   specs:
-    pulsar-client (2.6.1.pre.beta.1)
+    pulsar-client (2.6.1.pre.beta.2)
       rake-compiler (~> 1.0)
       rice (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     rake (10.5.0)
     rake-compiler (1.1.1)
       rake
     rice (2.2.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
 
 PLATFORMS
   ruby
@@ -37,4 +37,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/ext/bindings/client.cpp

@@ -6,6 +6,7 @@
 #include "client.hpp"
 #include "logger.hpp"
 #include "util.hpp"
+#include "vector.hpp"
 
 namespace pulsar_rb {
 
@@ -133,7 +134,7 @@ Producer::ptr Client::create_producer(Rice::String topic, const ProducerConfigur
 
 typedef struct {
   pulsar::Client& client;
-  const Rice::String& topic;
+  const Rice::Array& topics;
   const Rice::String& subscriptionName;
   const pulsar::ConsumerConfiguration& config;
   pulsar::Consumer consumer;
@@ -142,12 +143,27 @@ typedef struct {
 
 void* client_subscribe_worker(void* taskPtr) {
   client_subscribe_task& task = *(client_subscribe_task*)taskPtr;
-  task.result = task.client.subscribe(task.topic.str(), task.subscriptionName.str(), task.config, task.consumer);
+
+  const std::vector<std::string>& topics = from_ruby<std::vector<std::string>>(task.topics);
+  switch(topics.size()) {
+    case 0:
+      throw Rice::Exception(rb_eArgError, "Must have at least one topic");
+      break;
+    case 1: {
+      // Skip the MultiTopicsConsumer if there's only one.
+      task.result = task.client.subscribe(topics[0], task.subscriptionName.str(), task.config, task.consumer);
+      break;
+    }
+    default: {
+      task.result = task.client.subscribe(topics, task.subscriptionName.str(), task.config, task.consumer);
+      break;
+    }
+  }
   return nullptr;
 }
 
-Consumer::ptr Client::subscribe(Rice::String topic, Rice::String subscriptionName, const ConsumerConfiguration& config) {
-  client_subscribe_task task = { _client, topic, subscriptionName, config };
+Consumer::ptr Client::subscribe(Rice::Array topics, Rice::String subscriptionName, const ConsumerConfiguration& config) {
+  client_subscribe_task task = { _client, topics, subscriptionName, config };
   rb_thread_call_without_gvl(&client_subscribe_worker, &task, RUBY_UBF_IO, nullptr);
   CheckResult(task.result);
   return Consumer::ptr(new Consumer(task.consumer));

data/ext/bindings/client.hpp

@@ -47,7 +47,7 @@ namespace pulsar_rb {
     Client(Rice::String service_url, const ClientConfiguration& config);
 
     Producer::ptr create_producer(Rice::String topic, const ProducerConfiguration& config);
-    Consumer::ptr subscribe(Rice::String topic, Rice::String subscriptionName, const ConsumerConfiguration& config);
+    Consumer::ptr subscribe(Rice::Array topics, Rice::String subscriptionName, const ConsumerConfiguration& config);
     void close();
 
     typedef Rice::Data_Object<Client> ptr;

data/ext/bindings/consumer.cpp

@@ -82,6 +82,10 @@ void bind_consumer(Module &module) {
     .define_value("Failover", ConsumerFailover)
     .define_value("KeyShared", ConsumerKeyShared);
 
+  define_enum<pulsar::InitialPosition>("InitialPosition", module)
+    .define_value("Latest", InitialPositionLatest)
+    .define_value("Earliest", InitialPositionEarliest);
+
   define_class_under<pulsar_rb::ConsumerConfiguration>(module, "ConsumerConfiguration")
     .define_constructor(Constructor<pulsar_rb::ConsumerConfiguration>())
     .define_method("consumer_type", &ConsumerConfiguration::getConsumerType)

data/ext/bindings/message.cpp

@@ -41,6 +41,7 @@ Message::Message(const std::string& data, Rice::Object arg = Rice::Object()) {
   }
 
   _msg = mb.build();
+  received = false;
 }
 
 Rice::String Message::getData() {
@@ -65,6 +66,12 @@ Rice::String Message::getOrderingKey() {
   return to_ruby(_msg.getOrderingKey());
 }
 
+Rice::Object Message::getTopicName() {
+  // If the message topic hasn't been set (it gets set when received, not when
+  // built) getTopicName will try to dereference a null pointer.
+  return received ? to_ruby(_msg.getTopicName()) : Rice::Nil;
+}
+
 }
 
 using namespace Rice;
@@ -84,5 +91,6 @@ void bind_message(Module& module) {
     .define_method("properties", &pulsar_rb::Message::getProperties)
     .define_method("partition_key", &pulsar_rb::Message::getPartitionKey)
     .define_method("ordering_key", &pulsar_rb::Message::getOrderingKey)
+    .define_method("topic", &pulsar_rb::Message::getTopicName)
     ;
 }

data/ext/bindings/message.hpp

@@ -21,6 +21,7 @@ namespace pulsar_rb {
   class Message {
   public:
     pulsar::Message _msg;
+    bool received = true; // received from consumer rather than built with builder
     Message(const pulsar::Message& msg) : _msg(msg) {};
     Message(const std::string& data, Rice::Object opts);
 
@@ -29,6 +30,7 @@ namespace pulsar_rb {
     Rice::Hash getProperties();
     Rice::String getPartitionKey();
     Rice::String getOrderingKey();
+    Rice::Object getTopicName();
 
     typedef Rice::Data_Object<Message> ptr;
   };

data/ext/bindings/vector.cpp

@@ -0,0 +1,16 @@
+#include "rice/Array.hpp"
+
+#include "vector.hpp"
+
+template<>
+std::vector<std::string> from_ruby<std::vector<std::string>>(Rice::Object o)
+{
+  Rice::Array a(o);
+  std::vector<std::string> v;
+  Rice::Array::iterator it = a.begin();
+  Rice::Array::iterator end = a.end();
+  for(; it != end; ++it) {
+    v.push_back(it->to_s().str());
+  }
+  return v;
+}

data/ext/bindings/vector.hpp

@@ -0,0 +1,10 @@
+#ifndef __PULSAR_RUBY_CLIENT_VECTOR_HPP
+#define __PULSAR_RUBY_CLIENT_VECTOR_HPP
+
+#include "rice/Object.hpp"
+#include <pulsar/Client.h>
+
+template<>
+std::vector<std::string> from_ruby<std::vector<std::string>>(Rice::Object o);
+
+#endif

data/lib/pulsar/client.rb

@@ -41,7 +41,7 @@ module Pulsar
         unless config.is_a?(Pulsar::ConsumerConfiguration)
           config = Pulsar::ConsumerConfiguration.new(config)
         end
-        super(topic, subscription_name, config)
+        super(Array(topic), subscription_name, config)
       end
     end
 

data/lib/pulsar/client/version.rb

@@ -19,6 +19,6 @@
 
 module Pulsar
   class Client
-    VERSION = "2.6.1-beta.1"
+    VERSION = "2.6.1-beta.2"
   end
 end

data/lib/pulsar/consumer_configuration.rb

@@ -33,6 +33,12 @@ module Pulsar
       :key_shared => Pulsar::ConsumerType::KeyShared
     }
 
+    # aligns with the pulsar::InitialPosition enum in the C++ library
+    INITIAL_POSITIONS = {
+      :latest => Pulsar::InitialPosition::Latest,
+      :earliest => Pulsar::InitialPosition::Earliest
+    }
+
     module RubySideTweaks
       def initialize(config={})
         super()
@@ -53,6 +59,21 @@ module Pulsar
         end
         super(type)
       end
+
+      def subscription_initial_position
+        enum_value = super
+        INITIAL_POSITIONS.invert[enum_value]
+      end
+
+      def subscription_initial_position=(type)
+        unless type.is_a?(Pulsar::InitialPosition)
+          type = INITIAL_POSITIONS[type]
+          unless type
+            raise ArgumentError, "unrecognized subscription_initial_position"
+          end
+        end
+        super(type)
+      end
     end
 
     prepend RubySideTweaks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulsar-client
 version: !ruby/object:Gem::Version
-  version: 2.6.1.pre.beta.1
+  version: 2.6.1.pre.beta.2
 platform: ruby
 authors:
 - Jacob Fugal
@@ -119,6 +119,8 @@ files:
 - ext/bindings/stringmap.hpp
 - ext/bindings/util.cpp
 - ext/bindings/util.hpp
+- ext/bindings/vector.cpp
+- ext/bindings/vector.hpp
 - lib/pulsar/client.rb
 - lib/pulsar/client/version.rb
 - lib/pulsar/client_configuration.rb
@@ -145,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Apache Pulsar Ruby Client