fluq-kafka 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14bf6c533a3bc8171681579e6b2bd9d5c578424c
-  data.tar.gz: ddaa619f61a3d08a690ebbf987d8d3edadfad014
+  metadata.gz: 209affc0c927d251efc91a30c18cb52ddbda3827
+  data.tar.gz: 6b496c7f488346c6bb8792d1c3f7a1dd32da2f79
 SHA512:
-  metadata.gz: a8afc4eebc8ab90412d3eb6a16c93db5b8d4d91198eb43dd15d3084da622bf3398cc1aa7c17a1dae6241d2c998cc10f6c7705de622c6bbbb75dd072ccfa37adc
-  data.tar.gz: b5763d4b2b25ff2cbf5aa8afa657938d8f2114208ee14395b214bc9b97175adab136ea718c4b797186c46bdb41f5beb4c5d986c21e6019ab9b24b2036a6b10ec
+  metadata.gz: c82cdf855b4d1e11ab55e0b64b8c389527521d6d6c157522adc8524a6047f4b7d6ebd29ee11e5864243ae9aace51b5fbdf5f185e295f02672a21585400d57ca4
+  data.tar.gz: d2a0e5989f104b778098c42d4d866ccd96819d9f70bcd352ababbb2aebcc4edf25cfac9f15249ddcc6070d6cf38a4c716570a85a4f2989a4eccc938c2528218d

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    fluq-kafka (0.8.0)
+    fluq-kafka (0.8.1)
       fluq (~> 0.8.0)
       poseidon_cluster
 
@@ -26,8 +26,8 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
-    docile (1.1.2)
-    fluq (0.8.0)
+    docile (1.1.3)
+    fluq (0.8.1)
       celluloid-io (~> 0.15.0)
       multi_json
       timed_lru
@@ -38,7 +38,7 @@ GEM
     multi_json (1.8.4)
     nio4r (1.0.0)
     nio4r (1.0.0-java)
-    poseidon_cluster (0.0.5)
+    poseidon_cluster (0.1.0)
       poseidon
       zk
     rake (10.1.1)
@@ -49,9 +49,9 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.5)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -64,7 +64,7 @@ GEM
     thor (0.18.1)
     timed_lru (0.3.1)
     timers (1.1.0)
-    tins (0.13.1)
+    tins (0.13.2)
     yard (0.8.7.3)
     zk (1.9.3)
       logging (~> 1.7.2)

data/fluq-kafka.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.add_dependency "fluq", "~> #{s.version}"
+  s.add_dependency "fluq", "~> #{s.version.to_s.sub(/\d+$/, '0')}"
   s.add_dependency "poseidon_cluster"
 
   s.add_development_dependency "rake"

data/lib/fluq/input/kafka.rb

@@ -14,6 +14,8 @@ class FluQ::Input::Kafka < FluQ::Input::Base
   #   Default: 100 (100ms)
   # @option options [Integer] :min_bytes smallest amount of data the server should send us.
   #   Default: 0 (send us data as soon as it is ready)
+  # @option options [Class] :consumer_class the consumer class to use.
+  #   Ddefault: FluQ::Kafka::Consumer
   #
   # @raises [ArgumentError] when no topic provided
   #
@@ -64,7 +66,7 @@ class FluQ::Input::Kafka < FluQ::Input::Base
   protected
 
     def consumer
-      @consumer ||= ::Poseidon::ConsumerGroup.new config[:group], config[:brokers], config[:zookeepers], config[:topic],
+      @consumer ||= config[:consumer_class].new config[:group], config[:brokers], config[:zookeepers], config[:topic],
         min_bytes: config[:min_bytes],
         max_bytes: config[:max_bytes],
         max_wait_ms: config[:max_wait_ms]
@@ -81,12 +83,16 @@ class FluQ::Input::Kafka < FluQ::Input::Base
         max_bytes: (1024 * 1024),
         max_wait_ms: 100,
         brokers: ["localhost:9092"],
-        zookeepers: ["localhost:2181"]
+        zookeepers: ["localhost:2181"],
+        consumer_class: ::FluQ::Kafka::Consumer
+
     end
 
     def before_terminate
       @consumer.close if @consumer
     rescue ThreadError
+    ensure
+      @consumer = nil
     end
 
 end

data/lib/fluq/kafka.rb

@@ -1,8 +1,5 @@
 require 'fluq'
 require 'fluq/kafka/version'
-require 'poseidon_cluster'
+require 'fluq/kafka/consumer'
 require 'fluq/input/kafka'
 
-class Poseidon::Connection
-  TCPSocket = Celluloid::IO::TCPSocket
-end

data/lib/fluq/kafka/consumer.rb

@@ -0,0 +1,13 @@
+require 'poseidon_cluster'
+
+class Poseidon::Connection
+  TCPSocket = Celluloid::IO::TCPSocket
+end
+
+module FluQ
+  module Kafka
+    class Consumer < Poseidon::ConsumerGroup
+    end
+  end
+end
+

data/lib/fluq/kafka/version.rb

@@ -1,5 +1,5 @@
 module FluQ
   module Kafka
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
   end
 end

data/spec/fluq/input/kafka_spec.rb

@@ -6,7 +6,7 @@ describe FluQ::Input::Kafka do
   let(:actors)  { [] }
 
   let :mock_consumer do
-    double Poseidon::ConsumerGroup, claimed: [], fetch_loop: nil, close: true
+    double FluQ::Kafka::Consumer, claimed: [], fetch_loop: nil, close: true
   end
 
   def input(opts = {})
@@ -15,14 +15,25 @@ describe FluQ::Input::Kafka do
     actor
   end
 
-  before  { Poseidon::ConsumerGroup.stub new: mock_consumer }
+  before  { FluQ::Kafka::Consumer.stub new: mock_consumer }
   after   { actors.each &:terminate }
   subject { input topic: "my-topic" }
 
   it { should be_a(FluQ::Input::Base) }
   its(:description) { should == "kafka:my-topic (fluq <- localhost:9092)" }
   its(:name)        { should == "kafka:my-topic" }
-  its(:config)      { should == {format: "json", format_options: {}, group: "fluq", min_bytes: 0, max_bytes: 1048576, max_wait_ms: 100, brokers: ["localhost:9092"], zookeepers: ["localhost:2181"], topic: "my-topic"} }
+  its(:config)      { should == {
+    format: "json",
+    format_options: {},
+    group: "fluq",
+    min_bytes: 0,
+    max_bytes: 1048576,
+    max_wait_ms: 100,
+    brokers: ["localhost:9092"],
+    zookeepers: ["localhost:2181"],
+    topic: "my-topic",
+    consumer_class: FluQ::Kafka::Consumer,
+  }}
 
   it 'should require a topic option' do
     -> { input }.should raise_error(ArgumentError, /No topic provided/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluq-kafka
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Black Square Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluq
@@ -125,6 +125,7 @@ files:
 - lib/fluq-kafka.rb
 - lib/fluq/input/kafka.rb
 - lib/fluq/kafka.rb
+- lib/fluq/kafka/consumer.rb
 - lib/fluq/kafka/version.rb
 - spec/fluq/input/kafka_spec.rb
 - spec/fluq/kafka_spec.rb
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: FluQ Kafka