deas 0.26.0 → 0.27.0

data/test/system/rack_tests.rb

@@ -96,13 +96,6 @@ module Deas
       assert_equal expected_body, last_response.body
     end
 
-    should "render partial templates" do
-      get '/partial.html'
-      expected_body = "Stuff: some-info\n"
-      assert_equal 200,           last_response.status
-      assert_equal expected_body, last_response.body
-    end
-
     should "return a 302 redirecting to the expected locations" do
       get '/redirect'
       expected_location = 'http://google.com'
@@ -158,7 +151,6 @@ module Deas
     end
 
     should "be able to access sinatra call data" do
-      assert_equal 'something',    @data['app_settings_a_setting']
       assert_equal 'Logger',       @data['logger_class_name']
       assert_equal 'GET',          @data['request_method']
       assert_equal 'Content-Type', @data['response_firstheaderval']

data/test/unit/deas_runner_tests.rb

@@ -0,0 +1,97 @@
+require 'assert'
+require 'deas/deas_runner'
+
+require 'deas/runner'
+require 'test/support/normalized_params_spy'
+require 'test/support/view_handlers'
+
+class Deas::DeasRunner
+
+  class UnitTests < Assert::Context
+    desc "Deas::DeasRunner"
+    setup do
+      @runner_class = Deas::DeasRunner
+    end
+    subject{ @runner_class }
+
+    should "be a `Runner`" do
+      assert subject < Deas::Runner
+    end
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      @params = { 'value' => '1' }
+      @norm_params_spy = Deas::Runner::NormalizedParamsSpy.new
+      Assert.stub(NormalizedParams, :new){ |p| @norm_params_spy.new(p) }
+
+      @runner = @runner_class.new(DeasRunnerViewHandler, :params => @params)
+    end
+    subject{ @runner }
+
+    should have_imeths :run
+
+    should "super its params arg" do
+      assert_equal @params, subject.params
+    end
+
+    should "call to normalize its params" do
+      assert_equal @params, @norm_params_spy.params
+      assert_true @norm_params_spy.value_called
+    end
+
+  end
+
+  class RunTests < InitTests
+    desc "and run"
+    setup do
+      @return_value = @runner.run
+      @handler = @runner.instance_variable_get("@handler")
+    end
+    subject{ @handler }
+
+    should "run the before and after hooks" do
+      assert_equal true, subject.before_called
+      assert_equal true, subject.after_called
+    end
+
+    should "run the handler's init and run" do
+      assert_equal true, subject.init_bang_called
+      assert_equal true, subject.run_bang_called
+    end
+
+    should "return the handler's run! return value" do
+      assert_equal true, @return_value
+    end
+
+  end
+
+  class NormalizedParamsTests < UnitTests
+    desc "NormalizedParams"
+    setup do
+      @norm_params_class = Deas::SinatraRunner::NormalizedParams
+    end
+
+    should "be a normalized params subclass" do
+      assert @norm_params_class < Deas::Runner::NormalizedParams
+    end
+
+    should "not convert Tempfile param values to strings" do
+      tempfile = Class.new(::Tempfile){ def initialize; end }.new
+      params = normalized({
+        'attachment' => { :tempfile => tempfile }
+      })
+      assert_kind_of ::Tempfile, params['attachment']['tempfile']
+    end
+
+    private
+
+    def normalized(params)
+      @norm_params_class.new(params).value
+    end
+
+  end
+
+end

data/test/unit/redirect_proxy_tests.rb

@@ -1,7 +1,8 @@
 require 'assert'
-require 'deas/test_helpers'
 require 'deas/redirect_proxy'
 
+require 'deas/test_helpers'
+
 class Deas::RedirectProxy
 
   class UnitTests < Assert::Context
@@ -12,6 +13,7 @@ class Deas::RedirectProxy
     subject{ @proxy }
 
     should have_readers :handler_class_name, :handler_class
+    should have_imeths :validate!
 
     should "know its handler class name" do
       assert_equal subject.handler_class.name, subject.handler_class_name

data/test/unit/route_proxy_tests.rb

@@ -1,31 +1,35 @@
 require 'assert'
+require 'deas/route_proxy'
+
 require 'deas/test_helpers'
 require 'test/support/view_handlers'
-require 'deas/route_proxy'
 
 class Deas::RouteProxy
 
   class UnitTests < Assert::Context
     desc "Deas::RouteProxy"
     setup do
-      @proxy = Deas::RouteProxy.new('TestViewHandler')
+      @proxy = Deas::RouteProxy.new('EmptyViewHandler')
     end
     subject{ @proxy }
 
-    should have_reader :handler_class_name
-    should have_imeths :handler_class
+    should have_readers :handler_class_name, :handler_class
+    should have_imeths :validate!
 
     should "know its handler class name" do
-      assert_equal 'TestViewHandler', subject.handler_class_name
+      assert_equal 'EmptyViewHandler', subject.handler_class_name
     end
 
-    should "know its handler class" do
-      assert_equal TestViewHandler, subject.handler_class
+    should "set its handler class on `validate!`" do
+      assert_nil subject.handler_class
+
+      assert_nothing_raised{ subject.validate! }
+      assert_equal EmptyViewHandler, 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
+        Deas::RouteProxy.new('SomethingNotDefined').validate!
       end
     end
 

data/test/unit/route_tests.rb

@@ -1,32 +1,35 @@
 require 'assert'
-require 'test/support/view_handlers'
-require 'deas/route_proxy'
 require 'deas/route'
 
+require 'deas/sinatra_runner'
+require 'deas/route_proxy'
+require 'test/support/fake_sinatra_call'
+require 'test/support/view_handlers'
+
 class Deas::Route
 
   class UnitTests < Assert::Context
     desc "Deas::Route"
     setup do
-      @handler_proxy = Deas::RouteProxy.new('TestViewHandler')
-      @route = Deas::Route.new(:get, '/test', @handler_proxy)
+      @route_proxy = Deas::RouteProxy.new('EmptyViewHandler')
+      @route = Deas::Route.new(:get, '/test', @route_proxy)
     end
     subject{ @route }
 
-    should have_readers :method, :path, :handler_proxy, :handler_class
+    should have_readers :method, :path, :route_proxy, :handler_class
     should have_imeths :validate!, :run
 
-    should "know its method and path and handler_proxy" do
+    should "know its method, path and route proxy" do
       assert_equal :get, subject.method
       assert_equal '/test', subject.path
-      assert_equal @handler_proxy, subject.handler_proxy
+      assert_equal @route_proxy, subject.route_proxy
     end
 
     should "set its handler class on `validate!`" do
       assert_nil subject.handler_class
 
       assert_nothing_raised{ subject.validate! }
-      assert_equal TestViewHandler, subject.handler_class
+      assert_equal EmptyViewHandler, subject.handler_class
     end
 
     should "complain given an invalid handler class" do
@@ -38,4 +41,85 @@ class Deas::Route
 
   end
 
+  class RunTests < UnitTests
+    desc "when run"
+    setup do
+      @fake_sinatra_call = FakeSinatraCall.new
+      @runner_spy = SinatraRunnerSpy.new
+      Assert.stub(Deas::SinatraRunner, :new) do |*args|
+        @runner_spy.build(*args)
+        @runner_spy
+      end
+
+      @route.validate!
+      @route.run(@fake_sinatra_call)
+    end
+
+    should "build and run a sinatra runner" do
+      assert_equal subject.handler_class, @runner_spy.handler_class
+
+      exp_args = {
+        :sinatra_call => @fake_sinatra_call,
+        :request      => @fake_sinatra_call.request,
+        :response     => @fake_sinatra_call.response,
+        :params       => @fake_sinatra_call.params,
+        :logger       => @fake_sinatra_call.settings.logger,
+        :router       => @fake_sinatra_call.settings.router,
+        :session      => @fake_sinatra_call.session
+      }
+      assert_equal exp_args, @runner_spy.args
+
+      assert_true @runner_spy.run_called
+    end
+
+    should "add the runner params to the request env" do
+      exp = @runner_spy.params
+      assert_equal exp, @fake_sinatra_call.request.env['deas.params']
+    end
+
+    should "add the handler class name to the request env" do
+      exp = subject.handler_class.name
+      assert_equal exp, @fake_sinatra_call.request.env['deas.handler_class_name']
+    end
+
+    should "log the handler and params" do
+      exp_msgs = [
+        "  Handler: #{subject.handler_class}",
+        "  Params:  #{@runner_spy.params.inspect}"
+      ]
+      assert_equal exp_msgs, @fake_sinatra_call.request.logging_msgs
+    end
+
+  end
+
+  class SinatraRunnerSpy
+
+    attr_reader :run_called
+    attr_reader :handler_class, :args
+    attr_reader :sinatra_call
+    attr_reader :request, :response, :params
+    attr_reader :logger, :router, :session
+
+    def initialize
+      @run_called = false
+    end
+
+    def build(handler_class, args)
+      @handler_class, @args = handler_class, args
+
+      @sinatra_call = args[:sinatra_call]
+      @request      = args[:request]
+      @response     = args[:response]
+      @params       = args[:params]
+      @logger       = args[:logger]
+      @router       = args[:router]
+      @session      = args[:session]
+    end
+
+    def run
+      @run_called = true
+    end
+
+  end
+
 end

data/test/unit/router_tests.rb

@@ -30,7 +30,7 @@ class Deas::Router
       assert_instance_of Deas::Route, route
       assert_equal :get,         route.method
       assert_equal '/things',    route.path
-      assert_equal 'ListThings', route.handler_proxy.handler_class_name
+      assert_equal 'ListThings', route.route_proxy.handler_class_name
     end
 
     should "add a POST route using #post" do
@@ -40,7 +40,7 @@ class Deas::Router
       assert_instance_of Deas::Route, route
       assert_equal :post,         route.method
       assert_equal '/things',     route.path
-      assert_equal 'CreateThing', route.handler_proxy.handler_class_name
+      assert_equal 'CreateThing', route.route_proxy.handler_class_name
     end
 
     should "add a PUT route using #put" do
@@ -50,7 +50,7 @@ class Deas::Router
       assert_instance_of Deas::Route, route
       assert_equal :put,          route.method
       assert_equal '/things/:id', route.path
-      assert_equal 'UpdateThing', route.handler_proxy.handler_class_name
+      assert_equal 'UpdateThing', route.route_proxy.handler_class_name
     end
 
     should "add a PATCH route using #patch" do
@@ -60,7 +60,7 @@ class Deas::Router
       assert_instance_of Deas::Route, route
       assert_equal :patch,        route.method
       assert_equal '/things/:id', route.path
-      assert_equal 'UpdateThing', route.handler_proxy.handler_class_name
+      assert_equal 'UpdateThing', route.route_proxy.handler_class_name
     end
 
     should "add a DELETE route using #delete" do
@@ -70,7 +70,7 @@ class Deas::Router
       assert_instance_of Deas::Route, route
       assert_equal :delete,       route.method
       assert_equal '/things/:id', route.path
-      assert_equal 'DeleteThing', route.handler_proxy.handler_class_name
+      assert_equal 'DeleteThing', route.route_proxy.handler_class_name
     end
 
     should "allow defining any kind of route using #route" do
@@ -80,7 +80,7 @@ class Deas::Router
       assert_instance_of Deas::Route, route
       assert_equal :options,    route.method
       assert_equal '/get_info', route.path
-      assert_equal 'GetInfo',   route.handler_proxy.handler_class_name
+      assert_equal 'GetInfo',   route.route_proxy.handler_class_name
     end
 
     should "set a view handler namespace and use it when defining routes" do
@@ -89,11 +89,11 @@ class Deas::Router
 
       # should use the ns
       route = subject.route(:get, '/ns_test', 'NsTest')
-      assert_equal 'MyStuff::NsTest', route.handler_proxy.handler_class_name
+      assert_equal 'MyStuff::NsTest', route.route_proxy.handler_class_name
 
       # should ignore the ns when the leading colons are present
       route = subject.route(:post, '/no_ns_test', '::NoNsTest')
-      assert_equal '::NoNsTest', route.handler_proxy.handler_class_name
+      assert_equal '::NoNsTest', route.route_proxy.handler_class_name
     end
 
     should "set a base url" do
@@ -130,7 +130,7 @@ class Deas::Router
       assert_instance_of Deas::Route, route
       assert_equal :get,       route.method
       assert_equal '/invalid', route.path
-      assert_equal 'Deas::RedirectHandler', route.handler_proxy.handler_class_name
+      assert_equal 'Deas::RedirectHandler', route.route_proxy.handler_class_name
 
       route.validate!
       assert_not_nil route.handler_class

data/test/unit/runner_tests.rb

@@ -1,6 +1,7 @@
 require 'assert'
 require 'deas/runner'
 
+require 'deas/router'
 require 'test/support/view_handlers'
 
 class Deas::Runner
@@ -8,7 +9,16 @@ class Deas::Runner
   class UnitTests < Assert::Context
     desc "Deas::Runner"
     setup do
-      @runner = Deas::Runner.new(TestViewHandler)
+      @runner_class = Deas::Runner
+    end
+    subject{ @runner_class }
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      @runner = @runner_class.new(EmptyViewHandler)
     end
     subject{ @runner }
 
@@ -16,22 +26,27 @@ class Deas::Runner
     should have_readers :request, :response, :params
     should have_readers :logger, :router, :session
     should have_imeths :halt, :redirect, :content_type, :status, :headers
-    should have_imeths :render, :partial, :send_file
+    should have_imeths :render, :send_file
 
     should "know its handler and handler class" do
-      assert_equal TestViewHandler, subject.handler_class
+      assert_equal EmptyViewHandler, subject.handler_class
       assert_instance_of subject.handler_class, subject.handler
     end
 
-    should "not set any settings" do
+    should "default its settings" do
       assert_nil subject.request
       assert_nil subject.response
-      assert_nil subject.params
-      assert_nil subject.logger
-      assert_nil subject.router
+      assert_kind_of ::Hash, subject.params
+      assert_kind_of Deas::NullLogger, subject.logger
+      assert_kind_of Deas::Router, subject.router
       assert_nil subject.session
     end
 
+    should "default its params" do
+      runner = @runner_class.new(TestRunnerViewHandler)
+      assert_equal ::Hash.new, runner.params
+    end
+
     should "not implement any actions" do
       assert_raises(NotImplementedError){ subject.halt }
       assert_raises(NotImplementedError){ subject.redirect }
@@ -39,7 +54,6 @@ class Deas::Runner
       assert_raises(NotImplementedError){ subject.status }
       assert_raises(NotImplementedError){ subject.headers }
       assert_raises(NotImplementedError){ subject.render }
-      assert_raises(NotImplementedError){ subject.partial }
       assert_raises(NotImplementedError){ subject.send_file }
     end