deas 0.40.0 → 0.41.0

data/test/unit/sinatra_app_tests.rb

@@ -19,58 +19,53 @@ module Deas::SinatraApp
       @router.get('/something', 'EmptyViewHandler')
       @router.validate!
 
-      @configuration = Deas::Server::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.default_encoding = 'latin1'
-        c.router           = @router
-      end
-      @sinatra_app = Deas::SinatraApp.new(@configuration)
+      @config = Deas::Server::Config.new
+      @config.router = @router
+
+      @sinatra_app = Deas::SinatraApp.new(@config)
     end
     subject{ @sinatra_app }
 
     should "ensure its config is valid" do
-      assert @configuration.valid?
+      assert @config.valid?
     end
 
     should "be a kind of Sinatra::Base" do
       assert_equal Sinatra::Base, subject.superclass
     end
 
-    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
-
-        # 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
+    should "have it's configuration set based on the server config" 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
+
+      exp = Deas::ServerData.new({
+        :error_procs     => @config.error_procs,
+        :logger          => @config.logger,
+        :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
     end
 
     should "define Sinatra routes for every route in the configuration" do

data/test/unit/template_engine_tests.rb

@@ -86,13 +86,13 @@ class Deas::TemplateEngine
     end
 
     should "read and return the given path in its source path on `render`" do
-      template = ['test/support/template.a', 'test/support/template.a.json'].choice
+      template = ['test/support/template.a', 'test/support/template.a.json'].sample
       exp = File.read(Dir.glob(subject.source_path.join("#{template}*")).first)
       assert_equal exp, subject.render(template, @v, @l)
     end
 
     should "call `render` to implement its `partial` method" do
-      template = ['test/support/template.a', 'test/support/template.a.json'].choice
+      template = ['test/support/template.a', 'test/support/template.a.json'].sample
       exp = subject.render(template, nil, @l)
       assert_equal exp, subject.partial(template, @l)
     end

data/test/unit/template_source_tests.rb

@@ -191,6 +191,12 @@ class Deas::TemplateSource
       assert_equal '', subject.path
     end
 
+    should "optionally take a root path" do
+      exp = Factory.path
+      source = Deas::NullTemplateSource.new(exp)
+      assert_equal exp, source.path
+    end
+
   end
 
   class TestEngine < Deas::TemplateEngine

data/test/unit/url_tests.rb

@@ -87,6 +87,32 @@ class Deas::Url
       })
     end
 
+    should "complain if given an empty named param value" do
+      params = {
+        'some' => 'a',
+        :thing => 'goose'
+      }
+      empty_param_name  = params.keys.sample
+      empty_param_value = [nil, ''].sample
+      params[empty_param_name] = empty_param_value
+
+      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"
+      assert_equal exp, err.message
+    end
+
+    should "not complain if given empty splat param values" do
+      exp_path = "/a/goose/"
+      assert_equal exp_path, subject.path_for({
+        'some'  => 'a',
+        :thing  => 'goose',
+        'splat' => [nil, '']
+      })
+    end
+
     should "append other (additional) params as query params" do
       exp_path = "/a/goose/cooked/well?aye=a&bee=b"
       assert_equal exp_path, subject.path_for({
@@ -154,38 +180,6 @@ class Deas::Url
       })
     end
 
-    should "generate given ordered params only" do
-      exp_path = "/a/:thing/*/*"
-      assert_equal exp_path, subject.path_for('a')
-
-      exp_path = "/a/goose/*/*"
-      assert_equal exp_path, subject.path_for('a', 'goose')
-
-      exp_path = "/a/goose/cooked-well/*"
-      assert_equal exp_path, subject.path_for('a', 'goose', 'cooked-well')
-
-      exp_path = "/a/goose/cooked/well"
-      assert_equal exp_path, subject.path_for('a', 'goose', 'cooked', 'well')
-    end
-
-    should "generate given mixed ordered and named params" do
-      exp_path = "/:some/:thing/*/*"
-      assert_equal exp_path, subject.path_for
-
-      exp_path = "/a/goose/*/*"
-      assert_equal exp_path, subject.path_for('a', 'thing' => 'goose')
-
-      exp_path = "/goose/a/well/*"
-      assert_equal exp_path, subject.path_for('a', 'well', 'some' => 'goose')
-
-      exp_path = "/a/goose/cooked/well"
-      assert_equal exp_path, subject.path_for('ignore', 'these', 'params', {
-        'some'  => 'a',
-        :thing  => 'goose',
-        'splat' => ['cooked', 'well']
-      })
-    end
-
     should "'squash' duplicate forward-slashes" do
       exp_path = "/a/goose/cooked/well/"
       assert_equal exp_path, subject.path_for({
@@ -198,8 +192,8 @@ class Deas::Url
     should "not alter the given params" do
       params = {
         'some'    => 'thing',
-        :captures => 'captures',
-        :splat    => 'splat',
+        :captures => ['captures'],
+        :splat    => ['splat'],
         '#'       => 'anchor'
       }
       exp_params = params.dup
@@ -208,6 +202,12 @@ class Deas::Url
       assert_equal exp_params, params
     end
 
+    should "complain if given non-hash params" do
+      assert_raises NonHashParamsError do
+        subject.path_for([Factory.string, Factory.integer, nil].sample)
+      end
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-04-11 00:00:00 Z
+date: 2016-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.15.1
+        version: 2.16.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.3
+        version: 1.0.4
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -39,39 +39,29 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ns-options
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.6
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.1"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.2"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 description: Handler-based web framework powered by Sinatra
 email: 
 - kelly@kellyredding.com
@@ -167,17 +157,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id007 
+  - &id006 
     - ">="
     - !ruby/object:Gem::Version 
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id007
+  - *id006
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Handler-based web framework powered by Sinatra