evt-consumer 0.2.1.0 → 0.3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d8a67363fe73b9f14487853b768ae7c7517a8cf
-  data.tar.gz: 186fe59a8acbbf419b705b88a343fd87e07a84e4
+  metadata.gz: e1d54c15b94cdb4d5f1bca14b2bef0d35a1d8e82
+  data.tar.gz: 2e44a08b424289ba4225fdbdd6ff7c73e91e3842
 SHA512:
-  metadata.gz: 49ac045f2b5f46c4d4ced49a8fb7cab179be64efb2bedf80502d4a175d6b6ef3dd2f80bd25f5e51704cbc963c9f2fddbecd61a39f0e4e857c6584e82be5cf78c
-  data.tar.gz: 50fc32c50bf55ea29a308afcc3c15e46239396d151a7717e53ad2d636c99e1ca5b3ef108adfd252f06d4887063ff47e5244353276d7c221e7c58817024e46a84
+  metadata.gz: 20ea5da08362f78ef225d55b8ccc9e7994db823b7d2914e3675812e8e68d8d6011628c83ff91177320bffae50a0044d2a820dde568b9ef1105f3c2f620e09827
+  data.tar.gz: 8999009e287a384350d799f93f91cebb1e74d8a9279dbf86db34d1577fdbd6c134366a28b4ced2b3bab416d93f1ee3bebe1ffe84a1ba446a7a07d389b7bcd697

data/lib/consumer/consumer.rb

@@ -8,13 +8,15 @@ module Consumer
       extend Start
 
       extend HandleMacro
-      extend PositionStoreMacro
 
       prepend Configure
 
       initializer :stream
 
       attr_writer :position_update_interval
+      def position_update_interval
+        @position_update_interval ||= Defaults.position_update_interval
+      end
 
       attr_accessor :cycle_maximum_milliseconds
       attr_accessor :cycle_timeout_milliseconds
@@ -67,18 +69,12 @@ module Consumer
   end
 
   module Configure
-    def configure(batch_size: nil, session: nil)
+    def configure(batch_size: nil, session: nil, position_store: nil)
       logger.trace { "Configuring (Batch Size: #{batch_size}, Session: #{session.inspect})" }
 
       super if defined? super
 
-      position_store_class = self.class.position_store_class
-
-      unless position_store_class.nil?
-        position_store = position_store_class.configure self, stream
-
-        starting_position = position_store.get
-      end
+      starting_position = self.position_store.get
 
       subscription = Subscription.configure(
         self,
@@ -96,13 +92,14 @@ module Consumer
   end
 
   module Build
-    def build(stream_name, batch_size: nil, session: nil, cycle_timeout_milliseconds: nil, cycle_maximum_milliseconds: nil)
-      stream = EventSource::Stream.canonize stream_name
+    def build(stream_name, batch_size: nil, position_store: nil, position_update_interval: nil, session: nil, cycle_timeout_milliseconds: nil, cycle_maximum_milliseconds: nil)
+      stream = EventSource::Stream.build stream_name
 
       instance = new stream
+      instance.position_update_interval = position_update_interval
       instance.cycle_maximum_milliseconds = cycle_maximum_milliseconds
       instance.cycle_timeout_milliseconds = cycle_timeout_milliseconds
-      instance.configure batch_size: batch_size, session: session
+      instance.configure batch_size: batch_size, position_store: position_store, session: session
       instance
     end
   end
@@ -162,23 +159,4 @@ module Consumer
       @handler_registry ||= HandlerRegistry.new
     end
   end
-
-  module PositionStoreMacro
-    def self.extended(cls)
-      cls.singleton_class.class_exec do
-        attr_accessor :position_store_class
-        attr_writer :position_update_interval
-
-        def position_update_interval
-          @position_update_interval ||= Defaults.position_update_interval
-        end
-      end
-    end
-
-    def position_store_macro(position_store_class, update_interval: nil)
-      self.position_store_class = position_store_class
-      self.position_update_interval = update_interval
-    end
-    alias_method :position_store, :position_store_macro
-  end
 end

data/lib/consumer/controls.rb

@@ -18,4 +18,4 @@ require 'consumer/controls/position_store/local_file'
 require 'consumer/controls/subscription'
 
 require 'consumer/controls/consumer'
-require 'consumer/controls/consumer/logs_events'
+require 'consumer/controls/consumer/incrementing'

data/lib/consumer/controls/consumer.rb

@@ -9,10 +9,10 @@ module Consumer
         include ::Consumer
 
         handle Handle::Example
-        position_store PositionStore::Example
 
-        def configure(session: nil, batch_size: nil)
+        def configure(session: nil, batch_size: nil, position_store: nil)
           Get::Example.configure self
+          PositionStore::Example.configure self, position_store: position_store
         end
       end
     end

data/lib/consumer/controls/consumer/{logs_events.rb → incrementing.rb}

@@ -1,7 +1,7 @@
 module Consumer
   module Controls
     module Consumer
-      class LogsEvents
+      class Incrementing
         include ::Consumer
 
         def self.logger
@@ -16,13 +16,13 @@ module Consumer
           logger.debug { event_data.data.pretty_inspect }
         end
 
-        position_store PositionStore::LocalFile, update_interval: 10
-
-        def configure(session: nil, batch_size: nil)
+        def configure(session: nil, batch_size: nil, position_store: nil)
           sleep_duration = ENV['SLEEP_DURATION'] || 100
           sleep_duration = sleep_duration.to_i
 
           Get::Incrementing.configure self, sleep_duration
+
+          PositionStore::LocalFile.configure self, position_store: position_store
         end
       end
     end

data/lib/consumer/controls/position_store.rb

@@ -2,9 +2,7 @@ module Consumer
   module Controls
     module PositionStore
       def self.example
-        stream_name = StreamName.example
-
-        Example.build stream_name
+        Example.build
       end
 
       class Example

data/lib/consumer/position_store.rb

@@ -5,33 +5,65 @@ module Consumer
         include Log::Dependency
 
         extend Build
+        extend ClassConfigure
 
+        prepend Configure
         prepend Get
         prepend Put
 
-        configure :position_store
-
-        initializer :stream
-
         dependency :telemetry, ::Telemetry
       end
     end
 
     Virtual::Method.define self, :configure
 
+    module Build
+      def build
+        instance = new
+        instance.configure
+        instance
+      end
+    end
+
+    module ClassConfigure
+      def configure(receiver, *arguments, position_store: nil, attr_name: nil, **keyword_arguments)
+        attr_name ||= :position_store
+
+        if position_store.nil?
+          if arguments.any?
+            position_store = build *arguments, **keyword_arguments
+          else
+            position_store = build *arguments
+          end
+        end
+
+        receiver.public_send "#{attr_name}=", position_store
+
+        position_store
+      end
+    end
+
+    module Configure
+      def configure
+        ::Telemetry.configure self
+
+        super
+      end
+    end
+
     module Get
       def self.prepended(cls)
         Virtual::PureMethod.define cls, :get
       end
 
       def get
-        logger.trace { "Get position (Stream: #{stream.name})" }
+        logger.trace { "Get position" }
 
         position = super
 
-        logger.debug { "Get position done (Stream: #{stream.name}, Position: #{position})" }
+        logger.debug { "Get position done (Position: #{position})" }
 
-        telemetry.record :get, Telemetry::Get.new(position, stream)
+        telemetry.record :get, Telemetry::Get.new(position)
 
         position
       end
@@ -43,27 +75,16 @@ module Consumer
       end
 
       def put(position)
-        logger.trace { "Put position (Stream: #{stream.name}, Position: #{position})" }
+        logger.trace { "Put position (Position: #{position})" }
 
         super
 
-        logger.debug { "Put position done (Stream: #{stream.name}, Position: #{position})" }
+        logger.debug { "Put position done (Position: #{position})" }
 
-        telemetry.record :put, Telemetry::Put.new(position, stream)
+        telemetry.record :put, Telemetry::Put.new(position)
 
         nil
       end
     end
-
-    module Build
-      def build(stream)
-        stream = EventSource::Stream.canonize stream
-
-        instance = new stream
-        ::Telemetry.configure instance
-        instance.configure
-        instance
-      end
-    end
   end
 end

data/lib/consumer/position_store/telemetry.rb

@@ -8,8 +8,8 @@ module Consumer
         record :put
       end
 
-      Get = Struct.new :position, :stream
-      Put = Struct.new :position, :stream
+      Get = Struct.new :position
+      Put = Struct.new :position
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 0.2.1.0
+  version: 0.3.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -78,7 +78,7 @@ files:
 - lib/consumer/controls.rb
 - lib/consumer/controls/category.rb
 - lib/consumer/controls/consumer.rb
-- lib/consumer/controls/consumer/logs_events.rb
+- lib/consumer/controls/consumer/incrementing.rb
 - lib/consumer/controls/cycle.rb
 - lib/consumer/controls/error.rb
 - lib/consumer/controls/event_data.rb