handlebar 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/handlebar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "handlebar"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = "2011-11-28"
+  s.date = "2012-07-18"
   s.description = "A simple text templating system"
   s.email = "github@tadman.ca"
   s.extra_rdoc_files = [
@@ -29,12 +29,13 @@ Gem::Specification.new do |s|
     "notes/example.hb",
     "test/helper.rb",
     "test/test_handlebar.rb",
+    "test/test_handlebar_support.rb",
     "test/test_handlebar_template.rb"
   ]
   s.homepage = "http://github.com/twg/handlebar"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "Simple text tempating system"
 
   if s.respond_to? :specification_version then

data/lib/handlebar/support.rb

@@ -42,5 +42,32 @@ module Handlebar::Support
     end
   end
   
+  def variable_stack(variables, force_as_array = true)
+    case (variables)
+    when Hash
+      remapped = Hash[
+        variables.collect do |k, v|
+          [ k ? k.to_sym : k, variable_stack(v, false) ]
+        end
+      ]
+      
+      if (default = variables.default)
+        remapped.default = default
+      end
+
+      if (default_proc = variables.default_proc)
+        remapped.default_proc = default_proc
+      end
+      
+      remapped
+    when Array
+      variables.collect do |v|
+        variable_stack(v, false)
+      end
+    else
+      force_as_array ? [ variables ] : variables
+    end
+  end
+  
   extend self
 end

data/lib/handlebar/template.rb

@@ -3,6 +3,8 @@ class Handlebar::Template
   
   TOKEN_REGEXP = /((?:[^\{]|\{[^\{]|\{\{\{)+)|\{\{\s*([\&\%\$\.\:\*\/\=]|\?\!?)?([^\}]*)\}\}/.freeze
   TOKEN_TRIGGER = /\{\{/.freeze
+    
+  TO_YAML_PROPERTIES = %w[ @content @escape_method ].freeze
 
   # == Utility Classes ======================================================
   
@@ -24,7 +26,7 @@ class Handlebar::Template
   class RecursionError < Exception; end
 
   # == Class Methods ========================================================
-
+  
   # == Instance Methods =====================================================
   
   def initialize(content, options = nil)
@@ -61,20 +63,8 @@ class Handlebar::Template
   end
   
   def render(variables = nil, templates = nil, parents = nil)
-    variables =
-      case (variables)
-      when Array
-        variables
-      when Hash
-        _variables = variables
-        
-        Hash.new do |h, k|
-          h[k] = k ? (_variables[k.to_sym] || _variables[k.to_s]) : _variables[k]
-        end
-      else
-        [ variables ]
-      end
-      
+    variables = Handlebar::Support.variable_stack(variables, true)
+    
     if (templates)
       # Unless the template options have already been processed, mapping
       # will need to be performed.
@@ -206,8 +196,6 @@ class Handlebar::Template
           sections and sections[tag] = true
         when '?', '?!'
           # Defines start of a ?conditional
-          
-          stack[-1][2][tag.inspect]
 
           # The stack will inherit the variable assignment locations from the
           # existing stack layer.
@@ -277,11 +265,17 @@ class Handlebar::Template
     true
   end
   
-  def to_yaml(dump)
+  def to_yaml_properties
+    TO_YAML_PROPERTIES
+  end
+  
+  def psych_to_yaml(dump)
+    # Avoid serializing the generated proc by moving it to a temporary
+    # variable for the duration of this operation.
     _proc, @_proc = @_proc, nil
     
     super(dump)
-    
+
     @_proc = _proc
     
     dump

data/test/test_handlebar_support.rb

@@ -0,0 +1,47 @@
+require 'helper'
+
+require 'yaml'
+
+class TestHandlebarSupport < Test::Unit::TestCase
+  def test_variable_stack
+    test = { :test => [ { :a => 'a', :b => 'b' }, { :c => 'c' } ] }
+    
+    variables = Handlebar::Support.variable_stack(test)
+    
+    assert_equal test, variables
+    
+    assert_equal 'a', variables[:test][0][:a]
+    assert_equal 'b', variables[:test][0][:b]
+    assert_equal 'c', variables[:test][1][:c]
+
+    test = { 'test' => [ { 'a' => :a, 'b' => :b }, { 'c' => :c } ] }
+    
+    variables = Handlebar::Support.variable_stack(test)
+    
+    assert_equal :a, variables[:test][0][:a]
+    assert_equal :b, variables[:test][0][:b]
+    assert_equal :c, variables[:test][1][:c]
+
+    assert_equal 'test',  Handlebar::Support.variable_stack('test', false)
+    assert_equal [ 'test' ],  Handlebar::Support.variable_stack('test')
+    assert_equal [ 'test' ],  Handlebar::Support.variable_stack([ 'test' ], false)
+    assert_equal [ 'test' ],  Handlebar::Support.variable_stack([ 'test' ])
+    
+    variables = Handlebar::Support.variable_stack(:head => [ { :tag => 'meta' }, { :tag => 'link' } ])
+    
+    assert_equal 'meta', variables[:head][0][:tag]
+    assert_equal 'link', variables[:head][1][:tag]
+    
+    test = { 'top' => { 'layer' => 'top', 't' => 'top', 'middle' => { 'layer' => 'middle', 'm' => 'middle', 'bottom' => { 'layer' => 'bottom', 'b' => 'bottom' } } } }
+    
+    variables = Handlebar::Support.variable_stack(test)
+    
+    assert_equal 'top', variables[:top][:t]
+    assert_equal 'middle', variables[:top][:middle][:m]
+    assert_equal 'bottom', variables[:top][:middle][:bottom][:b]
+
+    assert_equal 'top', variables[:top][:layer]
+    assert_equal 'middle', variables[:top][:middle][:layer]
+    assert_equal 'bottom', variables[:top][:middle][:bottom][:layer]
+  end
+end

data/test/test_handlebar_template.rb

@@ -39,15 +39,34 @@ class TestHandlebarTemplate < Test::Unit::TestCase
     assert_equal 'false', template.render
     assert_equal 'true', template.render(:boolean => true)
     assert_equal 'false', template.render(:boolean => false)
-  end
+
+    template = Handlebar::Template.new('{{?boolean}}{{true}}{{/boolean}}{{?!boolean}}{{false}}{{/boolean}}')
+
+    assert_equal '', template.render
+    assert_equal 'TRUE', template.render(:boolean => true, :true => 'TRUE')
+    assert_equal 'FALSE', template.render(:boolean => false, :false => 'FALSE')
     
+    template = Handlebar::Template.new('{{?boolean}}{{/boolean}}{{?!boolean}}{{/boolean}}')
+    
+    assert_equal '', template.render
+    assert_equal '', template.render(:boolean => true)
+    assert_equal '', template.render(:boolean => false)
+  end
+  
   def test_sectioned_templates
     template = Handlebar::Template.new('<head>{{:head}}<{{tag}}>{{/}}</head>')
     
     assert_equal '<head><meta></head>', template.render(:head => 'meta')
+    assert_equal '<head><meta></head>', template.render('head' => 'meta')
     assert_equal '<head><meta><link></head>', template.render(:head => %w[ meta link ])
+    assert_equal '<head><meta><link></head>', template.render('head' => [ :meta, :link ])
     assert_equal '<head><meta><link></head>', template.render(:head => [ { :tag => 'meta' }, { :tag => 'link' } ])
+    assert_equal '<head><meta><link></head>', template.render('head' => [ { 'tag' => :meta }, { 'tag' => :link } ])
     assert_equal '<head></head>', template.render
+    assert_equal '<head></head>', template.render([ ])
+    assert_equal '<head></head>', template.render({ })
+    assert_equal '<head><></head>', template.render('')
+    assert_equal '<head><></head>', template.render(:head => '')
     assert_equal '<head></head>', template.render(:head => nil)
     assert_equal '<head></head>', template.render(:head => [ ])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handlebar
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies: []
 description: A simple text templating system
 email: github@tadman.ca
@@ -31,6 +31,7 @@ files:
 - notes/example.hb
 - test/helper.rb
 - test/test_handlebar.rb
+- test/test_handlebar_support.rb
 - test/test_handlebar_template.rb
 homepage: http://github.com/twg/handlebar
 licenses:
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple text tempating system