kafka-rb 0.0.6 → 0.0.8

data/LICENSE

@@ -1,20 +1,202 @@
-Copyright (c) 2010 Alejandro Crosa
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -1,13 +1,19 @@
 # kafka-rb
-kafka-rb allows you to produce messages to the Kafka distributed publish/subscribe messaging service.
+kafka-rb allows you to produce and consume messages to / from the Kafka distributed messaging service.
+This is an improved version of the original Ruby client written by Alejandro Crosa, 
+and is used in production at wooga.
 
 ## Requirements
-You need to have access to your Kafka instance and be able to connect through TCP. You can obtain a copy and instructions on how to setup kafka at https://github.com/kafka-dev/kafka
+You need to have access to your Kafka instance and be able to connect through TCP. 
+You can obtain a copy and instructions on how to setup kafka at http://incubator.apache.org/kafka/
+
 
 ## Installation
-sudo gem install kafka-rb
 
-(the code works fine with JRuby, Ruby 1.8x and Ruby 1.9.x)
+    sudo gem install wooga-kafka-rb
+
+(should work fine with JRuby, Ruby 1.8 and 1.9)
+
 
 ## Usage
 
@@ -55,8 +61,8 @@ sudo gem install kafka-rb
     end
 
 
-Contact for questions
-
+## Questions?
 alejandrocrosa at(@) gmail.com
-
 http://twitter.com/alejandrocrosa
+
+tim.lossen@wooga.net

data/Rakefile

@@ -1,41 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'rubygems'
 require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
 require 'rspec/core/rake_task'
 
-GEM = 'kafka-rb'
-GEM_NAME = 'Kafka Client'
-GEM_VERSION = '0.0.5'
-AUTHORS = ['Alejandro Crosa']
-EMAIL = "alejandrocrosa@gmail.com"
-HOMEPAGE = "http://github.com/acrosa/kafka-rb"
-SUMMARY = "A Ruby client for the Kafka distributed publish/subscribe messaging service"
-DESCRIPTION = "kafka-rb allows you to produce and consume messages using the Kafka distributed publish/subscribe messaging service."
-
 spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
+  s.name = %q{kafka-rb}
+  s.version = "0.0.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Alejandro Crosa", "Stefan Mees", "Tim Lossen"]
+  s.autorequire = %q{kafka-rb}
+  s.date = Time.now.strftime("%Y-%m-%d")
+  s.description = %q{kafka-rb allows you to produce and consume messages using the Kafka distributed publish/subscribe messaging service.}
   s.extra_rdoc_files = ["LICENSE"]
-  s.summary = SUMMARY
-  s.description = DESCRIPTION
-  s.authors = AUTHORS
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_development_dependency "rspec"
-  s.require_path = 'lib'
-  s.autorequire = GEM
-  s.files = %w(LICENSE README.md Rakefile) + Dir.glob("{lib,tasks,spec}/**/*")
-end
+  s.files = ["LICENSE", "README.md", "Rakefile", "lib/kafka", "lib/kafka/batch.rb", "lib/kafka/consumer.rb", "lib/kafka/io.rb", "lib/kafka/message.rb", "lib/kafka/producer.rb", "lib/kafka/request_type.rb", "lib/kafka/error_codes.rb", "lib/kafka.rb", "spec/batch_spec.rb", "spec/consumer_spec.rb", "spec/io_spec.rb", "spec/kafka_spec.rb", "spec/message_spec.rb", "spec/producer_spec.rb", "spec/spec_helper.rb"]
+  s.homepage = %q{http://github.com/wooga/kafka-rb}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{A Ruby client for the Kafka distributed publish/subscribe messaging service}
 
-task :default => :spec
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
 
-desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = FileList['spec/**/*_spec.rb']
-  t.rspec_opts = %w(-fs --color)
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -44,14 +55,7 @@ end
 
 desc "install the gem locally"
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM_NAME}-#{GEM_VERSION}}
-end
-
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
+  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
 end
 
 desc "Run all examples with RCov"
@@ -59,3 +63,12 @@ RSpec::Core::RakeTask.new(:rcov) do |t|
   t.pattern = FileList['spec/**/*_spec.rb']
   t.rcov = true
 end
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
+  t.rspec_opts = %w(-fs --color)
+end
+
+task :default => :spec
+

data/lib/kafka/batch.rb

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module Kafka
   class Batch
     attr_accessor :messages

data/lib/kafka/consumer.rb

@@ -1,76 +1,105 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module Kafka
   class Consumer
 
     include Kafka::IO
 
-    CONSUME_REQUEST_TYPE = Kafka::RequestType::FETCH
-    MAX_SIZE = 1048576 # 1 MB
-    DEFAULT_POLLING_INTERVAL = 2 # 2 seconds
+    MAX_SIZE = 1024 * 1024        # 1 megabyte
+    DEFAULT_POLLING_INTERVAL = 2  # 2 seconds
+    MAX_OFFSETS = 1
+    LATEST_OFFSET = -1
+    EARLIEST_OFFSET = -2
 
     attr_accessor :topic, :partition, :offset, :max_size, :request_type, :polling
 
     def initialize(options = {})
-      self.topic        = options[:topic]        || "test"
-      self.partition    = options[:partition]    || 0
-      self.host         = options[:host]         || "localhost"
-      self.port         = options[:port]         || 9092
-      self.offset       = options[:offset]       || 0
-      self.max_size     = options[:max_size]     || MAX_SIZE
-      self.request_type = options[:request_type] || CONSUME_REQUEST_TYPE
-      self.polling      = options[:polling]      || DEFAULT_POLLING_INTERVAL
-      self.connect(self.host, self.port)
+      self.topic        = options[:topic]     || "test"
+      self.partition    = options[:partition] || 0
+      self.host         = options[:host]      || "localhost"
+      self.port         = options[:port]      || 9092
+      self.offset       = options[:offset]
+      self.max_size     = options[:max_size]  || MAX_SIZE
+      self.polling      = options[:polling]   || DEFAULT_POLLING_INTERVAL
+      connect(host, port)
     end
 
-    # REQUEST TYPE ID + TOPIC LENGTH + TOPIC + PARTITION + OFFSET + MAX SIZE
-    def request_size
-      2 + 2 + topic.length + 4 + 8 + 4
+    def loop(&block)
+      messages = []
+      while (true) do
+        messages = consume
+        block.call(messages) if messages && !messages.empty?
+        sleep(polling)
+      end
     end
 
-    def encode_request_size
-      [self.request_size].pack("N")
+    def consume
+      self.offset ||= fetch_latest_offset
+      send_consume_request
+      data = read_data_response
+      parse_message_set_from(data)
+    rescue SocketError
+      nil
     end
 
-    def encode_request(request_type, topic, partition, offset, max_size)
-      request_type = [request_type].pack("n")
-      topic        = [topic.length].pack('n') + topic
-      partition    = [partition].pack("N")
-      offset       = [offset].pack("Q").reverse # DIY 64bit big endian integer
-      max_size     = [max_size].pack("N")
+    def fetch_latest_offset
+      send_offsets_request
+      read_offsets_response
+    end
 
-      request_type + topic + partition + offset + max_size
+    def send_offsets_request
+      write(encoded_request_size)
+      write(encode_request(Kafka::RequestType::OFFSETS, topic, partition, LATEST_OFFSET, MAX_OFFSETS))
     end
 
-    def consume
-      self.send_consume_request         # request data
-      data = self.read_data_response    # read data response
-      self.parse_message_set_from(data) # parse message set
+    def read_offsets_response
+      read_data_response[4,8].reverse.unpack('q')[0]
     end
 
-    def loop(&block)
-      messages = []
-      while(true) do
-        messages = self.consume
-        block.call(messages) if messages && !messages.empty?
-        sleep(self.polling)
-      end
+    def send_consume_request
+      write(encoded_request_size)
+      write(encode_request(Kafka::RequestType::FETCH, topic, partition, offset, max_size))
     end
 
     def read_data_response
-      data_length = self.socket.read(4).unpack("N").shift # read length
-      data = self.socket.read(data_length)                # read message set
-      data[2, data.length]                                # we start with a 2 byte offset
+      data_length = read(4).unpack("N").shift
+      data = read(data_length)
+      # TODO: inspect error code instead of skipping it
+      data[2, data.length]
     end
 
-    def send_consume_request
-      self.write(self.encode_request_size) # write request_size
-      self.write(self.encode_request(self.request_type, self.topic, self.partition, self.offset, self.max_size)) # write request
+    def encoded_request_size
+      size = 2 + 2 + topic.length + 4 + 8 + 4
+      [size].pack("N")
+    end
+
+    def encode_request(request_type, topic, partition, offset, max_size)
+      request_type = [request_type].pack("n")
+      topic        = [topic.length].pack('n') + topic
+      partition    = [partition].pack("N")
+      offset       = [offset].pack("q").reverse # DIY 64bit big endian integer
+      max_size     = [max_size].pack("N")
+      request_type + topic + partition + offset + max_size
     end
 
     def parse_message_set_from(data)
       messages = []
       processed = 0
       length = data.length - 4
-      while(processed <= length) do
+      while (processed <= length) do
         message_size = data[processed, 4].unpack("N").shift + 4
         message_data = data[processed, message_size]
         break unless message_data.size == message_size
@@ -80,5 +109,6 @@ module Kafka
       self.offset += processed
       messages
     end
+
   end
 end

data/lib/kafka/error_codes.rb

@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+module Kafka
+  module ErrorCodes
+    NO_ERROR                = 0
+    OFFSET_OUT_OF_RANGE     = 1
+    INVALID_MESSAGE_CODE    = 2
+    WRONG_PARTITION_CODE    = 3
+    INVALID_RETCH_SIZE_CODE = 4
+
+    STRINGS = {
+      0 => 'No error',
+      1 => 'Offset out of range',
+      2 => 'Invalid message code',
+      3 => 'Wrong partition code',
+      4 => 'Invalid retch size code',
+    }
+
+    def self.to_s(code)
+      STRINGS[code] || 'Unknown error'
+    end
+  end
+end

data/lib/kafka/io.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 module Kafka
   module IO
     attr_accessor :socket, :host, :port
@@ -10,8 +24,10 @@ module Kafka
     end
 
     def reconnect
+      self.socket = TCPSocket.new(self.host, self.port)
+    rescue
       self.disconnect
-      self.socket = self.connect(self.host, self.port)
+      raise
     end
 
     def disconnect
@@ -19,21 +35,20 @@ module Kafka
       self.socket = nil
     end
 
+    def read(length)
+      self.socket.read(length) || raise(SocketError, "no data")
+    rescue
+      self.disconnect
+      raise SocketError, "cannot read: #{$!.message}"
+    end
+
     def write(data)
       self.reconnect unless self.socket
       self.socket.write(data)
-    rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED
-      self.reconnect
-      self.socket.write(data) # retry
+    rescue
+      self.disconnect
+      raise SocketError, "cannot write: #{$!.message}"
     end
 
-    def read(length)
-      begin
-        self.socket.read(length)
-      rescue Errno::EAGAIN
-        self.disconnect
-        raise Errno::EAGAIN, "Timeout reading from the socket"
-      end
-    end
   end
 end

data/lib/kafka/message.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 module Kafka
 
   # A message. The format of an N byte message is the following:

data/lib/kafka/producer.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 module Kafka
   class Producer
 

data/lib/kafka/request_type.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 module Kafka
   module RequestType
     PRODUCE      = 0

data/lib/kafka.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 require 'socket'
 require 'zlib'
 if RUBY_VERSION[0,3] == "1.8"
@@ -6,10 +20,14 @@ end
 
 require File.join(File.dirname(__FILE__), "kafka", "io")
 require File.join(File.dirname(__FILE__), "kafka", "request_type")
+require File.join(File.dirname(__FILE__), "kafka", "error_codes")
 require File.join(File.dirname(__FILE__), "kafka", "batch")
 require File.join(File.dirname(__FILE__), "kafka", "message")
 require File.join(File.dirname(__FILE__), "kafka", "producer")
 require File.join(File.dirname(__FILE__), "kafka", "consumer")
 
 module Kafka
+
+  class SocketError < RuntimeError; end
+
 end

data/spec/batch_spec.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Batch do

data/spec/consumer_spec.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Consumer do
@@ -5,13 +19,13 @@ describe Consumer do
   before(:each) do
     @mocked_socket = mock(TCPSocket)
     TCPSocket.stub!(:new).and_return(@mocked_socket) # don't use a real socket
-    @consumer = Consumer.new
+    @consumer = Consumer.new(:offset => 0)
   end
 
   describe "Kafka Consumer" do
 
-    it "should have a CONSUME_REQUEST_TYPE" do
-      Consumer::CONSUME_REQUEST_TYPE.should eql(1)
+    it "should have a Kafka::RequestType::FETCH" do
+      Consumer::Kafka::RequestType::FETCH.should eql(1)
       @consumer.should respond_to(:request_type)
     end
 
@@ -40,8 +54,9 @@ describe Consumer do
       @consumer.port.should eql(9092)
     end
 
-    it "should have a default offset, and be able to set it" do
-      @consumer.offset.should eql(0)
+    it "should not have a default offset but be able to set it" do
+      @consumer = Consumer.new
+      @consumer.offset.should be_nil
       @consumer = Consumer.new({ :offset => 1111 })
       @consumer.offset.should eql(1111)
     end
@@ -52,25 +67,24 @@ describe Consumer do
     end
 
     it "should return the size of the request" do
-      @consumer.request_size.should eql(24)
       @consumer.topic = "someothertopicname"
-      @consumer.request_size.should eql(38)
-      @consumer.encode_request_size.should eql([@consumer.request_size].pack("N"))
+      @consumer.encoded_request_size.should eql([38].pack("N"))
     end
 
     it "should encode a request to consume" do
-      bytes = [Kafka::Consumer::CONSUME_REQUEST_TYPE].pack("n") + ["test".length].pack("n") + "test" + [0].pack("N") + [0].pack("L_") + [Kafka::Consumer::MAX_SIZE].pack("N")
-      @consumer.encode_request(Kafka::Consumer::CONSUME_REQUEST_TYPE, "test", 0, 0, Kafka::Consumer::MAX_SIZE).should eql(bytes)
+      bytes = [Kafka::RequestType::FETCH].pack("n") + ["test".length].pack("n") + "test" + [0].pack("N") + [0].pack("q").reverse + [Kafka::Consumer::MAX_SIZE].pack("N")
+      @consumer.encode_request(Kafka::RequestType::FETCH, "test", 0, 0, Kafka::Consumer::MAX_SIZE).should eql(bytes)
     end
 
     it "should read the response data" do
-      bytes = [8].pack("N") + [0].pack("C") + [1120192889].pack("N") + "ale"
-      @mocked_socket.should_receive(:read).exactly(:twice).and_return(bytes)
-      @consumer.read_data_response.should eql(bytes[2, bytes.length])
+      bytes = [0].pack("n") + [1120192889].pack("N") + "ale"
+      @mocked_socket.should_receive(:read).and_return([9].pack("N"))
+      @mocked_socket.should_receive(:read).with(9).and_return(bytes)
+      @consumer.read_data_response.should eql(bytes[2,7])
     end
 
     it "should send a consumer request" do
-      @consumer.stub!(:encode_request_size).and_return(666)
+      @consumer.stub!(:encoded_request_size).and_return(666)
       @consumer.stub!(:encode_request).and_return("someencodedrequest")
       @consumer.should_receive(:write).with("someencodedrequest").exactly(:once).and_return(true)
       @consumer.should_receive(:write).with(666).exactly(:once).and_return(true)
@@ -93,7 +107,7 @@ describe Consumer do
       messages = @consumer.parse_message_set_from(bytes)
       messages.size.should eql(1)
     end
-    
+
     it "should skip an incomplete message at the end of the response which has the same length as an empty message" do
       bytes = [8].pack("N") + [0].pack("C") + [1120192889].pack("N") + "ale"
       # incomplete message because payload is missing
@@ -101,7 +115,7 @@ describe Consumer do
       messages = @consumer.parse_message_set_from(bytes)
       messages.size.should eql(1)
     end
-    
+
     it "should read empty messages correctly" do
       # empty message
       bytes = [5].pack("N") + [0].pack("C") + [0].pack("N") + ""
@@ -140,5 +154,26 @@ describe Consumer do
 
       executed_times.should eql(2)
     end
+
+    it "should fetch initial offset if no offset is given" do
+      @consumer = Consumer.new
+      @consumer.should_receive(:fetch_latest_offset).exactly(:once).and_return(1000)
+      @consumer.should_receive(:send_consume_request).and_return(true)
+      @consumer.should_receive(:read_data_response).and_return("")
+      @consumer.consume
+      @consumer.offset.should eql(1000)
+    end
+
+    it "should encode an offset request" do
+      bytes = [Kafka::RequestType::OFFSETS].pack("n") + ["test".length].pack("n") + "test" + [0].pack("N") + [-1].pack("q").reverse + [Kafka::Consumer::MAX_OFFSETS].pack("N")
+      @consumer.encode_request(Kafka::RequestType::OFFSETS, "test", 0, -1, Kafka::Consumer::MAX_OFFSETS).should eql(bytes)
+    end
+
+    it "should parse an offsets response" do
+      bytes = [0].pack("n") + [1].pack('N') + [21346].pack('q').reverse
+      @mocked_socket.should_receive(:read).and_return([14].pack("N"))
+      @mocked_socket.should_receive(:read).and_return(bytes)
+      @consumer.read_offsets_response.should eql(21346)
+    end
   end
 end

data/spec/io_spec.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 require File.dirname(__FILE__) + '/spec_helper'
 
 class IOTest
@@ -41,7 +55,7 @@ describe IO do
 
     it "should read from a socket" do
       length = 200
-      @mocked_socket.should_receive(:read).with(length).and_return(nil)
+      @mocked_socket.should_receive(:read).with(length).and_return("foo")
       @io.read(length)
     end
 
@@ -49,7 +63,7 @@ describe IO do
       length = 200
       @mocked_socket.should_receive(:read).with(length).and_raise(Errno::EAGAIN)
       @io.should_receive(:disconnect)
-      lambda { @io.read(length) }.should raise_error(Errno::EAGAIN)
+      lambda { @io.read(length) }.should raise_error(Kafka::SocketError)
     end
 
     it "should disconnect" do
@@ -59,18 +73,15 @@ describe IO do
     end
 
     it "should reconnect" do
-      @mocked_socket.should_receive(:close)
-      @io.should_receive(:connect)
+      TCPSocket.should_receive(:new)
       @io.reconnect
     end
 
-    it "should reconnect on a broken pipe error" do
+    it "should disconnect on a broken pipe error" do
       [Errno::ECONNABORTED, Errno::EPIPE, Errno::ECONNRESET].each do |error|
-        @mocked_socket.should_receive(:write).exactly(:twice).and_raise(error)
+        @mocked_socket.should_receive(:write).exactly(:once).and_raise(error)
         @mocked_socket.should_receive(:close).exactly(:once).and_return(nil)
-        lambda {
-          @io.write("some data to send")
-        }.should raise_error(error)
+        lambda { @io.write("some data to send") }.should raise_error(Kafka::SocketError)
       end
     end
   end

data/spec/kafka_spec.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Kafka do

data/spec/message_spec.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Message do

data/spec/producer_spec.rb

@@ -1,4 +1,19 @@
 # encoding: utf-8
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Producer do
@@ -54,7 +69,7 @@ describe Producer do
           ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
           ic.iconv(Kafka::Message.parse_from(data).payload).should eql("ümlaut")
         else
-          Kafka::Message.parse_from(data).payload.force_encoding(Encoding::ASCII_8BIT).should eql("ümlaut")
+          Kafka::Message.parse_from(data).payload.force_encoding(Encoding::UTF_8).should eql("ümlaut")
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 require 'rubygems'
 require 'kafka'
 

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: kafka-rb
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Alejandro Crosa
+- Stefan Mees
+- Tim Lossen
 autorequire: kafka-rb
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -08:00
-default_executable: 
+date: 2012-01-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -33,7 +34,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 description: kafka-rb allows you to produce and consume messages using the Kafka distributed publish/subscribe messaging service.
-email: alejandrocrosa@gmail.com
+email: 
 executables: []
 
 extensions: []
@@ -50,6 +51,7 @@ files:
 - lib/kafka/message.rb
 - lib/kafka/producer.rb
 - lib/kafka/request_type.rb
+- lib/kafka/error_codes.rb
 - lib/kafka.rb
 - spec/batch_spec.rb
 - spec/consumer_spec.rb
@@ -58,8 +60,7 @@ files:
 - spec/message_spec.rb
 - spec/producer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/acrosa/kafka-rb
+homepage: http://github.com/wooga/kafka-rb
 licenses: []
 
 post_install_message: 
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the Kafka distributed publish/subscribe messaging service