tiltout 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tiltout (1.0.0)
+    tiltout (1.1.0)
       tilt (~> 1.3)
 
 GEM

data/lib/tiltout.rb

@@ -23,16 +23,16 @@
 # SOFTWARE.
 #++
 require "tilt"
+require "tiltout/version"
 
 class Tiltout
-  VERSION = "1.0.0"
-
   def initialize(template_root, opt = {})
     @template_root = template_root
     @cache = {} if !opt.key?(:cache) || opt[:cache]
     @layout = opt[:layout]
     @default_type = opt[:default_type] || "erb"
     @context_class = Class.new
+    (opt[:helpers] || []).each { |h| helper(h) }
   end
 
   def helper(helper)
@@ -62,6 +62,7 @@ class Tiltout
   end
 
   def find_file(name)
+    return name[:file] if name.is_a?(Hash)
     full_name = File.join(@template_root, name.to_s)
     return full_name if cached?(full_name) || File.exists?(full_name)
     File.join(@template_root, "#{name}.#{@default_type}")

data/lib/tiltout/version.rb

@@ -0,0 +1,28 @@
+# 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.
+#++
+
+class Tiltout
+  VERSION = "1.1.0"
+end

data/test/tiltout_test.rb

@@ -34,14 +34,23 @@ end
 describe Tiltout do
   before { @root = "/dolt/views" }
 
+  def file_read
+    File.respond_to?(:binread) ? :binread : :read
+  end
+
+  def fake_file(file, content)
+    File.stubs(:file_exists?).with(file).returns(true)
+    File.stubs(file_read).with(file).returns(content)
+  end
+
   it "reads template from file" do
-    File.expects(:read).with("/dolt/views/file.erb").returns("")
+    File.expects(file_read).with("/dolt/views/file.erb").returns("")
     renderer = Tiltout.new("/dolt/views")
     renderer.render(:file)
   end
 
   it "renders template with locals" do
-    File.stubs(:read).returns("<%= name %>!")
+    fake_file("#{@root}/file.erb", "<%= name %>!")
     renderer = Tiltout.new(@root)
 
     assert_equal "Chris!", renderer.render(:file, { :name => "Chris"})
@@ -49,43 +58,51 @@ describe Tiltout do
 
   it "caches template in memory" do
     renderer = Tiltout.new(@root)
-    File.stubs(:read).returns("Original")
+    fake_file("#{@root}/file.erb", "Original")
     renderer.render(:file)
-    File.stubs(:read).returns("Updated")
+    fake_file("#{@root}/file.erb", "Updated")
 
     assert_equal "Original", renderer.render(:file)
   end
 
   it "does not cache template in memory when configured not to" do
     renderer = Tiltout.new(@root, :cache => false)
-    File.stubs(:read).returns("Original")
+    fake_file("#{@root}/file.erb", "Original")
     renderer.render(:file)
-    File.stubs(:read).returns("Updated")
+    fake_file("#{@root}/file.erb", "Updated")
 
     assert_equal "Updated", renderer.render(:file)
   end
 
   it "renders template with layout" do
     renderer = Tiltout.new("/", :layout => "layout")
-    File.stubs(:read).with("/file.erb").returns("Template")
-    File.stubs(:read).with("/layout.erb").returns("I give you: <%= yield %>")
+    fake_file("/file.erb", "Template")
+    fake_file("/layout.erb", "I give you: <%= yield %>")
+
+    assert_equal "I give you: Template", 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 %>")
 
     assert_equal "I give you: Template", renderer.render(:file)
   end
 
   it "renders template once without layout" do
     renderer = Tiltout.new("/", :layout => "layout")
-    File.stubs(:read).with("/file.erb").returns("Template")
-    File.stubs(:read).with("/layout.erb").returns("I give you: <%= yield %>")
+    fake_file("/file.erb", "Template")
+    fake_file("/layout.erb", "I give you: <%= yield %>")
 
     assert_equal "Template", renderer.render(:file, {}, :layout => nil)
   end
 
   it "renders template once with different layout" do
     renderer = Tiltout.new("/", :layout => "layout")
-    File.stubs(:read).with("/file.erb").returns("Template")
-    File.stubs(:read).with("/layout.erb").returns("I give you: <%= yield %>")
-    File.stubs(:read).with("/layout2.erb").returns("I present you: <%= yield %>")
+    fake_file("/file.erb", "Template")
+    fake_file("/layout.erb", "I give you: <%= yield %>")
+    fake_file("/layout2.erb", "I present you: <%= yield %>")
 
     html = renderer.render(:file, {}, :layout => "layout2")
 
@@ -94,15 +111,15 @@ describe Tiltout do
 
   it "renders templates of default type" do
     renderer = Tiltout.new("/", :default_type => :str)
-    File.stubs(:read).with("/file.str").returns("Hey!")
+    fake_file("/file.str", "Hey!")
 
     assert_equal "Hey!", renderer.render(:file)
   end
 
   it "renders templates of specific type" do
     renderer = Tiltout.new("/", :default_type => :lol)
-    File.stubs(:read).with("/file.lol").returns("No!")
-    File.stubs(:read).with("/file.erb").returns("Yes!")
+    fake_file("/file.lol", "No!")
+    fake_file("/file.erb", "Yes!")
     File.stubs(:exists?).with("/file.lol").returns(false)
     File.stubs(:exists?).with("/file.erb").returns(true)
 
@@ -112,14 +129,21 @@ describe Tiltout do
   it "renders with helper object" do
     renderer = Tiltout.new("/")
     renderer.helper(ViewHelper)
-    File.stubs(:read).with("/file.erb").returns("Say it: <%= say_it %>")
+    fake_file("/file.erb", "Say it: <%= say_it %>")
+
+    assert_equal "Say it: YES", renderer.render(:file)
+  end
+
+  it "creates with helper object" do
+    renderer = Tiltout.new("/", :helpers => [ViewHelper])
+    fake_file("/file.erb", "Say it: <%= say_it %>")
 
     assert_equal "Say it: YES", renderer.render(:file)
   end
 
   it "does not leak state across render calls" do
     renderer = Tiltout.new("/")
-    File.stubs(:read).with("/file.erb").returns(<<-TEMPLATE)
+    fake_file("/file.erb", <<-TEMPLATE)
 <%= @response %><% @response = "NO" %><%= @response %>
     TEMPLATE
 
@@ -129,11 +153,10 @@ describe Tiltout do
 
   it "shares state between template and layout" do
     renderer = Tiltout.new("/", :layout => "layout")
-    File.stubs(:read).with("/file.erb").returns(<<-TEMPLATE)
-<% @response = "NO" %><h1><%= @response %></h1>
+    fake_file("/file.erb", <<-TEMPLATE)
+<h1><%= @response %><% @response = "NO" %><%= @response %></h1>
     TEMPLATE
-    tpl = "<title><%= @response %></title><%= yield %>"
-    File.stubs(:read).with("/layout.erb").returns(tpl)
+    fake_file("/layout.erb", "<title><%= @response %></title><%= yield %>")
 
     assert_equal "<title>NO</title><h1>NO</h1>\n", renderer.render(:file)
   end

data/tiltout.gemspec

@@ -23,7 +23,7 @@
 # SOFTWARE.
 #++
 dir = File.expand_path(File.dirname(__FILE__))
-require File.join(dir, "lib/tiltout")
+require File.join(dir, "lib/tiltout/version")
 
 Gem::Specification.new do |s|
   s.name        = "tiltout"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiltout
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-05 00:00:00 +02:00
+date: 2012-10-10 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/version.rb
 - test/tiltout_test.rb
 - tiltout.gemspec
 has_rdoc: true