tiltout 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tiltout (1.1.0)
+    tiltout (1.3.0)
       tilt (~> 1.3)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     metaclass (0.0.1)
     minitest (2.12.1)
-    mocha (0.12.6)
+    mocha (0.12.7)
       metaclass (~> 0.0.1)
     rake (0.9.2.2)
     tilt (1.3.3)

data/lib/tiltout.rb

@@ -24,6 +24,7 @@
 #++
 require "tilt"
 require "tiltout/version"
+require "tiltout/partials"
 
 class Tiltout
   def initialize(template_root, opt = {})
@@ -42,16 +43,22 @@ class Tiltout
 
   def render(template, locals = {}, options = {})
     context = @context_class.new
-    content = load(template).render(context, locals)
+    context.renderer = self if context.respond_to?(:renderer=)
+    content = render_in_context(context, template, locals)
     layout_tpl = options.key?(:layout) ? options[:layout] : @layout
 
     if !layout_tpl.nil?
-      content = load(layout_tpl).render(context, locals) { content }
+      content = render_in_context(context, layout_tpl, locals) { content }
+      #content = load(layout_tpl).render(context, locals) { content }
     end
 
     content
   end
 
+  def render_in_context(context, template, locals, &block)
+    load(template).render(context, locals, &block)
+  end
+
   private
   def load(name)
     file_name = find_file(name)

data/lib/tiltout/partials.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+# --
+# The MIT License (MIT)
+#
+# Copyright (C) 2012 Gitorious AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+
+module Tiltout::Partials
+  def renderer=(renderer)
+    @renderer = renderer
+  end
+
+  def partial(template, locals = {})
+    @renderer.render_in_context(self, template, locals)
+  end
+end

data/lib/tiltout/version.rb

@@ -24,5 +24,5 @@
 #++
 
 class Tiltout
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/tiltout_test.rb

@@ -50,10 +50,12 @@ describe Tiltout do
   end
 
   it "renders template with locals" do
-    fake_file("#{@root}/file.erb", "<%= name %>!")
+    fake_file("#{@root}/file.erb", <<-ERB)
+<%= name %>!
+    ERB
     renderer = Tiltout.new(@root)
 
-    assert_equal "Chris!", renderer.render(:file, { :name => "Chris"})
+    assert_equal "Chris!\n", renderer.render(:file, { :name => "Chris"})
   end
 
   it "caches template in memory" do
@@ -77,23 +79,29 @@ describe Tiltout do
   it "renders template with layout" do
     renderer = Tiltout.new("/", :layout => "layout")
     fake_file("/file.erb", "Template")
-    fake_file("/layout.erb", "I give you: <%= yield %>")
+    fake_file("/layout.erb", <<-ERB)
+I give you: <%= yield %>
+    ERB
 
-    assert_equal "I give you: Template", renderer.render(:file)
+    assert_equal "I give you: Template\n", renderer.render(:file)
   end
 
   it "renders template with layout not in template root" do
     renderer = Tiltout.new("/somewhere", :layout => { :file => "/my/layout.erb" })
     fake_file("/somewhere/file.erb", "Template")
-    fake_file("/my/layout.erb", "I give you: <%= yield %>")
+    fake_file("/my/layout.erb", <<-ERB)
+I give you: <%= yield %>
+    ERB
 
-    assert_equal "I give you: Template", renderer.render(:file)
+    assert_equal "I give you: Template\n", renderer.render(:file)
   end
 
   it "renders template once without layout" do
     renderer = Tiltout.new("/", :layout => "layout")
     fake_file("/file.erb", "Template")
-    fake_file("/layout.erb", "I give you: <%= yield %>")
+    fake_file("/layout.erb", <<-ERB)
+I give you: <%= yield %>
+    ERB
 
     assert_equal "Template", renderer.render(:file, {}, :layout => nil)
   end
@@ -101,12 +109,16 @@ describe Tiltout do
   it "renders template once with different layout" do
     renderer = Tiltout.new("/", :layout => "layout")
     fake_file("/file.erb", "Template")
-    fake_file("/layout.erb", "I give you: <%= yield %>")
-    fake_file("/layout2.erb", "I present you: <%= yield %>")
+    fake_file("/layout.erb", <<-ERB)
+I give you: <%= yield %>
+    ERB
+    fake_file("/layout2.erb", <<-ERB)
+I present you: <%= yield %>
+    ERB
 
     html = renderer.render(:file, {}, :layout => "layout2")
 
-    assert_equal "I present you: Template", html
+    assert_equal "I present you: Template\n", html
   end
 
   it "renders templates of default type" do
@@ -129,16 +141,20 @@ describe Tiltout do
   it "renders with helper object" do
     renderer = Tiltout.new("/")
     renderer.helper(ViewHelper)
-    fake_file("/file.erb", "Say it: <%= say_it %>")
+    fake_file("/file.erb", <<-ERB)
+Say it: <%= say_it %>
+    ERB
 
-    assert_equal "Say it: YES", renderer.render(:file)
+    assert_equal "Say it: YES\n", renderer.render(:file)
   end
 
   it "creates with helper object" do
     renderer = Tiltout.new("/", :helpers => [ViewHelper])
-    fake_file("/file.erb", "Say it: <%= say_it %>")
+    fake_file("/file.erb", <<-ERB)
+Say it: <%= say_it %>
+    ERB
 
-    assert_equal "Say it: YES", renderer.render(:file)
+    assert_equal "Say it: YES\n", renderer.render(:file)
   end
 
   it "does not leak state across render calls" do
@@ -160,4 +176,29 @@ describe Tiltout do
 
     assert_equal "<title>NO</title><h1>NO</h1>\n", renderer.render(:file)
   end
+
+  describe "partials" do
+    it "renders partial" do
+      renderer = Tiltout.new("/", :helpers => [Tiltout::Partials])
+      fake_file("/part.erb", "I'm partial")
+      fake_file("/file.erb", <<-TEMPLATE)
+<%= partial(:part) %>!
+      TEMPLATE
+
+      assert_equal "I'm partial!\n", renderer.render(:file)
+    end
+
+    it "renders partial in template context" do
+      renderer = Tiltout.new("/", :helpers => [Tiltout::Partials])
+      fake_file("/part.erb", <<-ERB)
+<%= @name %> is partial
+      ERB
+      fake_file("/file.erb", <<-TEMPLATE)
+<% @name = "Chris" %>
+<%= partial(:part) %>
+      TEMPLATE
+
+      assert_equal "Chris is partial\n", renderer.render(:file)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiltout
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-10 00:00:00 +02:00
+date: 2012-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ files:
 - Rakefile
 - Readme.md
 - lib/tiltout.rb
+- lib/tiltout/partials.rb
 - lib/tiltout/version.rb
 - test/tiltout_test.rb
 - tiltout.gemspec