deas 0.26.0 → 0.27.0

data/test/unit/server_configuration_tests.rb

@@ -96,7 +96,7 @@ class Deas::Server::Configuration
     setup do
       @initialized = false
       @other_initialized = false
-      proxy = Deas::RouteProxy.new('TestViewHandler')
+      proxy = Deas::RouteProxy.new('EmptyViewHandler')
       @route = Deas::Route.new(:get, '/something', proxy)
       @router = Deas::Router.new
       @router.routes = [ @route ]
@@ -132,7 +132,7 @@ class Deas::Server::Configuration
 
       subject.validate!
 
-      assert_equal TestViewHandler, @route.handler_class
+      assert_equal EmptyViewHandler, @route.handler_class
     end
 
     should "default the :erb :outvar setting in the SinatraApp it creates" do

data/test/unit/sinatra_app_tests.rb

@@ -12,7 +12,7 @@ module Deas::SinatraApp
   class UnitTests < Assert::Context
     desc "Deas::SinatraApp"
     setup do
-      proxy = Deas::RouteProxy.new('TestViewHandler')
+      proxy = Deas::RouteProxy.new('EmptyViewHandler')
       @route = Deas::Route.new(:get, '/something', proxy)
       @router = Deas::Router.new
       @router.routes = [ @route ]

data/test/unit/sinatra_runner_tests.rb

@@ -1,10 +1,9 @@
 require 'assert'
 require 'deas/sinatra_runner'
 
-require 'deas/runner'
+require 'deas/deas_runner'
 require 'deas/template'
 require 'test/support/fake_sinatra_call'
-require 'test/support/normalized_params_spy'
 require 'test/support/view_handlers'
 
 class Deas::SinatraRunner
@@ -16,7 +15,7 @@ class Deas::SinatraRunner
     end
     subject{ @runner_class }
 
-    should "be a Runner" do
+    should "be a `DeasRunner`" do
       assert subject < Deas::Runner
     end
 
@@ -25,32 +24,15 @@ class Deas::SinatraRunner
   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) }
-
       @fake_sinatra_call = FakeSinatraCall.new
-      @runner = @runner_class.new(FlagViewHandler, @fake_sinatra_call)
+      @runner = @runner_class.new(DeasRunnerViewHandler, {
+        :sinatra_call => @fake_sinatra_call
+      })
     end
     subject{ @runner }
 
-    should have_readers :app_settings
     should have_imeths :run
 
-    should "get its settings from the sinatra call" do
-      assert_equal @fake_sinatra_call.request, subject.request
-      assert_equal @fake_sinatra_call.response, subject.response
-      assert_equal @fake_sinatra_call.params, subject.params
-      assert_equal @fake_sinatra_call.settings.logger, subject.logger
-      assert_equal @fake_sinatra_call.settings.router, subject.router
-      assert_equal @fake_sinatra_call.session, subject.session
-    end
-
-    should "call to normalize its params" do
-      assert_equal @fake_sinatra_call.params, @norm_params_spy.params
-      assert_true @norm_params_spy.value_called
-    end
-
     should "call the sinatra_call's halt with" do
       return_value = catch(:halt){ subject.halt('test') }
       assert_equal [ 'test' ], return_value
@@ -84,8 +66,8 @@ class Deas::SinatraRunner
     end
 
     should "render the template with :view/:logger locals and the handler layouts" do
-      exp_handler = FlagViewHandler.new(subject)
-      exp_layouts = FlagViewHandler.layouts
+      exp_handler = DeasRunnerViewHandler.new(subject)
+      exp_layouts = DeasRunnerViewHandler.layouts
       exp_result = Deas::Template.new(@fake_sinatra_call, 'index', {
         :locals => {
           :view => exp_handler,
@@ -93,16 +75,23 @@ class Deas::SinatraRunner
         },
         :layout => exp_layouts
       }).render
-
       assert_equal exp_result, subject.render('index')
-    end
 
-    should "render partials with locals" do
-      exp_result = Deas::Template::Partial.new(@fake_sinatra_call, 'info', {
-        :some => 'locals'
+      exp_result = Deas::Template.new(@fake_sinatra_call, 'index', {
+        :locals => {
+          :view => 'a-view',
+          :some => 'thing',
+          :logger => @runner.logger
+        },
+        :layout => false
       }).render
-
-      assert_equal exp_result, subject.partial('info', :some => 'locals')
+      assert_equal exp_result, subject.render('index', {
+        :layout => false,
+        :locals => {
+          :view => 'a-view',
+          :some => 'thing'
+        }
+      })
     end
 
     should "call the sinatra_call's send_file to set the send files" do
@@ -115,54 +104,4 @@ class Deas::SinatraRunner
 
   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_hook_called
-      assert_equal true, subject.after_hook_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/template_tests.rb

@@ -144,6 +144,11 @@ class Deas::Template
       assert_equal :"users/index/_listing", subject.name
     end
 
+    should "not add an underscore to it's template's basename if one already exists" do
+      partial = Deas::Template::Partial.new(@fake_sinatra_call, 'users/index/_listing')
+      assert_equal :"users/index/_listing", partial.name
+    end
+
     should "set it's locals option" do
       assert_equal({ :user => 'Joe Test' }, subject.options[:locals])
     end

data/test/unit/test_runner_tests.rb

@@ -2,7 +2,6 @@ require 'assert'
 require 'deas/test_runner'
 
 require 'rack/test'
-require 'deas/router'
 require 'deas/runner'
 require 'test/support/normalized_params_spy'
 require 'test/support/view_handlers'
@@ -16,7 +15,7 @@ class Deas::TestRunner
     end
     subject{ @runner_class }
 
-    should "be a Runner" do
+    should "be a `Runner`" do
       assert subject < Deas::Runner
     end
 
@@ -26,31 +25,32 @@ class Deas::TestRunner
     desc "when init"
     setup do
       @params = { 'value' => '1' }
+      @args = {
+        :request  => 'a-request',
+        :response => 'a-response',
+        :params   => @params,
+        :logger   => 'a-logger',
+        :router   => 'a-router',
+        :session  => 'a-session'
+      }
+
       @norm_params_spy = Deas::Runner::NormalizedParamsSpy.new
       Assert.stub(NormalizedParams, :new){ |p| @norm_params_spy.new(p) }
-      @runner = @runner_class.new(TestRunnerViewHandler, :params => @params)
+
+      @runner = @runner_class.new(TestRunnerViewHandler, @args)
     end
     subject{ @runner }
 
-    should have_readers :app_settings, :return_value
+    should have_readers :return_value
     should have_imeths :run
 
-    should "know its app_settings" do
-      assert_kind_of OpenStruct, subject.app_settings
-    end
-
-    should "default its settings" do
-      assert_nil subject.request
-      assert_nil subject.response
-      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
+    should "super its standard args" do
+      assert_equal 'a-request',  subject.request
+      assert_equal 'a-response', subject.response
+      assert_equal @params,      subject.params
+      assert_equal 'a-logger',   subject.logger
+      assert_equal 'a-router',   subject.router
+      assert_equal 'a-session',  subject.session
     end
 
     should "call to normalize its params" do
@@ -58,8 +58,8 @@ class Deas::TestRunner
       assert_true @norm_params_spy.value_called
     end
 
-    should "write any non-standard settings on the handler" do
-      runner = Deas::TestRunner.new(TestRunnerViewHandler, :custom_value => 42)
+    should "write any non-standard args on the handler" do
+      runner = @runner_class.new(TestRunnerViewHandler, :custom_value => 42)
       assert_equal 42, runner.handler.custom_value
     end
 
@@ -124,16 +124,6 @@ class Deas::TestRunner
       assert_equal 'some/template', value.template_name
     end
 
-    should "build partial args if partial is called" do
-      value = subject.partial 'some/partial', :some => 'locals'
-      assert_kind_of PartialArgs, value
-      [:partial_name, :locals].each do |meth|
-        assert_respond_to meth, value
-      end
-      assert_equal 'some/partial', value.partial_name
-      assert_equal({:some => 'locals'}, value.locals)
-    end
-
     should "build send file args if send file is called" do
       value = subject.send_file 'some/file/path'
       assert_kind_of SendFileArgs, value

data/test/unit/view_handler_tests.rb

@@ -10,21 +10,64 @@ module Deas::ViewHandler
 
     desc "Deas::ViewHandler"
     setup do
-      @handler = test_handler(TestViewHandler)
+      @handler_class = TestViewHandler
+    end
+    subject{ @handler_class }
+
+    should have_imeths :layout, :layouts
+    should have_imeths :before, :prepend_before, :before_callbacks
+    should have_imeths :after,  :prepend_after,  :after_callbacks
+    should have_imeths :before_init, :prepend_before_init, :before_init_callbacks
+    should have_imeths :after_init,  :prepend_after_init,  :after_init_callbacks
+    should have_imeths :before_run,  :prepend_before_run,  :before_run_callbacks
+    should have_imeths :after_run,   :prepend_after_run,   :after_run_callbacks
+
+    should "specify layouts" do
+      subject.layout 'layouts/app'
+      assert_equal ['layouts/app'], subject.layouts
+
+      subject.layouts 'layouts/web', 'layouts/search'
+      assert_equal ['layouts/app', 'layouts/web', 'layouts/search'], subject.layouts
+    end
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      @handler = test_handler(@handler_class)
     end
     subject{ @handler }
 
     should have_imeths :init, :init!, :run, :run!
-    should have_cmeths :layout, :layouts
-    should have_cmeths :before, :prepend_before, :before_callbacks
-    should have_cmeths :after,  :prepend_after,  :after_callbacks
-    should have_cmeths :before_init, :prepend_before_init, :before_init_callbacks
-    should have_cmeths :after_init,  :prepend_after_init,  :after_init_callbacks
-    should have_cmeths :before_run,  :prepend_before_run,  :before_run_callbacks
-    should have_cmeths :after_run,   :prepend_after_run,   :after_run_callbacks
+
+    should "have called `init!` and it's callbacks" do
+      assert_equal true, subject.before_init_called
+      assert_equal true, subject.second_before_init_called
+      assert_equal true, subject.init_bang_called
+      assert_equal true, subject.after_init_called
+    end
+
+    should "not have called `run!` or it's callbacks when initialized" do
+      assert_nil subject.before_run_called
+      assert_nil subject.run_bang_called
+      assert_nil subject.after_run_called
+    end
+
+  end
+
+  class RunTests < InitTests
+    desc "and run"
+
+    should "call `run!` and it's callbacks" do
+      subject.run
+      assert_equal true, subject.before_run_called
+      assert_equal true, subject.run_bang_called
+      assert_equal true, subject.after_run_called
+    end
 
     should "complain if run! is not overwritten" do
-      assert_raises(NotImplementedError){ subject.run! }
+      assert_raises(NotImplementedError){ test_runner(EmptyViewHandler).run }
     end
 
     should "render templates" do
@@ -33,32 +76,15 @@ module Deas::ViewHandler
       assert_equal({ :some => :option }, render_args.options)
     end
 
-    should "render partial templates" do
-      partial_args = test_runner(PartialViewHandler).run
-      assert_equal "my_partial",        partial_args.partial_name
-      assert_equal({:some => 'locals'}, partial_args.locals)
-    end
-
     should "send files" do
       send_file_args = test_runner(SendFileViewHandler).run
       assert_equal "my_file.txt",        send_file_args.file_path
       assert_equal({ :some => :option }, send_file_args.options)
     end
 
-    should "allow specifying the layouts using #layout or #layouts" do
-      handler_class = Class.new{ include Deas::ViewHandler }
-
-      handler_class.layout 'layouts/app'
-      assert_equal ['layouts/app'], handler_class.layouts
-
-      handler_class.layouts 'layouts/web', 'layouts/search'
-      assert_equal ['layouts/app', 'layouts/web', 'layouts/search'], handler_class.layouts
-    end
-
   end
 
   class CallbackTests < UnitTests
-    desc "callbacks"
     setup do
       @proc1 = proc{ '1' }
       @proc2 = proc{ '2' }
@@ -139,34 +165,6 @@ module Deas::ViewHandler
 
   end
 
-  class WithMethodFlagsTests < UnitTests
-    setup do
-      @handler = test_handler(FlagViewHandler)
-    end
-
-    should "have called `init!` and it's callbacks" do
-      assert_equal true, subject.before_init_called
-      assert_equal true, subject.second_before_init_called
-      assert_equal true, subject.init_bang_called
-      assert_equal true, subject.after_init_called
-    end
-
-    should "not have called `run!` or it's callbacks when initialized" do
-      assert_nil subject.before_run_called
-      assert_nil subject.run_bang_called
-      assert_nil subject.after_run_called
-    end
-
-    should "call `run!` and it's callbacks when it's `run`" do
-      subject.run
-
-      assert_equal true, subject.before_run_called
-      assert_equal true, subject.run_bang_called
-      assert_equal true, subject.after_run_called
-    end
-
-  end
-
   class HaltTests < UnitTests
     desc "halt"
 
@@ -226,4 +224,26 @@ module Deas::ViewHandler
 
   end
 
+  class TestViewHandler
+    include Deas::ViewHandler
+
+    attr_reader :before_called, :after_called
+    attr_reader :before_init_called, :second_before_init_called
+    attr_reader :init_bang_called, :after_init_called
+    attr_reader :before_run_called, :run_bang_called, :after_run_called
+
+    before{ @before_called = true }
+    after{  @after_called  = true }
+
+    before_init{ @before_init_called        = true }
+    before_init{ @second_before_init_called = true }
+    after_init{  @after_init_called         = true }
+    before_run{  @before_run_called         = true }
+    after_run{   @after_run_called          = true }
+
+    def init!; @init_bang_called = true; end
+    def run!;  @run_bang_called = true;  end
+
+  end
+
 end