deas 0.12.0 → 0.13.0

data/deas.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("assert")
   gem.add_development_dependency("assert-mocha")
   gem.add_development_dependency("assert-rack-test")
+  gem.add_development_dependency('haml')
 
 end

data/lib/deas/template.rb

@@ -15,6 +15,14 @@ module Deas
       end
     end
 
+    def engine(template_name)
+      return 'erb' if @sinatra_call.settings.views.nil?
+
+      views_path = Pathname.new(@sinatra_call.settings.views)
+      template = Dir.glob("#{views_path.join(template_name.to_s)}.*").first.to_s
+      File.extname(template)[1..-1] || 'erb'
+    end
+
     # builds render-blocks like:
     #
     #   erb :main_layout do
@@ -26,7 +34,7 @@ module Deas
     def render(&block)
       template_names = [ @layouts, @name ].flatten.reverse
       top_render_proc = template_names.inject(block) do |render_proc, name|
-        proc{ @sinatra_call.erb(name, @options, &render_proc) }
+        proc{ @sinatra_call.send(engine(name), name, @options, &render_proc) }
       end
       top_render_proc.call
     end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/test/support/fake_app.rb

@@ -8,12 +8,14 @@ class FakeApp
 
   attr_accessor :request, :response, :params, :settings, :session
 
-  def initialize
+  def initialize(settings={})
     @request = FakeRequest.new('GET','/something', {}, OpenStruct.new)
     @params   = @request.params
     @session  = @request.session
     @response = FakeResponse.new
-    @settings = OpenStruct.new(:deas_template_scope => Deas::Template::Scope)
+    @settings = OpenStruct.new(settings.merge({
+      :deas_template_scope => Deas::Template::Scope
+    }))
   end
 
   def halt(*args)

data/test/support/routes.rb

@@ -22,12 +22,16 @@ class DeasTestServer
   get  '/show',            'ShowHandler'
   get  '/halt',            'HaltHandler'
   get  '/error',           'ErrorHandler'
-  get  '/with_layout',     'WithLayoutHandler'
-  get  '/alt_with_layout', 'AlternateWithLayoutHandler'
   get  '/redirect',        'RedirectHandler'
   post '/session',         'SetSessionHandler'
   get  '/session',         'UseSessionHandler'
 
+  get  '/with_layout',           'WithLayoutHandler'
+  get  '/alt_with_layout',       'AlternateWithLayoutHandler'
+  get  '/haml_with_layout',      'HamlWithLayoutHandler'
+  get  '/with_haml_layout',      'WithHamlLayoutHandler'
+  get  '/haml_with_haml_layout', 'HamlWithHamlLayoutHandler'
+
   get '/handler/tests.json', 'HandlerTestsHandler'
 
   redirect :get, '/route_redirect',   '/somewhere'
@@ -110,6 +114,36 @@ class AlternateWithLayoutHandler
 
 end
 
+class HamlWithLayoutHandler
+  include Deas::ViewHandler
+  layouts 'layout1'
+
+  def run!
+    render 'haml_with_layout'
+  end
+
+end
+
+class WithHamlLayoutHandler
+  include Deas::ViewHandler
+  layouts 'haml_layout1'
+
+  def run!
+    render 'with_layout'
+  end
+
+end
+
+class HamlWithHamlLayoutHandler
+  include Deas::ViewHandler
+  layouts 'haml_layout1'
+
+  def run!
+    render 'haml_with_layout'
+  end
+
+end
+
 class RedirectHandler
   include Deas::ViewHandler
 

data/test/support/views/haml_layout1.haml

@@ -0,0 +1,2 @@
+Layout 1
+=yield

data/test/support/views/haml_with_layout.haml

@@ -0,0 +1 @@
+With Layout

data/test/system/rack_tests.rb

@@ -47,15 +47,30 @@ module Deas
       assert_equal "Oops, something went wrong", last_response.body
     end
 
-    should "return a 200 response and use all the layouts" do
-      get '/with_layout'
-
+    should "render erb templates using layouts" do
       expected_body = "Layout 1\nLayout 2\nLayout 3\nWith Layout\n"
+
+      get '/with_layout'
       assert_equal 200,           last_response.status
       assert_equal expected_body, last_response.body
 
       get '/alt_with_layout'
+      assert_equal 200,           last_response.status
+      assert_equal expected_body, last_response.body
+    end
+
+    should "render mixed (erb and other) templates using layouts" do
+      expected_body = "Layout 1\nWith Layout\n"
+
+      get '/haml_with_layout'
+      assert_equal 200,           last_response.status
+      assert_equal expected_body, last_response.body
+
+      get '/with_haml_layout'
+      assert_equal 200,           last_response.status
+      assert_equal expected_body, last_response.body
 
+      get '/haml_with_haml_layout'
       assert_equal 200,           last_response.status
       assert_equal expected_body, last_response.body
     end

data/test/unit/template_tests.rb

@@ -12,7 +12,7 @@ class Deas::Template
     end
     subject{ @template }
 
-    should have_instance_methods :name, :options, :render
+    should have_instance_methods :name, :options, :render, :engine
 
     should "symbolize it's name" do
       assert_equal :"users/index", subject.name
@@ -22,6 +22,29 @@ class Deas::Template
       assert_instance_of Deas::Template::Scope, subject.options[:scope]
     end
 
+    should "know a named template's render engine" do
+      views_exist = FakeApp.new(:views => TEST_SUPPORT_ROOT.join('views'))
+      template = Deas::Template.new(views_exist, 'whatever')
+
+      assert_equal 'erb',    template.engine('layout1')
+      assert_equal 'haml',   template.engine('haml_layout1')
+      assert_equal 'other',  template.engine('some.html.file')
+      assert_equal 'engine', template.engine('some_file')
+      assert_equal 'erb',    template.engine('some_no_engine_extension')
+      assert_equal 'erb',    template.engine('does_not_exist')
+
+      views_no_exist = FakeApp.new(:views => '/does/not/exist')
+      template_no_exist = Deas::Template.new(views_no_exist, 'whatever')
+
+      assert_equal 'erb', template_no_exist.engine('layout1')
+      assert_equal 'erb', template_no_exist.engine('haml_layout1')
+      assert_equal 'erb', template_no_exist.engine('some.html.file')
+      assert_equal 'erb', template_no_exist.engine('some_file')
+      assert_equal 'erb', template_no_exist.engine('some_no_engine_extension')
+      assert_equal 'erb', template_no_exist.engine('does_not_exist')
+
+    end
+
     should "call the sinatra_call's `erb` method with #render" do
       return_value = subject.render
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 43
   prerelease: 
   segments: 
   - 0
-  - 12
+  - 13
   - 0
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-21 00:00:00 Z
+date: 2013-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options
@@ -113,6 +113,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Handler-based web framework powered by Sinatra
 email: 
 - kelly@kellyredding.com
@@ -153,10 +167,15 @@ files:
 - test/support/routes.rb
 - test/support/view_handlers.rb
 - test/support/views/_info.erb
+- test/support/views/haml_layout1.haml
+- test/support/views/haml_with_layout.haml
 - test/support/views/layout1.erb
 - test/support/views/layout2.erb
 - test/support/views/layout3.erb
 - test/support/views/show.erb
+- test/support/views/some.html.file.other
+- test/support/views/some_file.engine
+- test/support/views/some_no_engine_extension
 - test/support/views/with_layout.erb
 - test/system/rack_tests.rb
 - test/unit/error_handler_tests.rb
@@ -212,10 +231,15 @@ test_files:
 - test/support/routes.rb
 - test/support/view_handlers.rb
 - test/support/views/_info.erb
+- test/support/views/haml_layout1.haml
+- test/support/views/haml_with_layout.haml
 - test/support/views/layout1.erb
 - test/support/views/layout2.erb
 - test/support/views/layout3.erb
 - test/support/views/show.erb
+- test/support/views/some.html.file.other
+- test/support/views/some_file.engine
+- test/support/views/some_no_engine_extension
 - test/support/views/with_layout.erb
 - test/system/rack_tests.rb
 - test/unit/error_handler_tests.rb