tiltout 1.2.0 → 1.3.0

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+  - 1.8.7
+  - ree

data/Gemfile.lock

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

data/Readme.md

@@ -1,5 +1,9 @@
 # Tiltout
 
+<a href="http://travis-ci.org/cjohansen/tiltout" class="travis">
+  <img src="https://secure.travis-ci.org/cjohansen/tiltout.png">
+</a>
+
 ## Tilt templates with layouts and helpers
 
 Tiltout is a small abstraction over Tilt that allows you to render templates

data/lib/tiltout.rb

@@ -33,12 +33,13 @@ class Tiltout
     @layout = opt[:layout]
     @default_type = opt[:default_type] || "erb"
     @context_class = Class.new
-    (opt[:helpers] || []).each { |h| helper(h) }
+    helper(opt[:helpers])
   end
 
-  def helper(helper)
-    helper = [helper] unless Array === helper
-    helper.each { |h| @context_class.send(:include, h) }
+  def helper(helpers)
+    return if helpers.nil?
+    helpers = [helpers] unless helpers.is_a?(Array)
+    helpers.each { |h| @context_class.send(:include, helper_module(h)) }
   end
 
   def render(template, locals = {}, options = {})
@@ -49,7 +50,6 @@ class Tiltout
 
     if !layout_tpl.nil?
       content = render_in_context(context, layout_tpl, locals) { content }
-      #content = load(layout_tpl).render(context, locals) { content }
     end
 
     content
@@ -82,4 +82,12 @@ class Tiltout
   def cached?(name)
     @cache && !!@cache[name]
   end
+
+  def helper_module(mod)
+    return mod if mod.is_a?(Module)
+    mod.keys.inject(Module.new) do |helper, attr|
+      helper.send(:define_method, attr) { mod[attr] }
+      helper
+    end
+  end
 end

data/lib/tiltout/version.rb

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

data/test/tiltout_test.rb

@@ -86,6 +86,17 @@ I give you: <%= yield %>
     assert_equal "I give you: Template\n", renderer.render(:file)
   end
 
+  it "renders template not in template root" do
+    renderer = Tiltout.new("/else")
+    fake_file("/somewhere/file.erb", "Template")
+    fake_file("/my/layout.erb", <<-ERB)
+I give you: <%= yield %>
+    ERB
+
+    template = { :file => "/somewhere/file.erb" }
+    assert_equal "Template", renderer.render(template)
+  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")
@@ -157,6 +168,16 @@ Say it: <%= say_it %>
     assert_equal "Say it: YES\n", renderer.render(:file)
   end
 
+  it "uses hash as helper" do
+    renderer = Tiltout.new("/")
+    renderer.helper(:say_it => 42, "do_it" => 12)
+    fake_file("/file.erb", <<-ERB)
+Say it: <%= say_it %>, <%= do_it %>
+    ERB
+
+    assert_equal "Say it: 42, 12\n", renderer.render(:file)
+  end
+
   it "does not leak state across render calls" do
     renderer = Tiltout.new("/")
     fake_file("/file.erb", <<-TEMPLATE)

metadata

@@ -1,96 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tiltout
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Christian Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-15 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: tilt
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: |
-  Tiltout is a small abstraction on top of Tilt that allows you to render
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Tiltout is a small abstraction on top of Tilt that allows you to render
+
   templates with optional layouts, share state between layout and template,
+
   register helper modules and optionally cache templates.
 
-email: 
+'
+email:
 - christian@gitorious.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -100,39 +98,28 @@ files:
 - lib/tiltout/version.rb
 - test/tiltout_test.rb
 - tiltout.gemspec
-has_rdoc: true
 homepage: http://gitorious.org/gitorious/tiltout
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Tilt templates with layouts and helpers
 test_files: []
-