deas 0.13.1 → 0.14.0

data/lib/deas/runner.rb

@@ -10,17 +10,12 @@ module Deas
       @handler = @handler_class.new(self)
     end
 
-    def halt(*args)
-      raise NotImplementedError
-    end
-
-    def render(*args)
-      raise NotImplementedError
-    end
-
-    def redirect(*args)
-      raise NotImplementedError
-    end
+    def halt(*args);         raise NotImplementedError; end
+    def redirect(*args);     raise NotImplementedError; end
+    def content_type(*args); raise NotImplementedError; end
+    def status(*args);       raise NotImplementedError; end
+    def headers(*args);      raise NotImplementedError; end
+    def render(*args);       raise NotImplementedError; end
 
   end
 

data/lib/deas/server.rb

@@ -31,14 +31,15 @@ module Deas::Server
     option :reload_templates, NsOptions::Boolean, :default => false
 
     # server handling options
-    option :error_procs,     Array, :default => []
-    option :init_procs,      Array, :default => []
-    option :logger,                 :default => proc{ Deas::NullLogger.new }
-    option :middlewares,     Array, :default => []
-    option :settings,        Hash,  :default => {}
-    option :verbose_logging,        :default => true
-    option :routes,          Array, :default => []
+    option :error_procs,     Array,  :default => []
+    option :init_procs,      Array,  :default => []
+    option :logger,                  :default => proc{ Deas::NullLogger.new }
+    option :middlewares,     Array,  :default => []
+    option :settings,        Hash,   :default => {}
+    option :verbose_logging,         :default => true
+    option :routes,          Array,  :default => []
     option :view_handler_ns, String
+    option :default_charset, String, :default => 'utf-8'
 
     attr_reader :template_helpers
 
@@ -159,6 +160,10 @@ module Deas::Server
       self.configuration.init_procs << block
     end
 
+    def error(&block)
+      self.configuration.error_procs << block
+    end
+
     def template_helpers(*helper_modules)
       helper_modules.each{ |m| self.configuration.template_helpers << m }
       self.configuration.template_helpers
@@ -168,14 +173,6 @@ module Deas::Server
       self.configuration.template_helpers.include?(helper_module)
     end
 
-    def error(&block)
-      self.configuration.error_procs << block
-    end
-
-    def logger(*args)
-      self.configuration.logger *args
-    end
-
     def use(*args)
       self.configuration.middlewares << args
     end
@@ -192,6 +189,14 @@ module Deas::Server
       self.configuration.verbose_logging *args
     end
 
+    def logger(*args)
+      self.configuration.logger *args
+    end
+
+    def default_charset(*args)
+      self.configuration.default_charset *args
+    end
+
     def get(path, handler_class_name)
       self.route(:get, path, handler_class_name)
     end

data/lib/deas/sinatra_app.rb

@@ -30,9 +30,10 @@ module Deas
         set :show_exceptions,  false
 
         # custom settings
-        set :deas_template_scope, server_config.template_scope
-        set :deas_error_procs,    server_config.error_procs
-        set :logger,              server_config.logger
+        set :deas_template_scope,  server_config.template_scope
+        set :deas_error_procs,     server_config.error_procs
+        set :deas_default_charset, server_config.default_charset
+        set :logger,               server_config.logger
 
         server_config.settings.each{ |set_args| set *set_args }
         server_config.middlewares.each{ |use_args| use *use_args }

data/lib/deas/sinatra_runner.rb

@@ -34,15 +34,37 @@ module Deas
       @sinatra_call.halt(*args)
     end
 
+    def redirect(*args)
+      @sinatra_call.redirect(*args)
+    end
+
+    def content_type(*args)
+      return @sinatra_call.content_type if args.empty?
+
+      opts, value = [
+        args.last.kind_of?(::Hash) ? args.pop : {},
+        args.first
+      ]
+      @sinatra_call.content_type(value, {
+        :charset => @sinatra_call.settings.deas_default_charset
+      }.merge(opts || {}))
+    end
+
+    def status(*args)
+      @sinatra_call.status(*args)
+    end
+
+    def headers(*args)
+      @sinatra_call.headers(*args)
+    end
+
     def render(template_name, options = nil, &block)
       options ||= {}
       options[:locals] = { :view => @handler }.merge(options[:locals] || {})
       options[:layout] ||= @handler_class.layouts
-      Deas::Template.new(@sinatra_call, template_name, options).render(&block)
-    end
 
-    def redirect(*args)
-      @sinatra_call.redirect(*args)
+      self.content_type(get_content_type(template_name)) if self.content_type.nil?
+      Deas::Template.new(@sinatra_call, template_name, options).render(&block)
     end
 
     private
@@ -51,5 +73,9 @@ module Deas
       callbacks.each{|proc| @handler.instance_eval(&proc) }
     end
 
+    def get_content_type(template_name)
+      File.extname(template_name)[1..-1] || 'html'
+    end
+
   end
 end

data/lib/deas/test_runner.rb

@@ -32,22 +32,38 @@ module Deas
       throw(:halt, args)
     end
 
-    def render(template_name, options = nil, &block)
-      RenderArgs.new(template_name, options, block)
-    end
-
     def redirect(path, *halt_args)
       RedirectArgs.new(path, halt_args)
     end
 
-    RenderArgs = Struct.new(:template_name, :options, :block)
-
     class RedirectArgs < Struct.new(:path, :halt_args)
-      def redirect?
-        true
-      end
+      def redirect?; true; end
+    end
+
+    def content_type(value, opts={})
+      ContentTypeArgs.new(value, opts)
+    end
+
+    ContentTypeArgs = Struct.new(:value, :opts)
+
+    def status(value)
+      StatusArgs.new(value)
     end
 
+    StatusArgs = Struct.new(:value)
+
+    def headers(value)
+      HeadersArgs.new(value)
+    end
+
+    HeadersArgs = Struct.new(:value)
+
+    def render(template_name, options = nil, &block)
+      RenderArgs.new(template_name, options, block)
+    end
+
+    RenderArgs = Struct.new(:template_name, :options, :block)
+
   end
 
 end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/lib/deas/view_handler.rb

@@ -47,8 +47,11 @@ module Deas
 
     # Helpers
 
-    def halt(*args);     @deas_runner.halt(*args);     end
-    def redirect(*args); @deas_runner.redirect(*args); end
+    def halt(*args);         @deas_runner.halt(*args);         end
+    def redirect(*args);     @deas_runner.redirect(*args);     end
+    def content_type(*args); @deas_runner.content_type(*args); end
+    def status(*args);       @deas_runner.status(*args);       end
+    def headers(*args);      @deas_runner.headers(*args);      end
 
     def render(*args, &block)
       @deas_runner.render(*args, &block)

data/test/support/{fake_app.rb → fake_sinatra_call.rb}

@@ -1,7 +1,7 @@
 require 'deas'
 require 'ostruct'
 
-class FakeApp
+class FakeSinatraCall
 
   # Mimic's the context that is accessible in a Sinatra' route. Should provide
   # any methods needed to replace using an actual Sinatra app.
@@ -14,7 +14,8 @@ class FakeApp
     @session  = @request.session
     @response = FakeResponse.new
     @settings = OpenStruct.new(settings.merge({
-      :deas_template_scope => Deas::Template::Scope
+      :deas_template_scope => Deas::Template::Scope,
+      :deas_default_charset => 'utf-8'
     }))
   end
 
@@ -22,6 +23,14 @@ class FakeApp
     throw :halt, args
   end
 
+  def redirect(*args)
+    halt 302, { 'Location' => args[0] }
+  end
+
+  def content_type(*args); args; end
+  def status(*args);       args; end
+  def headers(*args);      args; end
+
   # return the template name for each nested calls
   def erb(name, opts, &block)
     if block
@@ -31,10 +40,6 @@ class FakeApp
     end
   end
 
-  def redirect(*args)
-    halt 302, { 'Location' => args[0] }
-  end
-
 end
 
 class FakeRequest < Struct.new(:http_method, :path, :params, :session)

data/test/support/routes.rb

@@ -19,12 +19,18 @@ class DeasTestServer
     end
   end
 
-  get  '/show',            'ShowHandler'
-  get  '/halt',            'HaltHandler'
-  get  '/error',           'ErrorHandler'
-  get  '/redirect',        'RedirectHandler'
-  post '/session',         'SetSessionHandler'
-  get  '/session',         'UseSessionHandler'
+  get  '/show',              'ShowHandler'
+  get  '/show.html',         'ShowHtmlHandler'
+  get  '/show.json',         'ShowJsonHandler'
+  get  '/show-latin1-json',  'ShowLatinJsonHandler'
+  get  '/show-text',         'ShowTextHandler'
+  get  '/show-headers-text', 'ShowHeadersTextHandler'
+
+  get  '/halt',     'HaltHandler'
+  get  '/error',    'ErrorHandler'
+  get  '/redirect', 'RedirectHandler'
+  post '/session',  'SetSessionHandler'
+  get  '/session',  'UseSessionHandler'
 
   get  '/with_layout',           'WithLayoutHandler'
   get  '/alt_with_layout',       'AlternateWithLayoutHandler'
@@ -71,6 +77,50 @@ class ShowHandler
 
 end
 
+class ShowHtmlHandler
+  include Deas::ViewHandler
+
+  def run!; render 'show.html'; end
+
+end
+
+class ShowJsonHandler
+  include Deas::ViewHandler
+
+  def run!; render 'show.json'; end
+
+end
+
+class ShowLatinJsonHandler
+  include Deas::ViewHandler
+
+  def run!
+    content_type :json, :charset => 'latin1'
+    render 'show_json'
+  end
+
+end
+
+class ShowTextHandler
+  include Deas::ViewHandler
+
+  def run!
+    hdrs = {'Content-Type' => 'text/plain'}
+    halt 200, hdrs, render('show.json')
+  end
+
+end
+
+class ShowHeadersTextHandler
+  include Deas::ViewHandler
+
+  def run!
+    headers 'Content-Type' => 'text/plain'
+    render('show.json')
+  end
+
+end
+
 class HaltHandler
   include Deas::ViewHandler
 

data/test/support/view_handlers.rb

@@ -61,3 +61,32 @@ class HaltViewHandler
   end
 
 end
+
+class ContentTypeViewHandler
+  include Deas::ViewHandler
+
+  def run!
+    content_type 'text/plain', :charset => 'latin1'
+  end
+
+end
+
+class StatusViewHandler
+  include Deas::ViewHandler
+
+  def run!
+    status 422
+  end
+
+end
+
+class HeadersViewHandler
+  include Deas::ViewHandler
+
+  def run!
+    headers \
+      'other' => "other",
+      'a-header' => 'some value'
+  end
+
+end

data/test/system/rack_tests.rb

@@ -25,6 +25,26 @@ module Deas
       assert_equal expected_body, last_response.body
     end
 
+    should "set the content type appropriately" do
+      get '/show'
+      assert_equal 'text/html;charset=utf-8', last_response.headers['Content-Type']
+
+      get '/show.html'
+      assert_equal 'text/html;charset=utf-8', last_response.headers['Content-Type']
+
+      get '/show.json'
+      assert_equal 'application/json;charset=utf-8', last_response.headers['Content-Type']
+
+      get '/show-latin1-json'
+      assert_equal 'application/json;charset=latin1', last_response.headers['Content-Type']
+
+      get '/show-text'
+      assert_equal 'text/plain', last_response.headers['Content-Type']
+
+      get '/show-headers-text'
+      assert_equal 'text/plain', last_response.headers['Content-Type']
+    end
+
     should "allow halting with a custom response" do
       get '/halt', 'with' => 234
 

data/test/unit/error_handler_tests.rb

@@ -7,8 +7,8 @@ class Deas::ErrorHandler
     desc "Deas::ErrorHandler"
     setup do
       @exception = RuntimeError.new
-      @fake_app  = FakeApp.new
-      @error_handler = Deas::ErrorHandler.new(@exception, @fake_app, [])
+      @fake_sinatra_call  = FakeSinatraCall.new
+      @error_handler = Deas::ErrorHandler.new(@exception, @fake_sinatra_call, [])
     end
     subject{ @error_handler }
 
@@ -25,12 +25,12 @@ class Deas::ErrorHandler
         "my return value"
       end ]
 
-      @error_handler = Deas::ErrorHandler.new(@exception, @fake_app, @error_procs)
+      @error_handler = Deas::ErrorHandler.new(@exception, @fake_sinatra_call, @error_procs)
       @response = @error_handler.run
     end
 
     should "run the proc in the context of the app" do
-      assert_equal @exception, @fake_app.settings.exception_that_occurred
+      assert_equal @exception, @fake_sinatra_call.settings.exception_that_occurred
     end
 
     should "return whatever the proc returns" do
@@ -57,14 +57,14 @@ class Deas::ErrorHandler
         end
       ]
 
-      @error_handler = Deas::ErrorHandler.new(@exception, @fake_app, @error_procs)
+      @error_handler = Deas::ErrorHandler.new(@exception, @fake_sinatra_call, @error_procs)
       @response = @error_handler.run
     end
 
     should "run all the error procs" do
-      assert_equal true, @fake_app.settings.first_proc_run
-      assert_equal true, @fake_app.settings.second_proc_run
-      assert_equal true, @fake_app.settings.third_proc_run
+      assert_equal true, @fake_sinatra_call.settings.first_proc_run
+      assert_equal true, @fake_sinatra_call.settings.second_proc_run
+      assert_equal true, @fake_sinatra_call.settings.third_proc_run
     end
 
     should "return the last non-nil response" do
@@ -86,13 +86,13 @@ class Deas::ErrorHandler
         end
       ]
 
-      @error_handler = Deas::ErrorHandler.new(@exception, @fake_app, @error_procs)
+      @error_handler = Deas::ErrorHandler.new(@exception, @fake_sinatra_call, @error_procs)
       @response = catch(:halt){ @error_handler.run }
     end
 
     should "run error procs until one halts" do
-      assert_equal true, @fake_app.settings.first_proc_run
-      assert_nil @fake_app.settings.second_proc_run
+      assert_equal true, @fake_sinatra_call.settings.first_proc_run
+      assert_nil @fake_sinatra_call.settings.second_proc_run
     end
 
     should "return whatever was halted" do

data/test/unit/logging_tests.rb

@@ -1,5 +1,5 @@
 require 'assert'
-require 'test/support/fake_app'
+require 'test/support/fake_sinatra_call'
 require 'deas/logging'
 
 module Deas::Logging
@@ -7,7 +7,7 @@ module Deas::Logging
   class BaseTests < Assert::Context
     desc "Deas::Logging"
     setup do
-      @app = FakeApp.new
+      @app = FakeSinatraCall.new
     end
     subject{ Deas::Logging }
 

data/test/unit/route_tests.rb

@@ -1,7 +1,7 @@
 require 'assert'
 require 'deas/route'
 require 'deas/sinatra_runner'
-require 'test/support/fake_app'
+require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
 
 class Deas::Route

data/test/unit/runner_tests.rb

@@ -13,19 +13,32 @@ class Deas::Runner
 
     should have_reader  :app_settings
     should have_readers :request, :response, :params, :logger, :session
+    should have_imeths :halt, :redirect, :content_type, :status, :render
 
     should "raise NotImplementedError with #halt" do
       assert_raises(NotImplementedError){ subject.halt }
     end
 
-    should "raise NotImplementedError with #render" do
-      assert_raises(NotImplementedError){ subject.render }
-    end
-
     should "raise NotImplementedError with #redirect" do
       assert_raises(NotImplementedError){ subject.redirect }
     end
 
+    should "raise NotImplementedError with #content_type" do
+      assert_raises(NotImplementedError){ subject.content_type }
+    end
+
+    should "raise NotImplementedError with #status" do
+      assert_raises(NotImplementedError){ subject.status }
+    end
+
+    should "raise NotImplementedError with #headers" do
+      assert_raises(NotImplementedError){ subject.headers }
+    end
+
+    should "raise NotImplementedError with #render" do
+      assert_raises(NotImplementedError){ subject.render }
+    end
+
   end
 
 end

data/test/unit/server_configuration_tests.rb

@@ -22,7 +22,7 @@ class Deas::Server::Configuration
 
     # server handling options
     should have_imeths :error_procs, :init_procs, :logger, :middlewares, :settings
-    should have_imeths :verbose_logging, :routes, :view_handler_ns
+    should have_imeths :verbose_logging, :routes, :view_handler_ns, :default_charset
 
     should have_reader :template_helpers
     should have_imeths :valid?, :validate!
@@ -78,6 +78,10 @@ class Deas::Server::Configuration
       assert_nothing_raised{ config.root '/path/to/root'; config.validate! }
     end
 
+    should "use `utf-8` as the default_charset by default" do
+      assert_equal 'utf-8', subject.default_charset
+    end
+
   end
 
   class ValidationTests < BaseTests

data/test/unit/server_tests.rb

@@ -21,9 +21,10 @@ module Deas::Server
     should have_imeths :static_files, :reload_templates
 
     # DSL for server handling
-    should have_imeths :init, :template_helpers, :template_helper?, :error
-    should have_imeths :logger, :use, :set, :view_handler_ns, :verbose_logging
-    should have_imeths :get, :post, :put, :patch, :delete, :route
+    should have_imeths :init, :error, :template_helpers, :template_helper?
+    should have_imeths :use, :set, :view_handler_ns, :verbose_logging, :logger
+    should have_imeths :default_charset
+    should have_imeths :get, :post, :put, :patch, :delete, :redirect, :route
 
     should "allow setting it's configuration options" do
       config = subject.configuration
@@ -58,6 +59,18 @@ module Deas::Server
       subject.reload_templates true
       assert_equal true, config.reload_templates
 
+      assert_equal 0, config.init_procs.size
+      init_proc = proc{ }
+      subject.init(&init_proc)
+      assert_equal 1, config.init_procs.size
+      assert_equal init_proc, config.init_procs.first
+
+      assert_equal 0, config.error_procs.size
+      error_proc = proc{ }
+      subject.error(&error_proc)
+      assert_equal 1, config.error_procs.size
+      assert_equal error_proc, config.error_procs.first
+
       subject.use 'MyMiddleware'
       assert_equal [ ['MyMiddleware'] ], config.middlewares
 
@@ -68,11 +81,28 @@ module Deas::Server
       subject.logger stdout_logger
       assert_equal stdout_logger, config.logger
 
-      assert_equal 0, config.init_procs.size
-      init_proc = proc{ }
-      subject.init(&init_proc)
-      assert_equal 1, config.init_procs.size
-      assert_equal init_proc, config.init_procs.first
+      subject.default_charset 'latin1'
+      assert_equal 'latin1', config.default_charset
+    end
+
+    should "add and query helper modules" do
+      subject.template_helpers(helper_module = Module.new)
+      assert subject.template_helper?(helper_module)
+    end
+
+    should "set a namespace and use it when defining routes" do
+      subject.view_handler_ns 'MyStuff'
+      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
+
+      # 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
     end
 
     should "add a GET route using #get" do
@@ -146,27 +176,6 @@ module Deas::Server
       assert_equal 'GetInfo',   route.handler_class_name
     end
 
-    should "set a namespace with #view_handler_ns and " \
-           "use it when defining routes" do
-      subject.view_handler_ns 'MyStuff'
-      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
-
-      # 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
-    end
-
-    should "add and query helper modules" do
-      subject.template_helpers(helper_module = Module.new)
-      assert subject.template_helper?(helper_module)
-    end
-
   end
 
 end

data/test/unit/sinatra_runner_tests.rb

@@ -1,7 +1,7 @@
 require 'assert'
 require 'deas/sinatra_runner'
 require 'deas/template'
-require 'test/support/fake_app'
+require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
 
 class Deas::SinatraRunner
@@ -9,13 +9,13 @@ class Deas::SinatraRunner
   class BaseTests < Assert::Context
     desc "Deas::SinatraRunner"
     setup do
-      @fake_sinatra_call = FakeApp.new
+      @fake_sinatra_call = FakeSinatraCall.new
       @runner = Deas::SinatraRunner.new(FlagViewHandler, @fake_sinatra_call)
     end
     subject{ @runner }
 
-    should have_imeths :run, :request, :response, :params, :logger, :halt
-    should have_imeths :render, :session, :redirect
+    should have_imeths :run, :request, :response, :params, :logger, :session
+    should have_imeths :halt, :redirect, :content_type, :status, :render
 
     should "return the sinatra_call's request with #request" do
       assert_equal @fake_sinatra_call.request, subject.request
@@ -42,6 +42,33 @@ class Deas::SinatraRunner
       assert_equal [ 'test' ], return_value
     end
 
+    should "call the sinatra_call's redirect method with #redirect" do
+      return_value = catch(:halt){ subject.redirect('http://google.com') }
+      expected = [ 302, { 'Location' => 'http://google.com' } ]
+
+      assert_equal expected, return_value
+    end
+
+    should "call the sinatra_call's content_type method using the default_charset" do
+      expected = @fake_sinatra_call.content_type('text/plain', :charset => 'utf-8')
+      assert_equal expected, subject.content_type('text/plain')
+
+      expected = @fake_sinatra_call.content_type('text/plain', :charset => 'latin1')
+      assert_equal expected, subject.content_type('text/plain', :charset => 'latin1')
+    end
+
+    should "call the sinatra_call's status to set the response status" do
+      assert_equal [422], subject.status(422)
+    end
+
+    should "call the sinatra_call's status to set the response status" do
+      exp_headers = {
+        'a-header' => 'some value',
+        'other'    => 'other'
+      }
+      assert_equal [exp_headers], subject.headers(exp_headers)
+    end
+
     should "render the template with a :view local and the handler layouts with #render" do
       exp_handler = FlagViewHandler.new(subject)
       exp_layouts = FlagViewHandler.layouts
@@ -53,13 +80,6 @@ class Deas::SinatraRunner
       assert_equal exp_result, subject.render('index')
     end
 
-    should "call the sinatra_call's redirect method with #redirect" do
-      return_value = catch(:halt){ subject.redirect('http://google.com') }
-      expected = [ 302, { 'Location' => 'http://google.com' } ]
-
-      assert_equal expected, return_value
-    end
-
   end
 
   class RunTests < BaseTests

data/test/unit/template_tests.rb

@@ -1,13 +1,13 @@
 require 'assert'
 require 'deas/template'
-require 'test/support/fake_app'
+require 'test/support/fake_sinatra_call'
 
 class Deas::Template
 
   class BaseTests < Assert::Context
     desc "Deas::Template"
     setup do
-      @fake_sinatra_call = FakeApp.new
+      @fake_sinatra_call = FakeSinatraCall.new
       @template = Deas::Template.new(@fake_sinatra_call, 'users/index')
     end
     subject{ @template }
@@ -23,9 +23,9 @@ class Deas::Template
     end
 
     should "know a named template's render engine" do
-      fake_app = FakeApp.new(:views => TEST_SUPPORT_ROOT.join('views'))
+      fake_sinatra_call = FakeSinatraCall.new(:views => TEST_SUPPORT_ROOT.join('views'))
 
-      views_exist = Deas::Template.new(fake_app, 'whatever')
+      views_exist = Deas::Template.new(fake_sinatra_call, 'whatever')
       assert_equal 'erb',    views_exist.engine('layout1')
       assert_equal 'haml',   views_exist.engine('haml_layout1')
       assert_equal 'other',  views_exist.engine('some.html.file')
@@ -33,7 +33,7 @@ class Deas::Template
       assert_equal 'erb',    views_exist.engine('some_no_engine_extension')
       assert_equal 'erb',    views_exist.engine('does_not_exist')
 
-      views_no_exist = Deas::Template.new(fake_app, 'whatever', {
+      views_no_exist = Deas::Template.new(fake_sinatra_call, 'whatever', {
         :views => '/does/not/exist'
       })
       assert_equal 'erb', views_no_exist.engine('layout1')

data/test/unit/view_handler_tests.rb

@@ -173,4 +173,45 @@ module Deas::ViewHandler
 
   end
 
+  class ContentTypeTests < BaseTests
+    desc "content_type"
+
+    should "should set the response content_type/charset" do
+      runner = test_runner(ContentTypeViewHandler)
+      content_type_args = runner.run
+
+      assert_equal 'text/plain', content_type_args.value
+      assert_equal({:charset => 'latin1'}, content_type_args.opts)
+    end
+
+  end
+
+  class StatusTests < BaseTests
+    desc "status"
+
+    should "should set the response status" do
+      runner = test_runner(StatusViewHandler)
+      status_args = runner.run
+
+      assert_equal 422, status_args.value
+    end
+
+  end
+
+  class HeadersTests < BaseTests
+    desc "headers"
+
+    should "should set the response status" do
+      runner = test_runner(HeadersViewHandler)
+      headers_args = runner.run
+      exp_headers = {
+        'a-header' => 'some value',
+        'other'    => 'other'
+      }
+
+      assert_equal exp_headers, headers_args.value
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: 
   segments: 
   - 0
-  - 13
-  - 1
-  version: 0.13.1
+  - 14
+  - 0
+  version: 0.14.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -163,7 +163,7 @@ files:
 - lib/deas/view_handler.rb
 - log/.gitkeep
 - test/helper.rb
-- test/support/fake_app.rb
+- test/support/fake_sinatra_call.rb
 - test/support/routes.rb
 - test/support/view_handlers.rb
 - test/support/views/_info.erb
@@ -173,6 +173,9 @@ files:
 - test/support/views/layout2.erb
 - test/support/views/layout3.erb
 - test/support/views/show.erb
+- test/support/views/show.html.erb
+- test/support/views/show.json.erb
+- test/support/views/show_json.erb
 - test/support/views/some.html.file.other
 - test/support/views/some_file.engine
 - test/support/views/some_no_engine_extension
@@ -227,7 +230,7 @@ specification_version: 3
 summary: Handler-based web framework powered by Sinatra
 test_files: 
 - test/helper.rb
-- test/support/fake_app.rb
+- test/support/fake_sinatra_call.rb
 - test/support/routes.rb
 - test/support/view_handlers.rb
 - test/support/views/_info.erb
@@ -237,6 +240,9 @@ test_files:
 - test/support/views/layout2.erb
 - test/support/views/layout3.erb
 - test/support/views/show.erb
+- test/support/views/show.html.erb
+- test/support/views/show.json.erb
+- test/support/views/show_json.erb
 - test/support/views/some.html.file.other
 - test/support/views/some_file.engine
 - test/support/views/some_no_engine_extension