evt-consumer 0.9.0.3 → 0.10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc3d6431dff7865c8f5233900d1841c5153e1135d90a5dfca0f5238016d9178
-  data.tar.gz: 3e345a03e9b7a6abd430faa5462c2bfa348b00f895e955428bc6dd72291973aa
+  metadata.gz: 7a93391825108de34561c03f36c7e2319388cc63dad3809c2dd8e96a710dceff
+  data.tar.gz: 4f18345dc270025a494488f07b7961cbb854e708c9d649f3f821c5b2ad7a959d
 SHA512:
-  metadata.gz: 55e63385a74af095f01d6ed8ab70b03305e66bb2f730c30be4e9aa753df6ff767ab37ea14b1ecd134d74b0a3a24882e6bde48810422a904b7605fa5060e1b832
-  data.tar.gz: 96df5e691619f8ea5ab260d6d6add64512df7f194d793ef5bcc45be3a257e9057e6cc10dc9e5381acb8589b1e0179a96561b430f2a758840d08c26c7c2f9ddce
+  metadata.gz: fdd0b3542210e9984e9f7364b72239f663822b3d7632c3c328a3d591d046616f7566e0ef0486dc5e241055905f19df850310e61db0cf0b17887e28721e114925
+  data.tar.gz: 52c7945be88a0d169a9dcdcbc159cf6e5c4ef5a82e3d787830b86f8b004d7070bd60cd31eb2b51a8bb12a3b93ee3728f7caf2cd1cf40444f00b89fdde881a33e

data/lib/consumer.rb

@@ -4,6 +4,7 @@ require 'configure'; Configure.activate
 require 'poll'
 require 'messaging'
 require 'log'
+require 'settings'
 
 require 'consumer/log'
 require 'consumer/log_text'
@@ -16,9 +17,6 @@ require 'consumer/position_store'
 require 'consumer/position_store/substitute'
 require 'consumer/position_store/telemetry'
 
-require 'consumer/dispatch'
-require 'consumer/dispatch/substitute'
-
 require 'consumer/subscription'
 require 'consumer/subscription/defaults'
 require 'consumer/subscription/get_batch'

data/lib/consumer/actor.rb

@@ -26,7 +26,7 @@ module Consumer
       request_batch
 
       messages.each do |message_data|
-        consumer.(message_data)
+        consumer.dispatch(message_data)
       end
 
       logger.debug { "Batch received (Events: #{messages.count})" }

data/lib/consumer/consumer.rb

@@ -13,14 +13,25 @@ module Consumer
 
       initializer :stream_name
 
+      attr_writer :identifier
+      def identifier
+        @identifier ||= self.class.identifier
+      end
+
       attr_writer :position_update_interval
       def position_update_interval
         @position_update_interval ||= Defaults.position_update_interval
       end
 
+      attr_writer :position_update_counter
+      def position_update_counter
+        @position_update_counter ||= 0
+      end
+
+      attr_accessor :session
+
       attr_accessor :poll_interval_milliseconds
 
-      dependency :dispatch, Dispatch
       dependency :get
       dependency :position_store, PositionStore
       dependency :subscription, Subscription
@@ -28,13 +39,17 @@ module Consumer
       virtual :error_raised do |error, message_data|
         raise error
       end
+
+      alias_method :call, :dispatch
     end
   end
 
-  def call(message_data)
+  def dispatch(message_data)
     logger.trace { "Dispatching message (#{LogText.message_data(message_data)})" }
 
-    dispatch.(message_data)
+    self.class.handler_registry.each do |handler|
+      handler.(message_data, session: session)
+    end
 
     update_position(message_data.global_position)
 
@@ -45,10 +60,6 @@ module Consumer
     error_raised(error, message_data)
   end
 
-  def identifier
-    self.class.identifier
-  end
-
   def start(&probe)
     _, subscription_thread = ::Actor::Start.(subscription)
 
@@ -63,28 +74,22 @@ module Consumer
     AsyncInvocation::Incorrect
   end
 
-  def add_handler(handler)
-    dispatch.add_handler handler
-  end
-
   def update_position(position)
-    logger.trace { "Updating position (Position: #{position}, Interval: #{position_update_interval})" }
+    logger.trace { "Updating position (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
 
-    position_offset = position % position_update_interval
+    self.position_update_counter += 1
 
-    if position_offset == 0
+    if position_update_counter >= position_update_interval
       position_store.put(position)
 
-      logger.debug { "Updated position (Position: #{position}, Interval: #{position_update_interval})" }
+      logger.debug { "Updated position (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
+
+      self.position_update_counter = 0
     else
-      logger.debug { "Interval not reached; position not updated (Position: #{position}, Interval: #{position_update_interval})" }
+      logger.debug { "Interval not reached; position not updated (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
     end
   end
 
-  def position_update_interval
-    @position_update_interval ||= self.class.position_update_interval
-  end
-
   module LogText
     def self.message_data(message_data)
       "Type: #{message_data.type}, Stream: #{message_data.stream_name}, Position: #{message_data.position}, GlobalPosition: #{message_data.global_position}"
@@ -92,10 +97,10 @@ module Consumer
   end
 
   module Configure
-    def configure(batch_size: nil, session: nil, position_store: nil, **)
-      logger.trace { "Configuring (Batch Size: #{batch_size}, Session: #{session.inspect})" }
+    def configure(**kwargs)
+      logger.trace { "Configuring (Stream Name: #{stream_name})" }
 
-      super if defined?(super)
+      super(**kwargs)
 
       starting_position = self.position_store.get
 
@@ -107,22 +112,22 @@ module Consumer
         poll_interval_milliseconds: poll_interval_milliseconds
       )
 
-      handlers = self.class.handler_registry.get(self)
-
-      dispatch = Dispatch.configure(self, handlers)
-
-      logger.debug { "Done configuring (Batch Size: #{batch_size}, Session: #{session.inspect}, Starting Position: #{starting_position})" }
+      logger.debug { "Done configuring (Stream Name: #{stream_name}, Starting Position: #{starting_position})" }
     end
   end
 
   module Build
-    def build(stream_name, batch_size: nil, position_store: nil, position_update_interval: nil, session: nil, poll_interval_milliseconds: nil, **arguments)
-      instance = new stream_name
+    def build(stream_name, position_update_interval: nil, poll_interval_milliseconds: nil, identifier: nil, **arguments)
+      instance = new(stream_name)
+
+      unless identifier.nil?
+        instance.identifier = identifier
+      end
 
       instance.position_update_interval = position_update_interval
       instance.poll_interval_milliseconds = poll_interval_milliseconds
 
-      instance.configure(batch_size: batch_size, position_store: position_store, session: session, **arguments)
+      instance.configure(**arguments)
 
       instance
     end

data/lib/consumer/controls.rb

@@ -7,15 +7,19 @@ require 'consumer/controls/message_data/batch'
 require 'consumer/controls/error'
 require 'consumer/controls/get'
 require 'consumer/controls/get/incrementing'
-require 'consumer/controls/handle'
 require 'consumer/controls/id'
 require 'consumer/controls/identifier'
 require 'consumer/controls/position'
+require 'consumer/controls/session'
 require 'consumer/controls/stream_name'
 
 require 'consumer/controls/position_store'
 require 'consumer/controls/position_store/local_file'
 require 'consumer/controls/subscription'
 
+require 'consumer/controls/handle'
+require 'consumer/controls/handle/raise_error'
+
 require 'consumer/controls/consumer'
 require 'consumer/controls/consumer/incrementing'
+require 'consumer/controls/consumer/error_handler'

data/lib/consumer/controls/consumer.rb

@@ -1,20 +1,63 @@
 module Consumer
   module Controls
     module Consumer
-      def self.example
-        Example.new(StreamName.example)
+      def self.example(stream_name=nil, identifier: nil, handlers: nil)
+        stream_name ||= StreamName.example
+
+        cls = example_class(identifier: identifier, handlers: handlers)
+
+        cls.new(stream_name)
       end
 
-      class Example
-        include ::Consumer
+      def self.example_class(identifier: nil, handlers: nil)
+        if identifier == :none
+          identifier = nil
+        else
+          identifier ||= Identifier.random
+        end
+
+        if handlers == :none
+          handlers = []
+        else
+          handlers ||= [
+            Handle.example_class,
+            Handle.example_class
+          ]
+        end
+
+        Class.new do
+          include ::Consumer
+
+          handlers.each do |handler_cls|
+            handler handler_cls
+          end
 
-        handler Handle::Example
+          unless identifier.nil?
+            identifier identifier
+          end
 
-        def configure(batch_size: nil, session: nil, position_store: nil, **)
-          Get::Example.configure(self)
-          PositionStore::Example.configure(self, position_store: position_store)
+          def configure(settings: nil, **)
+            Controls::Session::Example.configure(self, settings)
+
+            Get::Example.configure(self)
+            PositionStore::Example.configure(self)
+          end
+
+          def handled_messages
+            handled_messages = []
+
+            self.class.handler_registry.each do |handler|
+              next unless handler.ancestors.include?(Handle)
+
+              handled_messages += handler.handled_messages
+            end
+
+            handled_messages
+          end
         end
       end
+
+      Example = self.example_class
     end
   end
 end

data/lib/consumer/controls/consumer/error_handler.rb

@@ -0,0 +1,40 @@
+module Consumer
+  module Controls
+    module Consumer
+      module ErrorHandler
+        def self.example(stream_name=nil)
+          stream_name ||= StreamName.example
+
+          Example.new(stream_name)
+        end
+
+        class Example
+          include ::Consumer
+
+          attr_accessor :handled_error
+          attr_accessor :failed_message
+
+          handler Handle::Example
+          handler Handle::RaiseError
+
+          def error_raised(error, message)
+            self.handled_error = error
+            self.failed_message = message
+          end
+
+          def handled_error?(error=nil)
+            if error.nil?
+              !handled_error.nil?
+            else
+              handled_error == error
+            end
+          end
+
+          def failed_message?(message)
+            failed_message == message
+          end
+        end
+      end
+    end
+  end
+end

data/lib/consumer/controls/consumer/incrementing.rb

@@ -5,21 +5,36 @@ module Consumer
         include ::Consumer
         include ::Log::Dependency
 
-        handler do |message_data|
-          logger.info { "Handled event (StreamName: #{message_data.stream_name}, GlobalPosition: #{message_data.global_position})" }
-        end
+        module Handlers
+          class PrintSummary
+            include Messaging::Handle
+            include Log::Dependency
+
+            def handle(message_data)
+              logger.info { "Handled event (StreamName: #{message_data.stream_name}, GlobalPosition: #{message_data.global_position})" }
+            end
+          end
 
-        handler do |message_data|
-          logger.debug { message_data.data.pretty_inspect }
+          class PrintData
+            include Messaging::Handle
+            include Log::Dependency
+
+            def handle(message_data)
+              logger.debug { message_data.data.pretty_inspect }
+            end
+          end
         end
 
-        def configure(session: nil, batch_size: nil, position_store: nil)
+        handler Handlers::PrintSummary
+        handler Handlers::PrintData
+
+        def configure
           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)
+          PositionStore::LocalFile.configure(self, identifier: identifier)
         end
       end
     end

data/lib/consumer/controls/get.rb

@@ -6,6 +6,8 @@ module Consumer
       end
 
       class Example
+        extend ::Configure::Macro
+
         configure :get
 
         def self.build

data/lib/consumer/controls/get/incrementing.rb

@@ -2,18 +2,26 @@ module Consumer
   module Controls
     module Get
       class Incrementing
+        extend ::Configure::Macro
+
         configure :get
 
-        initializer :sleep_duration
+        initializer :frequency_milliseconds
+
+        def frequency_seconds
+          frequency_milliseconds.to_f / 1000
+        end
+
+        def self.build(frequency_milliseconds=nil)
+          frequency_milliseconds ||= Defaults.frequency_milliseconds
 
-        def self.build(sleep_duration)
-          new(sleep_duration)
+          new(frequency_milliseconds)
         end
 
         def call(stream_name, position: nil)
           position ||= 0
 
-          sleep Rational(sleep_duration, 1000)
+          sleep(frequency_seconds)
 
           3.times.map do |offset|
             MessageData.get(
@@ -23,21 +31,27 @@ module Consumer
             )
           end
         end
-      end
 
-      class MessageData
-        def self.get(stream_name, global_position, position)
-          data = {
-            :position => position,
-            :global_position => global_position
-          }
-
-          Controls::MessageData.example(
-            stream_name: stream_name,
-            data: data,
-            global_position: global_position,
-            position: position
-          )
+        module Defaults
+          def self.frequency_milliseconds
+            100
+          end
+        end
+
+        class MessageData
+          def self.get(stream_name, global_position, position)
+            data = {
+              :position => position,
+              :global_position => global_position
+            }
+
+            Controls::MessageData.example(
+              stream_name: stream_name,
+              data: data,
+              global_position: global_position,
+              position: position
+            )
+          end
         end
       end
     end

data/lib/consumer/controls/handle.rb

@@ -2,24 +2,51 @@ module Consumer
   module Controls
     module Handle
       def self.example
-        Example.new
+        example_class.new
       end
 
-      class Example
-        include Messaging::Handle
+      def self.example_class
+        Class.new do
+          include Messaging::Handle
+          include Handle
 
-        def handle(message_data)
-          handled_messages << message_data
-        end
+          attr_accessor :session
 
-        def handled_messages
-          @handled_messages ||= []
-        end
+          def configure(session: nil)
+            self.session = session
+          end
+
+          def self.handled_messages
+            @@handled_messages ||= []
+          end
+
+          def handle(message_data)
+            handled_messages << message_data
+          end
 
-        def handled?(message_data)
-          handled_messages.include?(message_data)
+          def handled_messages
+            self.class.handled_messages
+          end
+
+          def handled?(message_data=nil)
+            if message_data.nil?
+              handled_messages.any?
+            else
+              handled_messages.include?(message_data)
+            end
+          end
+
+          def session?(session=nil)
+            if session.nil?
+              !self.session.nil?
+            else
+              session == self.session
+            end
+          end
         end
       end
+
+      Example = self.example_class
     end
   end
 end

data/lib/consumer/controls/handle/raise_error.rb

@@ -0,0 +1,17 @@
+module Consumer
+  module Controls
+    module Handle
+      module RaiseError
+        class Example
+          include Messaging::Handle
+
+          def handle(message_data)
+            error_text = "Example error (Message: #{message_data.type}, Stream: #{message_data.stream_name}, Position: #{message_data.position}, Global Position: #{message_data.global_position})"
+
+            raise Error::Example, error_text
+          end
+        end
+      end
+    end
+  end
+end

data/lib/consumer/controls/identifier.rb

@@ -1,8 +1,18 @@
 module Consumer
   module Controls
     module Identifier
-      def self.example
-        'some-consumer'
+      def self.example(random: nil)
+        random ||= false
+
+        unless random
+          'some-consumer'
+        else
+          "some-consumer-#{SecureRandom.hex(8)}"
+        end
+      end
+
+      def self.random
+        example(random: true)
       end
     end
   end

data/lib/consumer/controls/message_data.rb

@@ -5,9 +5,12 @@ module Consumer
         global_position ||= position
 
         message_data = MessageStore::Controls::MessageData::Read.example(data: data)
+
         message_data.stream_name = stream_name unless stream_name.nil?
+
         message_data.position = position unless position.nil?
         message_data.global_position = global_position unless global_position.nil?
+
         message_data
       end
     end

data/lib/consumer/controls/position_store/local_file.rb

@@ -3,15 +3,19 @@ module Consumer
     module PositionStore
       class LocalFile
         include Consumer::PositionStore
+        extend Initializer::Macro
 
-        def self.build
-          instance = new
+        initializer(:identifier)
+
+        def self.build(identifier: nil)
+          instance = new(identifier)
           instance.configure
           instance
         end
 
         def get
           return 0 unless File.exist?(path)
+
           text = File.read(path)
           text.to_i
         end
@@ -21,7 +25,13 @@ module Consumer
         end
 
         def path
-          'tmp/control_position_store'
+          path = File.join('tmp', 'local_file_position_store')
+
+          unless identifier.nil?
+            path << "-#{identifier}"
+          end
+
+          path
         end
       end
     end

data/lib/consumer/controls/session.rb

@@ -0,0 +1,59 @@
+module Consumer
+  module Controls
+    module Session
+      def self.example(settings=nil)
+        Example.build(settings)
+      end
+
+      class Example
+        extend ::Configure::Macro
+        extend ::Settings::Setting::Macro
+
+        configure :session
+
+        setting :some_setting
+        setting :other_setting
+
+        def self.build(settings=nil)
+          settings ||= Settings.example
+
+          instance = new
+          settings.set(instance)
+          instance
+        end
+
+        def settings?(other_settings)
+          self.some_setting == other_settings.get(:some_setting) &&
+            self.other_setting == other_settings.get(:other_setting)
+        end
+
+        def ==(other_session)
+          other_session.is_a?(self.class) &&
+            self.some_setting == other_session.some_setting &&
+            self.other_setting == other_session.other_setting
+        end
+      end
+
+      module Settings
+        def self.example
+          Example.build
+        end
+
+        class Example < ::Settings
+          def self.data_source
+            Raw.example
+          end
+        end
+
+        module Raw
+          def self.example
+            {
+              :some_setting => SecureRandom.hex(7),
+              :other_setting => SecureRandom.hex(7)
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/consumer/handler_registry.rb

@@ -4,34 +4,34 @@ module Consumer
 
     configure :handler_registry
 
+    def entries
+      @entries ||= Set.new
+    end
+
+    def count
+      entries.count
+    end
+
+    def each(&block)
+      entries.each(&block)
+    end
+
     def register(handler)
-      logger.trace { "Registering handler (Handler: #{LogText.handler(handler)})" }
+      logger.trace { "Registering handler (Handler: #{handler.name})" }
 
       if registered? handler
-        error_message = "Handler is already registered (Handler: #{LogText.handler(handler)})"
+        error_message = "Handler is already registered (Handler: #{handler.name})"
         logger.error { error_message }
         raise Error, error_message
       end
 
       entries << handler
 
-      logger.debug { "Handler registered (Handler: #{LogText.handler(handler)})" }
+      logger.debug { "Handler registered (Handler: #{handler.name})" }
 
       handler
     end
 
-    def get(consumer)
-      entries.map do |handler|
-        if handler.is_a? Proc
-          proc { |message_data|
-            consumer.instance_exec(message_data, &handler)
-          }
-        else
-          handler.build
-        end
-      end
-    end
-
     def registered?(handler)
       entries.any? do |entry|
         return true if handler == entry 
@@ -42,24 +42,6 @@ module Consumer
       end
     end
 
-    def entries
-      @entries ||= Set.new
-    end
-
-    def count
-      entries.count
-    end
-
-    module LogText
-      def self.handler(handler)
-        case handler
-        when Module then handler.name
-        when Proc then '(proc)'
-        else handler.inspect
-        end
-      end
-    end
-
     Error = Class.new(RuntimeError)
   end
 end

data/lib/consumer/position_store.rb

@@ -19,20 +19,22 @@ module Consumer
 
     module Build
       def self.extended(cls)
-        Virtual::PureMethod.define(cls.singleton_class, :build)
+        cls.singleton_class.class_exec do
+          extend Virtual::Macro
+
+          abstract :build
+        end
       end
     end
 
     module ClassConfigure
-      def configure(receiver, *arguments, position_store: nil, attr_name: nil, **keyword_arguments)
+      def configure(receiver, *arguments, 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
+        if keyword_arguments.any?
+          position_store = build(*arguments, **keyword_arguments)
+        else
+          position_store = build(*arguments)
         end
 
         receiver.public_send("#{attr_name}=", position_store)

data/lib/consumer/substitute.rb

@@ -5,7 +5,7 @@ module Consumer
     end
 
     class Consumer
-      def call(message_data)
+      def dispatch(message_data)
         dispatched_messages << message_data
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 0.9.0.3
+  version: 0.10.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: evt-settings
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_bench
   requirement: !ruby/object:Gem::Requirement
@@ -92,11 +106,13 @@ files:
 - lib/consumer/controls.rb
 - lib/consumer/controls/category.rb
 - lib/consumer/controls/consumer.rb
+- lib/consumer/controls/consumer/error_handler.rb
 - lib/consumer/controls/consumer/incrementing.rb
 - lib/consumer/controls/error.rb
 - lib/consumer/controls/get.rb
 - lib/consumer/controls/get/incrementing.rb
 - lib/consumer/controls/handle.rb
+- lib/consumer/controls/handle/raise_error.rb
 - lib/consumer/controls/id.rb
 - lib/consumer/controls/identifier.rb
 - lib/consumer/controls/message_data.rb
@@ -105,11 +121,10 @@ files:
 - lib/consumer/controls/position.rb
 - lib/consumer/controls/position_store.rb
 - lib/consumer/controls/position_store/local_file.rb
+- lib/consumer/controls/session.rb
 - lib/consumer/controls/stream_name.rb
 - lib/consumer/controls/subscription.rb
 - lib/consumer/defaults.rb
-- lib/consumer/dispatch.rb
-- lib/consumer/dispatch/substitute.rb
 - lib/consumer/handler_registry.rb
 - lib/consumer/log.rb
 - lib/consumer/log_text.rb
@@ -140,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Continuous subscription to a stream and message dispatching to handlers

data/lib/consumer/dispatch.rb

@@ -1,43 +0,0 @@
-module Consumer
-  class Dispatch
-    include Log::Dependency
-
-    def handlers
-      @handlers ||= []
-    end
-
-    configure :dispatch
-
-    def self.build(handlers=nil)
-      handlers = Array(handlers)
-
-      instance = new
-
-      handlers.each do |handler|
-        instance.add_handler(handler)
-      end
-
-      instance
-    end
-
-    def call(message_data)
-      logger.trace { "Dispatching event (#{LogText.message_data(message_data)})" }
-
-      handlers.each do |handle|
-        handle.(message_data)
-      end
-
-      logger.debug { "Event dispatched (#{LogText.message_data(message_data)}, Handlers Count: #{handlers.count})" }
-
-      nil
-    end
-
-    def add_handler(handler)
-      handlers << handler
-    end
-
-    def to_proc
-      method(:call)
-    end
-  end
-end

data/lib/consumer/dispatch/substitute.rb

@@ -1,41 +0,0 @@
-module Consumer
-  class Dispatch
-    module Substitute
-      def self.build
-        Dispatch.new
-      end
-
-      class Dispatch
-        def call(message_data)
-          dispatched_messages << message_data
-        end
-
-        def add_handler(handle)
-          handlers << handle
-        end
-
-        def dispatched_messages
-          @dispatched_messages ||= []
-        end
-
-        def dispatched?(message_data=nil, &block)
-          if message_data.nil?
-            block ||= proc { true }
-          else
-            block ||= proc { |msg| message_data == msg }
-          end
-
-          dispatched_messages.any? &block
-        end
-
-        def handlers
-          @handlers ||= []
-        end
-
-        def handler?(handler)
-          handlers.include?(handler)
-        end
-      end
-    end
-  end
-end