chickadee 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6bc891123601aa3aef8c11b049601ff55c86e8b
-  data.tar.gz: d4b92e4074b05681f496b7e53228424be2f97d0e
+  metadata.gz: 6454dba340dc5b38f51086c1156a2476c0eb1d43
+  data.tar.gz: 6f38fb7fb6819284b47d1331a172470dc47654a5
 SHA512:
-  metadata.gz: 93b379e977d300b5a37557cc4f95afc4c84f51f8dd04b5b7ccd375f0154a68738bf708354eae16b62a30097ef6ca946555c17a3048b05b9f79259015c229175b
-  data.tar.gz: 638f1d5ad8029451b0372e1d4052facdde8cc4e0fa2195d9ac4fb19a4f996491c643c8f79c42c085f014bdc688f10c17eb0d0f5983cc02cf262f1ab3593565e6
+  metadata.gz: bb440f384f0151d7fc2f9e75d707d70a85db83a981330e536458cad7cf3b19bfcf6c698fcff5e9070704566ea844921bf9b52a13a4be967dd9fcbbaf811f7cc5
+  data.tar.gz: da8297ba59d695926bcfe2b518f9f6bdcade6ab80025856e313471190b5627ab25fb012b96b81a4638d0df59458893a82ab3854abc22feaaa4d349648601e049

data/lib/chickadee/dispatcher.rb

@@ -19,12 +19,18 @@ module Chickadee
       @container.register(*args)
     end
 
-    def map(request_key, *handlers)
-      send("map_#{request_key.type}", request_key, *handlers)
+    def map(request_class, *handlers)
+      return map_command(request_class, *handlers) if request_class.type.command?
+      return map_query(request_class, *handlers) if request_class.type.query?
+      return map_event(request_class, *handlers) if request_class.type.event?
+      raise(DispatcherError, "Unrecognized request type: #{request_class}")
     end
 
     def dispatch(request)
-      send("dispatch_#{request.class.type}", request)
+      return dispatch_command(request) if request.class.type.command?
+      return dispatch_query(request) if request.class.type.query?
+      return dispatch_event(request) if request.class.type.event?
+      raise(DispatcherError, "Unrecognized request type: #{request.class}")
     end
 
     private

data/lib/chickadee/requests/command.rb

@@ -1,4 +1,7 @@
 module Chickadee
-  class Command < Request
+  class Command
+    def self.type
+      RequestType.new(:command)
+    end
   end
 end

data/lib/chickadee/requests/event.rb

@@ -1,4 +1,7 @@
 module Chickadee
-  class Event < Request
+  class Event
+    def self.type
+      RequestType.new(:event)
+    end
   end
 end

data/lib/chickadee/requests/query.rb

@@ -1,4 +1,7 @@
 module Chickadee
-  class Query < Request
+  class Query
+    def self.type
+      RequestType.new(:query)
+    end
   end
 end

data/lib/chickadee/requests/request_type.rb

@@ -0,0 +1,23 @@
+module Chickadee
+  class RequestType
+    def initialize(type)
+      @type = type
+    end
+
+    def query?
+      @type == :query
+    end
+
+    def command?
+      @type == :command
+    end
+
+    def event?
+      @type == :event
+    end
+
+    def match?(t)
+      t == @type
+    end
+  end
+end

data/lib/chickadee/version.rb

@@ -1,3 +1,3 @@
 module Chickadee
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/lib/chickadee.rb

@@ -3,7 +3,7 @@ require 'chickadee/version'
 require 'chickadee/exceptions'
 require 'chickadee/container'
 require 'chickadee/handler'
-require 'chickadee/requests/request'
+require 'chickadee/requests/request_type'
 require 'chickadee/requests/command'
 require 'chickadee/requests/query'
 require 'chickadee/requests/event'

data/spec/dispatcher_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'chickadee'
+
+describe Chickadee::Dispatcher do
+  it 'can dispatch a command' do
+    handler = stub(:handle => 'handler response')
+    command = Chickadee::Command.new
+    dispatcher = new_dispatcher
+    
+    dispatcher.register(:handler, handler, :as => :instance)
+    dispatcher.map(Chickadee::Command, :handler)
+
+    handler.expects(:handle).once
+    dispatcher.dispatch(command).must_be_nil
+  end
+
+  it 'can dispatch a query' do
+    handler = stub(:handle => 'handler response')
+    query = Chickadee::Query.new
+    dispatcher = new_dispatcher
+    
+    dispatcher.register(:handler, handler, :as => :instance)
+    dispatcher.map(Chickadee::Query, :handler)
+    dispatcher.dispatch(query).must_equal('handler response')
+  end
+
+  it 'can dispatch an event' do
+    handler = stub(:handle => 'handler response')
+    event = Chickadee::Event.new
+    dispatcher = new_dispatcher
+    
+    dispatcher.register(:handler, handler, :as => :instance)
+    dispatcher.map(Chickadee::Event, :handler)
+
+    handler.expects(:handle).once
+    dispatcher.dispatch(event).must_be_nil
+  end
+
+  def new_dispatcher
+    Chickadee::Dispatcher.new
+  end
+end

data/spec/requests/command_spec.rb

@@ -2,11 +2,8 @@ require 'spec_helper'
 require 'chickadee'
 
 describe Chickadee::Command do
-  it { new_query.query?.must_equal(false) }
-  it { new_query.command?.must_equal(true) }
-  it { new_query.event?.must_equal(false) }
-
-  def new_query
-    Chickadee::Command.new
-  end
+  it { Chickadee::Command.type.query?.must_equal(false) }
+  it { Chickadee::Command.type.command?.must_equal(true) }
+  it { Chickadee::Command.type.event?.must_equal(false) }
+  it { Chickadee::Command.type.match?(:command).must_equal(true) }
 end

data/spec/requests/event_spec.rb

@@ -2,11 +2,8 @@ require 'spec_helper'
 require 'chickadee'
 
 describe Chickadee::Event do
-  it { new_query.query?.must_equal(false) }
-  it { new_query.command?.must_equal(false) }
-  it { new_query.event?.must_equal(true) }
-
-  def new_query
-    Chickadee::Event.new
-  end
+  it { Chickadee::Event.type.query?.must_equal(false) }
+  it { Chickadee::Event.type.command?.must_equal(false) }
+  it { Chickadee::Event.type.event?.must_equal(true) }
+  it { Chickadee::Event.type.match?(:event).must_equal(true) }
 end

data/spec/requests/query_spec.rb

@@ -2,11 +2,8 @@ require 'spec_helper'
 require 'chickadee'
 
 describe Chickadee::Query do
-  it { new_query.query?.must_equal(true) }
-  it { new_query.command?.must_equal(false) }
-  it { new_query.event?.must_equal(false) }
-
-  def new_query
-    Chickadee::Query.new
-  end
+  it { Chickadee::Query.type.query?.must_equal(true) }
+  it { Chickadee::Query.type.command?.must_equal(false) }
+  it { Chickadee::Query.type.event?.must_equal(false) }
+  it { Chickadee::Query.type.match?(:query).must_equal(true) }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chickadee
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Erik Lott
@@ -94,8 +94,9 @@ files:
 - lib/chickadee/requests/command.rb
 - lib/chickadee/requests/event.rb
 - lib/chickadee/requests/query.rb
-- lib/chickadee/requests/request.rb
+- lib/chickadee/requests/request_type.rb
 - lib/chickadee/version.rb
+- spec/dispatcher_spec.rb
 - spec/dispatchers/command_dispatcher_spec.rb
 - spec/dispatchers/event_dispatcher_spec.rb
 - spec/dispatchers/handler_chain_struct_spec.rb
@@ -130,6 +131,7 @@ signing_key:
 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/handler_chain_struct_spec.rb

data/lib/chickadee/requests/request.rb

@@ -1,21 +0,0 @@
-module Chickadee
-  class Request
-    def command?
-      request_type == :command
-    end
-
-    def query?
-      request_type == :query
-    end
-
-    def event?
-      request_type == :event
-    end
-
-    private
-
-    def request_type
-      self.class.name.split('::').last.downcase.to_sym
-    end
-  end
-end