TODO.md @@ -7,8 +7,10 @@ module H2o COMMENT_START = '{*' COMMENT_END = '*}' + IDENTIFIER_RE = /[a-zA-Z_][a-zA-Z0-9_]*/ + NAME_RE = / - [a-zA-Z_][a-zA-Z0-9_]* + #{IDENTIFIER_RE} (?:\.[a-zA-Z0-9][a-zA-Z0-9_-]*)* /x lib/h2o/constants.rb @@ -1,7 +1,11 @@ module H2o module Tags class For < Tag - Syntax = /(?:(#{H2o::NAME_RE}),\s?)?(#{H2o::NAME_RE})\s+in\s+(#{H2o::NAME_RE})\s*(reversed)?/ + Syntax = / + (?:(#{H2o::IDENTIFIER_RE}),\s?)? + (#{H2o::IDENTIFIER_RE})\s+in\s+(#{H2o::NAME_RE})\s* + (reversed)? + /x def initialize(parser, argstring) @key = false lib/h2o/tags/for.rb @@ -1,45 +1,78 @@ require 'spec/spec_helper.rb' require 'pp' -describe "For tags" do +describe "For tag - Iterations" do it "should iteration through array" do - r = parse("{% for a in list %}{{ a }}{% endfor %}").render(:list => [1,2,3]) - - r.should == '123' + t = parse("{% for a in list %}{{ a }}{% endfor %}") + t.render(:list => [1,2,3]).should == '123' end it "should iterate through array subclass" do - context = {:user => {:lucky_numbers => Collection.new([1,2,3,4,5,6])}} - r = parse("{% for a in user.lucky_numbers %}{{a}}{%endfor%}").render(context) + t = parse("{% for i, user in users %}{{ i }}.{{ user }}{% endfor %}") + t.render(:users =>%w(PeterIT ManHoodHero)).should == '0.PeterIT1.ManHoodHero' + end + + it "should iterate through a hash object" do + person = {:name => 'taylor', :age => 19 } - r.should == '123456' + t = parse("{% for a in person %}{{ a }}{% endfor %}") + t.render(:person => person).should == 'taylor19' + + t = parse("{%for a, b in person %}{{ a }}{{ b }}{% endfor %}") + t.render(:person => person).should == 'nametaylorage19' end - it "should iterate through a hash object" do - context = {:person => {:name => 'taylor', :age => 19}} - r = parse("{%for a in person%}{{ a }}{% endfor %}").render(context) +end + + +describe "For Tag - Magic loop variable" do + + before do + @context = {:words=> %w(something else about this person) } + end + + it "should correct iteration counters" do + fortag('{{ loop.counter }}').render(@context).should == '12345' + fortag('{{ loop.counter0 }}').render(@context).should == '01234' + + fortag('{{ loop.revcounter }}').render(@context).should == '54321' + fortag('{{ loop.revcounter0 }}').render(@context).should == '43210' + end + + it "should have .even and .odd iteration flag" do + fortag('{% if loop.even %}{{ item }}{% endif %}').render(@context).should == 'elsethis' + fortag('{% if loop.odd %}{{ item}}{% endif %}').render(@context).should == 'somethingaboutperson' + end + + it "should have .first and .last flag to indicate if it's first/last iteration" do + fortag('{%if loop.first %}{{ item }}{% endif }').render(@context).should == 'something' + fortag('{%if loop.last %}{{ item }}{% endif }').render(@context).should == 'person' + end + + it "should have parent property pointer to parent loop" do + + result = fortag( + '{% for num in numbers %}{{ loop.parent.counter }}-{{ item }}{% endfor %}' + ).render(@context.merge(:numbers=> [6,8])) - if RUBY_VERSION.match("1.8") - r.should == '19taylor' - else - r.should == 'taylor19' - end + result.should == '1-something1-something2-else2-else3-about3-about4-this4-this5-person5-person' - r = parse("{%for a, b in person %}{{ a }}{{ b }}{% endfor %}").render(context) + result = fortag( + '{% for num in numbers %}{% if loop.parent.first %}{{ num }}-{{ item }}{% endif %}{% endfor %}' + ).render(@context.merge(:numbers=> [88,99,66])) + + result.should == '88-something99-something66-something' - if RUBY_VERSION.match("1.8") - r.should == 'age19nametaylor' - else - r.should == 'nametaylorage19' - end end + def fortag(body) + parse("{% for item in words %}#{body}{% endfor %}") + end end + def parse(source) H2o::Template.parse(source) end - -class Collection < Array;end \ No newline at end of file spec/tags_spec.rb f538d0c7e5a433af8f9c57faa23faffb88f9b4c7 speedmax subjective@gmail.com http://github.com/speedmax/h2o/commit/7c6557a56c904ace21a88f10e9874b1eaf3b6f85 7c6557a56c904ace21a88f10e9874b1eaf3b6f85 2009-05-09T00:33:01-07:00 2009-05-09T00:33:01-07:00 - Fixed fortag key, value to be local variable only - updated tags_spec for better for_tag testing (iteration, magic loop variable) 5eb8929536bb76751cfc6f38fbf27648ef1771ac speedmax subjective@gmail.com