replay 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2e196bd8e54aa363a8ad762f41797aa99c989e
-  data.tar.gz: cda39f5a62f384de3ba509f291407a54035b007b
+  metadata.gz: 084d0ba8e80a2b93566f0ba8e780feedccf92d28
+  data.tar.gz: 7cf7c4e15f76ee0659cb0be60cac9a21d0fc2d6b
 SHA512:
-  metadata.gz: af511f51f8dbec4f12fc284bebf4232786081e6832089d1bd7209f7ab88b001e02a40bb85a7182acb562c19715c037c797c0e5be4d54b4bfd51228e9bb853c94
-  data.tar.gz: 25ff65cea036543f63088c7ff299acbd1128cbbfd70c74aa6fbfefa4fa4c9312a0b034ac687cecff2e4ef041c063aac18ec5956d897d9f2d63da3c71c8351a57
+  metadata.gz: e1561eba9d3b6469a38243a840e22dd850500a057f3b272f8ea67964680436867f40c57a892e07cf31aa44cdd519660d3f273f4bd657e0e304635120bec65d64
+  data.tar.gz: ebd32484a7c18fa8c7dbbd77c49b3564bfaede2ee2c785c839e0a1af00d1dac5ee876ea57cc1f6659c6438f28013e1353aecd2b9abf80afe422389a7a9ab43eb

data/lib/replay.rb

@@ -13,6 +13,7 @@ module Replay
   class UndefinedKeyError      < ReplayError; end
   class UnhandledEventError    < ReplayError; end
   class UnknownEventError      < ReplayError; end
+  class InvalidRouterError     < ReplayError; end
   class InvalidStorageError    < ReplayError;
     def initialize(*args)
       klass = args.shift
@@ -33,6 +34,7 @@ require 'replay/event_decorator'
 require 'replay/event_declarations'
 require 'replay/publisher'
 require 'replay/subscription_manager'
+require 'replay/subscriptions'
 require 'replay/backends'
 require 'replay/repository'
 require 'replay/repository/identity_map'

data/lib/replay/observer.rb

@@ -2,16 +2,27 @@ module Replay
   module Observer
 
     def self.included(base)
-      class << base
-        def observe(event_type, &block)
-          @observer_blocks ||= Hash.new
-          @observer_blocks[Replay::Inflector.underscore(event_type.to_s)] = block
-        end
+      base.extend(ClassMethods)
+      base.instance_variable_set(:@router, Replay::Router::DefaultRouter)
+    end
+
+    module ClassMethods
+      def router(rtr)
+        raise Replay::InvalidRouterError.new("Router does not implement add_observer") unless rtr.respond_to?(:add_observer) 
+        @router = rtr
+      end
+
+      def observe(event_type, &block)
+        raise InvalidRouterError.new("No router defined!") unless @router
+        @observer_blocks ||= Hash.new
+        @observer_blocks[Replay::Inflector.underscore(event_type.to_s)] = block
+
+        @router.add_observer self, event_type
+      end
 
-        def published(stream_id, event)
-          blk = @observer_blocks[Replay::Inflector.underscore(event.class.to_s)]
-          blk.call(stream_id, event, binding) if blk
-        end
+      def published(stream_id, event)
+        blk = @observer_blocks[Replay::Inflector.underscore(event.class.to_s)]
+        blk.call(stream_id, event, binding) if blk
       end
     end
   end

data/lib/replay/publisher.rb

@@ -1,21 +1,12 @@
 module Replay
   module Publisher
     def self.included(base)
-      include_essentials base
-    end
-
-    def self.include_essentials(base)
       base.instance_variable_set :@application_blocks, {}
       base.extend ClassMethods
       base.extend(Replay::Events)
-    end
-
-    def subscription_manager
-      @subscription_manager ||= Replay::SubscriptionManager.new(Replay.logger)
-    end
-
-    def add_subscriber(subscriber)
-      subscription_manager.add_subscriber(subscriber)
+      base.class_exec do
+        include Replay::Subscriptions
+      end
     end
 
     def apply(events, raise_unhandled = true)

data/lib/replay/router.rb

@@ -1,5 +1,24 @@
 module Replay
   module Router
+    def self.included(base)
+      base.class_exec do
+        include Replay::Subscriptions
+        extend ClassMethods if base.include?(Singleton)
+      end
+    end
 
+    def add_observer(observer, *events)
+      add_subscriber observer
+    end
+
+    module ClassMethods
+      def add_observer(observer, *events)
+        instance.add_subscriber(observer)
+      end
+
+      def published(stream, event)
+        instance.published(stream, event)
+      end
+    end
   end
 end

data/lib/replay/router/default_router.rb

@@ -2,18 +2,7 @@ module Replay
   module Router
     class DefaultRouter
       include Singleton
-
-      def initialize
-        @subscription_manager = Replay::SubscriptionManager.new
-      end
-
-      def add_observer(observer, *events)
-        @subscription_manager.add_subscriber(observer)
-      end
-
-      def published(stream_id, event)
-        @subscription_manager.notify_subscribers(stream_id, event)
-      end
+      include Replay::Router
     end
   end
 end

data/lib/replay/subscriptions.rb

@@ -0,0 +1,15 @@
+module Replay
+  module Subscriptions
+    def subscription_manager
+      @subscription_manager ||= Replay::SubscriptionManager.new(Replay.logger)
+    end
+
+    def add_subscriber(subscriber)
+      subscription_manager.add_subscriber(subscriber)
+    end
+
+    def published(stream_id, event)
+      @subscription_manager.notify_subscribers(stream_id, event)
+    end
+  end
+end

data/lib/replay/test.rb

@@ -37,6 +37,16 @@ Replay::SubscriptionManager.class_exec do
   end
 end
 
+Replay::Router.module_exec do 
+  def inspect
+    self.class.to_s 
+  end
+
+  def observed_by?(object)
+    @subscription_manager.has_subscriber?(object)
+  end
+end
+
 Replay::Publisher::ClassMethods.module_exec do
   def self.extended(base)
     @publishers ||= []

data/lib/replay/version.rb

@@ -1,3 +1,3 @@
 module Replay
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/replay/observer_spec.rb

@@ -21,6 +21,19 @@ class ObserverTest
   end
 end
 
+class NonstandardRouter
+  include Singleton
+  include Replay::Router
+end
+
+class RoutedObserverTest
+  include Replay::Observer
+  router NonstandardRouter.instance
+
+  observe ObservedEvent do |e|
+  end
+end
+
 describe Replay::Observer do
   before do
     ObserverTest.reset
@@ -34,4 +47,12 @@ describe Replay::Observer do
     ObserverTest.published('123', UnobservedEvent.new)
     ObserverTest.wont_be :observed?
   end
+
+  it "links to DefaultRouter by default" do
+    Replay::Router::DefaultRouter.instance.must_be :observed_by?,ObserverTest
+  end
+
+  it "links to a substitute router when instructed" do
+    NonstandardRouter.instance.must_be :observed_by?, RoutedObserverTest
+  end
 end

data/test/replay/router/default_router_spec.rb

@@ -1,12 +1,4 @@
 require 'test_helper'
-
-module Router
-  module Test
-    def has_observer?(object)
-      @subscription_manager.has_subscriber?(object)
-    end
-  end
-end
 class TypedEvent
 
 end
@@ -20,8 +12,6 @@ class Observer
   end
 end
 
-Replay::Router::DefaultRouter.send(:include, Router::Test)
-
 describe Replay::Router::DefaultRouter do
   before do
     @router = Replay::Router::DefaultRouter.instance
@@ -29,7 +19,7 @@ describe Replay::Router::DefaultRouter do
   describe "adding observers" do
     it "tracks the observing object" do
       @router.add_observer(Observer)
-      assert(@router.has_observer?(Observer), "router does not track observer")
+      @router.must_be :observed_by?, Observer
     end
   end
   describe "event publishing" do

data/test/test_helper.rb

@@ -1,6 +1,4 @@
 gem 'minitest'
-gem 'replay'
-gem 'byebug'
 
 require 'minitest/autorun'
 require 'minitest/spec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: replay
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - karmajunkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - lib/replay/router/default_router.rb
 - lib/replay/rspec.rb
 - lib/replay/subscription_manager.rb
+- lib/replay/subscriptions.rb
 - lib/replay/test.rb
 - lib/replay/test/test_event_stream.rb
 - lib/replay/version.rb