deas 0.17.0 → 0.17.1

data/lib/deas/exceptions.rb

@@ -2,10 +2,18 @@ module Deas
 
   Error = Class.new(RuntimeError)
   ServerError = Class.new(Error)
+
   ServerRootError = Class.new(ServerError) do
     def message
       "server `root` not set but required"
     end
   end
 
+  NoHandlerClassError = Class.new(Error) do
+    def initialize(handler_class_name)
+      super "Deas couldn't find the view handler '#{handler_class_name}'" \
+            " - it doesn't exist or hasn't been required in yet."
+    end
+  end
+
 end

data/lib/deas/redirect_proxy.rb

@@ -0,0 +1,29 @@
+require 'deas/view_handler'
+
+module Deas
+  class RedirectProxy
+
+    attr_reader :handler_class_name, :handler_class
+
+    def initialize(path = nil, &block)
+      @handler_class = Class.new do
+        include Deas::ViewHandler
+
+        def self.redirect_path; @redirect_path; end
+        def self.redirect_path=(value)
+          @redirect_path = value
+        end
+
+        def self.name; 'Deas::RedirectHandler'; end
+
+        def run!
+          redirect self.instance_eval(&self.class.redirect_path)
+        end
+
+      end
+      @handler_class.redirect_path = path ? proc{ path } : block
+      @handler_class_name = @handler_class.name
+    end
+
+  end
+end

data/lib/deas/route.rb

@@ -1,51 +1,28 @@
 require 'deas/sinatra_runner'
 
 module Deas
-
   class Route
-    attr_reader :method, :path, :handler_class_name, :handler_class
 
-    def initialize(method, path, handler_class_name, handler_class = nil)
-      @method = method
-      @path   = path
-      @handler_class_name = handler_class_name
-      @handler_class      = handler_class
+    attr_reader :method, :path, :handler_proxy, :handler_class
+
+    def initialize(method, path, handler_proxy)
+      @method, @path, @handler_proxy = method, path, handler_proxy
     end
 
-    def constantize!
-      @handler_class ||= constantize_name(handler_class_name)
-      raise(NoHandlerClassError.new(handler_class_name)) if !@handler_class
+    def validate!
+      @handler_class = @handler_proxy.handler_class
     end
 
+    # TODO: unit test this??
     def run(sinatra_call)
       sinatra_call.request.env.tap do |env|
         env['sinatra.params']          = sinatra_call.params
-        env['deas.handler_class_name'] = @handler_class_name
+        env['deas.handler_class_name'] = self.handler_class.name
         env['deas.logging'].call "  Handler: #{env['deas.handler_class_name']}"
         env['deas.logging'].call "  Params:  #{env['sinatra.params'].inspect}"
       end
-      Deas::SinatraRunner.run(@handler_class, sinatra_call)
-    end
-
-    private
-
-    def constantize_name(class_name)
-      names = class_name.to_s.split('::').reject{|name| name.empty? }
-      klass = names.inject(Object) do |constant, name|
-        constant.const_get(name)
-      end
-      klass == Object ? false : klass
-    rescue NameError
-      false
+      Deas::SinatraRunner.run(self.handler_class, sinatra_call)
     end
 
   end
-
-  class NoHandlerClassError < RuntimeError
-    def initialize(handler_class_name)
-      super "Deas couldn't find the view handler '#{handler_class_name}'. " \
-        "It doesn't exist or hasn't been required in yet."
-    end
-  end
-
 end

data/lib/deas/route_proxy.rb

@@ -0,0 +1,30 @@
+require 'deas/view_handler'
+require 'deas/exceptions'
+
+module Deas
+  class RouteProxy
+
+    attr_reader :handler_class_name
+
+    def initialize(handler_class_name)
+      @handler_class_name = handler_class_name
+    end
+
+    def handler_class
+      constantize(@handler_class_name).tap do |handler_class|
+        raise(NoHandlerClassError.new(@handler_class_name)) if !handler_class
+      end
+    end
+
+    private
+
+    def constantize(class_name)
+      names = class_name.to_s.split('::').reject{ |name| name.empty? }
+      klass = names.inject(Object){ |constant, name| constant.const_get(name) }
+      klass == Object ? false : klass
+    rescue NameError
+      false
+    end
+
+  end
+end

data/lib/deas/server.rb

@@ -5,7 +5,8 @@ require 'set'
 require 'deas/exceptions'
 require 'deas/template'
 require 'deas/logging'
-require 'deas/redirect_handler'
+require 'deas/redirect_proxy'
+require 'deas/route_proxy'
 require 'deas/route'
 require 'deas/show_exceptions'
 require 'deas/sinatra_app'
@@ -70,8 +71,8 @@ module Deas::Server
       self.init_procs.each{ |p| p.call }
       raise Deas::ServerRootError if self.root.nil?
 
-      # constantize the routes to ensure they are available
-      self.routes.each(&:constantize!)
+      # validate the routes
+      self.routes.each(&:validate!)
 
       # set the :erb :outvar setting if it hasn't been set.  this is used
       # by template helpers and plugins and needs to be queryable.  the actual
@@ -96,6 +97,10 @@ module Deas::Server
       end
     end
 
+    def add_route(http_method, path, proxy)
+      Deas::Route.new(http_method, path, proxy).tap{ |r| self.routes.push(r) }
+    end
+
   end
 
   def self.included(receiver)
@@ -218,20 +223,16 @@ module Deas::Server
     end
 
     def redirect(http_method, path, to_path = nil, &block)
-      name          = 'Deas::RedirectHandler'
-      handler_class = Deas::RedirectHandler.new(to_path, &block)
-      Deas::Route.new(http_method, path, name, handler_class).tap do |route|
-        self.configuration.routes.push(route)
-      end
+      proxy = Deas::RedirectProxy.new(to_path, &block)
+      self.configuration.add_route(http_method, path, proxy)
     end
 
     def route(http_method, path, handler_class_name)
       if self.view_handler_ns && !(handler_class_name =~ /^::/)
         handler_class_name = "#{self.view_handler_ns}::#{handler_class_name}"
       end
-      Deas::Route.new(http_method, path, handler_class_name).tap do |route|
-        self.configuration.routes.push(route)
-      end
+      proxy = Deas::RouteProxy.new(handler_class_name)
+      self.configuration.add_route(http_method, path, proxy)
     end
 
   end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.17.0"
+  VERSION = "0.17.1"
 end

data/test/system/rack_tests.rb

@@ -4,13 +4,13 @@ require 'deas'
 
 module Deas
 
-  class RackTestContext < Assert::Context
+  class RackTestsContext < Assert::Context
     include Assert::Rack::Test
 
     def app; @app; end
   end
 
-  class RackTests < RackTestContext
+  class RackTests < RackTestsContext
     desc "a Deas server rack app"
     setup do
       @app = DeasTestServer.new
@@ -160,7 +160,7 @@ module Deas
 
   end
 
-  class ShowExceptionsTests < RackTestContext
+  class ShowExceptionsTests < RackTestsContext
     desc "a Deas server rack app with show exceptions enabled"
     setup do
       @app = DeasDevServer.new

data/test/unit/error_handler_tests.rb

@@ -1,4 +1,5 @@
 require 'assert'
+require 'test/support/fake_sinatra_call'
 require 'deas/error_handler'
 
 class Deas::ErrorHandler

data/test/unit/exceptions_tests.rb

@@ -11,6 +11,18 @@ module Deas
       assert_kind_of RuntimeError, Deas::Error.new
     end
 
+    should "provide a no handler class exception that subclasses `Error`" do
+      assert Deas::NoHandlerClassError
+
+      handler_class_name = 'AHandlerClass'
+      e = Deas::NoHandlerClassError.new(handler_class_name)
+      exp_msg = "Deas couldn't find the view handler '#{handler_class_name}'" \
+                " - it doesn't exist or hasn't been required in yet."
+
+      assert_kind_of Deas::Error, e
+      assert_equal exp_msg, e.message
+    end
+
     should "provide a server exception that subclasses `Error`" do
       assert Deas::ServerError
       assert_kind_of Deas::Error, Deas::ServerError.new

data/test/unit/{redirect_handler_tests.rb → redirect_proxy_tests.rb}

@@ -1,51 +1,73 @@
 require 'assert'
-require 'deas/redirect_handler'
 require 'deas/test_helpers'
+require 'deas/redirect_proxy'
 
-module Deas::RedirectHandler
+class Deas::RedirectProxy
 
   class BaseTests < Assert::Context
-    desc "Deas::RedirectHandler"
+    desc "Deas::RedirectProxy"
     setup do
-      @handler_class = Deas::RedirectHandler.new('/somewhere')
+      @proxy = Deas::RedirectProxy.new('/somewhere')
+    end
+    subject{ @proxy }
+
+    should have_readers :handler_class_name, :handler_class
+
+    should "know its handler class name" do
+      assert_equal subject.handler_class.name, subject.handler_class_name
+    end
+
+  end
+
+  class HandlerClassTests < BaseTests
+    desc "handler class"
+    setup do
+      @handler_class = @proxy.handler_class
     end
     subject{ @handler_class }
 
     should have_accessors :redirect_path
+    should have_imeth :name
 
-    should "build a redirect handler class" do
+    should "be a view handler" do
       subject.included_modules.tap do |modules|
         assert_includes Deas::ViewHandler, modules
-        assert_includes Deas::RedirectHandler::InstanceMethods, modules
       end
+    end
 
+    should "know its name" do
+      assert_equal 'Deas::RedirectHandler', subject.name
+    end
+
+    should "know its redirect path" do
       assert_instance_of Proc, subject.redirect_path
       assert_equal '/somewhere', subject.redirect_path.call
     end
 
-    should "allow passing a block instead of a static path" do
+    should "allow specifying the redir path as a block" do
       path_proc = proc{ '/somewhere' }
 
-      handler_class = Deas::RedirectHandler.new(&path_proc)
+      handler_class = Deas::RedirectProxy.new(&path_proc).handler_class
       assert_equal path_proc, handler_class.redirect_path
+      assert_equal '/somewhere', subject.redirect_path.call
     end
 
   end
 
-  class RunTests < BaseTests
+  class RunTests < HandlerClassTests
     include Deas::TestHelpers
 
     desc "when run"
 
     should "redirect to the path that it was build with" do
-      render_args = test_runner(@handler_class).run
+      render_args = test_runner(subject).run
       assert_equal true,         render_args.redirect?
       assert_equal '/somewhere', render_args.path
     end
 
     should "redirect to the path returned from instance evaling the proc" do
       path_proc = proc{ params['redirect_to'] }
-      handler_class = Deas::RedirectHandler.new(&path_proc)
+      handler_class = Deas::RedirectProxy.new(&path_proc).handler_class
 
       render_args = test_runner(handler_class, {
         :params => { 'redirect_to' => '/go_here' }

data/test/unit/route_proxy_tests.rb

@@ -0,0 +1,34 @@
+require 'assert'
+require 'deas/test_helpers'
+require 'test/support/view_handlers'
+require 'deas/route_proxy'
+
+class Deas::RouteProxy
+
+  class BaseTests < Assert::Context
+    desc "Deas::RouteProxy"
+    setup do
+      @proxy = Deas::RouteProxy.new('TestViewHandler')
+    end
+    subject{ @proxy }
+
+    should have_reader :handler_class_name
+    should have_imeths :handler_class
+
+    should "know its handler class name" do
+      assert_equal 'TestViewHandler', subject.handler_class_name
+    end
+
+    should "know its handler class" do
+      assert_equal TestViewHandler, subject.handler_class
+    end
+
+    should "complain if there is no handler class with the given name" do
+      assert_raises(Deas::NoHandlerClassError) do
+        Deas::RouteProxy.new('SomethingNotDefined').handler_class
+      end
+    end
+
+  end
+
+end

data/test/unit/route_tests.rb

@@ -1,42 +1,38 @@
 require 'assert'
-require 'deas/route'
-require 'deas/sinatra_runner'
-require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
+require 'deas/route_proxy'
+require 'deas/route'
 
 class Deas::Route
 
   class BaseTests < Assert::Context
     desc "Deas::Route"
     setup do
-      @route = Deas::Route.new(:get, '/test', 'TestViewHandler')
+      @handler_proxy = Deas::RouteProxy.new('TestViewHandler')
+      @route = Deas::Route.new(:get, '/test', @handler_proxy)
     end
     subject{ @route }
 
-    should have_instance_methods :method, :path, :handler_class_name,
-      :handler_class, :run
-
-    should "allow passing a constantized handler when initialized" do
-      route = Deas::Route.new(:get, '/test', 'TestViewHandler', TestViewHandler)
+    should have_readers :method, :path, :handler_proxy, :handler_class
+    should have_imeths :validate!, :run
 
-      # handler class is set without calling constantize
-      assert_equal TestViewHandler, route.handler_class
+    should "know its method and path and handler_proxy" do
+      assert_equal :get, subject.method
+      assert_equal '/test', subject.path
+      assert_equal @handler_proxy, subject.handler_proxy
     end
 
-    should "constantize the handler class with #constantize!" do
+    should "set its handler class on `validate!`" do
       assert_nil subject.handler_class
 
-      assert_nothing_raised{ subject.constantize! }
-
+      assert_nothing_raised{ subject.validate! }
       assert_equal TestViewHandler, subject.handler_class
     end
 
-    should "raise a custom exception if the handler class name " \
-           "can't be constantized" do
-      route = Deas::Route.new(:get, '/', 'SomethingNotDefined')
-
+    should "complain given an invalid handler class" do
+      proxy = Deas::RouteProxy.new('SomethingNotDefined')
       assert_raises(Deas::NoHandlerClassError) do
-        route.constantize!
+        Deas::Route.new(:get, '/test', proxy).validate!
       end
     end
 

data/test/unit/runner_tests.rb

@@ -1,6 +1,6 @@
 require 'assert'
-require 'deas/runner'
 require 'test/support/view_handlers'
+require 'deas/runner'
 
 class Deas::Runner
 

data/test/unit/server_configuration_tests.rb

@@ -3,6 +3,7 @@ require 'set'
 require 'test/support/view_handlers'
 require 'deas/exceptions'
 require 'deas/template'
+require 'deas/route_proxy'
 require 'deas/server'
 
 class Deas::Server::Configuration
@@ -89,7 +90,8 @@ class Deas::Server::Configuration
     setup do
       @initialized = false
       @other_initialized = false
-      @route = Deas::Route.new(:get, '/something', 'TestViewHandler')
+      proxy = Deas::RouteProxy.new('TestViewHandler')
+      @route = Deas::Route.new(:get, '/something', proxy)
 
       @configuration = Deas::Server::Configuration.new.tap do |c|
         c.env              = 'staging'

data/test/unit/server_tests.rb

@@ -95,64 +95,62 @@ module Deas::Server
       assert_equal 'MyStuff', subject.configuration.view_handler_ns
 
       # should use the ns
-      subject.route(:get, '/ns_test',     'NsTest')
-      route = subject.configuration.routes.last
-      assert_equal 'MyStuff::NsTest', route.handler_class_name
+      route = subject.route(:get, '/ns_test', 'NsTest')
+      assert_equal 'MyStuff::NsTest', route.handler_proxy.handler_class_name
 
       # should ignore the ns when the leading colons are present
-      subject.route(:post, '/no_ns_test', '::NoNsTest')
-      route = subject.configuration.routes.last
-      assert_equal '::NoNsTest', route.handler_class_name
+      route = subject.route(:post, '/no_ns_test', '::NoNsTest')
+      assert_equal '::NoNsTest', route.handler_proxy.handler_class_name
     end
 
     should "add a GET route using #get" do
-      subject.get('/assets', 'ListAssets')
+      subject.get('/things', 'ListThings')
 
       route = subject.configuration.routes[0]
       assert_instance_of Deas::Route, route
       assert_equal :get,         route.method
-      assert_equal '/assets',    route.path
-      assert_equal 'ListAssets', route.handler_class_name
+      assert_equal '/things',    route.path
+      assert_equal 'ListThings', route.handler_proxy.handler_class_name
     end
 
     should "add a POST route using #post" do
-      subject.post('/assets', 'CreateAsset')
+      subject.post('/things', 'CreateThing')
 
       route = subject.configuration.routes[0]
       assert_instance_of Deas::Route, route
       assert_equal :post,         route.method
-      assert_equal '/assets',     route.path
-      assert_equal 'CreateAsset', route.handler_class_name
+      assert_equal '/things',     route.path
+      assert_equal 'CreateThing', route.handler_proxy.handler_class_name
     end
 
     should "add a PUT route using #put" do
-      subject.put('/assets/:id', 'UpdateAsset')
+      subject.put('/things/:id', 'UpdateThing')
 
       route = subject.configuration.routes[0]
       assert_instance_of Deas::Route, route
       assert_equal :put,          route.method
-      assert_equal '/assets/:id', route.path
-      assert_equal 'UpdateAsset', route.handler_class_name
+      assert_equal '/things/:id', route.path
+      assert_equal 'UpdateThing', route.handler_proxy.handler_class_name
     end
 
     should "add a PATCH route using #patch" do
-      subject.patch('/assets/:id', 'UpdateAsset')
+      subject.patch('/things/:id', 'UpdateThing')
 
       route = subject.configuration.routes[0]
       assert_instance_of Deas::Route, route
       assert_equal :patch,        route.method
-      assert_equal '/assets/:id', route.path
-      assert_equal 'UpdateAsset', route.handler_class_name
+      assert_equal '/things/:id', route.path
+      assert_equal 'UpdateThing', route.handler_proxy.handler_class_name
     end
 
     should "add a DELETE route using #delete" do
-      subject.delete('/assets/:id', 'DeleteAsset')
+      subject.delete('/things/:id', 'DeleteThing')
 
       route = subject.configuration.routes[0]
       assert_instance_of Deas::Route, route
       assert_equal :delete,       route.method
-      assert_equal '/assets/:id', route.path
-      assert_equal 'DeleteAsset', route.handler_class_name
+      assert_equal '/things/:id', route.path
+      assert_equal 'DeleteThing', route.handler_proxy.handler_class_name
     end
 
     should "add a redirect route using #redirect" do
@@ -162,7 +160,9 @@ module Deas::Server
       assert_instance_of Deas::Route, route
       assert_equal :get,       route.method
       assert_equal '/invalid', route.path
-      assert_equal 'Deas::RedirectHandler', route.handler_class_name
+      assert_equal 'Deas::RedirectHandler', route.handler_proxy.handler_class_name
+
+      route.validate!
       assert_not_nil route.handler_class
     end
 
@@ -173,7 +173,7 @@ module Deas::Server
       assert_instance_of Deas::Route, route
       assert_equal :options,    route.method
       assert_equal '/get_info', route.path
-      assert_equal 'GetInfo',   route.handler_class_name
+      assert_equal 'GetInfo',   route.handler_proxy.handler_class_name
     end
 
   end

data/test/unit/sinatra_app_tests.rb

@@ -1,16 +1,18 @@
 require 'assert'
+require 'sinatra/base'
+require 'test/support/view_handlers'
+require 'deas/route_proxy'
 require 'deas/route'
 require 'deas/server'
 require 'deas/sinatra_app'
-require 'sinatra/base'
-require 'test/support/view_handlers'
 
 module Deas::SinatraApp
 
   class BaseTests < Assert::Context
     desc "Deas::SinatraApp"
     setup do
-      @route = Deas::Route.new(:get, '/something', 'TestViewHandler')
+      proxy = Deas::RouteProxy.new('TestViewHandler')
+      @route = Deas::Route.new(:get, '/something', proxy)
       @configuration = Deas::Server::Configuration.new.tap do |c|
         c.env              = 'staging'
         c.root             = 'path/to/somewhere'

data/test/unit/sinatra_runner_tests.rb

@@ -1,8 +1,8 @@
 require 'assert'
-require 'deas/sinatra_runner'
-require 'deas/template'
 require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
+require 'deas/template'
+require 'deas/sinatra_runner'
 
 class Deas::SinatraRunner
 

data/test/unit/template_tests.rb

@@ -1,6 +1,6 @@
 require 'assert'
-require 'deas/template'
 require 'test/support/fake_sinatra_call'
+require 'deas/template'
 
 class Deas::Template
 

data/test/unit/view_handler_tests.rb

@@ -1,7 +1,7 @@
 require 'assert'
+require 'test/support/view_handlers'
 require 'deas/test_helpers'
 require 'deas/view_handler'
-require 'test/support/view_handlers'
 
 module Deas::ViewHandler
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 89
   prerelease: 
   segments: 
   - 0
   - 17
-  - 0
-  version: 0.17.0
+  - 1
+  version: 0.17.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-12 00:00:00 Z
+date: 2013-06-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options
@@ -150,8 +150,9 @@ files:
 - lib/deas/logging.rb
 - lib/deas/plugin.rb
 - lib/deas/rack_request_fix.rb
-- lib/deas/redirect_handler.rb
+- lib/deas/redirect_proxy.rb
 - lib/deas/route.rb
+- lib/deas/route_proxy.rb
 - lib/deas/runner.rb
 - lib/deas/server.rb
 - lib/deas/show_exceptions.rb
@@ -186,7 +187,8 @@ files:
 - test/unit/exceptions_tests.rb
 - test/unit/logging_tests.rb
 - test/unit/plugin_tests.rb
-- test/unit/redirect_handler_tests.rb
+- test/unit/redirect_proxy_tests.rb
+- test/unit/route_proxy_tests.rb
 - test/unit/route_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/server_configuration_tests.rb
@@ -254,7 +256,8 @@ test_files:
 - test/unit/exceptions_tests.rb
 - test/unit/logging_tests.rb
 - test/unit/plugin_tests.rb
-- test/unit/redirect_handler_tests.rb
+- test/unit/redirect_proxy_tests.rb
+- test/unit/route_proxy_tests.rb
 - test/unit/route_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/server_configuration_tests.rb

data/lib/deas/redirect_handler.rb

@@ -1,34 +0,0 @@
-require 'deas/view_handler'
-
-module Deas
-
-  module RedirectHandler
-
-    def self.new(path = nil, &block)
-      handler_class = Class.new do
-        include Deas::ViewHandler
-        include InstanceMethods
-        extend ClassMethods
-      end
-      handler_class.redirect_path = path ? proc{ path } : block
-      handler_class
-    end
-
-    module InstanceMethods
-
-      def run!
-        path = self.instance_eval(&self.class.redirect_path)
-        redirect path
-      end
-
-    end
-
-    module ClassMethods
-
-      attr_accessor :redirect_path
-
-    end
-
-  end
-
-end