yakc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85582e1cc1e9f75e02b293ac2eb08e1e5c854805
-  data.tar.gz: 7cb171469ffcf5d4794f53c595c30ddc15d8277b
+  metadata.gz: 44d8d2354964fbc66a258745f1e258c27bbc4365
+  data.tar.gz: 61b5be7b9f75f887a8b0e7a6a76802c3244dd0a5
 SHA512:
-  metadata.gz: 93f2c0c330970fe2bf899f0770b7424b85d2e22a488135e47abf7ff5b917e13a5f4218bb3d3ef9d78e753703eb3e11e8d5cfced784a3fa38a24199ea7f1f939a
-  data.tar.gz: 38236c41997a8f531c7197d36892af9341ed58cbad981d08f3ce654e4738a0eabef983cd21cfdcf995830eb412c01c9529c6715ede02e19c335fa58ac271b599
+  metadata.gz: c5f17b3bc8143c260747832d695f94335df0b84ee7cdf1f63ed89662d01bccbcb745fdd9bb014d3caa4ddedbc27f123c09b7599b9f72804ac2a68796a4915af6
+  data.tar.gz: 5c1a6955c2f3c4762cf085404f2997af70d628127e330e350fa032326255ccf8b598310d4a6f73ab190f8025b3ba15771b982d8dfd1ee212c0f24eb0129d5010

data/README.md

@@ -32,9 +32,9 @@ This is the bit of code that handles what to do with the messages once they are
 To set it up:
 
 ```ruby
-  handler = YAKC::MessageBroadcaster.new publisher: MyBroadcaster, message_class: MyMessageClass
+  handler = YAKC::MessageBroadcaster.new publisher: MyBroadcaster, message_parser: MyMessageClass
   # or, if you are okay with Yeller
-  handler = YAKC::MessageBroadcaster.new message_class: MyMessageClass
+  handler = YAKC::MessageBroadcaster.new message_parser: MyMessageClass
 ```
 
 And now you're ready to init the [reader](#reader)
@@ -103,7 +103,7 @@ It implements:
 Here's how you would use it:
 
 ```ruby
-  handler = YAKC::MessageBroadcaster.new message_class: AvroMessage
+  handler = YAKC::MessageBroadcaster.new message_parser: AvroMessage
   reader = YAKC::Reader.new message_handler: handler
 
   reader.read
@@ -142,7 +142,7 @@ The reader would look like
 In your reader job
 
 ```ruby
-  handler = YAKC::MessageBroadcaster.new message_class: AvroMessage
+  handler = YAKC::MessageBroadcaster.new message_parser: AvroMessage
   reader = YAKC::Reader.new message_handler: handler
 
   reader.read

data/lib/yakc/configuration.rb

@@ -3,12 +3,12 @@ module YAKC
     attr_accessor :zookeepers, :brokers, :app, :suffix, :topics, :logger
 
     def initialize
-      logger      = Logger.new(STDOUT)
-      brokers     = ENV.fetch("BROKERS", "localhost:9092").split(",")
-      zookeepers  = ENV.fetch("ZOOKEEPERS", "localhost:2181").split(",") 
-      app         = ENV["APP"]
-      suffix      = ENV["SUFFIX"]
-      topics      = ENV["TOPICS"].split(",")
+      @logger      = Logger.new(STDOUT)
+      @brokers     = ENV.fetch("BROKERS", "localhost:9092").split(",")
+      @zookeepers  = ENV.fetch("ZOOKEEPERS", "localhost:2181").split(",")
+      @app         = ENV["APP"]
+      @suffix      = ENV["SUFFIX"]
+      @topics      = ENV.fetch("TOPICS", "").split(",")
     end
   end
 end

data/lib/yakc/fallthrough_instrumenter.rb

@@ -1,10 +1,8 @@
 module YAKC
-  module Instrumenter
-    class FallthroughInstrumenter
+  class FallthroughInstrumenter
 
-      def instrument( message )
-        yield
-      end
+    def instrument( message )
+      yield
     end
   end
 end

data/lib/yakc/message_broadcaster.rb

@@ -15,7 +15,7 @@ module YAKC
       @instrumenter.instrument( msg ) do 
         if msg.broadcastable?
           # broadcast the specific topic event 
-          @publisher.broadcast msg.payload, broadcast_key( topic, msg.event )        
+          @publisher.broadcast msg.payload, broadcast_key( topic, msg.event )
         end
       end
     end

data/lib/yakc/reader.rb

@@ -1,31 +1,36 @@
 module YAKC
   class Reader
-    attr_reader :message_handler, :terminated
+    attr_reader :message_handler, :terminated, :config
+    delegate :topics, :brokers, :zookeepers, :logger, :app, :suffix, to: :config
 
     def initialize( message_handler: )
       @message_handler  = message_handler
-      @config           = YAKC.configuration      
+      @config           = YAKC.configuration     
 
       raise KeyError, "YAKC::Reader initialized without a message handler. Please specify one so that your receives messages don't end up on the floor. For more info, go to: https://github.com/gaorlov/yakc#message-handler" unless message_handler
       
-      Signal.trap("INT") do
-        @terminated = true
+      %w(INT TERM).each do |signal|
+        Signal.trap(signal) do
+          @terminated = true
+        end
       end
     end
 
     def read
+      logger.info "YAKC: Starting reading"
       loop do
         consumers.map do |consumer|
           consumer.fetch do |partition, bulk|
             bulk.each do |message|
-              message_handler.handle topic, message
+              message_handler.handle consumer.topic, message
             end
           end
           return if terminated
         end
+        return if terminated
       end
     rescue => e
-      YACK.logger.error e
+      logger.error e
       retry
     end
 
@@ -35,8 +40,8 @@ module YAKC
       @consumers ||= topics.map do |topic|
         Poseidon::ConsumerGroup.new(
         "#{app}-#{topic}-consumer-#{suffix}", 
-        @config.brokers,
-        @config.zookeepers, 
+        brokers,
+        zookeepers, 
         topic,
         {})
       end

data/lib/yakc/version.rb

@@ -1,3 +1,3 @@
 module Yakc
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/yakc.rb

@@ -5,7 +5,7 @@ require 'yeller'
 
 module YAKC
   autoload :Configuration,            'yakc/configuration'
-  autoload :FallthroughInstrumenter,  'yakc/fallthorugh_instrumenter'
+  autoload :FallthroughInstrumenter,  'yakc/fallthrough_instrumenter'
   autoload :MessageBroadcaster,       'yakc/message_broadcaster'
   autoload :Reader,                   'yakc/reader'
   autoload :Message,                  'yakc/message'
@@ -14,13 +14,13 @@ module YAKC
     attr_writer :configuration
   end
 
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
-
   def self.configure
     yield configuration
   end
+  
+  def self.configuration
+    @configuration ||= YAKC::Configuration.new
+  end
 
   delegate :logger, to: :configuration
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yakc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Greg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yeller