hermann 0.24.1.0-java → 0.25.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36258654c7dab0d22f5605f7570e9af0bc1d413f
-  data.tar.gz: 6a76a7fe69d25b7ca81b729ead0bb443fbb89e64
+  metadata.gz: 7805fc3863f703bc692c4b555039124d5b64fd96
+  data.tar.gz: 6f754d5124d799dad76fa213068da2e921d079ad
 SHA512:
-  metadata.gz: 7e12d640758271fbc235823e3cb1990c63fc6140160e79ca3b40204ffc3a696a57b92bd4ccc09150b692532ea427147d4ee84c41ba8d5a0939657ba82bb51061
-  data.tar.gz: c9dd57c7ffac7ed14b29b0c76bb2dc048226c381608c772bdef86c653e18ff12b0563268c789929d9964acd339ae66d03afe041fd6ce71869d209487cf63049e
+  metadata.gz: cea1725e6f06bfdd6eb106052c7493464cf4b3061ef69115a3243cb5716f473b0affa0c2e56f86bbe3247a8e254bce822d344874e47c20002102a75e715d7862
+  data.tar.gz: 673769cf7fa08974e0d78b7b5609186933ad381f57f761b2e9b525f0527326a380fb6e73fd2ab59ed7902b531ee3faec62f34e3e72dc927c65f4fb848731d6e9

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/extensiontask'
 
 
 Rake::ExtensionTask.new do |t|
-  t.name = 'hermann_lib'
+  t.name = 'hermann_rdkafka'
   t.ext_dir = 'ext/hermann'
   t.gem_spec = Gem::Specification.load('hermann.gemspec')
 end

data/ext/hermann/extconf.rb

@@ -151,4 +151,4 @@ have_header('ruby/version.h')
 have_func('rb_thread_blocking_region')
 have_func('rb_thread_call_without_gvl')
 
-create_makefile('hermann/hermann_lib')
+create_makefile('hermann/hermann_rdkafka')

data/ext/hermann/{hermann_lib.c → hermann_rdkafka.c}

@@ -1,5 +1,5 @@
 /*
- * hermann_lib.c - Ruby wrapper for the librdkafka library
+ * hermann_rdkafka.c - Ruby wrapper for the librdkafka library
  *
  * Copyright (c) 2014 Stan Campbell
  * Copyright (c) 2014 Lookout, Inc.
@@ -31,7 +31,7 @@
 
 /* Much of the librdkafka library calls were lifted from rdkafka_example.c */
 
-#include "hermann_lib.h"
+#include "hermann_rdkafka.h"
 
 #ifdef HAVE_RUBY_VERSION_H
 #include <ruby/version.h>
@@ -264,9 +264,19 @@ static void msg_consume(rd_kafka_message_t *rkmessage, HermannInstanceConfig *cf
 
 	// Yield the data to the Consumer's block
 	if (rb_block_given_p()) {
-		VALUE value = rb_str_new((char *)rkmessage->payload, rkmessage->len);
+		VALUE key, data, offset;
+
+		data = rb_str_new((char *)rkmessage->payload, rkmessage->len);
+		offset = rb_ll2inum(rkmessage->offset);
+
+		if ( rkmessage->key_len > 0 ) {
+			key = rb_str_new((char*) rkmessage->key, (int)rkmessage->key_len);
+		} else {
+			key = Qnil;
+		}
+
 		rd_kafka_message_destroy(rkmessage);
-		rb_yield(value);
+		rb_yield_values(3, data, key, offset);
 	}
 	else {
 		if (DEBUG) {
@@ -444,7 +454,7 @@ static VALUE consumer_consume_loop_stop(VALUE self) {
 }
 
 /**
- * Hermann::Lib::Consumer.consume
+ * Hermann::Provider::RDKafka::Consumer.consume
  *
  * @param   VALUE   self	the Ruby object for this consumer
  * @param   VALUE   topic	the Ruby string representing a topic to consume
@@ -1190,21 +1200,21 @@ static VALUE producer_init_copy(VALUE copy,
 }
 
 /**
- * Init_hermann_lib
+ * Init_hermann_rdkafka
  *
  * Called by Ruby when the Hermann gem is loaded.
  * Defines the Hermann module.
  * Defines the Producer and Consumer classes.
  */
-void Init_hermann_lib() {
-	VALUE lib_module, c_consumer, c_producer;
+void Init_hermann_rdkafka() {
+	VALUE lib_module, provider_module, c_consumer, c_producer;
 
-	TRACER("setting up Hermann::Lib\n");
+	TRACER("setting up Hermann::Provider::RDKafka\n");
 
 	/* Define the module */
 	hermann_module = rb_define_module("Hermann");
-	lib_module = rb_define_module_under(hermann_module, "Lib");
-
+	provider_module = rb_define_module_under(hermann_module, "Provider");
+	lib_module = rb_define_module_under(provider_module, "RDKafka");
 
 	/* ---- Define the consumer class ---- */
 	c_consumer = rb_define_class_under(lib_module, "Consumer", rb_cObject);

data/ext/hermann/{hermann_lib.h → hermann_rdkafka.h}

@@ -1,5 +1,5 @@
 /*
- * hermann_lib.h - Ruby wrapper for the librdkafka library
+ * hermann_rdkafka.h - Ruby wrapper for the librdkafka library
  *
  * Copyright (c) 2014 Stan Campbell
  * Copyright (c) 2014 Lookout, Inc.
@@ -107,7 +107,7 @@ typedef struct HermannInstanceConfig {
 typedef HermannInstanceConfig hermann_conf_t;
 
 typedef struct {
-	/* Hermann::Lib::Producer */
+	/* Hermann::Provider::RDKafka::Producer */
 	hermann_conf_t *producer;
 	/* Hermann::Result */
 	VALUE result;

data/lib/hermann/consumer.rb

@@ -4,7 +4,7 @@ require 'hermann/errors'
 if Hermann.jruby?
   require 'hermann/provider/java_simple_consumer'
 else
-  require 'hermann_lib'
+  require 'hermann_rdkafka'
 end
 
 module Hermann
@@ -37,7 +37,7 @@ module Hermann
       else
         brokers, partition = require_values_at(opts, :brokers, :partition)
 
-        @internal = Hermann::Lib::Consumer.new(topic, brokers, partition, offset)
+        @internal = Hermann::Provider::RDKafka::Consumer.new(topic, brokers, partition, offset)
       end
     end
 

data/lib/hermann/discovery/metadata.rb

@@ -1,4 +1,4 @@
-require 'hermann_lib'
+require 'hermann_rdkafka'
 require 'hermann/consumer'
 
 module Hermann
@@ -20,7 +20,7 @@ module Hermann
       DEFAULT_TIMEOUT_MS = 2_000
       def initialize(brokers, options = {})
         raise "this is an MRI api only!" if Hermann.jruby?
-        @internal = Hermann::Lib::Producer.new(brokers)
+        @internal = Hermann::Provider::RDKafka::Producer.new(brokers)
         @timeout = options[:timeout] || DEFAULT_TIMEOUT_MS
       end
 

data/lib/hermann/producer.rb

@@ -6,7 +6,7 @@ require 'hermann/result'
 if RUBY_PLATFORM == "java"
   require 'hermann/provider/java_producer'
 else
-  require 'hermann_lib'
+  require 'hermann_rdkafka'
 end
 
 module Hermann
@@ -23,7 +23,7 @@ module Hermann
       if Hermann.jruby?
         @internal = Hermann::Provider::JavaProducer.new(brokers.join(','), opts)
       else
-        @internal = Hermann::Lib::Producer.new(brokers.join(','))
+        @internal = Hermann::Provider::RDKafka::Producer.new(brokers.join(','))
       end
       # We're tracking children so we can make sure that at Producer exit we
       # make a reasonable attempt to clean up outstanding result objects

data/lib/hermann/version.rb

@@ -1,3 +1,3 @@
 module Hermann
-  VERSION = '0.24.1'
+  VERSION = '0.25.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermann
 version: !ruby/object:Gem::Version
-  version: 0.24.1.0
+  version: 0.25.0.1
 platform: java
 authors:
 - R. Tyler Croy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -79,8 +79,8 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - ext/hermann/extconf.rb
-- ext/hermann/hermann_lib.c
-- ext/hermann/hermann_lib.h
+- ext/hermann/hermann_rdkafka.c
+- ext/hermann/hermann_rdkafka.h
 - lib/hermann.rb
 - lib/hermann/consumer.rb
 - lib/hermann/discovery/metadata.rb