deas 0.22.1 → 0.23.0

data/deas.gemspec

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

data/lib/deas/logging.rb

@@ -30,14 +30,17 @@ module Deas
 
     # The real Rack call interface.
     # This is the common behavior for both the verbose and summary logging
-    # middlewares. It times the response and returns it as is.
+    # middlewares. It sets rack's logger, times the response and returns it as is.
     def call!(env)
+      env['rack.logger'] = @logger
+
       status, headers, body = nil, nil, nil
       benchmark = Benchmark.measure do
         status, headers, body = @app.call(env)
       end
       log_error(env['sinatra.error'])
       env['deas.time_taken'] = RoundedTime.new(benchmark.real)
+
       [ status, headers, body ]
     end
 

data/lib/deas/template.rb

@@ -49,8 +49,8 @@ module Deas
         Template.new(@sinatra_call, name, options || {}).render(&block)
       end
 
-      def partial(name, locals = nil)
-        Partial.new(@sinatra_call, name, locals || {}).render
+      def partial(name, locals = nil, &block)
+        Partial.new(@sinatra_call, name, locals || {}).render(&block)
       end
 
       def escape_html(html)

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.22.1"
+  VERSION = "0.23.0"
 end

data/test/support/fake_sinatra_call.rb

@@ -33,11 +33,14 @@ class FakeSinatraCall
   def headers(*args);      args; end
 
   # return the template name for each nested calls
-  def erb(name, opts, &block)
+
+  RenderArgs = Struct.new(:template_name, :opts, :block_call_result)
+
+  def erb(template_name, opts, &block)
     if block
-      [ name, opts, block.call ].flatten
+      RenderArgs.new(template_name, opts, block.call)
     else
-      [ name, opts ]
+      RenderArgs.new(template_name, opts, nil)
     end
   end
 

data/test/unit/template_tests.rb

@@ -4,7 +4,7 @@ require 'deas/template'
 
 class Deas::Template
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::Template"
     setup do
       @fake_sinatra_call = FakeSinatraCall.new
@@ -54,7 +54,7 @@ class Deas::Template
 
   end
 
-  class WithLayoutsTests < BaseTests
+  class WithLayoutsTests < UnitTests
     desc "with layouts"
     setup do
       @template = Deas::Template.new(@fake_sinatra_call, 'users/index', {
@@ -62,20 +62,19 @@ class Deas::Template
       })
     end
 
-    should "call the engine's `erb` method for each layout, " \
-           "in the `layout` option" do
-      return_value = subject.render
+    should "call the engine's `erb` method for each layout" do
+      web_lay_render_args     = subject.render
+      search_lay_render_args  = web_lay_render_args.block_call_result
+      users_index_render_args = search_lay_render_args.block_call_result
 
-      # the return_value is a one-dimensional array of all the render args
-      # used in order. Thus the, 0, 2, 4 nature of the indexes.
-      assert_equal :"layouts/web",    return_value[0]
-      assert_equal :"layouts/search", return_value[2]
-      assert_equal :"users/index",    return_value[4]
+      assert_equal :"layouts/web",    web_lay_render_args.template_name
+      assert_equal :"layouts/search", search_lay_render_args.template_name
+      assert_equal :"users/index",    users_index_render_args.template_name
     end
 
   end
 
-  class ScopeTests < BaseTests
+  class ScopeTests < UnitTests
     desc "Deas::Template::RenderScope"
     setup do
       @scope = Deas::Template::Scope.new(@fake_sinatra_call)
@@ -86,47 +85,45 @@ class Deas::Template
     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)
+    should "call the sinatra_call's erb method with #render" do
+      render_args = subject.render('my_template', {
+        :views  => '/path/to/templates',
+        :locals => { :something => true }
+      }, &Proc.new{ '#render called this proc' })
 
-      assert_equal :_part, return_value[0]
+      assert_equal :my_template, render_args.template_name
+      assert_instance_of Deas::Template::Scope, render_args.opts[:scope]
 
-      expected_options = return_value[1]
-      assert_instance_of Deas::Template::Scope, expected_options[:scope]
+      exp_locals = { :something => true }
+      assert_equal exp_locals, render_args.opts[:locals]
 
-      expected_locals = { :something => true }
-      assert_equal(expected_locals, expected_options[:locals])
+      assert_equal '#render called this proc', render_args.block_call_result
     end
 
-    should "call the sinatra_call's erb method with #render" do
-      return_value = subject.render('my_template', {
-        :views  => '/path/to/templates',
-        :locals => { :something => true }
-      })
+    should "call the sinatra_call's erb method with #partial" do
+      render_args = subject.partial('part', {
+        :something => true
+      }, &Proc.new{ '#partial called this proc' })
 
-      assert_equal :my_template, return_value[0]
+      assert_equal :_part, render_args.template_name
+      assert_instance_of Deas::Template::Scope, render_args.opts[:scope]
 
-      expected_options = return_value[1]
-      assert_instance_of Deas::Template::Scope, expected_options[:scope]
+      exp_locals = { :something => true }
+      assert_equal exp_locals, render_args.opts[:locals]
 
-      expected_locals = { :something => true }
-      assert_equal(expected_locals, expected_options[:locals])
+      assert_equal '#partial called this proc', render_args.block_call_result
     end
 
     should "escape html with #h or #escape_html" do
-      return_value = subject.escape_html("<strong></strong>")
-      assert_equal "&lt;strong&gt;&lt;&#x2F;strong&gt;", return_value
-
-      return_value = subject.h("<strong></strong>")
-      assert_equal "&lt;strong&gt;&lt;&#x2F;strong&gt;", return_value
+      exp_val = "&lt;strong&gt;&lt;&#x2F;strong&gt;"
+      assert_equal exp_val, subject.escape_html("<strong></strong>")
+      assert_equal exp_val, subject.h("<strong></strong>")
     end
 
     should "escape urls with #u or #escape_url" do
-      return_value = subject.escape_url("/path/to/somewhere")
-      assert_equal "%2Fpath%2Fto%2Fsomewhere", return_value
-
-      return_value = subject.u("/path/to/somewhere")
-      assert_equal "%2Fpath%2Fto%2Fsomewhere", return_value
+      exp_val = "%2Fpath%2Fto%2Fsomewhere"
+      assert_equal exp_val, subject.escape_url("/path/to/somewhere")
+      assert_equal exp_val, subject.u("/path/to/somewhere")
     end
 
     should "expose the sinatra call (and deas server) logger" do
@@ -135,7 +132,7 @@ class Deas::Template
 
   end
 
-  class PartialTests < BaseTests
+  class PartialTests < UnitTests
     desc "Partial"
     setup do
       @partial = Deas::Template::Partial.new(@fake_sinatra_call, 'users/index/listing', {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 67
   prerelease: 
   segments: 
   - 0
-  - 22
-  - 1
-  version: 0.22.1
+  - 23
+  - 0
+  version: 0.23.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-03 00:00:00 Z
+date: 2013-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options
@@ -77,12 +77,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        version: "2.3"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency