ruby-kafka 0.5.2.beta1 → 0.5.2.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d3ed93d12793328cee689f4b0ace7da8e8ba951
-  data.tar.gz: cdf38141d80608ad6c16fa5866be66204b599c7a
+  metadata.gz: eed57dde0ac66ebd2434a84f198ae88654b0a792
+  data.tar.gz: 6da001e90557c6633c930db1e8c8c27eda062556
 SHA512:
-  metadata.gz: 23e15780a1c7c9089cc27bac07a077d026ce0e0d4f3132061ecd6da91d42ebea75eb8d8a379c896d2637900c3d355cbedbc306945be08cf9d01a3500289e8722
-  data.tar.gz: 3f336771af6ce3c84175717668e7cd2a7e7405521be2a618e57124592999d153d5fdbb75750081b7013fbb5eacd054ab954ae8255dccc49989aef851a5cebdd8
+  metadata.gz: 7dc72dec0637c11e5f18f4fb4b90b2384c6ac0150069fb7c2c03e56a43b27e023d07e6bd7f01141131dabe83735a8d3788de765bab3dc59d6db263f23e39859f
+  data.tar.gz: 96895ff990a1dfa40a0487811b8abee3ff00a560b3a1beadd6e3835ba6343b2a7c70305df74da002476f2d0dad775304e75ddd6587121ea1cfd90f53a82fb412

data/.circleci/config.yml

@@ -1,6 +1,17 @@
 version: 2
 jobs:
-  build:
+  unit:
+    docker:
+      - image: circleci/ruby:2.4.1-node
+        environment:
+          LOG_LEVEL: DEBUG
+    steps:
+      - checkout
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rspec
+      - run: bundle exec rubocop
+
+  kafka-0.10:
     docker:
       - image: circleci/ruby:2.4.1-node
         environment:
@@ -24,10 +35,74 @@ jobs:
           KAFKA_ADVERTISED_PORT: 9094
           KAFKA_PORT: 9094
           KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+    steps:
+      - checkout
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rspec --profile --tag functional spec/functional
+
+  kafka-0.11:
+    docker:
+      - image: circleci/ruby:2.4.1-node
+        environment:
+          LOG_LEVEL: DEBUG
+      - image: wurstmeister/zookeeper
+      - image: wurstmeister/kafka:0.11.0.1
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9092
+          KAFKA_PORT: 9092
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+      - image: wurstmeister/kafka:0.11.0.1
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9093
+          KAFKA_PORT: 9093
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+      - image: wurstmeister/kafka:0.11.0.1
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9094
+          KAFKA_PORT: 9094
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+    steps:
+      - checkout
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rspec --profile --tag functional spec/functional
 
+  kafka-1.0:
+    docker:
+      - image: circleci/ruby:2.4.1-node
+        environment:
+          LOG_LEVEL: DEBUG
+      - image: wurstmeister/zookeeper
+      - image: wurstmeister/kafka:1.0.0
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9092
+          KAFKA_PORT: 9092
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+      - image: wurstmeister/kafka:1.0.0
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9093
+          KAFKA_PORT: 9093
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+      - image: wurstmeister/kafka:1.0.0
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9094
+          KAFKA_PORT: 9094
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
     steps:
       - checkout
       - run: bundle install --path vendor/bundle
-      - run: bundle exec rspec
       - run: bundle exec rspec --profile --tag functional spec/functional
-      - run: bundle exec rubocop
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - unit
+      - kafka-0.10
+      - kafka-0.11
+      - kafka-1.0

data/CHANGELOG.md

@@ -10,6 +10,7 @@ Changes and additions to the library will be listed here.
 - Add support for LZ4 compression (#499).
 - Refactor compression codec lookup (#509).
 - Fix compressed message set offset bug (#506).
+- Test against multiple versions of Kafka.
 
 ## v0.5.1
 

data/lib/kafka/compression.rb

@@ -21,9 +21,13 @@ module Kafka
     end
 
     def self.find_codec(name)
-      CODECS.fetch(name) do
+      codec = CODECS.fetch(name) do
         raise "Unknown compression codec #{name}"
       end
+
+      codec.load
+
+      codec
     end
 
     def self.find_codec_by_id(codec_id)

data/lib/kafka/gzip_codec.rb

@@ -1,13 +1,13 @@
 module Kafka
   class GzipCodec
-    def initialize
-      require "zlib"
-    end
-
     def codec_id
       1
     end
 
+    def load
+      require "zlib"
+    end
+
     def compress(data)
       buffer = StringIO.new
       buffer.set_encoding(Encoding::BINARY)

data/lib/kafka/lz4_codec.rb

@@ -1,15 +1,15 @@
 module Kafka
   class LZ4Codec
-    def initialize
+    def codec_id
+      3
+    end
+
+    def load
       require "extlz4"
     rescue LoadError
       raise LoadError, "using lz4 compression requires adding a dependency on the `extlz4` gem to your Gemfile."
     end
 
-    def codec_id
-      3
-    end
-
     def compress(data)
       LZ4.encode(data)
     end

data/lib/kafka/protocol/message.rb

@@ -58,7 +58,7 @@ module Kafka
         message_set_decoder = Decoder.from_string(data)
         message_set = MessageSet.decode(message_set_decoder)
 
-        correct_offsets(message_set)
+        correct_offsets(message_set.messages)
       end
 
       def self.decode(decoder)
@@ -111,15 +111,16 @@ module Kafka
       # All other cases, compressed inner messages should have relative offset, with below attributes:
       #   - The container message should have the 'real' offset
       #   - The container message's offset should be the 'real' offset of the last message in the compressed batch
-      def correct_offsets(message_set)
-        max_relative_offset = message_set.messages.last.offset
+      def correct_offsets(messages)
+        max_relative_offset = messages.last.offset
 
         # The offsets are already correct, do nothing.
-        return message_set if max_relative_offset == offset
+        return messages if max_relative_offset == offset
 
         # The contained messages have relative offsets, and needs to be corrected.
         base_offset = offset - max_relative_offset
-        messages = message_set.messages.map do |message|
+
+        messages.map do |message|
           Message.new(
             offset: message.offset + base_offset,
             value: message.value,
@@ -128,8 +129,6 @@ module Kafka
             codec_id: message.codec_id
           )
         end
-
-        MessageSet.new(messages: messages)
       end
 
       def encode_with_crc

data/lib/kafka/protocol/message_set.rb

@@ -31,8 +31,7 @@ module Kafka
             message = Message.decode(decoder)
 
             if message.compressed?
-              wrapped_message_set = message.decompress
-              fetched_messages.concat(wrapped_message_set.messages)
+              fetched_messages.concat(message.decompress)
             else
               fetched_messages << message
             end

data/lib/kafka/snappy_codec.rb

@@ -1,16 +1,16 @@
 module Kafka
   class SnappyCodec
-    def initialize
+    def codec_id
+      2
+    end
+
+    def load
       require "snappy"
     rescue LoadError
       raise LoadError,
         "Using snappy compression requires adding a dependency on the `snappy` gem to your Gemfile."
     end
 
-    def codec_id
-      2
-    end
-
     def compress(data)
       Snappy.deflate(data)
     end

data/lib/kafka/version.rb

@@ -1,3 +1,3 @@
 module Kafka
-  VERSION = "0.5.2.beta1"
+  VERSION = "0.5.2.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.5.2.beta1
+  version: 0.5.2.beta2
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler