deas 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adc507d7ca21b98b7f24b336b303ebe5800a5902
-  data.tar.gz: 85fc3d5b41048f51ce959d0b9fd0d630b28d477a
+  metadata.gz: cfa612b3fc472e3c8a14005ca567c2a20b901476
+  data.tar.gz: c6e19d87a4393a780da387f19a5698100ab80296
 SHA512:
-  metadata.gz: 800d1d86aef361ab9f194f74fb83ea4951c4e45ce639c8dccf46378c3eb7daea7442045c3bbdedd6f9e238146a2a130c8b4c2b1b0234cf5d40e886eccb37ea0d
-  data.tar.gz: 8a67207f27e0fb0e993207c7c5f4cc31c0d189086c66a5dbfc5c9aa0845d58cc5b7807caaf23f08386867c83160c649a4d75b664d1e99e26a44fb02f29600a7c
+  metadata.gz: 99c27beacb566a4f0361aadfd85c4d504c2bf11d0ed09112082f35ea115c37df3d69273da9482b27a9d0e50d6ef4eed1b2e3b1f8431eec5d50ffb053eb1e5622
+  data.tar.gz: 602b81f39fa49f1d92b244450248e7efc7515e06317c51b2ba951172ee9f67c29b4feb4ec7d14a30483bd0b5bfd6a68b03833848df85b6a5bbac7697fe65d409

data/lib/deas/server.rb

@@ -29,7 +29,7 @@ module Deas::Server
     option :show_exceptions,  NsOptions::Boolean, :default => false
     option :static_files,     NsOptions::Boolean, :default => true
     option :reload_templates, NsOptions::Boolean, :default => false
-    option :default_charset,  String,             :default => 'utf-8'
+    option :default_encoding, String,             :default => 'utf-8'
 
     # server handling options
 
@@ -190,8 +190,8 @@ module Deas::Server
       self.configuration.logger *args
     end
 
-    def default_charset(*args)
-      self.configuration.default_charset *args
+    def default_encoding(*args)
+      self.configuration.default_encoding *args
     end
 
     def template_source(*args)

data/lib/deas/sinatra_app.rb

@@ -21,6 +21,7 @@ module Deas
         set :sessions,         server_config.sessions
         set :static,           server_config.static_files
         set :reload_templates, server_config.reload_templates
+        set :default_encoding, server_config.default_encoding
         set :logging,          false
 
         # raise_errors and show_exceptions prevent Deas error handlers from
@@ -30,11 +31,16 @@ module Deas
         set :show_exceptions,  false
 
         # custom settings
-        set :deas_error_procs,     server_config.error_procs
-        set :deas_default_charset, server_config.default_charset
-        set :logger,               server_config.logger
-        set :router,               server_config.router
-        set :template_source,      server_config.template_source
+        set :deas_error_procs, server_config.error_procs
+        set :logger,           server_config.logger
+        set :router,           server_config.router
+        set :template_source,  server_config.template_source
+
+        # TODO: rework with `server_config.default_encoding` once we move off of using Sinatra
+        # TODO: could maybe move into a deas-json mixin once off of Sinatra
+        # Add charset to json content type responses - by default only added to these:
+        # ["application/javascript", "application/xml", "application/xhtml+xml", /^text\//]
+        settings.add_charset << "application/json"
 
         server_config.settings.each{ |set_args| set *set_args }
         server_config.middlewares.each{ |use_args| use *use_args }

data/lib/deas/sinatra_runner.rb

@@ -20,15 +20,7 @@ module Deas
     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 || {}))
+      @sinatra_call.content_type(*args)
     end
 
     def status(*args)
@@ -40,18 +32,23 @@ module Deas
     end
 
     def source_render(source, template_name, locals = nil)
-      self.content_type(get_content_type(template_name)) if self.content_type.nil?
+      if self.content_type.nil?
+        self.content_type(get_content_type_ext(template_name) || 'html')
+      end
       super
     end
 
-    def send_file(*args, &block)
-      @sinatra_call.send_file(*args, &block)
+    def send_file(file_path, opts = nil, &block)
+      if self.content_type.nil?
+        self.content_type(get_content_type_ext(file_path))
+      end
+      @sinatra_call.send_file(file_path, opts || {}, &block)
     end
 
     private
 
-    def get_content_type(template_name)
-      File.extname(template_name)[1..-1] || 'html'
+    def get_content_type_ext(file_path)
+      File.extname(file_path)[1..-1]
     end
 
   end

data/lib/deas/test_runner.rb

@@ -9,7 +9,7 @@ module Deas
 
   class TestRunner < Runner
 
-    attr_reader :return_value
+    attr_reader :response_value
 
     def initialize(handler_class, args = nil)
       if !handler_class.include?(Deas::ViewHandler)
@@ -29,11 +29,18 @@ module Deas
       })
       args.each{|key, value| self.handler.send("#{key}=", value) }
 
-      @return_value = catch(:halt){ self.handler.init; nil }
+      @response_value = catch(:halt){ self.handler.init; nil }
+    end
+
+    # TODO: remove eventually
+    def return_value
+      warn "calling `return_value` on a test runner is deprecated - " \
+           "switch to `response_value` instead"
+      self.response_value
     end
 
     def run
-      @return_value ||= catch(:halt){ self.handler.run }
+      @response_value ||= catch(:halt){ self.handler.run }
     end
 
     # Helpers
@@ -60,18 +67,27 @@ module Deas
       def redirect?; true; end
     end
 
-    def content_type(value, opts={})
-      ContentTypeArgs.new(value, opts)
+    def content_type(*args)
+      return @content_type if args.empty?
+      opts, value = [
+        args.last.kind_of?(Hash) ? args.pop : {},
+        args.last
+      ]
+      @content_type = ContentTypeArgs.new(value, opts)
     end
     ContentTypeArgs = Struct.new(:value, :opts)
 
-    def status(value)
-      StatusArgs.new(value)
+    def status(*args)
+      return @status if args.empty?
+      value = args.last
+      @status = StatusArgs.new(value)
     end
     StatusArgs = Struct.new(:value)
 
-    def headers(value)
-      HeadersArgs.new(value)
+    def headers(*args)
+      return @headers if args.empty?
+      value = args.last
+      @headers = HeadersArgs.new(value)
     end
     HeadersArgs = Struct.new(:value)
 

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.33.0"
+  VERSION = "0.34.0"
 end

data/test/support/fake_sinatra_call.rb

@@ -20,8 +20,11 @@ class FakeSinatraCall
     @router          = Deas::Router.new
     @template_source = Deas::NullTemplateSource.new
 
+    @content_type = nil
+    @status       = 200
+    @headers      = {}
+
     @settings = OpenStruct.new({
-      :deas_default_charset => 'utf-8',
       :logger => @logger,
       :router => @router,
       :template_source => @template_source
@@ -36,9 +39,25 @@ class FakeSinatraCall
     halt 302, { 'Location' => args[0] }
   end
 
-  def content_type(*args); args; end
-  def status(*args);       args; end
-  def headers(*args);      args; end
+  def content_type(*args)
+    return @content_type if args.empty?
+    opts, value = [
+      args.last.kind_of?(Hash) ? args.pop : {},
+      args.last
+    ]
+    opts_value = opts.keys.map{ |k| "#{k}=#{opts[k]}" }.join(';')
+    @content_type = [value, opts_value].reject{ |v| v.to_s.empty? }.join(';')
+  end
+
+  def status(*args)
+    return @status if args.empty?
+    @status = args.last
+  end
+
+  def headers(*args)
+    return @headers if args.empty?
+    @headers = args.last
+  end
 
   def send_file(file_path, opts, &block)
     if block

data/test/unit/deas_runner_tests.rb

@@ -48,7 +48,7 @@ class Deas::DeasRunner
   class RunTests < InitTests
     desc "and run"
     setup do
-      @return_value = @runner.run
+      @response_value = @runner.run
       @handler = @runner.instance_variable_get("@handler")
     end
     subject{ @handler }
@@ -63,8 +63,8 @@ class Deas::DeasRunner
       assert_equal true, subject.run_bang_called
     end
 
-    should "return the handler's run! return value" do
-      assert_equal true, @return_value
+    should "use the handler's run! return value as its response value" do
+      assert_equal true, @response_value
     end
 
   end

data/test/unit/server_configuration_tests.rb

@@ -21,7 +21,7 @@ class Deas::Server::Configuration
 
     should have_imeths :env, :root, :public_root, :views_root
     should have_imeths :dump_errors, :method_override, :sessions, :show_exceptions
-    should have_imeths :static_files, :reload_templates, :default_charset
+    should have_imeths :static_files, :reload_templates, :default_encoding
 
     # server handling options
 
@@ -79,8 +79,8 @@ 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
+    should "use `utf-8` as the default encoding by default" do
+      assert_equal 'utf-8', subject.default_encoding
     end
 
   end

data/test/unit/server_tests.rb

@@ -23,7 +23,7 @@ module Deas::Server
 
     # DSL for server handling settings
     should have_imeths :init, :error, :template_helpers, :template_helper?
-    should have_imeths :use, :set, :verbose_logging, :logger, :default_charset
+    should have_imeths :use, :set, :verbose_logging, :logger, :default_encoding
     should have_imeths :template_source
 
     # DSL for server routing settings
@@ -93,8 +93,8 @@ module Deas::Server
       subject.template_source a_source
       assert_equal a_source, config.template_source
 
-      subject.default_charset 'latin1'
-      assert_equal 'latin1', config.default_charset
+      subject.default_encoding 'latin1'
+      assert_equal 'latin1', config.default_encoding
     end
 
     should "add and query helper modules" do

data/test/unit/sinatra_app_tests.rb

@@ -27,6 +27,7 @@ module Deas::SinatraApp
         c.show_exceptions  = true
         c.static           = true
         c.reload_templates = true
+        c.default_encoding = 'latin1'
         c.router           = @router
       end
       @sinatra_app = Deas::SinatraApp.new(@configuration)
@@ -52,6 +53,7 @@ module Deas::SinatraApp
         assert_equal false,                          settings.sessions
         assert_equal true,                           settings.static
         assert_equal true,                           settings.reload_templates
+        assert_equal 'latin1',                       settings.default_encoding
         assert_instance_of Deas::NullLogger,         settings.logger
         assert_instance_of Deas::Router,             settings.router
         assert_instance_of Deas::NullTemplateSource, settings.template_source
@@ -60,6 +62,8 @@ module Deas::SinatraApp
         assert_equal false, settings.logging
         assert_equal false, settings.raise_errors
         assert_equal false, settings.show_exceptions
+
+        assert_includes "application/json", settings.add_charset
       end
     end
 

data/test/unit/sinatra_runner_tests.rb

@@ -33,27 +33,27 @@ class Deas::SinatraRunner
     should have_imeths :run
 
     should "call the sinatra_call's halt with" do
-      return_value = catch(:halt){ subject.halt('test') }
-      assert_equal [ 'test' ], return_value
+      response_value = catch(:halt){ subject.halt('test') }
+      assert_equal [ 'test' ], response_value
     end
 
     should "call the sinatra_call's redirect method with" do
-      return_value = catch(:halt){ subject.redirect('http://google.com') }
-      expected = [ 302, { 'Location' => 'http://google.com' } ]
+      response_value = catch(:halt){ subject.redirect('http://google.com') }
+      exp = [ 302, { 'Location' => 'http://google.com' } ]
 
-      assert_equal expected, return_value
+      assert_equal exp, response_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')
+    should "call the sinatra_call's content_type to set the response content type" do
+      args = ['txt', { :charset => 'latin1' }]
+      exp = @fake_sinatra_call.content_type(*args)
+      subject.content_type(*args)
+      assert_equal exp, subject.content_type
     end
 
     should "call the sinatra_call's status to set the response status" do
-      assert_equal [422], subject.status(422)
+      subject.status(422)
+      assert_equal 422, subject.status
     end
 
     should "call the sinatra_call's headers to set the response headers" do
@@ -61,15 +61,18 @@ class Deas::SinatraRunner
         'a-header' => 'some value',
         'other'    => 'other'
       }
-      assert_equal [exp_headers], subject.headers(exp_headers)
+      subject.headers(exp_headers)
+      assert_equal exp_headers, subject.headers
     end
 
     should "call the sinatra_call's send_file to set the send files" do
       block_called = false
-      args = subject.send_file('a/file', {:some => 'opts'}, &proc{ block_called = true })
-      assert_equal 'a/file', args.file_path
+      args = subject.send_file('a/file.txt', {:some => 'opts'}, &proc{ block_called = true })
+      assert_equal 'a/file.txt', args.file_path
       assert_equal({:some => 'opts'}, args.options)
       assert_true block_called
+
+      assert_equal 'txt', subject.content_type
     end
 
   end

data/test/unit/test_runner_tests.rb

@@ -44,8 +44,9 @@ class Deas::TestRunner
     end
     subject{ @runner }
 
-    should have_readers :return_value
+    should have_readers :response_value
     should have_imeths :run
+    should have_imeths :return_value # TODO: deprecated
 
     should "raise an invalid error when not passed a view handler" do
       assert_raises(Deas::InvalidServiceHandlerError) do
@@ -81,14 +82,21 @@ class Deas::TestRunner
       assert_true subject.handler.init_called
     end
 
-    should "not set a return value on initialize" do
-      assert_nil subject.return_value
+    should "not set a response value on initialize" do
+      assert_nil subject.response_value
     end
 
-    should "set its return value to the return value of `run!` on run" do
-      assert_nil subject.return_value
+    should "set its response value to the return value of `run!` on run" do
+      assert_nil subject.response_value
       subject.run
-      assert_equal subject.handler.run!, subject.return_value
+      assert_equal subject.handler.run!, subject.response_value
+    end
+
+    # TODO: deprecated
+    should "alias its response value at `return_value`" do
+      assert_equal subject.response_value, subject.return_value
+      subject.run
+      assert_equal subject.response_value, subject.return_value
     end
 
     should "build halt args if halt is called" do
@@ -116,6 +124,8 @@ class Deas::TestRunner
         assert_respond_to meth, value
       end
       assert_equal 'something', value.value
+
+      assert_same value, subject.content_type
     end
 
     should "build status args if status is called" do
@@ -123,6 +133,8 @@ class Deas::TestRunner
       assert_kind_of StatusArgs, value
       assert_respond_to :value, value
       assert_equal 432, value.value
+
+      assert_same value, subject.status
     end
 
     should "build headers args if headers is called" do
@@ -131,6 +143,8 @@ class Deas::TestRunner
       assert_respond_to :value, value
       exp_val = {:some => 'thing'}
       assert_equal exp_val, value.value
+
+      assert_same value, subject.headers
     end
 
     should "build send file args if send file is called" do

data/test/unit/view_handler_tests.rb

@@ -225,9 +225,9 @@ module Deas::ViewHandler
       })
       runner.run
 
-      assert_equal 200,                                runner.return_value.status
-      assert_equal({ 'Content-Type' => 'text/plain' }, runner.return_value.headers)
-      assert_equal 'test halting',                     runner.return_value.body
+      assert_equal 200,                                runner.response_value.status
+      assert_equal({ 'Content-Type' => 'text/plain' }, runner.response_value.headers)
+      assert_equal 'test halting',                     runner.response_value.body
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deas
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ns-options