tilt 2.0.0.beta1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61afe68e016ac0b7857c8dab1c753683f432cbc1
-  data.tar.gz: f530866bbe789257559be15b56224a0f568acc03
+  metadata.gz: f43cb3f1357b1eeb55d129fed314692c5c053322
+  data.tar.gz: 63ba1cd6367f652f75c968a479530ae6830dc663
 SHA512:
-  metadata.gz: aaa94daebb4a6407c68a1487ffdb51b575bf732d4971dcbcae5efdf38e6f906a86947af15059a6480ed9d06885248f30d3f5bcda061e48f8313b90e69c7a0df6
-  data.tar.gz: ae9c268c9c14dc3187714374f8008a8f8b982f5075dcf709aede679fef26de0702e9d48f242d196aa9d194b3a2513f439f1719503a76c4761c78d7e1e0f24df1
+  metadata.gz: 2a30fa65c04fe76bb58af64df4d1940272507d765b942eea1433ad070f0f924566f0c5b3569700dd50f947fc9c6bafe634a46c77279c42e4ac22ee8133e7adcf
+  data.tar.gz: eca0811f6a72525467c766996191feb3c0bc59b533dbe91831379e7ba3142b4010f37452b232d52145431e66391c3c0a858c0457a8dbe98bd857e1cbc7e0a015

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## master
 
+* Add Handlebars as external template engine (#204, judofyr, jimothyGator)
+* Add org-ruby as external template engine (#207, judofyr, minad)
+* Documentation typo (#208, elgalu)
+
+## 2.0.0.beta1 (2013-07-16)
+
+* Documentation typo (#202, chip)
+* Use YARD for documentation (#189, judofyr)
+* Add Slim as an external template engine (judofyr)
 * Add Tilt.templates_for (#121, judofyr)
 * Add Tilt.current_template (#151, judofyr)
 * Avoid loading all files in tilt.rb (#160, #187, judofyr)

data/Gemfile

@@ -18,7 +18,7 @@ group :engines do
   gem 'liquid'
   gem 'markaby'
   gem 'maruku'
-  gem 'nokogiri'
+  gem 'nokogiri' if RUBY_VERSION > '1.9.2'
   gem 'radius'
   gem 'sass'
   gem 'wikicloth'
@@ -26,14 +26,14 @@ group :engines do
 
   platform :ruby do
     gem 'yajl-ruby'
-    gem 'redcarpet'
-    gem 'rdiscount' if RUBY_VERSION != '1.9.2'
+    gem 'redcarpet' if RUBY_VERSION > '1.8.7'
+    gem 'rdiscount', '>= 2.1.6' if RUBY_VERSION != '1.9.2'
     gem 'RedCloth'
   end
 
   platform :mri do
     gem 'therubyracer'
-    gem 'bluecloth'
+    gem 'bluecloth' if ENV['BLUECLOTH']
   end
 end
 

data/README.md

@@ -5,7 +5,7 @@ Tilt [![Build Status](https://secure.travis-ci.org/rtomayko/tilt.png)](http://tr
 https://github.com/rtomayko/tilt/tree/tilt-1 for the current version.
 
 Tilt is a thin interface over a bunch of different Ruby template engines in
-an attempt to make their usage as generic possible. This is useful for web
+an attempt to make their usage as generic as possible. This is useful for web
 frameworks, static site generators, and other systems that support multiple
 template engines but don't want to code for each of them individually.
 
@@ -61,6 +61,7 @@ These template engines ship with their own Tilt integration:
     Embedded CoffeeScript                        sprockets
     JST                                          sprockets
     Org-mode                   .org              org-ruby (>= 0.6.2)
+    Handlebars                 .hbs, .handlebars tilt-handlebars
 
 See [TEMPLATES.md][t] for detailed information on template engine
 options and supported features.

data/docs/TEMPLATES.md

@@ -519,4 +519,5 @@ using this template engine within a threaded environment.
 [discount]: http://www.pell.portland.or.us/~orc/Code/discount/ "Discount"
 [rdiscount]: http://github.com/rtomayko/rdiscount/ "RDiscount"
 [smartypants]: http://daringfireball.net/projects/smartypants/ "Smarty Pants"
+[markdown]: http://en.wikipedia.org/wiki/Markdown "Markdown"
 

data/lib/tilt.rb

@@ -4,7 +4,7 @@ require 'tilt/template'
 # Namespace for Tilt. This module is not intended to be included anywhere.
 module Tilt
   # Current version.
-  VERSION = '2.0.0.beta1'
+  VERSION = '2.0.0'
 
   @default_mapping = Mapping.new
 
@@ -131,5 +131,7 @@ module Tilt
   register_lazy :YajlTemplate,         'tilt/yajl',      'yajl'
 
   # External template engines
-  register_lazy 'Slim::Template',      'slim',           'slim'
+  register_lazy 'Slim::Template',            'slim',            'slim'
+  register_lazy 'Tilt::HandlebarsTemplate',  'tilt/handlebars', 'handlebars', 'hbs'
+  register_lazy 'Tilt::OrgTemplate',         'org-ruby',        'org'
 end

data/lib/tilt/mapping.rb

@@ -63,7 +63,7 @@ module Tilt
     # Registrers a lazy template implementation by file extension. You
     # can have multiple lazy template implementations defined on the
     # same file extension, in which case the template implementation
-    # defined *last* will be attemted loaded *first*.
+    # defined *last* will be attempted loaded *first*.
     #
     # @param class_name [String] Class name of a template class.
     # @param file [String] Filename where the template class is defined.
@@ -100,8 +100,13 @@ module Tilt
     #   mapping.register MyEngine::Template, 'mt'
     #   mapping['index.mt'] # => MyEngine::Template
     def register(template_class, *extensions)
+      if template_class.respond_to?(:to_str)
+        # Support register(ext, template_class) too
+        extensions, template_class = [template_class], extensions[0]
+      end
+
       extensions.each do |ext|
-        @template_map[ext] = template_class
+        @template_map[ext.to_s] = template_class
       end
     end
 
@@ -171,6 +176,19 @@ module Tilt
       templates
     end
 
+    # Finds the extensions the template class has been registered under.
+    # @param [template class] template_class
+    def extensions_for(template_class)
+      res = []
+      template_map.each do |ext, klass|
+        res << ext if template_class == klass
+      end
+      lazy_map.each do |ext, choices|
+        res << ext if choices.any? { |klass, file| template_class.to_s == klass }
+      end
+      res
+    end
+
     private
 
     def lazy?(ext)

data/lib/tilt/template.rb

@@ -58,7 +58,9 @@ module Tilt
         when arg.respond_to?(:to_int)  ; @line = arg.to_int
         when arg.respond_to?(:to_hash) ; @options = arg.to_hash.dup
         when arg.respond_to?(:path)    ; @file = arg.path
-        else raise TypeError
+        when arg.respond_to?(:to_path) ; @file = arg.to_path
+        else raise TypeError, "Can't load the template file. Pass a string with a path " +
+          "or an object that responds to 'to_str', 'path' or 'to_path'"
         end
       end
 

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+
 require 'bundler'
 Bundler.setup
 

data/test/{tilt_mapping.rb → tilt_mapping_test.rb}

@@ -44,6 +44,16 @@ module Tilt
       refute @mapping.registered?('baz')
     end
 
+    test "#extensions_for" do
+      @mapping.register(Stub, 'foo', 'bar')
+      assert_equal ['foo', 'bar'].sort, @mapping.extensions_for(Stub).sort
+    end
+
+    test "supports old-style #register" do
+      @mapping.register('foo', Stub)
+      assert_equal Stub, @mapping['foo']
+    end
+
     context "lazy with one template class" do
       setup do
         @mapping.register_lazy('MyTemplate', 'my_template', 'mt')
@@ -57,6 +67,10 @@ module Tilt
         assert @mapping.registered?('mt')
       end
 
+      test "#extensions_for" do
+        assert_equal ['mt'], @mapping.extensions_for('MyTemplate')
+      end
+
       test "basic lookup" do
         req = proc do |file|
           assert_equal 'my_template', file

data/test/tilt_markdown_test.rb

@@ -67,11 +67,6 @@ module MarkdownTests
     html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => false
     assert_equal "<p>Hello ``World'' -- This is --- a test ...</p>", html
   end
-
-  def test_smarty_pants_true
-    html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
-    assert_equal "<p>Hello “World” — This is —– a test …</p>", html
-  end
 end
 
 begin
@@ -80,6 +75,11 @@ begin
   class MarkdownRDiscountTest < Minitest::Test
     include MarkdownTests
     template Tilt::RDiscountTemplate
+
+    def test_smarty_pants_true
+      html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
+      assert_equal "<p>Hello “World” – This is — a test …</p>", html
+    end
   end
 rescue LoadError => boom
   # It should already be warned in the main tests
@@ -121,6 +121,11 @@ begin
   class MarkdownBlueClothTest < Minitest::Test
     include MarkdownTests
     template Tilt::BlueClothTemplate
+
+    def test_smarty_pants_true
+      html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
+      assert_equal "<p>Hello “World” — This is —– a test …</p>", html
+    end
   end
 rescue LoadError => boom
   # It should already be warned in the main tests
@@ -137,7 +142,6 @@ begin
     # Smarty Pants is *always* on, but doesn't support it fully
     undef test_smarty_pants
     undef test_smarty_pants_false
-    undef test_smarty_pants_true
   end
 rescue LoadError => boom
   # It should already be warned in the main tests
@@ -155,7 +159,6 @@ begin
     # Doesn't support Smarty Pants, and even fails on ``Foobar''
     undef test_smarty_pants
     undef test_smarty_pants_false
-    undef test_smarty_pants_true
     # Smart Quotes is always on
     undef test_smart_quotes
     undef test_smart_quotes_false

data/test/tilt_marukutemplate_test.rb

@@ -17,18 +17,18 @@ begin
 
     test "preparing and evaluating templates on #render" do
       template = Tilt::MarukuTemplate.new { |t| "# Hello World!" }
-      assert_equal "<h1 id='hello_world'>Hello World!</h1>", template.render
+      assert_equal "<h1 id=\"hello_world\">Hello World!</h1>", template.render.strip
     end
 
     test "can be rendered more than once" do
       template = Tilt::MarukuTemplate.new { |t| "# Hello World!" }
-      3.times { assert_equal "<h1 id='hello_world'>Hello World!</h1>", template.render }
+      3.times { assert_equal "<h1 id=\"hello_world\">Hello World!</h1>", template.render.strip }
     end
 
     test "removes HTML when :filter_html is set" do
       template = Tilt::MarukuTemplate.new(:filter_html => true) { |t|
         "HELLO <blink>WORLD</blink>" }
-      assert_equal "<p>HELLO </p>", template.render
+      assert_equal "<p>HELLO </p>", template.render.strip
     end
   end
 rescue LoadError => boom

data/test/tilt_rdiscounttemplate_test.rb

@@ -28,7 +28,7 @@ begin
     test "smartypants when :smart is set" do
       template = Tilt::RDiscountTemplate.new(:smart => true) { |t|
         "OKAY -- 'Smarty Pants'" }
-      assert_equal "<p>OKAY &mdash; &lsquo;Smarty Pants&rsquo;</p>\n",
+      assert_equal "<p>OKAY &ndash; &lsquo;Smarty Pants&rsquo;</p>\n",
         template.render
     end
 

data/test/tilt_template_test.rb

@@ -32,6 +32,13 @@ class TiltTemplateTest < Minitest::Test
     assert_equal File.basename(tempfile.path), inst.basename
   end
 
+  test "initializing with a pathname" do
+    tempfile = Tempfile.new('tilt_template_test')
+    pathname = Pathname.new(tempfile.path)
+    inst = MockTemplate.new(pathname)
+    assert_equal File.basename(tempfile.path), inst.basename
+  end
+
   class SillyHash < Hash
     def path(arg)
     end

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 = '2.0.0.beta1'
-  s.date = '2013-07-16'
+  s.version = '2.0.0'
+  s.date = '2013-11-30'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -76,7 +76,7 @@ Gem::Specification.new do |s|
     test/tilt_lesstemplate_test.less
     test/tilt_lesstemplate_test.rb
     test/tilt_liquidtemplate_test.rb
-    test/tilt_mapping.rb
+    test/tilt_mapping_test.rb
     test/tilt_markaby_test.rb
     test/tilt_markdown_test.rb
     test/tilt_marukutemplate_test.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilt
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Tomayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies: []
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com
@@ -78,7 +78,7 @@ files:
 - test/tilt_lesstemplate_test.less
 - test/tilt_lesstemplate_test.rb
 - test/tilt_liquidtemplate_test.rb
-- test/tilt_mapping.rb
+- test/tilt_mapping_test.rb
 - test/tilt_markaby_test.rb
 - test/tilt_markdown_test.rb
 - test/tilt_marukutemplate_test.rb
@@ -117,12 +117,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 2
 summary: Generic interface to multiple Ruby template engines
@@ -142,6 +142,7 @@ test_files:
 - test/tilt_kramdown_test.rb
 - test/tilt_lesstemplate_test.rb
 - test/tilt_liquidtemplate_test.rb
+- test/tilt_mapping_test.rb
 - test/tilt_markaby_test.rb
 - test/tilt_markdown_test.rb
 - test/tilt_marukutemplate_test.rb