deas 0.25.0 → 0.26.0

data/lib/deas/router.rb

@@ -23,6 +23,10 @@ module Deas
       @base_url
     end
 
+    def prepend_base_url(url_path)
+      "#{base_url}#{url_path}"
+    end
+
     def url(name, path)
       if !path.kind_of?(::String)
         raise ArgumentError, "invalid path `#{path.inspect}` - "\
@@ -34,8 +38,7 @@ module Deas
     def url_for(name, *args)
       url = self.urls[name.to_sym]
       raise ArgumentError, "no route named `#{name.to_sym.inspect}`" unless url
-
-      "#{base_url}#{url.path_for(*args)}"
+      prepend_base_url(url.path_for(*args))
     end
 
     def get(path, handler_name);    self.route(:get,    path, handler_name); end
@@ -52,7 +55,7 @@ module Deas
 
       from_url = self.urls[from_path]
       from_url_path = from_url.path if from_url
-      add_route(http_method, "#{base_url}#{from_url_path || from_path}", proxy)
+      add_route(http_method, prepend_base_url(from_url_path || from_path), proxy)
     end
 
     def redirect(from_path, to_path = nil, &block)

data/lib/deas/runner.rb

@@ -5,7 +5,8 @@ module Deas
   class Runner
 
     attr_reader :handler_class, :handler
-    attr_reader :request, :response, :params, :logger, :session
+    attr_reader :request, :response, :params
+    attr_reader :logger, :router, :session
 
     def initialize(handler_class)
       @handler_class = handler_class

data/lib/deas/sinatra_runner.rb

@@ -15,6 +15,7 @@ module Deas
       @response = @sinatra_call.response
       @params   = NormalizedParams.new(@sinatra_call.params).value
       @logger   = @sinatra_call.settings.logger
+      @router   = @sinatra_call.settings.router
       @session  = @sinatra_call.session
 
       super(handler_class)
@@ -60,7 +61,10 @@ module Deas
 
     def render(template_name, options = nil, &block)
       options ||= {}
-      options[:locals] = { :view => @handler }.merge(options[:locals] || {})
+      options[:locals] = {
+        :view => @handler,
+        :logger => @logger
+      }.merge(options[:locals] || {})
       options[:layout] ||= @handler_class.layouts
 
       self.content_type(get_content_type(template_name)) if self.content_type.nil?

data/lib/deas/template.rb

@@ -65,18 +65,6 @@ module Deas
       end
       alias :u :escape_url
 
-      def 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)
         self.sinatra_call == other_scope.sinatra_call
         self.class.included_modules == other_scope.class.included_modules

data/lib/deas/test_runner.rb

@@ -1,5 +1,6 @@
 require 'ostruct'
 require 'rack/multipart'
+require 'deas/router'
 require 'deas/runner'
 
 module Deas
@@ -16,6 +17,7 @@ module Deas
       @response = args.delete(:response)
       @params   = NormalizedParams.new(args.delete(:params) || {}).value
       @logger   = args.delete(:logger) || Deas::NullLogger.new
+      @router   = args.delete(:router) || Deas::Router.new
       @session  = args.delete(:session)
 
       super(handler_class)

data/lib/deas/version.rb

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

data/lib/deas/view_handler.rb

@@ -59,6 +59,7 @@ module Deas
 
     def app_settings; @deas_runner.app_settings; end
     def logger;       @deas_runner.logger;       end
+    def router;       @deas_runner.router;       end
     def request;      @deas_runner.request;      end
     def response;     @deas_runner.response;     end
     def params;       @deas_runner.params;       end

data/test/support/fake_sinatra_call.rb

@@ -18,7 +18,8 @@ class FakeSinatraCall
     @settings = OpenStruct.new({
       :deas_template_scope => Deas::Template::Scope,
       :deas_default_charset => 'utf-8',
-      :router => Deas::Router.new
+      :router => Deas::Router.new,
+      :logger => @logger
     }.merge(settings))
   end
 

data/test/unit/router_tests.rb

@@ -11,7 +11,7 @@ class Deas::Router
     subject{ @router }
 
     should have_accessors :urls, :routes
-    should have_imeths :view_handler_ns, :base_url
+    should have_imeths :view_handler_ns, :base_url, :prepend_base_url
     should have_imeths :url, :url_for
     should have_imeths :get, :post, :put, :patch, :delete
     should have_imeths :route, :redirect
@@ -103,12 +103,23 @@ class Deas::Router
       assert_equal url, subject.base_url
     end
 
-    should "use the base url when adding routes" do
+    should "prepend the base url to any url path" do
+      url_path = Factory.path
+      base_url = Factory.url
+
+      assert_equal url_path, subject.prepend_base_url(url_path)
+
+      subject.base_url base_url
+      assert_equal "#{base_url}#{url_path}", subject.prepend_base_url(url_path)
+    end
+
+    should "prepend the base url when adding routes" do
       url = Factory.url
       subject.base_url url
-      route = subject.get('/some-path', Object)
+      path = Factory.path
+      route = subject.get(path, Object)
 
-      exp_path = "#{url}/some-path"
+      exp_path = subject.prepend_base_url(path)
       assert_equal exp_path, route.path
     end
 
@@ -197,13 +208,14 @@ class Deas::Router
       assert_equal url.path, route.path
     end
 
-    should "use the base url when building named urls" do
+    should "prepend the base url when building named urls" do
       url = Factory.url
       subject.base_url url
-      subject.url('base_get_info', '/info/:for')
+      path = Factory.path
+      subject.url('base_get_info', path)
 
-      exp_path = "#{url}/info/now"
-      assert_equal exp_path, subject.url_for(:base_get_info, :for => 'now')
+      exp_path = subject.prepend_base_url(path)
+      assert_equal exp_path, subject.url_for(:base_get_info)
     end
 
   end

data/test/unit/runner_tests.rb

@@ -13,7 +13,8 @@ class Deas::Runner
     subject{ @runner }
 
     should have_readers :handler_class, :handler
-    should have_readers :request, :response, :params, :logger, :session
+    should have_readers :request, :response, :params
+    should have_readers :logger, :router, :session
     should have_imeths :halt, :redirect, :content_type, :status, :headers
     should have_imeths :render, :partial, :send_file
 
@@ -27,6 +28,7 @@ class Deas::Runner
       assert_nil subject.response
       assert_nil subject.params
       assert_nil subject.logger
+      assert_nil subject.router
       assert_nil subject.session
     end
 

data/test/unit/sinatra_runner_tests.rb

@@ -4,6 +4,7 @@ require 'deas/sinatra_runner'
 require 'deas/runner'
 require 'deas/template'
 require 'test/support/fake_sinatra_call'
+require 'test/support/normalized_params_spy'
 require 'test/support/view_handlers'
 
 class Deas::SinatraRunner
@@ -40,7 +41,8 @@ class Deas::SinatraRunner
       assert_equal @fake_sinatra_call.request, subject.request
       assert_equal @fake_sinatra_call.response, subject.response
       assert_equal @fake_sinatra_call.params, subject.params
-      assert_equal @fake_sinatra_call.settings.deas_logger, subject.logger
+      assert_equal @fake_sinatra_call.settings.logger, subject.logger
+      assert_equal @fake_sinatra_call.settings.router, subject.router
       assert_equal @fake_sinatra_call.session, subject.session
     end
 
@@ -81,11 +83,14 @@ class Deas::SinatraRunner
       assert_equal [exp_headers], subject.headers(exp_headers)
     end
 
-    should "render the template with a :view local and the handler layouts" do
+    should "render the template with :view/:logger locals and the handler layouts" do
       exp_handler = FlagViewHandler.new(subject)
       exp_layouts = FlagViewHandler.layouts
       exp_result = Deas::Template.new(@fake_sinatra_call, 'index', {
-        :locals => { :view => exp_handler },
+        :locals => {
+          :view => exp_handler,
+          :logger => @runner.logger
+        },
         :layout => exp_layouts
       }).render
 

data/test/unit/template_tests.rb

@@ -83,7 +83,6 @@ class Deas::Template
 
     should have_reader :sinatra_call
     should have_imeths :render, :partial, :escape_html, :h, :escape_url, :u
-    should have_imeths :logger, :router, :url_for
 
     should "call the sinatra_call's erb method with #render" do
       render_args = subject.render('my_template', {
@@ -126,23 +125,6 @@ class Deas::Template
       assert_equal exp_val, subject.u("/path/to/somewhere")
     end
 
-    should "expose the sinatra call (and deas server) logger" do
-      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
 
   class PartialTests < UnitTests

data/test/unit/test_runner_tests.rb

@@ -2,6 +2,7 @@ require 'assert'
 require 'deas/test_runner'
 
 require 'rack/test'
+require 'deas/router'
 require 'deas/runner'
 require 'test/support/normalized_params_spy'
 require 'test/support/view_handlers'
@@ -43,6 +44,7 @@ class Deas::TestRunner
       assert_nil subject.response
       assert_kind_of ::Hash, subject.params
       assert_kind_of Deas::NullLogger, subject.logger
+      assert_kind_of Deas::Router, subject.router
       assert_nil subject.session
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 119
   prerelease: 
   segments: 
   - 0
-  - 25
+  - 26
   - 0
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-08-01 00:00:00 Z
+date: 2014-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement