chickadee 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c45a1f20bf614dc238cf437da29378262cf125f
-  data.tar.gz: f9e20b5cf1f972a23c706f5d9a9d37ff81c83cbd
+  metadata.gz: 9ae3ac8453e16a736b621287feb437dffcd6f9f5
+  data.tar.gz: 346b0090f2fd811fbfba8eab282695f97ec743c1
 SHA512:
-  metadata.gz: 1d4afff9ff43424b25c81fa10c890355f77077f2a63c04197069d6dec37f14d4b169d7f269834950b8a67bcb4ed76025a02f9a69ca5e7ea70b9d6ed869986d03
-  data.tar.gz: 6068df3441f7d418813d51da6ff6fdef9052b2d656f1aad18dd40295a4492dd6dc6fffc28ccbba47ffcd410e45660c2562e9f4e2ffe61ad8c24d1442e549f18c
+  metadata.gz: 7a678a42ca376f9555ad31c3a1672f82ad636c97095997dc4912dcb4ae26ce71414709a47798943a626a1735462c445e1f609e6d0220592598aaefc1e93db4ed
+  data.tar.gz: 166b7822c624fbbe1b6acc4f100310c7606c00db771fcbe7ee778c2f923583634a4b0e4e8f2f3243cc8ded7bff491bc9cd5d65b7dc982fccaa32560cdb5ebe23

data/lib/chickadee/{block_installer.rb → application/block_installer.rb}

@@ -8,6 +8,4 @@ module Chickadee
       c.instance_eval(&@block) if @block
     end
   end
-end
-
-
+end

data/lib/chickadee/{bootstrapper.rb → application/bootstrapper.rb}

@@ -1,12 +1,12 @@
 module Chickadee
   class Bootstrapper
-    def initialize(container_class, installer)
+    def initialize(container_class, *installers)
       @container_class = container_class
-      @installer = installer
+      @installers = installers
     end
 
     def new_bootstrap_container
-      @container_class.install(@installer)
+      @container_class.install(*@installers)
     end
   end
 end

data/lib/chickadee/application/container.rb

@@ -0,0 +1,15 @@
+require 'ioc'
+require 'chickadee/utils/string_inflections'
+
+module Chickadee
+  class Container < ::IOC::Container
+    def register_service(service_name, service_object)
+      register(service_name, service_object, :as => :instance)
+    end
+
+    def register_handler(klass)
+      name = StringInflections.underscore(StringInflections.demodulize(klass.name)).to_sym
+      register(name, klass)
+    end
+  end
+end

data/lib/chickadee/application.rb

@@ -1,33 +1,31 @@
-require 'chickadee/container'
-require 'chickadee/bootstrapper'
-require 'chickadee/block_installer'
+require 'chickadee/application/container'
+require 'chickadee/application/bootstrapper'
+require 'chickadee/application/block_installer'
+require 'chickadee/utils/string_inflections'
 
 module Chickadee
   class Application
-    def self.handler_map
-      @handler_map ||= {}
+    def self.install(&block)
+      @installer = BlockInstaller.new(&block)
     end
 
-    def self.map(hash)
-      handler_map.update(hash)
-    end
-
-    def self.handler_class_for(request)
-      handler_map.fetch(request.class)
-    rescue KeyError => e
-      raise(ArgumentError, "Unrecognized request class: '#{request.class.name}'")
+    def self.installer
+      @installer
     end
 
     def initialize(&block)
-      @bootstrapper = Bootstrapper.new(Container, BlockInstaller.new(&block))
+      installers = []
+      installers << self.class.installer if self.class.installer
+      installers << BlockInstaller.new(&block) if block_given?
+      @bootstrapper = Bootstrapper.new(Container, *installers)
     end
     
     def handle(request)
+      handler_registry_name = StringInflections.underscore(StringInflections.demodulize("#{request.class.name}Handler")).to_sym
       @bootstrapper
         .new_bootstrap_container
-        .resolve_anonymous(handler_class_for(request))
+        .resolve(handler_registry_name)
         .handle(request)
-      nil
     end
 
     def queue(request)
@@ -35,13 +33,6 @@ module Chickadee
         .new_bootstrap_container
         .resolve(:request_queue)
         .queue(request)
-      nil
-    end
-
-    private
-
-    def handler_class_for(request)
-      self.class.handler_class_for(request)
     end
   end
 end

data/lib/chickadee/exceptions.rb

@@ -1,3 +1,4 @@
 module Chickadee
   class ChickadeeError < StandardError; end
+  class RoutingError < StandardError; end
 end

data/lib/chickadee/utils/string_inflections.rb

@@ -0,0 +1,20 @@
+module Chickadee
+  module StringInflections
+    def self.underscore(str)
+      str
+        .gsub(/::/, '/')
+        .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+        .gsub(/([a-z\d])([A-Z])/,'\1_\2')
+        .tr("-", "_")
+        .downcase
+    end
+
+    def self.deconstantize(constant_name)
+      constant_name.split( '::' )[0,constant_name.split( '::' ).length-1].join('::')
+    end
+
+    def self.demodulize(constant_name)
+      constant_name.split('::').last
+    end
+  end
+end

data/lib/chickadee/version.rb

@@ -1,3 +1,3 @@
 module Chickadee
-  VERSION = "6.0.1"
+  VERSION = "6.0.2"
 end

data/spec/{block_installer_spec.rb → application/block_installer_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
-require 'chickadee/block_installer'
-require 'chickadee/container'
+require 'chickadee/application/block_installer'
+require 'chickadee/application/container'
 
 describe Chickadee::BlockInstaller do
   it 'can install from block' do

data/spec/{bootstrapper_spec.rb → application/bootstrapper_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'chickadee/bootstrapper'
-require 'chickadee/container'
-require 'chickadee/block_installer'
+require 'chickadee/application/bootstrapper'
+require 'chickadee/application/container'
+require 'chickadee/application/block_installer'
 
 describe Chickadee::Bootstrapper do
   describe '#new_bootstrap_container' do

data/spec/application_spec.rb

@@ -2,48 +2,26 @@ require 'spec_helper'
 require 'chickadee/application'
 
 describe Chickadee::Application do
-  describe '::handle' do
-    it 'can map a request to a handler' do
-      request_class = Class.new
-      handler_class = Class.new
-      app_class = Class.new(Chickadee::Application)
-      app_class.map(request_class => handler_class)
-      app_class.handler_class_for(request_class.new).must_equal(handler_class)
-    end
-  end
-
-  describe '#map' do
-    context 'when the request has been mapped' do
-      it 'can handle a request' do
-        request_class = Class.new do
-          attr_accessor :output
-        end
-        handler_class = Class.new do
-          def handle(request)
-            request.output = "I have handled the request"
-          end
-        end
-        app_class = Class.new(Chickadee::Application)
-        app_class.map(request_class => handler_class)
-        request = request_class.new
-        app = app_class.new
-        app.handle(request)
-        request.output.must_equal('I have handled the request')
+  it 'can handle a request' do
+    class RequestHandler
+      def handle(request)
+        request.is_success = true
       end
     end
 
-    context 'when the request has not been mapped' do
-      it 'can handle a request' do
-        request_class = Class.new
-        handler_class = Class.new
-        app_class = Class.new(Chickadee::Application)
-        request = request_class.new
-        app = app_class.new
+    class Request
+      attr_accessor :is_success
+    end
 
-        proc {
-          app.handle(request).must_raise(ArgumentError)
-        }
+    class App < Chickadee::Application
+      install do
+        register_handler(RequestHandler)
       end
     end
+
+    app = App.new
+    request = Request.new
+    app.handle(request)
+    request.is_success.must_equal(true)
   end
 end

data/spec/utils/string_inflections_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'chickadee/utils/string_inflections'
+
+describe Chickadee::StringInflections do
+  describe '#underscore' do
+    it 'changes string to underscore' do
+      inflector.underscore("ThisIsAString").must_equal('this_is_a_string')
+    end
+
+    it 'changes module notation to slash' do
+      inflector.underscore("ThisIs::AString").must_equal('this_is/a_string')
+    end
+  end
+
+  describe '#deconstantize' do
+    it 'gets namespace for current constant' do
+      inflector.deconstantize('A::B::C').must_equal('A::B')
+    end
+  end
+
+  describe '#demodulize' do
+    it 'gets class name' do
+      inflector.demodulize('A::B::C').must_equal('C')
+    end
+  end
+
+  def inflector
+    Chickadee::StringInflections
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chickadee
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ioc
@@ -82,15 +82,17 @@ files:
 - chickadee.gemspec
 - lib/chickadee.rb
 - lib/chickadee/application.rb
-- lib/chickadee/block_installer.rb
-- lib/chickadee/bootstrapper.rb
-- lib/chickadee/container.rb
+- lib/chickadee/application/block_installer.rb
+- lib/chickadee/application/bootstrapper.rb
+- lib/chickadee/application/container.rb
 - lib/chickadee/exceptions.rb
+- lib/chickadee/utils/string_inflections.rb
 - lib/chickadee/version.rb
+- spec/application/block_installer_spec.rb
+- spec/application/bootstrapper_spec.rb
 - spec/application_spec.rb
-- spec/block_installer_spec.rb
-- spec/bootstrapper_spec.rb
 - spec/spec_helper.rb
+- spec/utils/string_inflections_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -116,7 +118,8 @@ signing_key:
 specification_version: 4
 summary: Lightweight command library
 test_files:
+- spec/application/block_installer_spec.rb
+- spec/application/bootstrapper_spec.rb
 - spec/application_spec.rb
-- spec/block_installer_spec.rb
-- spec/bootstrapper_spec.rb
 - spec/spec_helper.rb
+- spec/utils/string_inflections_spec.rb

data/lib/chickadee/container.rb

@@ -1,9 +0,0 @@
-require 'ioc'
-
-module Chickadee
-  class Container < ::IOC::Container
-    def register_service(service_name, service_object)
-      register(service_name, service_object, :as => :instance)
-    end
-  end
-end