deas 0.14.1 → 0.15.0

data/lib/deas/template.rb

@@ -63,6 +63,10 @@ module Deas
       end
       alias :u :escape_url
 
+      def logger
+        @sinatra_call.logger
+      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

@@ -29,7 +29,17 @@ module Deas
     # Helpers
 
     def halt(*args)
-      throw(:halt, args)
+      throw(:halt, HaltArgs.new(args))
+    end
+
+    class HaltArgs < Struct.new(:body, :headers, :status)
+      def initialize(args)
+        super(*[
+          !args.last.kind_of?(::Hash) && !args.last.kind_of?(::Integer) ? args.pop : nil,
+          args.last.kind_of?(::Hash) ? args.pop : nil,
+          args.first.kind_of?(::Integer) ? args.first : nil
+        ])
+      end
     end
 
     def redirect(path, *halt_args)

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.14.1"
+  VERSION = "0.15.0"
 end

data/test/support/fake_sinatra_call.rb

@@ -6,13 +6,14 @@ class FakeSinatraCall
   # Mimic's the context that is accessible in a Sinatra' route. Should provide
   # any methods needed to replace using an actual Sinatra app.
 
-  attr_accessor :request, :response, :params, :settings, :session
+  attr_accessor :request, :response, :params, :settings, :session, :logger
 
   def initialize(settings={})
     @request = FakeRequest.new('GET','/something', {}, OpenStruct.new)
     @params   = @request.params
     @session  = @request.session
     @response = FakeResponse.new
+    @logger   = Deas::NullLogger.new
     @settings = OpenStruct.new(settings.merge({
       :deas_template_scope => Deas::Template::Scope,
       :deas_default_charset => 'utf-8'

data/test/unit/template_tests.rb

@@ -82,7 +82,9 @@ class Deas::Template
     end
     subject{ @scope }
 
-    should have_imeths :partial, :escape_html, :h, :escape_url, :u, :render
+    should have_reader :sinatra_call
+    should have_imeths :render, :partial, :escape_html, :h, :escape_url, :u
+    should have_imeths :logger
 
     should "call the sinatra_call's erb method with #partial" do
       return_value = subject.partial('part', :something => true)
@@ -127,6 +129,10 @@ class Deas::Template
       assert_equal "%2Fpath%2Fto%2Fsomewhere", return_value
     end
 
+    should "expose the sinatra call (and deas server) logger" do
+      assert_equal @fake_sinatra_call.logger, subject.logger
+    end
+
   end
 
   class PartialTests < BaseTests

data/test/unit/view_handler_tests.rb

@@ -166,9 +166,9 @@ module Deas::ViewHandler
       })
       runner.run
 
-      assert_equal 200,                                runner.return_value[0]
-      assert_equal({ 'Content-Type' => 'text/plain' }, runner.return_value[1])
-      assert_equal 'test halting',                     runner.return_value[2]
+      assert_equal 200,                                runner.return_value.status
+      assert_equal({ 'Content-Type' => 'text/plain' }, runner.return_value.headers)
+      assert_equal 'test halting',                     runner.return_value.body
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: 
   segments: 
   - 0
-  - 14
-  - 1
-  version: 0.14.1
+  - 15
+  - 0
+  version: 0.15.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-24 00:00:00 Z
+date: 2013-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options