feather 0.3.0 → 0.3.1

data/Gemfile

@@ -0,0 +1,5 @@
+source :rubygems
+
+group :development do
+  gem 'jeweler'
+end

data/README.md

@@ -47,6 +47,6 @@ as a reference.
 
 ## Copyright
 
-Copyright (c) 2011-2012 Scott Tadman, The Working Group Inc.
+Copyright (c) 2011-2013 Scott Tadman, The Working Group Inc.
 See LICENSE.txt for further details.
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/feather.gemspec

@@ -0,0 +1,54 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "feather"
+  s.version = "0.3.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Scott Tadman"]
+  s.date = "2013-01-25"
+  s.description = "A simple light-weight text templating system"
+  s.email = "github@tadman.ca"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "feather.gemspec",
+    "lib/feather.rb",
+    "lib/feather/support.rb",
+    "lib/feather/template.rb",
+    "notes/example.ft",
+    "test/helper.rb",
+    "test/test_feather.rb",
+    "test/test_feather_support.rb",
+    "test/test_feather_template.rb"
+  ]
+  s.homepage = "http://github.com/twg/feather"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Light-weight text tempating system"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+    else
+      s.add_dependency(%q<jeweler>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<jeweler>, [">= 0"])
+  end
+end
+

data/lib/feather.rb

@@ -4,6 +4,8 @@ module Feather
   autoload(:Support, 'feather/support')
   autoload(:Template, 'feather/template')
 
+  # == Module Methods =======================================================
+
   def self.version
     @version ||= File.readlines(
       File.expand_path('../VERSION', File.dirname(__FILE__))

data/lib/feather/support.rb

@@ -2,6 +2,8 @@ require 'uri'
 require 'cgi'
 
 module Feather::Support
+  # == Module/Mixin Methods =================================================
+
   def uri_escape(object)
     URI.escape(object.to_s, /[^a-z0-9\-\.]/i)
   end

data/lib/feather/template.rb

@@ -81,6 +81,8 @@ class Feather::Template
               v
             when TOKEN_TRIGGER
               self.class.new(v, :escape => @escape_method)
+            when nil
+              nil
             else
               v.to_s
             end
@@ -206,7 +208,7 @@ class Feather::Template
 
           variables and variables[tag] = true
         when '*'
-          source and source << "_t=t&&t[#{tag.inspect}];r<<(_t.respond_to?(:call)?_t.call(v,t):_t.to_s);"
+          source and source << "_t=t&&(t[#{tag.inspect}]||t[#{tag.to_s.inspect}]);r<<(_t.respond_to?(:call)?_t.call(v,t):_t.to_s);"
           
           templates and templates[tag] = true
         when '/'

data/test/test_feather_support.rb

@@ -13,6 +13,7 @@ class TestFeatherSupport < Test::Unit::TestCase
     assert_equal 'a', variables[:test][0][:a]
     assert_equal 'b', variables[:test][0][:b]
     assert_equal 'c', variables[:test][1][:c]
+    assert_equal nil, variables[:test][1][:d]
 
     test = { 'test' => [ { 'a' => :a, 'b' => :b }, { 'c' => :c } ] }
     

data/test/test_feather_template.rb

@@ -94,6 +94,7 @@ class TestFeatherTemplate < Test::Unit::TestCase
     template = Feather::Template.new('{{*example}}', :escape => :html)
     
     assert_equal 'child', template.render(nil, { :example => '{{*parent}}', :parent => 'child' }.freeze)
+    assert_equal 'child', template.render(nil, { 'example' => '{{*parent}}', 'parent' => 'child' }.freeze)
   end
 
   def test_dynamic_variables

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feather
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -36,10 +36,12 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
+- feather.gemspec
 - lib/feather.rb
 - lib/feather/support.rb
 - lib/feather/template.rb