tilt 0.5 → 0.6

data/TEMPLATES.md

@@ -308,9 +308,9 @@ The class or module where View classes are located. If you have
 `Hurl::App::Views`, namespace should be `Hurl:App`. This defaults to `Object`,
 causing `::Views` to be searched for classes.
 
-#### `:mustaches => nil`
+#### `:mustaches => nil` or `:view_path => nil`
 
-Where mustache views (.rb files) are located, or nil to disable auto-requiring
+Where mustache views (`.rb` files) are located, or `nil` to disable auto-requiring
 of views based on template names. By default, the view file is assumed to be in
 the same directory as the template file.
 

data/lib/tilt.rb

@@ -1,5 +1,5 @@
 module Tilt
-  VERSION = '0.5'
+  VERSION = '0.6'
 
   @template_mappings = {}
 
@@ -77,6 +77,7 @@ module Tilt
       @line = line || 1
       @options = options || {}
       @reader = block || lambda { |t| File.read(file) }
+      @data = nil
 
       if !self.class.engine_initialized
         initialize_engine
@@ -400,9 +401,8 @@ module Tilt
         scope  = scope.to_h.inject({}){ |h,(k,v)| h[k.to_s] = v ; h }
         locals = scope.merge(locals)
       end
-      # TODO: Is it possible to lazy yield ?
       locals['yield'] = block.nil? ? '' : yield
-      locals['content'] = block.nil? ? '' : yield
+      locals['content'] = locals['yield']
       @engine.render(locals)
     end
   end
@@ -437,22 +437,22 @@ module Tilt
   register 'md', RDiscountTemplate
 
 
-# RedCloth implementation. See:
-# http://redcloth.org/
-class RedClothTemplate < Template
-  def initialize_engine
-    require_template_library 'redcloth' unless defined? ::RedCloth
-  end
+  # RedCloth implementation. See:
+  # http://redcloth.org/
+  class RedClothTemplate < Template
+    def initialize_engine
+      require_template_library 'redcloth' unless defined? ::RedCloth
+    end
 
-  def compile!
-    @engine = RedCloth.new(data)
-  end
+    def compile!
+      @engine = RedCloth.new(data)
+    end
 
-  def evaluate(scope, locals, &block)
-    @engine.to_html
+    def evaluate(scope, locals, &block)
+      @engine.to_html
+    end
   end
-end
-register 'textile', RedClothTemplate
+  register 'textile', RedClothTemplate
 
 
   # Mustache is written and maintained by Chris Wanstrath. See:
@@ -470,9 +470,10 @@ register 'textile', RedClothTemplate
 
     def compile!
       Mustache.view_namespace = options[:namespace]
+      Mustache.view_path = options[:view_path] || options[:mustaches]
       @engine = options[:view] || Mustache.view_class(name)
       options.each do |key, value|
-        next if %w[view namespace mustaches].include?(key.to_s)
+        next if %w[view view_path namespace mustaches].include?(key.to_s)
         @engine.send("#{key}=", value) if @engine.respond_to? "#{key}="
       end
     end
@@ -525,4 +526,21 @@ register 'textile', RedClothTemplate
     end
   end
   register 'rdoc', RDocTemplate
+
+  # CoffeeScript info:
+  # http://jashkenas.github.com/coffee-script/
+  class CoffeeTemplate < Template
+    def initialize_engine
+      require_template_library 'coffee-script' unless defined? ::CoffeeScript
+    end
+
+    def compile!
+      @engine = ::CoffeeScript::compile(data, options)
+    end
+
+    def evaluate(scope, locals, &block)
+      @engine
+    end
+  end
+  register 'coffee', CoffeeTemplate
 end

data/test/tilt_coffeetemplate_test.rb

@@ -0,0 +1,20 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'coffee-script'
+
+  class CoffeeTemplateTest < Test::Unit::TestCase
+    test "is registered for '.coffee' files" do
+      assert_equal Tilt::CoffeeTemplate, Tilt['test.coffee']
+    end
+
+    test "compiles and evaluates the template on #render" do
+      template = Tilt::CoffeeTemplate.new { |t| "greeting: \"Hello CoffeeScript\"" }
+      assert_equal "(function(){\n  var greeting;\n  greeting = \"Hello CoffeeScript\";\n})();", template.render
+    end
+  end
+
+rescue LoadError => boom
+  warn "Tilt::CoffeeTemplate (disabled)\n"
+end

data/test/tilt_mustache_views/external.rb

@@ -0,0 +1,9 @@
+require 'mustache'
+
+module Views
+  class External < Mustache
+    def hello
+      "Stached"
+    end
+  end
+end

data/test/tilt_mustachetemplate_test.rb

@@ -51,6 +51,15 @@ begin
       assert_equal "<p>Hello World!</p>", template.render
     end
 
+    test "locating views in files" do
+      view_path = File.expand_path('../tilt_mustache_views', __FILE__)
+      template = Tilt::MustacheTemplate.new('external.mustache', :view_path => view_path) { "<p>{{hello}}!</p>" }
+      template.compile
+      assert defined?(Views::External), "external.rb should have been required"
+      assert_equal Views::External, template.engine
+      assert_equal "<p>Stached!</p>", template.render
+    end
+
     test "copying instance variables from scope object" do
       template = Tilt::MustacheTemplate.new('foo.mustache') { "<p>Hey {{foo}}!</p>" }
       scope = Object.new

data/tilt.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'tilt'
-  s.version = '0.5'
-  s.date = '2010-01-15'
+  s.version = '0.6'
+  s.date = '2010-02-22'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -22,11 +22,13 @@ Gem::Specification.new do |s|
     lib/tilt.rb
     test/tilt_buildertemplate_test.rb
     test/tilt_cache_test.rb
+    test/tilt_coffeetemplate_test.rb
     test/tilt_erbtemplate_test.rb
     test/tilt_erubistemplate_test.rb
     test/tilt_hamltemplate_test.rb
     test/tilt_lesstemplate_test.rb
     test/tilt_liquidtemplate_test.rb
+    test/tilt_mustache_views/external.rb
     test/tilt_mustachetemplate_test.rb
     test/tilt_rdiscounttemplate_test.rb
     test/tilt_rdoctemplate_test.rb

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: tilt
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -9,89 +13,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -08:00
+date: 2010-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: contest
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: erubis
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mustache
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rdiscount
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: liquid
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: less
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id008
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com
 executables: []
@@ -109,11 +129,13 @@ files:
 - lib/tilt.rb
 - test/tilt_buildertemplate_test.rb
 - test/tilt_cache_test.rb
+- test/tilt_coffeetemplate_test.rb
 - test/tilt_erbtemplate_test.rb
 - test/tilt_erubistemplate_test.rb
 - test/tilt_hamltemplate_test.rb
 - test/tilt_lesstemplate_test.rb
 - test/tilt_liquidtemplate_test.rb
+- test/tilt_mustache_views/external.rb
 - test/tilt_mustachetemplate_test.rb
 - test/tilt_rdiscounttemplate_test.rb
 - test/tilt_rdoctemplate_test.rb
@@ -141,18 +163,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: wink
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Generic interface to multiple Ruby template engines