chickadee 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 944c2383c13fa3a2189cff7c067510996b817ca4
-  data.tar.gz: 3118a4d81f007d03b537d7e9ec066ed03f65e6cd
+  metadata.gz: 0c871897239bb45e6e02e54b6eb1d12685cc0f2d
+  data.tar.gz: 58f8f9827a25bdf7de346254a4d3753be532b2cd
 SHA512:
-  metadata.gz: 008659b0df9454eed991171ec0d6d92e1475c0fe961d7b8b0f2026f5812dbb9c5f90507cd782415451d3f55a5282a95fbf83b3b1c630eadf03477482e8b1ef42
-  data.tar.gz: 30594d643d70eb744a9b32a2e7db927be221f984f0b14edfe04180d80e96c71be2a5461cd290ea074e7621a47260aefb2fc0d02d71753ab5392edde71499f1e4
+  metadata.gz: bdd719125dd3d7dd02c80475da5ea912d5e1ece40a473a505438af97343721cd4c564823a93502e154d015fc062aaed6ef5e34ea1ba3b160c55eb84ecb491e14
+  data.tar.gz: 0de3dc3407af9782b8a310e27ecc3678422c8dd50e6f743f5d1c9cfd5b74b99b0ecf2aa54da3003fa8596c5b64bead96c97cb811f9a34ab99c0c1ed44045a28b

data/chickadee.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "mocha", "~> 0.14.0"
+  spec.add_development_dependency "mocha", "~> 1.0.0"
   spec.add_development_dependency "guard-minitest", "~> 2.2.0"
 end

data/lib/chickadee/dispatcher.rb

@@ -9,28 +9,26 @@ module Chickadee
 
     def initialize
       @container = Container.new
-      @request_dispatcher = RequestDispatcher.new(@container)
-      @container.register(:event_dispatcher, @request_dispatcher.event_dispatcher, :as => :instance)
+      @request_map = {}
     end
 
     def register(*args)
       @container.register(*args)
     end
 
-    def command(request_class, *handlers)
-      @request_dispatcher.map(:command, request_class, *handlers)
+    def map(request_class, *handlers)
+      raise(DispatcherError, "Request already mapped: #{request_class}") if @request_map.key?(request_class)
+      @request_map[request_class] = Proc.new{|req| resolve_handler_chain(*handlers).handle(req)}
     end
 
-    def event(request_class, *handlers)
-      @request_dispatcher.map(:event, request_class, *handlers)
+    def execute(request)
+      @request_map[request.class].call(request)
     end
 
-    def query(request_class, *handlers)
-      @request_dispatcher.map(:query, request_class, *handlers)
-    end
+    private
 
-    def dispatch(request)
-      @request_dispatcher.dispatch(request)
+    def resolve_handler_chain(*handlers)
+      @container.resolve_anonymous(HandlerChainStruct.new(*handlers))
     end
   end
 end

data/lib/chickadee/version.rb

@@ -1,3 +1,3 @@
 module Chickadee
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/lib/chickadee.rb

@@ -3,12 +3,6 @@ require 'chickadee/version'
 require 'chickadee/exceptions'
 require 'chickadee/container'
 require 'chickadee/handler_chain_struct'
-require 'chickadee/message_bus'
-require 'chickadee/dispatchers/abstract_dispatcher'
-require 'chickadee/dispatchers/event_dispatcher'
-require 'chickadee/dispatchers/command_dispatcher'
-require 'chickadee/dispatchers/query_dispatcher'
-require 'chickadee/dispatchers/request_dispatcher'
 require 'chickadee/dispatcher'
 
 module Chickadee

data/spec/dispatcher_spec.rb

@@ -2,41 +2,15 @@ require 'spec_helper'
 require 'chickadee'
 
 describe Chickadee::Dispatcher do
-  it 'can dispatch a command' do
+  it 'can dispatch a request' do
     handler = stub(:handle => 'handler response')
-    command_class = Class.new
-    command = command_class.new
+    request_class = Class.new
+    request = request_class.new
     dispatcher = new_dispatcher
     
     dispatcher.register(:handler, handler, :as => :instance)
-    dispatcher.command(command_class, :handler)
-
-    handler.expects(:handle).once
-    dispatcher.dispatch(command).must_be_nil
-  end
-
-  it 'can dispatch a query' do
-    handler = stub(:handle => 'handler response')
-    query_class = Class.new
-    query = query_class.new
-    dispatcher = new_dispatcher
-    
-    dispatcher.register(:handler, handler, :as => :instance)
-    dispatcher.query(query_class, :handler)
-    dispatcher.dispatch(query).must_equal('handler response')
-  end
-
-  it 'can dispatch an event' do
-    handler = stub(:handle => 'handler response')
-    event_class = Class.new
-    event = event_class.new
-    dispatcher = new_dispatcher
-    
-    dispatcher.register(:handler, handler, :as => :instance)
-    dispatcher.event(event_class, :handler)
-
-    handler.expects(:handle).once
-    dispatcher.dispatch(event).must_be_nil
+    dispatcher.map(request_class, :handler)
+    dispatcher.execute(request).must_equal('handler response')
   end
 
   def new_dispatcher

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chickadee
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ioc
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -97,21 +97,11 @@ files:
 - lib/chickadee.rb
 - lib/chickadee/container.rb
 - lib/chickadee/dispatcher.rb
-- lib/chickadee/dispatchers/abstract_dispatcher.rb
-- lib/chickadee/dispatchers/command_dispatcher.rb
-- lib/chickadee/dispatchers/event_dispatcher.rb
-- lib/chickadee/dispatchers/query_dispatcher.rb
-- lib/chickadee/dispatchers/request_dispatcher.rb
 - lib/chickadee/exceptions.rb
 - lib/chickadee/handler_chain_struct.rb
-- lib/chickadee/message_bus.rb
 - lib/chickadee/version.rb
 - spec/dispatcher_spec.rb
-- spec/dispatchers/command_dispatcher_spec.rb
-- spec/dispatchers/event_dispatcher_spec.rb
-- spec/dispatchers/query_dispatcher_spec.rb
 - spec/handler_chain_struct_spec.rb
-- spec/message_bus_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -139,9 +129,5 @@ specification_version: 4
 summary: Lightweight domain driven design library
 test_files:
 - spec/dispatcher_spec.rb
-- spec/dispatchers/command_dispatcher_spec.rb
-- spec/dispatchers/event_dispatcher_spec.rb
-- spec/dispatchers/query_dispatcher_spec.rb
 - spec/handler_chain_struct_spec.rb
-- spec/message_bus_spec.rb
 - spec/spec_helper.rb

data/lib/chickadee/dispatchers/abstract_dispatcher.rb

@@ -1,21 +0,0 @@
-module Chickadee
-  class AbstractDispatcher
-    def initialize(container)
-      @container = container
-    end
-
-    def map(request_key, *handlers)
-      raise(NotImplementedError)
-    end
-
-    def dispatch(request)
-      raise(NotImplementedError)
-    end
-
-    private
-
-    def resolve_handler_chain(*handlers)
-      @container.resolve_anonymous(HandlerChainStruct.new(*handlers))
-    end
-  end
-end

data/lib/chickadee/dispatchers/command_dispatcher.rb

@@ -1,19 +0,0 @@
-module Chickadee
-  class CommandDispatcher < AbstractDispatcher
-    def map(request_key, *handlers)
-      raise(DispatcherError, "Command already mapped: #{request_key}") if bus.topic_exists?(request_key)
-      bus.subscribe(request_key) {|req| resolve_handler_chain(*handlers).handle(req)}
-    end
-
-    def dispatch(request)
-      bus.publish(request.class, request)
-      nil
-    end
-
-    private
-
-    def bus
-      @bus ||= MessageBus.new
-    end
-  end
-end

data/lib/chickadee/dispatchers/event_dispatcher.rb

@@ -1,22 +0,0 @@
-module Chickadee
-  class EventDispatcher < AbstractDispatcher
-    def map(request_key, *handlers)
-      bus.subscribe(request_key) {|req| resolve_handler_chain(*handlers).handle(req)}
-    end
-
-    def dispatch(request)
-      bus.publish(request.class, request)
-      nil
-    end
-
-    def raise(*args)
-      dispatch(*args)
-    end
-
-    private
-
-    def bus
-      @bus ||= MessageBus.new
-    end
-  end
-end

data/lib/chickadee/dispatchers/query_dispatcher.rb

@@ -1,18 +0,0 @@
-module Chickadee
-  class QueryDispatcher < AbstractDispatcher
-    def map(request_key, *handlers)
-      raise(DispatcherError, "Query already mapped: #{request_key}") if cache.key?(request_key)
-      cache[request_key] = Proc.new{|req| resolve_handler_chain(*handlers).handle(req)}
-    end
-
-    def dispatch(request)
-      cache[request.class].call(request)
-    end
-
-    private
-
-    def cache
-      @cache ||= {}
-    end
-  end
-end

data/lib/chickadee/dispatchers/request_dispatcher.rb

@@ -1,24 +0,0 @@
-module Chickadee
-  class RequestDispatcher
-
-    attr_reader :command_dispatcher, :query_dispatcher, :event_dispatcher
-
-    def initialize(container)
-      @command_dispatcher = CommandDispatcher.new(container)
-      @query_dispatcher = QueryDispatcher.new(container)
-      @event_dispatcher = EventDispatcher.new(container)
-      @request_dispatcher_map = {}
-    end
-
-    def map(request_type, request_class, *handlers)
-      dispatcher = instance_variable_get("@#{request_type}_dispatcher")
-      @request_dispatcher_map[request_class] = dispatcher
-      dispatcher.map(request_class, *handlers)
-    end
-
-    def dispatch(request)
-      raise(DispatcherError, "Unrecognized request type: #{request.class}") unless @request_dispatcher_map.key?(request.class)
-      @request_dispatcher_map[request.class].dispatch(request)
-    end
-  end
-end

data/lib/chickadee/message_bus.rb

@@ -1,65 +0,0 @@
-module Chickadee
-  class MessageBus
-    class Topic
-      attr_reader :subscribers
-
-      def initialize
-        @subscribers = []
-      end
-
-      def subscribe(obj)
-        @subscribers << obj
-      end
-
-      def unsubscribe(subscriber_id)
-        @subscribers.delete_if{|subscriber| subscriber.id == subscriber_id}
-      end
-    end
-
-    class Subscriber
-      attr_reader :id
-
-      def initialize(id, &block)
-        @id = id
-        @block = block
-      end
-
-      def call(*args)
-        @block.call(*args)
-      end
-    end
-
-    def initialize
-      @topics = {}
-      @subscriber_id = -1
-    end
-
-    def subscribe(topic_key, &block)
-      subscriber = Subscriber.new(next_subscriber_id, &block)
-      get_topic(topic_key).subscribe(subscriber)
-      subscriber.id
-    end
-
-    def unsubscribe(subscriber_id)
-      @topics.each {|topic_key, topic| topic.unsubscribe(subscriber_id)}
-    end
-
-    def publish(topic_key, *args)
-      get_topic(topic_key).subscribers.each {|s| s.call(*args)}
-    end
-
-    def topic_exists?(key)
-      @topics.keys.include?(key)
-    end
-
-    private
-
-    def get_topic(topic_key)
-      @topics[topic_key] ||= Topic.new
-    end
-
-    def next_subscriber_id
-      @subscriber_id = @subscriber_id + 1
-    end
-  end
-end

data/spec/dispatchers/command_dispatcher_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-require 'chickadee'
-
-describe Chickadee::CommandDispatcher do
-  it 'can map handler chain to request' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    command_class = Class.new
-    command = command_class.new
-    handler1 = stub(:handle => 'handler1_response')
-    handler2 = stub(:handle => 'handler2_response')
-
-    container.register(:myhandler1, handler1, :as => :instance)
-    container.register(:myhandler2, handler2, :as => :instance)
-
-    dispatcher.map(command_class, :myhandler1, :myhandler2)
-
-    handler1.expects(:handle).once
-    handler2.expects(:handle).once
-    dispatcher.dispatch(command)
-  end
-
-  it 'complains if same command mapped twice' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    command_class = Class.new
-    command = command_class.new
-
-    dispatcher.map(command_class, stub)
-    proc{ dispatcher.map(command_class, stub) }.must_raise(Chickadee::DispatcherError)
-  end
-
-  it 'returns nothing' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    command_class = Class.new
-    command = command_class.new
-    handler1 = stub(:handle => 'handler1_response')
-
-    container.register(:myhandler1, handler1, :as => :instance)
-
-    dispatcher.map(command_class, :myhandler1)
-    dispatcher.dispatch(command).must_be_nil
-  end
-
-  def define_container
-    Chickadee::Container.new
-  end
-
-  def define_dispatcher(*args)
-    Chickadee::CommandDispatcher.new(*args)
-  end
-end

data/spec/dispatchers/event_dispatcher_spec.rb

@@ -1,70 +0,0 @@
-require 'spec_helper'
-require 'chickadee'
-
-describe Chickadee::EventDispatcher do
-  it 'can map handler chain to request' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    event_class = Class.new
-    event = event_class.new
-
-    handler1 = stub(:handle => 'handler1_response')
-    handler2 = stub(:handle => 'handler2_response')
-
-    container.register(:myhandler1, handler1, :as => :instance)
-    container.register(:myhandler2, handler2, :as => :instance)
-
-    dispatcher.map(event_class, :myhandler1, :myhandler2)
-
-    handler1.expects(:handle).once
-    handler2.expects(:handle).once
-    dispatcher.dispatch(event)
-  end
-
-  it 'can map multiple handler chains to request' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    event_class = Class.new
-    event = event_class.new
-    handler1 = stub(:handle => 'handler1_response')
-    handler2 = stub(:handle => 'handler2_response')
-    handler3 = stub(:handle => 'handler3_response')
-    handler4 = stub(:handle => 'handler4_response')
-
-    container.register(:myhandler1, handler1, :as => :instance)
-    container.register(:myhandler2, handler2, :as => :instance)
-    container.register(:myhandler3, handler3, :as => :instance)
-    container.register(:myhandler4, handler4, :as => :instance)
-
-    dispatcher.map(event_class, :myhandler1, :myhandler2)
-    dispatcher.map(event_class, :myhandler3, :myhandler4)
-
-    handler1.expects(:handle).once
-    handler2.expects(:handle).once
-    handler3.expects(:handle).once
-    handler4.expects(:handle).once
-    dispatcher.dispatch(event)
-  end
-
-  it 'returns nothing' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    event_class = Class.new
-    event = event_class.new
-    handler1 = stub(:handle => 'handler1_response')
-
-    container.register(:myhandler1, handler1, :as => :instance)
-
-    dispatcher.map(event_class, :myhandler1)
-    dispatcher.dispatch(event).must_be_nil
-  end
-
-
-  def define_container
-    Chickadee::Container.new
-  end
-
-  def define_dispatcher(*args)
-    Chickadee::EventDispatcher.new(*args)
-  end
-end

data/spec/dispatchers/query_dispatcher_spec.rb

@@ -1,56 +0,0 @@
-require 'spec_helper'
-require 'chickadee'
-
-describe Chickadee::QueryDispatcher do
-  it 'can map handler chain to request' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    query_class = Class.new
-    query = query_class.new
-    handler1 = stub(:handle => 'handler1_response')
-    handler2 = stub(:handle => 'handler2_response')
-
-    container.register(:myhandler1, handler1, :as => :instance)
-    container.register(:myhandler2, handler2, :as => :instance)
-
-    dispatcher.map(query_class, :myhandler1, :myhandler2)
-
-    handler1.expects(:handle).once
-    handler2.expects(:handle).once
-    dispatcher.dispatch(query)
-  end
-
-  it 'complains if same query mapped twice' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    query_class = Class.new
-    query = query_class.new
-
-    dispatcher.map(query_class, stub)
-    proc{ dispatcher.map(query_class, stub) }.must_raise(Chickadee::DispatcherError)
-  end
-
-  it 'returns output from last handler in chain' do
-    container = define_container
-    dispatcher = define_dispatcher(container)
-    query_class = Class.new
-    query = query_class.new
-    handler1 = stub(:handle => 'handler1_response')
-    handler2 = stub(:handle => 'handler2_response')
-
-    container.register(:myhandler1, handler1, :as => :instance)
-    container.register(:myhandler2, handler2, :as => :instance)
-
-    dispatcher.map(query_class, :myhandler1, :myhandler2)
-    dispatcher.dispatch(query).must_equal('handler2_response')
-  end
-
-
-  def define_container
-    Chickadee::Container.new
-  end
-
-  def define_dispatcher(*args)
-    Chickadee::QueryDispatcher.new(*args)
-  end
-end

data/spec/message_bus_spec.rb

@@ -1,73 +0,0 @@
-require 'spec_helper'
-require 'chickadee'
-
-describe Chickadee::MessageBus do
-  it 'can register block with bus topic' do
-    bus = new_bus
-
-    output = nil
-    
-    bus.subscribe("topic") do |msg|
-      output = msg
-    end
-
-    output.must_be_nil
-    bus.publish("topic", 'the proc was called')
-    output.must_equal('the proc was called')
-  end
-
-  it 'can pubish a message for a given topic' do
-    bus = new_bus
-
-    output1 = nil
-    output2 = nil
-
-    bus.subscribe("topic1") { |msg| output1 = msg }
-    bus.subscribe("topic2") { |msg| output2 = msg }
-
-    bus.publish("topic1", 'message for topic1')
-    bus.publish("topic2", 'message for topic2')
-
-    output1.must_equal('message for topic1')
-    output2.must_equal('message for topic2')
-  end
-
-  it 'can unsubscribe a listener' do
-    bus = new_bus
-
-    output = nil
-    subscriber_id = bus.subscribe("topic") { |msg| output = msg }
-    
-    bus.publish("topic", 'i received the message')
-    output.must_equal('i received the message')
-
-    bus.publish("topic", 'i received the message a second time')
-    output.must_equal('i received the message a second time')
-
-    bus.unsubscribe(subscriber_id)
-
-    bus.publish("topic", 'i received the message a third time')
-    output.must_equal('i received the message a second time')
-  end
-
-  it 'can publish any number of arguments' do
-    bus = new_bus
-
-    output1 = nil
-    output2 = nil
-    
-    bus.subscribe("topic") do |arg1, arg2|
-      output1 = arg1
-      output2 = arg2
-    end
-
-    bus.publish("topic", 'myarg1', 'myarg2')
-
-    output1.must_equal('myarg1')
-    output2.must_equal('myarg2')
-  end
-  
-  def new_bus
-    Chickadee::MessageBus.new
-  end
-end