deas 0.24.1 → 0.25.0

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake'
-gem 'pry'
+gem 'pry', "~> 0.9.0"
 gem 'multi_json'
 gem 'yajl-ruby'
 gem 'rack-test'

data/deas.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency("rack",       ["~> 1.5"])
   gem.add_dependency("sinatra",    ["~> 1.4"])
 
-  gem.add_development_dependency("assert", ["~> 2.8"])
-  gem.add_development_dependency("assert-mocha")
+  gem.add_development_dependency("assert", ["~> 2.12"])
   gem.add_development_dependency("assert-rack-test")
   gem.add_development_dependency('haml')
 

data/lib/deas/router.rb

@@ -18,6 +18,11 @@ module Deas
       @view_handler_ns
     end
 
+    def base_url(value = nil)
+      @base_url = value if !value.nil?
+      @base_url
+    end
+
     def url(name, path)
       if !path.kind_of?(::String)
         raise ArgumentError, "invalid path `#{path.inspect}` - "\
@@ -30,7 +35,7 @@ module Deas
       url = self.urls[name.to_sym]
       raise ArgumentError, "no route named `#{name.to_sym.inspect}`" unless url
 
-      url.path_for(*args)
+      "#{base_url}#{url.path_for(*args)}"
     end
 
     def get(path, handler_name);    self.route(:get,    path, handler_name); end
@@ -47,7 +52,7 @@ module Deas
 
       from_url = self.urls[from_path]
       from_url_path = from_url.path if from_url
-      add_route(http_method, from_url_path || from_path, proxy)
+      add_route(http_method, "#{base_url}#{from_url_path || from_path}", proxy)
     end
 
     def redirect(from_path, to_path = nil, &block)

data/lib/deas/server.rb

@@ -38,7 +38,7 @@ module Deas::Server
     attr_accessor :settings, :error_procs, :init_procs, :template_helpers
     attr_accessor :middlewares, :router
 
-    def initialize(values=nil)
+    def initialize(values = nil)
       # these are defaulted here because we want to use the Configuration
       # instance `root`. If we define a proc above, we will be using the
       # Configuration class `root`, which will not update these options as
@@ -206,6 +206,7 @@ module Deas::Server
     end
 
     def view_handler_ns(*args); self.router.view_handler_ns(*args); end
+    def base_url(*args);        self.router.base_url(*args);        end
 
     def url(*args, &block);     self.router.url(*args, &block);     end
     def url_for(*args, &block); self.router.url_for(*args, &block); end

data/lib/deas/sinatra_app.rb

@@ -34,6 +34,7 @@ module Deas
         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
 
         server_config.settings.each{ |set_args| set *set_args }
         server_config.middlewares.each{ |use_args| use *use_args }

data/lib/deas/template.rb

@@ -66,7 +66,15 @@ module Deas
       alias :u :escape_url
 
       def logger
-        @sinatra_call.logger
+        @sinatra_call.settings.logger
+      end
+
+      def router
+        @sinatra_call.settings.router
+      end
+
+      def url_for(url)
+        "#{self.router.base_url}#{url}"
       end
 
       def ==(other_scope)

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.24.1"
+  VERSION = "0.25.0"
 end

data/test/helper.rb

@@ -9,7 +9,8 @@ TEST_SUPPORT_ROOT = ROOT.join('test/support')
 
 # require pry for debugging (`binding.pry`)
 require 'pry'
-require 'assert-mocha' if defined?(Assert)
+
+require 'test/support/factory'
 
 require 'fileutils'
 require 'logger'

data/test/support/factory.rb

@@ -0,0 +1,6 @@
+require 'assert/factory'
+
+module Factory
+  extend Assert::Factory
+
+end

data/test/support/fake_sinatra_call.rb

@@ -9,16 +9,17 @@ class FakeSinatraCall
   attr_accessor :request, :response, :params, :settings, :session, :logger
 
   def initialize(settings={})
-    @settings = OpenStruct.new(settings.merge({
-      :deas_template_scope => Deas::Template::Scope,
-      :deas_default_charset => 'utf-8'
-    }))
-
     @request = FakeRequest.new('GET','/something', {}, OpenStruct.new)
     @response = FakeResponse.new
     @params   = @request.params
     @logger   = Deas::NullLogger.new
     @session  = @request.session
+
+    @settings = OpenStruct.new({
+      :deas_template_scope => Deas::Template::Scope,
+      :deas_default_charset => 'utf-8',
+      :router => Deas::Router.new
+    }.merge(settings))
   end
 
   def halt(*args)

data/test/unit/error_handler_tests.rb

@@ -4,7 +4,7 @@ require 'deas/error_handler'
 
 class Deas::ErrorHandler
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::ErrorHandler"
     setup do
       @exception = RuntimeError.new
@@ -18,7 +18,7 @@ class Deas::ErrorHandler
 
   end
 
-  class RunTests < BaseTests
+  class RunTests < UnitTests
     desc "run"
     setup do
       @error_procs = [ proc do |exception|
@@ -40,7 +40,7 @@ class Deas::ErrorHandler
 
   end
 
-  class RunWithMultipleProcsTests < BaseTests
+  class RunWithMultipleProcsTests < UnitTests
     desc "run with multiple procs"
     setup do
       @error_procs = [
@@ -74,7 +74,7 @@ class Deas::ErrorHandler
 
   end
 
-  class RunWithProcsThatHaltTests < BaseTests
+  class RunWithProcsThatHaltTests < UnitTests
     desc "run with a proc that halts"
     setup do
       @error_procs = [

data/test/unit/logging_tests.rb

@@ -4,7 +4,7 @@ require 'deas/logging'
 
 module Deas::Logging
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::Logging"
     setup do
       @app = FakeSinatraCall.new
@@ -15,7 +15,7 @@ module Deas::Logging
 
   end
 
-  class VerboseLoggingTests < BaseTests
+  class VerboseLoggingTests < UnitTests
     desc "Deas::VerboseLogging"
     setup do
       @middleware = Deas::VerboseLogging.new(@app)
@@ -30,7 +30,7 @@ module Deas::Logging
 
   end
 
-  class SummaryLoggingTests < BaseTests
+  class SummaryLoggingTests < UnitTests
     desc "Deas::SummaryLogging"
     setup do
       @middleware = Deas::SummaryLogging.new(@app)
@@ -45,7 +45,7 @@ module Deas::Logging
 
   end
 
-  class SummaryLineTests < BaseTests
+  class SummaryLineTests < UnitTests
     desc "Deas::SummaryLine"
     subject{ Deas::SummaryLine }
 

data/test/unit/redirect_proxy_tests.rb

@@ -4,7 +4,7 @@ require 'deas/redirect_proxy'
 
 class Deas::RedirectProxy
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::RedirectProxy"
     setup do
       @proxy = Deas::RedirectProxy.new('/somewhere')
@@ -19,7 +19,7 @@ class Deas::RedirectProxy
 
   end
 
-  class HandlerClassTests < BaseTests
+  class HandlerClassTests < UnitTests
     include Deas::TestHelpers
 
     desc "redir handler class"

data/test/unit/route_proxy_tests.rb

@@ -5,7 +5,7 @@ require 'deas/route_proxy'
 
 class Deas::RouteProxy
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::RouteProxy"
     setup do
       @proxy = Deas::RouteProxy.new('TestViewHandler')

data/test/unit/router_tests.rb

@@ -3,7 +3,7 @@ require 'deas/router'
 
 class Deas::Router
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::Router"
     setup do
       @router = Deas::Router.new
@@ -11,13 +11,14 @@ class Deas::Router
     subject{ @router }
 
     should have_accessors :urls, :routes
-    should have_imeths :view_handler_ns
+    should have_imeths :view_handler_ns, :base_url
     should have_imeths :url, :url_for
     should have_imeths :get, :post, :put, :patch, :delete
     should have_imeths :route, :redirect
 
-    should "have no view_handler_ns, urls, or routes by default" do
+    should "have no view_handler_ns, base_url, urls, or routes by default" do
       assert_nil subject.view_handler_ns
+      assert_nil subject.base_url
       assert_empty subject.urls
       assert_empty subject.routes
     end
@@ -95,6 +96,22 @@ class Deas::Router
       assert_equal '::NoNsTest', route.handler_proxy.handler_class_name
     end
 
+    should "set a base url" do
+      url = Factory.url
+      subject.base_url url
+
+      assert_equal url, subject.base_url
+    end
+
+    should "use the base url when adding routes" do
+      url = Factory.url
+      subject.base_url url
+      route = subject.get('/some-path', Object)
+
+      exp_path = "#{url}/some-path"
+      assert_equal exp_path, route.path
+    end
+
     should "add a redirect route using #redirect" do
       subject.redirect('/invalid', '/assets')
 
@@ -119,7 +136,7 @@ class Deas::Router
 
   end
 
-  class NamedUrlTests < BaseTests
+  class NamedUrlTests < UnitTests
     desc "when using named urls"
     setup do
       @router.url('get_info', '/info/:for')
@@ -180,6 +197,15 @@ class Deas::Router
       assert_equal url.path, route.path
     end
 
+    should "use the base url when building named urls" do
+      url = Factory.url
+      subject.base_url url
+      subject.url('base_get_info', '/info/:for')
+
+      exp_path = "#{url}/info/now"
+      assert_equal exp_path, subject.url_for(:base_get_info, :for => 'now')
+    end
+
   end
 
 end

data/test/unit/server_configuration_tests.rb

@@ -8,7 +8,7 @@ require 'deas/router'
 
 class Deas::Server::Configuration
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::Server::Configuration"
     setup do
       @configuration = Deas::Server::Configuration.new
@@ -91,7 +91,7 @@ class Deas::Server::Configuration
 
   end
 
-  class ValidationTests < BaseTests
+  class ValidationTests < UnitTests
     desc "when successfully validated"
     setup do
       @initialized = false

data/test/unit/server_tests.rb

@@ -6,7 +6,7 @@ require 'deas/router'
 
 module Deas::Server
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::Server"
     setup do
       @server_class = Class.new{ include Deas::Server }
@@ -22,12 +22,12 @@ module Deas::Server
 
     # DSL for server handling settings
     should have_imeths :init, :error, :template_helpers, :template_helper?
-    should have_imeths :use, :set, :view_handler_ns, :verbose_logging, :logger
+    should have_imeths :use, :set, :verbose_logging, :logger
     should have_imeths :get, :post, :put, :patch, :delete
     should have_imeths :redirect, :route, :url, :url_for
 
     # DSL for server routing settings
-    should have_imeths :router, :view_handler_ns
+    should have_imeths :router, :view_handler_ns, :base_url
     should have_imeths :url, :url_for
     should have_imeths :get, :post, :put, :patch, :delete
     should have_imeths :route, :redirect
@@ -98,6 +98,8 @@ module Deas::Server
 
     should "have a router by default and allow overriding it" do
       assert_kind_of Deas::Router, subject.router
+      assert_equal subject.router.view_handler_ns, subject.view_handler_ns
+      assert_equal subject.router.base_url, subject.base_url
 
       new_router = Deas::Router.new
       subject.router new_router

data/test/unit/show_exceptions_tests.rb

@@ -4,7 +4,7 @@ require 'deas/show_exceptions'
 
 class Deas::ShowExceptions
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::ShowExceptions"
     setup do
       exception = Sinatra::NotFound.new

data/test/unit/sinatra_app_tests.rb

@@ -3,12 +3,13 @@ require 'sinatra/base'
 require 'test/support/view_handlers'
 require 'deas/route_proxy'
 require 'deas/route'
+require 'deas/router'
 require 'deas/server'
 require 'deas/sinatra_app'
 
 module Deas::SinatraApp
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::SinatraApp"
     setup do
       proxy = Deas::RouteProxy.new('TestViewHandler')
@@ -51,6 +52,7 @@ module Deas::SinatraApp
         assert_equal true,                       settings.static
         assert_equal true,                       settings.reload_templates
         assert_instance_of Deas::NullLogger,     settings.logger
+        assert_instance_of Deas::Router,         settings.router
 
         # settings that are set but can't be changed
         assert_equal false, settings.logging

data/test/unit/template_tests.rb

@@ -83,7 +83,7 @@ class Deas::Template
 
     should have_reader :sinatra_call
     should have_imeths :render, :partial, :escape_html, :h, :escape_url, :u
-    should have_imeths :logger
+    should have_imeths :logger, :router, :url_for
 
     should "call the sinatra_call's erb method with #render" do
       render_args = subject.render('my_template', {
@@ -127,7 +127,20 @@ class Deas::Template
     end
 
     should "expose the sinatra call (and deas server) logger" do
-      assert_equal @fake_sinatra_call.logger, subject.logger
+      assert_equal @fake_sinatra_call.settings.logger, subject.logger
+    end
+
+    should "expose the sinatra call (and deas server) router" do
+      assert_equal @fake_sinatra_call.settings.router, subject.router
+    end
+
+    should "build urls with #url_for" do
+      base_url = Factory.url
+      url = Factory.url
+      @fake_sinatra_call.settings.router.base_url(base_url)
+
+      exp = "#{base_url}#{url}"
+      assert_equal exp, subject.url_for(url)
     end
 
   end

data/test/unit/view_handler_tests.rb

@@ -5,7 +5,7 @@ require 'deas/view_handler'
 
 module Deas::ViewHandler
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     include Deas::TestHelpers
 
     desc "Deas::ViewHandler"
@@ -57,7 +57,7 @@ module Deas::ViewHandler
 
   end
 
-  class CallbackTests < BaseTests
+  class CallbackTests < UnitTests
     desc "callbacks"
     setup do
       @proc1 = proc{ '1' }
@@ -139,7 +139,7 @@ module Deas::ViewHandler
 
   end
 
-  class WithMethodFlagsTests < BaseTests
+  class WithMethodFlagsTests < UnitTests
     setup do
       @handler = test_handler(FlagViewHandler)
     end
@@ -167,7 +167,7 @@ module Deas::ViewHandler
 
   end
 
-  class HaltTests < BaseTests
+  class HaltTests < UnitTests
     desc "halt"
 
     should "return a response with the status code and the passed data" do
@@ -185,7 +185,7 @@ module Deas::ViewHandler
 
   end
 
-  class ContentTypeTests < BaseTests
+  class ContentTypeTests < UnitTests
     desc "content_type"
 
     should "should set the response content_type/charset" do
@@ -198,7 +198,7 @@ module Deas::ViewHandler
 
   end
 
-  class StatusTests < BaseTests
+  class StatusTests < UnitTests
     desc "status"
 
     should "should set the response status" do
@@ -210,7 +210,7 @@ module Deas::ViewHandler
 
   end
 
-  class HeadersTests < BaseTests
+  class HeadersTests < UnitTests
     desc "headers"
 
     should "should set the response status" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 123
   prerelease: 
   segments: 
   - 0
-  - 24
-  - 1
-  version: 0.24.1
+  - 25
+  - 0
+  version: 0.25.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-26 00:00:00 Z
+date: 2014-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -77,11 +77,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
         - 2
-        - 8
-        version: "2.8"
+        - 12
+        version: "2.12"
   type: :development
   name: assert
   version_requirements: *id004
@@ -97,7 +97,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: assert-mocha
+  name: assert-rack-test
   version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -111,22 +111,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: assert-rack-test
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
   name: haml
-  version_requirements: *id007
+  version_requirements: *id006
   prerelease: false
 description: Handler-based web framework powered by Sinatra
 email: 
@@ -168,6 +154,7 @@ files:
 - lib/deas/view_handler.rb
 - log/.gitkeep
 - test/helper.rb
+- test/support/factory.rb
 - test/support/fake_sinatra_call.rb
 - test/support/normalized_params_spy.rb
 - test/support/routes.rb
@@ -241,6 +228,7 @@ specification_version: 3
 summary: Handler-based web framework powered by Sinatra
 test_files: 
 - test/helper.rb
+- test/support/factory.rb
 - test/support/fake_sinatra_call.rb
 - test/support/normalized_params_spy.rb
 - test/support/routes.rb