tilt 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f43cb3f1357b1eeb55d129fed314692c5c053322
-  data.tar.gz: 63ba1cd6367f652f75c968a479530ae6830dc663
+  metadata.gz: fceb7a7101d7fee0f5a3d64a4b554c0a0526b028
+  data.tar.gz: 4cfc354aebbcf7d22a7fc85d34cfdc74e17245e3
 SHA512:
-  metadata.gz: 2a30fa65c04fe76bb58af64df4d1940272507d765b942eea1433ad070f0f924566f0c5b3569700dd50f947fc9c6bafe634a46c77279c42e4ac22ee8133e7adcf
-  data.tar.gz: eca0811f6a72525467c766996191feb3c0bc59b533dbe91831379e7ba3142b4010f37452b232d52145431e66391c3c0a858c0457a8dbe98bd857e1cbc7e0a015
+  metadata.gz: 1ca1be3a71d372a712708730fc265b293da204309fcfc577229b96190f84bbea4f5dfb12d2ce3dbdb93f0adf2330da2ee8f97b07676fb826b61e42560e5c09c6
+  data.tar.gz: ce739c19f41b2dcff91ed9d6827839123407a471d644743ec7c292de4c24185b6b66adeacd968fd065a84d18277ee2b49308bf993af5a98d8f1121218dd1e50f

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## master
 
+## 2.0.1 (2014-03-21)
+
+* Fix Tilt::Mapping bug in Ruby 2.1.0 (9589652c569760298f2647f7a0f9ed4f85129f20)
+* Fix `tilt --list` (#223, Achrome)
+* Fix circular require (#221, amarshall)
+
+## 2.0.0 (2013-11-30)
+
+* Support Pathname in Template#new (#219, kabturek)
+* Add Mapping#templates_for (judofyr)
+* Support old-style #register (judofyr)
 * Add Handlebars as external template engine (#204, judofyr, jimothyGator)
 * Add org-ruby as external template engine (#207, judofyr, minad)
 * Documentation typo (#208, elgalu)

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'yard', '~> 0.8.6'
 gem 'minitest', '~> 5.0'
@@ -21,10 +21,10 @@ group :engines do
   gem 'nokogiri' if RUBY_VERSION > '1.9.2'
   gem 'radius'
   gem 'sass'
-  gem 'wikicloth'
   gem 'rdoc', (ENV['RDOC_VERSION'] || '> 0')
 
   platform :ruby do
+    gem 'wikicloth'
     gem 'yajl-ruby'
     gem 'redcarpet' if RUBY_VERSION > '1.8.7'
     gem 'rdiscount', '>= 2.1.6' if RUBY_VERSION != '1.9.2'
@@ -37,3 +37,8 @@ group :engines do
   end
 end
 
+## WHY do I have to do this?!?
+platform :rbx do
+  gem 'rubysl'
+end
+

data/README.md

@@ -1,8 +1,8 @@
 Tilt [![Build Status](https://secure.travis-ci.org/rtomayko/tilt.png)](http://travis-ci.org/rtomayko/tilt) [![Dependency Status](https://gemnasium.com/rtomayko/tilt.png)](https://gemnasium.com/rtomayko/tilt)
 ====
 
-**NOTE** The follow file documents the upcoming release of Tilt (2.0). See
-https://github.com/rtomayko/tilt/tree/tilt-1 for the current version.
+**NOTE** The following file documents the current release of Tilt (2.0). See
+https://github.com/rtomayko/tilt/tree/tilt-1 for documentation for Tilt 1.4.
 
 Tilt is a thin interface over a bunch of different Ruby template engines in
 an attempt to make their usage as generic as possible. This is useful for web

data/bin/tilt

@@ -44,9 +44,9 @@ ARGV.options do |o|
   # list all available template engines
   o.on("-l", "--list") do
     groups = {}
-    Tilt.mappings.each do |pattern,engines|
+    Tilt.lazy_map.each do |pattern,engines|
       engines.each do |engine|
-        key = engine.name.split('::').last.sub(/Template$/, '')
+        key = engine[0].split('::').last.sub(/Template$/, '')
         (groups[key] ||= []) << pattern
       end
     end

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'
+  VERSION = '2.0.1'
 
   @default_mapping = Mapping.new
 

data/lib/tilt/mapping.rb

@@ -148,7 +148,7 @@ module Tilt
     #
     # @return [template class]
     def [](file)
-      prefix, ext = split(file)
+      _, ext = split(file)
       ext && lookup(ext)
     end
 
@@ -256,8 +256,8 @@ module Tilt
 
     def constant_defined?(name)
       name.split('::').inject(Object) do |scope, n|
-        return false unless scope.const_defined?(n)
         return false if scope.autoload?(n) # skip autload
+        return false unless scope.const_defined?(n)
         scope.const_get(n)
       end
     end

data/lib/tilt/template.rb

@@ -1,4 +1,3 @@
-require 'tilt'
 require 'thread'
 
 module Tilt

data/test/tilt_marukutemplate_test.rb

@@ -28,7 +28,7 @@ begin
     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.strip
+      assert_equal "<p>HELLO</p>", template.render.strip
     end
   end
 rescue LoadError => boom

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'
-  s.date = '2013-11-30'
+  s.version = '2.0.1'
+  s.date = '2014-03-21'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilt
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ryan Tomayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies: []
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com
@@ -102,27 +102,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Tilt
-- --main
+- "--main"
 - Tilt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 2
 summary: Generic interface to multiple Ruby template engines