deas 0.42.0 → 0.43.0

data/test/unit/server_data_tests.rb

@@ -30,7 +30,7 @@ class Deas::ServerData
     end
 
     should "default its attributes when they aren't provided" do
-      server_data = Deas::ServerData.new
+      server_data = Deas::ServerData.new({})
 
       assert_equal [], server_data.error_procs
       assert_nil server_data.logger
@@ -38,6 +38,19 @@ class Deas::ServerData
       assert_nil server_data.template_source
     end
 
+    should "know if it is equal to another server data" do
+      server_data = Deas::ServerData.new({
+        :error_procs     => @error_procs,
+        :logger          => @logger,
+        :router          => @router,
+        :template_source => @template_source
+      })
+      assert_equal server_data, subject
+
+      server_data = Deas::ServerData.new({})
+      assert_not_equal server_data, subject
+    end
+
   end
 
 end

data/test/unit/server_tests.rb

@@ -20,16 +20,12 @@ module Deas::Server
 
     should have_imeths :new, :config
 
-    should have_imeths :env, :root, :views_path, :views_root
-    should have_imeths :public_path, :public_root, :default_encoding
-    should have_imeths :set, :settings, :template_helpers, :template_helper?
-    should have_imeths :use, :middlewares, :init, :init_procs, :error, :error_procs
+    should have_imeths :env, :root
+    should have_imeths :method_override, :show_exceptions, :verbose_logging
+    should have_imeths :use, :middlewares
+    should have_imeths :init, :init_procs, :error, :error_procs
     should have_imeths :template_source, :logger, :router, :url_for
 
-    should have_imeths :dump_errors, :method_override, :reload_templates
-    should have_imeths :sessions, :show_exceptions, :static_files
-    should have_imeths :verbose_logging
-
     should "use much-plugin" do
       assert_includes MuchPlugin, Deas::Server
     end
@@ -45,21 +41,17 @@ module Deas::Server
       subject.root exp
       assert_equal exp, config.root
 
-      exp = Factory.path
-      subject.views_path exp
-      assert_equal exp, config.views_path
-
-      exp = Factory.path
-      subject.public_path exp
-      assert_equal exp, config.public_path
+      exp = Factory.boolean
+      subject.method_override exp
+      assert_equal exp, config.method_override
 
-      exp = Factory.string
-      subject.default_encoding exp
-      assert_equal exp, config.default_encoding
+      exp = Factory.boolean
+      subject.show_exceptions exp
+      assert_equal exp, config.show_exceptions
 
-      exp = { Factory.string.to_sym => Factory.string }
-      subject.set exp.keys.first, exp.values.first
-      assert_equal exp, config.settings
+      exp = Factory.boolean
+      subject.verbose_logging exp
+      assert_equal exp, config.verbose_logging
 
       exp = ['MyMiddleware', Factory.string]
       subject.use *exp
@@ -84,50 +76,14 @@ module Deas::Server
       exp = Logger.new(STDOUT)
       subject.logger exp
       assert_equal exp, config.logger
-
-      exp = Factory.boolean
-      subject.dump_errors exp
-      assert_equal exp, config.dump_errors
-
-      exp = Factory.boolean
-      subject.method_override exp
-      assert_equal exp, config.method_override
-
-      exp = Factory.boolean
-      subject.reload_templates exp
-      assert_equal exp, config.reload_templates
-
-      exp = Factory.boolean
-      subject.sessions exp
-      assert_equal exp, config.sessions
-
-      exp = Factory.boolean
-      subject.show_exceptions exp
-      assert_equal exp, config.show_exceptions
-
-      exp = Factory.boolean
-      subject.static_files exp
-      assert_equal exp, config.static_files
-
-      exp = Factory.boolean
-      subject.verbose_logging exp
-      assert_equal exp, config.verbose_logging
     end
 
-    should "demeter its config values that aren't directly set" do
-      assert_equal subject.config.views_root,  subject.views_root
-      assert_equal subject.config.public_root, subject.public_root
-      assert_equal subject.config.settings,    subject.settings
+    should "demeter its config values that aren't set directly" do
       assert_equal subject.config.middlewares, subject.middlewares
       assert_equal subject.config.init_procs,  subject.init_procs
       assert_equal subject.config.error_procs, subject.error_procs
     end
 
-    should "add and query helper modules" do
-      subject.template_helpers(helper_module = Module.new)
-      assert_true subject.template_helper?(helper_module)
-    end
-
     should "have a router by default and allow overriding it" do
       assert_kind_of Deas::Router, subject.router
 
@@ -168,22 +124,16 @@ module Deas::Server
     end
     subject{ @config }
 
-    should have_accessors :env, :root, :views_path, :public_path, :default_encoding
-    should have_accessors :settings, :template_helpers, :middlewares
-    should have_accessors :init_procs, :error_procs, :template_source, :logger, :router
+    should have_accessors :env, :root
+    should have_accessors :method_override, :show_exceptions, :verbose_logging
+    should have_accessors :middlewares, :init_procs, :error_procs
+    should have_accessors :template_source, :logger, :router
 
-    should have_accessors :dump_errors, :method_override, :reload_templates
-    should have_accessors :sessions, :show_exceptions, :static_files
-    should have_accessors :verbose_logging
-
-    should have_imeths :views_root, :public_root, :urls, :routes
+    should have_imeths :urls, :routes
     should have_imeths :valid?, :validate!
 
-    should "know its default attr values" do
+    should "know its default env" do
       assert_equal 'development', @config_class::DEFAULT_ENV
-      assert_equal 'views',       @config_class::DEFAULT_VIEWS_PATH
-      assert_equal 'public',      @config_class::DEFAULT_PUBLIC_PATH
-      assert_equal 'utf-8',       @config_class::DEFAULT_ENCODING
     end
 
     should "default its attrs" do
@@ -193,42 +143,19 @@ module Deas::Server
       exp = ENV['PWD']
       assert_equal exp, subject.root
 
-      exp = @config_class::DEFAULT_VIEWS_PATH
-      assert_equal exp, subject.views_path
-
-      exp = @config_class::DEFAULT_PUBLIC_PATH
-      assert_equal exp, subject.public_path
-
-      exp = @config_class::DEFAULT_ENCODING
-      assert_equal exp, subject.default_encoding
+      assert_equal true,  subject.method_override
+      assert_equal false, subject.show_exceptions
+      assert_equal true,  subject.verbose_logging
 
-      assert_equal Hash.new, subject.settings
-      assert_equal [],       subject.template_helpers
-      assert_equal [],       subject.middlewares
-      assert_equal [],       subject.init_procs
-      assert_equal [],       subject.error_procs
+      assert_equal [], subject.middlewares
+      assert_equal [], subject.init_procs
+      assert_equal [], subject.error_procs
 
       assert_instance_of Deas::NullTemplateSource, subject.template_source
       assert_equal subject.root, subject.template_source.path
 
       assert_instance_of Deas::NullLogger, subject.logger
       assert_instance_of Deas::Router,     subject.router
-
-      assert_equal false, subject.dump_errors
-      assert_equal true,  subject.method_override
-      assert_equal false, subject.reload_templates
-      assert_equal false, subject.sessions
-      assert_equal false, subject.show_exceptions
-      assert_equal true,  subject.static_files
-      assert_equal true,  subject.verbose_logging
-    end
-
-    should "know its views root and public root" do
-      exp = File.expand_path(subject.views_path.to_s, subject.root.to_s)
-      assert_equal exp, subject.views_root
-
-      exp = File.expand_path(subject.public_path.to_s, subject.root.to_s)
-      assert_equal exp, subject.public_root
     end
 
     should "demeter its router" do
@@ -259,11 +186,12 @@ module Deas::Server
       Assert.stub(@router, :validate!){ @router_validate_called = true }
 
       @config = Config.new.tap do |c|
-        c.root             = Factory.path
-        c.show_exceptions  = true
-        c.verbose_logging  = true
-        c.middlewares      = Factory.integer(3).times.map{ [Factory.string] }
-        c.router           = @router
+        c.root            = Factory.path
+        c.method_override = true
+        c.show_exceptions = true
+        c.verbose_logging = true
+        c.middlewares     = Factory.integer(3).times.map{ [Factory.string] }
+        c.router          = @router
       end
 
       @initialized = false
@@ -290,19 +218,26 @@ module Deas::Server
       assert_true @router_validate_called
     end
 
-    should "add the Logging and ShowExceptions middleware to the end" do
+    should "prepend and append middleware based" do
+      assert_true subject.method_override
       assert_true subject.show_exceptions
       assert_true subject.verbose_logging
 
       num_middlewares = subject.middlewares.size
+      assert_not_equal [Rack::MethodOverride], subject.middlewares[0]
       assert_not_equal [Deas::ShowExceptions], subject.middlewares[-2]
       assert_not_equal [Deas::VerboseLogging], subject.middlewares[-1]
 
       subject.validate!
 
-      assert_equal (num_middlewares+2), subject.middlewares.size
+      assert_equal (num_middlewares+3), subject.middlewares.size
+      assert_equal [Rack::MethodOverride], subject.middlewares[0]
       assert_equal [Deas::ShowExceptions], subject.middlewares[-2]
       assert_equal [Deas::VerboseLogging], subject.middlewares[-1]
+
+      assert_raises do
+        subject.middlewares << [Factory.string]
+      end
     end
 
     should "only be able to be validated once" do

data/test/unit/sinatra_app_tests.rb

@@ -14,6 +14,23 @@ module Deas::SinatraApp
 
   class UnitTests < Assert::Context
     desc "Deas::SinatraApp"
+    subject{ Deas::SinatraApp }
+
+    should have_imeths :new
+
+    should "know its default error response status" do
+      assert_equal 500, subject::DEFAULT_ERROR_RESPONSE_STATUS
+    end
+
+    should "know its standard error classes" do
+      exp = [StandardError, LoadError, NotImplementedError, Timeout::Error]
+      assert_equal exp, subject::STANDARD_ERROR_CLASSES
+    end
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
     setup do
       @router = Deas::Router.new
       @router.get('/something', 'EmptyViewHandler')
@@ -30,27 +47,15 @@ module Deas::SinatraApp
       assert @config.valid?
     end
 
-    should "be a kind of Sinatra::Base" do
+    should "be a kind of Sinatra::Base app" do
       assert_equal Sinatra::Base, subject.superclass
     end
 
-    should "have it's configuration set based on the server config" do
+    should "have it's configuration set based on the server config or defaults" do
       s = subject.settings
 
-      assert_equal @config.env,              s.environment
-      assert_equal @config.root,             s.root
-      assert_equal @config.views_root,       s.views
-      assert_equal @config.public_root,      s.public_folder
-      assert_equal @config.default_encoding, s.default_encoding
-      assert_equal @config.dump_errors,      s.dump_errors
-      assert_equal @config.method_override,  s.method_override
-      assert_equal @config.reload_templates, s.reload_templates
-      assert_equal @config.sessions,         s.sessions
-      assert_equal @config.static_files,     s.static
-
-      assert_equal false, s.raise_errors
-      assert_equal false, s.show_exceptions
-      assert_equal false, s.logging
+      assert_equal @config.env,  s.environment
+      assert_equal @config.root, s.root
 
       exp = Deas::ServerData.new({
         :error_procs     => @config.error_procs,
@@ -58,14 +63,21 @@ module Deas::SinatraApp
         :router          => @config.router,
         :template_source => @config.template_source
       })
-      sd = s.deas_server_data
-      assert_instance_of Deas::ServerData, sd
-      assert_instance_of exp.template_source.class, sd.template_source
-      assert_instance_of exp.logger.class, sd.logger
-      assert_equal exp.error_procs, sd.error_procs
-      assert_equal exp.router,      sd.router
-
-      assert_includes "application/json", s.add_charset
+      assert_equal exp, s.deas_server_data
+
+      assert_equal @config.root, s.views
+      assert_equal @config.root, s.public_folder
+      assert_equal 'utf-8',      s.default_encoding
+
+      assert_false s.method_override
+      assert_false s.reload_templates
+      assert_false s.static
+      assert_false s.sessions
+      assert_false s.protection
+      assert_false s.raise_errors
+      assert_false s.show_exceptions
+      assert_false s.dump_errors
+      assert_false s.logging
     end
 
     should "define Sinatra routes for every route in the configuration" do
@@ -75,6 +87,8 @@ module Deas::SinatraApp
       assert_not_nil sinatra_routes.detect{ |r| r[0].match(router_route.path) }
     end
 
+    # System tests ensure that routes get applied to the sinatra app correctly.
+
   end
 
 end

data/test/unit/test_runner_tests.rb

@@ -33,8 +33,8 @@ class Deas::TestRunner
         :router          => Factory.string,
         :template_source => Factory.string,
         :request         => @request,
-        :session         => Factory.string,
         :params          => @params,
+        :route_path      => Factory.string,
         :splat           => Factory.path,
         :custom_value    => Factory.integer
       }
@@ -49,7 +49,7 @@ class Deas::TestRunner
     subject{ @runner }
 
     should have_readers :content_type_args
-    should have_imeths :halted?, :run
+    should have_imeths :splat, :halted?, :run
 
     should "raise an invalid error when passed a non view handler" do
       assert_raises(Deas::InvalidViewHandlerError) do
@@ -62,9 +62,12 @@ class Deas::TestRunner
       assert_equal @args[:router],          subject.router
       assert_equal @args[:template_source], subject.template_source
       assert_equal @args[:request],         subject.request
-      assert_equal @args[:session],         subject.session
       assert_equal @args[:params],          subject.params
-      assert_equal @args[:splat],           subject.splat
+      assert_equal @args[:route_path],      subject.route_path
+    end
+
+    should "know its splat value" do
+      assert_equal @args[:splat], subject.splat
     end
 
     should "call to normalize its params" do

data/test/unit/url_tests.rb

@@ -87,6 +87,17 @@ class Deas::Url
       })
     end
 
+    should "apply composed named params" do
+      url = Deas::Url.new(:some_thing, '/:some/:something/:something_else')
+
+      exp_path = '/a/goose/cooked'
+      assert_equal exp_path, url.path_for({
+        'some'           => 'a',
+        :something       => 'goose',
+        'something_else' => 'cooked'
+      })
+    end
+
     should "complain if given an empty named param value" do
       params = {
         'some' => 'a',
@@ -99,8 +110,8 @@ class Deas::Url
       err = assert_raises EmptyNamedValueError do
         subject.path_for(params)
       end
-      exp = "an empty value (`#{empty_param_value.inspect}`) "\
-            "was given for the `#{empty_param_name}` url param"
+      exp = "an empty value, `#{empty_param_value.inspect}`, "\
+            "was given for the `#{empty_param_name.inspect}` url param"
       assert_equal exp, err.message
     end
 

data/test/unit/view_handler_tests.rb

@@ -232,11 +232,6 @@ module Deas::ViewHandler
       assert_equal @runner.request, subject.instance_eval{ request }
     end
 
-    should "call to the runner for its session" do
-      stub_runner_with_something_for(:session)
-      assert_equal @runner.session, subject.instance_eval{ session }
-    end
-
     should "call to the runner for its params" do
       stub_runner_with_something_for(:params)
       assert_equal @runner.params, subject.instance_eval{ params }
@@ -391,8 +386,7 @@ module Deas::ViewHandler
       runner  = subject.test_runner(@handler_class)
 
       assert_kind_of ::Deas::TestRunner, runner
-      assert_kind_of Rack::Request,  runner.request
-      assert_equal runner.request.session, runner.session
+      assert_kind_of ::Rack::Request,    runner.request
     end
 
     should "return an initialized handler instance" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-09-01 00:00:00 Z
+date: 2016-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -49,7 +49,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.1"
+        version: 1.6.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - lib/deas/logging.rb
 - lib/deas/rack_request_fix.rb
 - lib/deas/redirect_proxy.rb
+- lib/deas/request_data.rb
 - lib/deas/respond_with_proxy.rb
 - lib/deas/route.rb
 - lib/deas/route_proxy.rb
@@ -107,6 +108,7 @@ files:
 - test/support/empty_view_handler.rb
 - test/support/factory.rb
 - test/support/fake_request.rb
+- test/support/fake_response.rb
 - test/support/fake_sinatra_call.rb
 - test/support/file1.txt
 - test/support/file2.txt
@@ -130,6 +132,7 @@ files:
 - test/unit/handler_proxy_tests.rb
 - test/unit/logging_tests.rb
 - test/unit/redirect_proxy_tests.rb
+- test/unit/request_data_tests.rb
 - test/unit/respond_with_proxy_tests.rb
 - test/unit/route_proxy_tests.rb
 - test/unit/route_tests.rb
@@ -176,6 +179,7 @@ test_files:
 - test/support/empty_view_handler.rb
 - test/support/factory.rb
 - test/support/fake_request.rb
+- test/support/fake_response.rb
 - test/support/fake_sinatra_call.rb
 - test/support/file1.txt
 - test/support/file2.txt
@@ -199,6 +203,7 @@ test_files:
 - test/unit/handler_proxy_tests.rb
 - test/unit/logging_tests.rb
 - test/unit/redirect_proxy_tests.rb
+- test/unit/request_data_tests.rb
 - test/unit/respond_with_proxy_tests.rb
 - test/unit/route_proxy_tests.rb
 - test/unit/route_tests.rb