evt-consumer 0.4.0.2 → 0.4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8a3d8ef3f63812e905fafe70844fe8ebbdff63
-  data.tar.gz: f0275972572b727a976f873ab60cbeed85b257e0
+  metadata.gz: c2fdb752c2c2e6a472a1d8f5e366fc547b43c2d8
+  data.tar.gz: 30085cfb53accfc5ddbe2bbfc07b6f291f0bc7fe
 SHA512:
-  metadata.gz: d5994f23f85aa8f4f05fdc3aa5656a6b8d062563005d0644f0e542f52e805fbe2b1d4fcf81c3f781571795babd32d0001b35a56a7303f6e74e5d5aadc0a5587b
-  data.tar.gz: f858a1b50eaf238101748fb64fa4c9ceff6961080abefed8eef8f73e18024df4bfc8838cbffcd18f6d3e6ec21eb099f8924fd7a50a4b9632b48c485751741366
+  metadata.gz: d93e4722ed90c52ae5b7abc8fd97396e76255033aeb938a12145a0757da77aa6e01cab4681bed5d8bacad5acbd9ac0d4c2e11530a21ba4eba30770db32781547
+  data.tar.gz: f11d4e31aeeeb527621e55463dfcd0693789d41aef69c3af8bf1d5b73680e6dbeefa0084c9228e1dc7c92e837606aee7a76a0775a4a2ce0f8f569390bf1915c9

data/lib/consumer/consumer.rb

@@ -11,7 +11,7 @@ module Consumer
 
       prepend Configure
 
-      initializer :stream
+      initializer :stream_name
 
       attr_writer :position_update_interval
       def position_update_interval
@@ -42,6 +42,46 @@ module Consumer
     error_raised error, event_data
   end
 
+  def run(&probe)
+    threads, addresses = nil
+
+    start do |_, _threads, _addresses|
+      threads = _threads
+      addresses = _addresses
+    end
+
+    loop do
+      probe.(self, threads, addresses) if probe
+      consumer.subscription.cycle { nil }
+    end
+
+    addresses.each do |address|
+      Actor::Messaging::Send.(:stop, address)
+    end
+
+    threads.each &:join
+
+    AsyncInvocation::Incorrect
+  end
+
+  def start(&probe)
+    _, subscription_thread = ::Actor::Start.(subscription)
+
+    actor_address, actor_thread = Actor.start self, subscription, include: :thread
+
+    if probe
+      subscription_address = subscription.address
+
+      probe.(self, [actor_thread, subscription_thread], [actor_address, subscription_address])
+    end
+
+    AsyncInvocation::Incorrect
+  end
+
+  def add_handler(handler)
+    dispatch.add_handler handler
+  end
+
   def error_raised(error, _)
     raise error
   end
@@ -78,7 +118,7 @@ module Consumer
 
       subscription = Subscription.configure(
         self,
-        stream,
+        stream_name,
         get,
         position: starting_position,
         cycle_maximum_milliseconds: cycle_maximum_milliseconds,
@@ -95,9 +135,7 @@ module Consumer
 
   module Build
     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 = new stream_name
       instance.position_update_interval = position_update_interval
       instance.cycle_maximum_milliseconds = cycle_maximum_milliseconds
       instance.cycle_timeout_milliseconds = cycle_timeout_milliseconds
@@ -107,45 +145,16 @@ module Consumer
   end
 
   module Run
-    def run(stream_name, **arguments, &action)
-      consumer, threads, addresses = nil
-
-      return_value = start stream_name, **arguments do |_consumer, _threads, _addresses|
-        consumer = _consumer
-        threads = _threads
-        addresses = _addresses
-      end
-
-      loop do
-        action.(consumer, threads, addresses) if action
-        consumer.subscription.cycle { nil }
-      end
-
-      addresses.each do |address|
-        Actor::Messaging::Send.(:stop, address)
-      end
-
-      threads.each &:join
-
-      return_value
+    def run(stream_name, **arguments, &probe)
+      instance = build stream_name, **arguments
+      instance.run &probe
     end
   end
 
   module Start
     def start(stream_name, **arguments, &probe)
       instance = build stream_name, **arguments
-
-      _, subscription_thread = ::Actor::Start.(instance.subscription)
-
-      actor_address, actor_thread = Actor.start instance, instance.subscription, include: :thread
-
-      if probe
-        subscription_address = instance.subscription.address
-
-        probe.(instance, [actor_thread, subscription_thread], [actor_address, subscription_address])
-      end
-
-      AsyncInvocation::Incorrect
+      instance.start &probe
     end
   end
 

data/lib/consumer/controls.rb

@@ -10,7 +10,6 @@ require 'consumer/controls/get/incrementing'
 require 'consumer/controls/handle'
 require 'consumer/controls/id'
 require 'consumer/controls/position'
-require 'consumer/controls/stream'
 require 'consumer/controls/stream_name'
 
 require 'consumer/controls/position_store'

data/lib/consumer/controls/consumer.rb

@@ -2,7 +2,7 @@ module Consumer
   module Controls
     module Consumer
       def self.example
-        Example.new Stream.example
+        Example.new StreamName.example
       end
 
       class Example

data/lib/consumer/controls/handle.rb

@@ -1,6 +1,10 @@
 module Consumer
   module Controls
     module Handle
+      def self.example
+        Example.new
+      end
+
       class Example
         include Messaging::Handle
 

data/lib/consumer/controls/subscription.rb

@@ -2,15 +2,15 @@ module Consumer
   module Controls
     module Subscription
       def self.example(next_batch: nil, batch: nil, position: nil)
-        stream = Stream.example
+        stream_name = StreamName.example
 
         get = Get.example
 
         unless batch.nil?
-          get.set_batch stream.name, batch, position
+          get.set_batch stream_name, batch, position
         end
 
-        subscription = ::Consumer::Subscription.new stream, get
+        subscription = ::Consumer::Subscription.new stream_name, get
 
         subscription.position = position if position
 

data/lib/consumer/dispatch.rb

@@ -24,6 +24,10 @@ module Consumer
       nil
     end
 
+    def add_handler(handler)
+      handlers << handler
+    end
+
     def to_proc
       method :call
     end

data/lib/consumer/dispatch/substitute.rb

@@ -10,6 +10,10 @@ module Consumer
           dispatched_events << event_data
         end
 
+        def add_handler(handle)
+          handlers << handle
+        end
+
         def dispatched_events
           @dispatched_events ||= []
         end
@@ -23,6 +27,14 @@ module Consumer
 
           dispatched_events.any? &block
         end
+
+        def handlers
+          @handlers ||= []
+        end
+
+        def handler?(handler)
+          handlers.include? handler
+        end
       end
     end
   end

data/lib/consumer/subscription.rb

@@ -5,7 +5,7 @@ module Consumer
 
     configure :subscription
 
-    initializer :stream, :get
+    initializer :stream_name, :get
 
     attr_accessor :next_batch
 
@@ -16,11 +16,11 @@ module Consumer
 
     dependency :cycle, Cycle
 
-    def self.build(stream, get, position: nil, cycle_maximum_milliseconds: nil, cycle_timeout_milliseconds: nil)
+    def self.build(stream_name, get, position: nil, cycle_maximum_milliseconds: nil, cycle_timeout_milliseconds: nil)
       cycle_maximum_milliseconds ||= Defaults.cycle_maximum_milliseconds
       cycle_timeout_milliseconds ||= Defaults.cycle_timeout_milliseconds
 
-      instance = new stream, get
+      instance = new stream_name, get
 
       instance.position = position
 
@@ -85,9 +85,5 @@ module Consumer
 
       batch
     end
-
-    def stream_name
-      stream.name
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 0.4.0.2
+  version: 0.4.1.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -104,7 +104,6 @@ files:
 - lib/consumer/controls/position.rb
 - lib/consumer/controls/position_store.rb
 - lib/consumer/controls/position_store/local_file.rb
-- lib/consumer/controls/stream.rb
 - lib/consumer/controls/stream_name.rb
 - lib/consumer/controls/subscription.rb
 - lib/consumer/defaults.rb

data/lib/consumer/controls/stream.rb

@@ -1,5 +0,0 @@
-module Consumer
-  module Controls
-    Stream = Messaging::Controls::Stream
-  end
-end