deas 0.36.0 → 0.37.0

data/test/unit/logging_tests.rb

@@ -1,14 +1,12 @@
 require 'assert'
 require 'deas/logging'
 
-require 'test/support/fake_sinatra_call'
-
 module Deas::Logging
 
   class UnitTests < Assert::Context
     desc "Deas::Logging"
     setup do
-      @app = FakeSinatraCall.new
+      @app = Factory.sinatra_call
     end
     subject{ Deas::Logging }
 

data/test/unit/route_tests.rb

@@ -3,7 +3,6 @@ require 'deas/route'
 
 require 'deas/exceptions'
 require 'deas/route_proxy'
-require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
 
 class Deas::Route
@@ -41,21 +40,22 @@ class Deas::Route
   class RunTests < UnitTests
     desc "when run"
     setup do
-      @fake_sinatra_call = FakeSinatraCall.new
+      @server_data       = Factory.server_data
+      @fake_sinatra_call = Factory.sinatra_call
     end
 
     should "run the proxy for the given request type name" do
-      Assert.stub(@fake_sinatra_call.settings.router, :request_type_name).with(
+      Assert.stub(@server_data.router, :request_type_name).with(
         @fake_sinatra_call.request
       ){ @req_type_name }
 
-      @route.run(@fake_sinatra_call)
+      @route.run(@server_data, @fake_sinatra_call)
       assert_true @proxy.run_called
     end
 
     should "halt 404 if it can't find a proxy for the given request type name" do
       halt_value = catch(:halt) do
-        @route.run(@fake_sinatra_call)
+        @route.run(@server_data, @fake_sinatra_call)
       end
       assert_equal [404], halt_value
     end
@@ -64,11 +64,12 @@ class Deas::Route
 
   class HandlerProxySpy
 
-    attr_reader :validate_called, :run_called, :sinatra_call
+    attr_reader :validate_called, :run_called, :server_data, :sinatra_call
 
     def initialize
       @run_called      = false
       @validate_called = false
+      @server_data     = nil
       @sinatra_call    = nil
     end
 
@@ -76,7 +77,8 @@ class Deas::Route
       @validate_called = true
     end
 
-    def run(sinatra_call)
+    def run(server_data, sinatra_call)
+      @server_data  = sinatra_call
       @sinatra_call = sinatra_call
       @run_called   = true
     end

data/test/unit/server_data_tests.rb

@@ -0,0 +1,43 @@
+require 'assert'
+require 'deas/server_data'
+
+class Deas::ServerData
+
+  class UnitTests < Assert::Context
+    desc "Deas::ServerData"
+    setup do
+      @error_procs     = Factory.integer(3).times.map{ proc{} }
+      @logger          = Factory.string
+      @router          = Factory.string
+      @template_source = Factory.string
+
+      @server_data = Deas::ServerData.new({
+        :error_procs     => @error_procs,
+        :logger          => @logger,
+        :router          => @router,
+        :template_source => @template_source
+      })
+    end
+    subject{ @server_data }
+
+    should have_readers :error_procs, :logger, :router, :template_source
+
+    should "know its attributes" do
+      assert_equal @error_procs,     subject.error_procs
+      assert_equal @logger,          subject.logger
+      assert_equal @router,          subject.router
+      assert_equal @template_source, subject.template_source
+    end
+
+    should "default its attributes when they aren't provided" do
+      server_data = Deas::ServerData.new
+
+      assert_equal [], server_data.error_procs
+      assert_nil server_data.logger
+      assert_nil server_data.router
+      assert_nil server_data.template_source
+    end
+
+  end
+
+end

data/test/unit/server_tests.rb

@@ -2,8 +2,11 @@ require 'assert'
 require 'deas/server'
 
 require 'logger'
+require 'deas/exceptions'
+require 'deas/logger'
 require 'deas/router'
 require 'deas/template_source'
+require 'test/support/view_handlers'
 
 module Deas::Server
 
@@ -114,4 +117,145 @@ module Deas::Server
 
   end
 
+  class ConfigurationTests < UnitTests
+    desc "Configuration"
+    setup do
+      @configuration = Configuration.new
+      @configuration.root = TEST_SUPPORT_ROOT
+    end
+    subject{ @configuration }
+
+    # sinatra-based options
+
+    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_encoding
+
+    # server handling options
+
+    should have_imeths :verbose_logging, :logger, :template_source
+
+    should have_accessors :settings, :init_procs, :error_procs, :template_helpers
+    should have_accessors :middlewares, :router
+    should have_imeths :valid?, :validate!, :urls, :routes
+    should have_imeths :to_hash
+
+    should "default the env to 'development'" do
+      assert_equal 'development', subject.env
+    end
+
+    should "default the public and views folders based off the root" do
+      assert_equal subject.root.join('public'), subject.public_root
+      assert_equal subject.root.join('views'), subject.views_root
+    end
+
+    should "default the Sinatra flags" do
+      assert_equal false, subject.dump_errors
+      assert_equal true,  subject.method_override
+      assert_equal false, subject.sessions
+      assert_equal false, subject.show_exceptions
+      assert_equal true,  subject.static_files
+      assert_equal false, subject.reload_templates
+    end
+
+    should "default the handling options" do
+      assert_equal true, subject.verbose_logging
+      assert_instance_of Deas::NullLogger, subject.logger
+      assert_instance_of Deas::NullTemplateSource, subject.template_source
+    end
+
+    should "default its stored configuration" do
+      assert_empty subject.settings
+      assert_empty subject.error_procs
+      assert_empty subject.init_procs
+      assert_empty subject.template_helpers
+      assert_empty subject.middlewares
+      assert_empty subject.routes
+      assert_empty subject.urls
+      assert_kind_of Deas::Router, subject.router
+    end
+
+    should "not be valid until validate! has been run" do
+      assert_not subject.valid?
+
+      subject.validate!
+      assert subject.valid?
+    end
+
+    should "complain if validating and `root` isn't set" do
+      config = Configuration.new
+      assert_raises(Deas::ServerRootError){ config.validate! }
+      assert_nothing_raised{ config.root '/path/to/root'; config.validate! }
+    end
+
+    should "use `utf-8` as the default encoding by default" do
+      assert_equal 'utf-8', subject.default_encoding
+    end
+
+    should "include its error procs and router in its `to_hash`" do
+      config_hash = subject.to_hash
+
+      assert_equal subject.error_procs, config_hash[:error_procs]
+      assert_equal subject.router,      config_hash[:router]
+    end
+
+  end
+
+  class ValidationTests < ConfigurationTests
+    desc "when successfully validated"
+    setup do
+      @initialized = false
+      @other_initialized = false
+      @router = Deas::Router.new
+      @route = @router.get('/something', 'EmptyViewHandler')
+      @proxy = @route.handler_proxies[@router.default_request_type_name]
+
+      @configuration = Configuration.new.tap do |c|
+        c.env              = 'staging'
+        c.root             = 'path/to/somewhere'
+        c.dump_errors      = true
+        c.method_override  = false
+        c.sessions         = false
+        c.show_exceptions  = true
+        c.static           = true
+        c.reload_templates = true
+        c.middlewares      = [ ['MyMiddleware'] ]
+        c.router           = @router
+      end
+      @configuration.init_procs << proc{ @initialized = true }
+      @configuration.init_procs << proc{ @other_initialized = true }
+    end
+
+    should "call init procs" do
+      assert_equal false, @initialized
+      assert_equal false, @other_initialized
+
+      subject.validate!
+
+      assert_equal true, @initialized
+      assert_equal true, @other_initialized
+    end
+
+    should "call validate! on all routes" do
+      assert_nil @proxy.handler_class
+
+      subject.validate!
+      assert_equal EmptyViewHandler, @proxy.handler_class
+    end
+
+    should "add the Logging and ShowExceptions middleware to the end" do
+      num_middlewares = subject.middlewares.size
+      assert subject.verbose_logging
+      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 [Deas::ShowExceptions], subject.middlewares[-2]
+      assert_equal [Deas::VerboseLogging], subject.middlewares[-1]
+    end
+
+  end
+
 end

data/test/unit/sinatra_app_tests.rb

@@ -7,6 +7,7 @@ require 'deas/route_proxy'
 require 'deas/route'
 require 'deas/router'
 require 'deas/server'
+require 'deas/server_data'
 require 'test/support/view_handlers'
 
 module Deas::SinatraApp
@@ -44,25 +45,30 @@ module Deas::SinatraApp
 
     should "have it's configuration set based on the server configuration" do
       subject.settings.tap do |settings|
-        assert_equal 'staging',                      settings.environment
-        assert_equal 'path/to/somewhere',            settings.root.to_s
-        assert_equal 'path/to/somewhere/public',     settings.public_folder.to_s
-        assert_equal 'path/to/somewhere/views',      settings.views.to_s
-        assert_equal true,                           settings.dump_errors
-        assert_equal false,                          settings.method_override
-        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
+        assert_equal 'staging',                  settings.environment
+        assert_equal 'path/to/somewhere',        settings.root.to_s
+        assert_equal 'path/to/somewhere/public', settings.public_folder.to_s
+        assert_equal 'path/to/somewhere/views',  settings.views.to_s
+        assert_equal true,                       settings.dump_errors
+        assert_equal false,                      settings.method_override
+        assert_equal false,                      settings.sessions
+        assert_equal true,                       settings.static
+        assert_equal true,                       settings.reload_templates
+        assert_equal 'latin1',                   settings.default_encoding
 
         # settings that are set but can't be changed
         assert_equal false, settings.logging
         assert_equal false, settings.raise_errors
         assert_equal false, settings.show_exceptions
 
+        exp = Deas::ServerData.new(@configuration.to_hash)
+        sd = settings.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", settings.add_charset
       end
     end

data/test/unit/sinatra_runner_tests.rb

@@ -2,7 +2,6 @@ require 'assert'
 require 'deas/sinatra_runner'
 
 require 'deas/deas_runner'
-require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
 
 class Deas::SinatraRunner
@@ -23,7 +22,7 @@ class Deas::SinatraRunner
   class InitTests < UnitTests
     desc "when init"
     setup do
-      @fake_sinatra_call = FakeSinatraCall.new
+      @fake_sinatra_call = Factory.sinatra_call
       @runner = @runner_class.new(DeasRunnerViewHandler, {
         :sinatra_call => @fake_sinatra_call
       })

metadata

@@ -1,101 +1,117 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: deas
-version: !ruby/object:Gem::Version
-  version: 0.36.0
+version: !ruby/object:Gem::Version 
+  hash: 139
+  prerelease: 
+  segments: 
+  - 0
+  - 37
+  - 0
+  version: 0.37.0
 platform: ruby
-authors:
+authors: 
 - Kelly Redding
 - Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ns-options
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+
+date: 2015-09-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 1
+        - 4
         version: 1.1.4
   type: :runtime
+  name: ns-options
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
   type: :runtime
+  name: rack
+  version_requirements: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
+  name: sinatra
+  version_requirements: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: assert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 15
+        version: "2.15"
   type: :development
+  name: assert
+  version_requirements: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
-- !ruby/object:Gem::Dependency
-  name: assert-rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  name: assert-rack-test
+  version_requirements: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Handler-based web framework powered by Sinatra
-email:
+email: 
 - kelly@kellyredding.com
 - collin.redding@me.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
+
+files: 
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,6 +131,7 @@ files:
 - lib/deas/router.rb
 - lib/deas/runner.rb
 - lib/deas/server.rb
+- lib/deas/server_data.rb
 - lib/deas/show_exceptions.rb
 - lib/deas/sinatra_app.rb
 - lib/deas/sinatra_runner.rb
@@ -148,7 +165,7 @@ files:
 - test/unit/route_tests.rb
 - test/unit/router_tests.rb
 - test/unit/runner_tests.rb
-- test/unit/server_configuration_tests.rb
+- test/unit/server_data_tests.rb
 - test/unit/server_tests.rb
 - test/unit/show_exceptions_tests.rb
 - test/unit/sinatra_app_tests.rb
@@ -161,30 +178,39 @@ files:
 - test/unit/view_handler_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/deas
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Handler-based web framework powered by Sinatra
-test_files:
+test_files: 
 - test/helper.rb
 - test/support/factory.rb
 - test/support/fake_sinatra_call.rb
@@ -207,7 +233,7 @@ test_files:
 - test/unit/route_tests.rb
 - test/unit/router_tests.rb
 - test/unit/runner_tests.rb
-- test/unit/server_configuration_tests.rb
+- test/unit/server_data_tests.rb
 - test/unit/server_tests.rb
 - test/unit/show_exceptions_tests.rb
 - test/unit/sinatra_app_tests.rb