runo 0.2.0 → 0.2.1

data/lib/_parser.rb

@@ -69,13 +69,14 @@ module Runo::Parser
     out = ''
     s = StringScanner.new html
     until s.eos?
+      out << skip_comment(s)
       if s.scan rex_open_tag
         open_tag = s[0]
         inner_html, close_tag = scan_inner_html(s, s[1])
         close_tag << "\n" if s.scan /\n/
         out << block.call(open_tag, inner_html, close_tag)
       else
-        out << s.scan(/.+?(?=\t| |<|\z)/m)
+        out << s.scan(/.+?(?=\t| |<|\z)/m).to_s
       end
     end
     out
@@ -85,15 +86,24 @@ module Runo::Parser
     out = ''
     s = StringScanner.new html
     until s.eos?
+      out << skip_comment(s)
       if s.scan /\$\((\w+)(?:\s+|\s*=\s*)([\w\-]+)\s*/m
         out << block.call(s[1], {:klass => s[2]}.merge(scan_tokens(s)))
       else
-        out << s.scan(/.+?(?=\$|\w|<|\z)/m)
+        out << s.scan(/.+?(?=\$|<!|\z)/m).to_s
       end
     end
     out
   end
 
+  def skip_comment(s)
+    if s.scan /\s*<(!--|!\[CDATA\[)\n*/
+      s[0] + scan_inner_html(s, s[1]).join + (s.scan(/\n/) || '')
+    else
+      ''
+    end
+  end
+
   def scrape_meta(html)
     meta = {}
     html.gsub!(/(?:^\s+)?<meta[^>]*name="runo-([^"]+)[^>]*content="([^"]+).*?>\n?/i) {
@@ -210,15 +220,18 @@ module Runo::Parser
   end
 
   def scan_inner_html(s, name)
+    open_tag  = "<#{name}"
+    close_tag = {'!--' => '-->', '<![CDATA[' => ']]>'}[name] || "</#{name}>"
     contents = ''
+    rex = /(.*?)(#{Regexp.quote(open_tag)}|#{Regexp.quote(close_tag)}|\z)/m
     gen = 1
     until s.eos? || (gen < 1)
-      contents << s.scan(/(.*?)(<#{name}|<\/#{name}>|\z)/m)
-      gen += 1 if s[2] == "<#{name}"
-      gen -= 1 if s[2] == "</#{name}>"
+      contents << s.scan(rex)
+      gen += 1 if s[2] == open_tag
+      gen -= 1 if s[2] == close_tag
     end
     contents.gsub!(/\A\n+/, '')
-    contents.gsub!(/[\t ]*<\/#{name}>\z/, '')
+    contents.gsub!(/[\t ]*#{Regexp.quote(close_tag)}\z/, '')
     [contents, $&]
   end
 

data/lib/set/_set.rb

@@ -103,14 +103,15 @@ module Runo::Set
 
   def _get_by_tmpl(arg, tmpl = '')
     tmpl.gsub(/@\((.+?)\)/) {
+      tag   = $&
       steps = $1.split '-'
       id    = steps.pop
       item  = item steps
-      item ? item[id.intern] : '???'
+      item ? item[id.intern] : tag
     }.gsub(/_\((.+?)\)/) {
       _ $1
     }.gsub(/\$\((.*?)(?:\.([\w\-]+))?\)/) {
-      name, action = $1, $2
+      tag, name, action = $&, $1, $2
       if name == ''
         self_arg = action ?
           arg.merge(:orig_action => arg[:action], :action => action.intern) : arg
@@ -120,7 +121,7 @@ module Runo::Set
         item_arg = item_arg(arg, steps)
         item = item steps
         if item.nil?
-          '???'
+          tag
         elsif action
           item_arg = item_arg.merge(
             :orig_action => item_arg[:action],

data/t/test_parser.rb

@@ -77,6 +77,34 @@ _html
     )
   end
 
+  def test_parse_empty_tag_in_comment
+    html = 'hello <!-- $(foo = bar "baz baz") --> world'
+    result = Runo::Parser.parse_html html
+    assert_equal(
+      {},
+      result[:item],
+      'Parser.parse_html should skip runo tags in a comment'
+    )
+    assert_equal(
+      {:index => html},
+      result[:tmpl],
+      'Parser.parse_html should skip runo tags in a comment'
+    )
+
+    html = '<script><![CDATA[ $(foo = bar "baz baz") ]]></script>'
+    result = Runo::Parser.parse_html html
+    assert_equal(
+      {},
+      result[:item],
+      'Parser.parse_html should skip runo tags in a comment'
+    )
+    assert_equal(
+      {:index => html},
+      result[:tmpl],
+      'Parser.parse_html should skip runo tags in a comment'
+    )
+  end
+
   def test_obscure_markup
     result = Runo::Parser.parse_html('hello $(foo = bar $(baz=1) baz) world')
     assert_equal(
@@ -366,6 +394,44 @@ _html
     )
   end
 
+  def test_scan_comment
+    s = StringScanner.new 'baz -->'
+    inner_html, close_tag = Runo::Parser.scan_inner_html(s, '!--')
+    assert_equal(
+      'baz',
+      inner_html,
+      'Parser.scan_inner_html should parse html comments'
+    )
+    assert_equal(
+      ' -->',
+      close_tag,
+      'Parser.scan_inner_html should parse html comments'
+    )
+
+    s = StringScanner.new "baz\n  <!--bar-->\n-->"
+    inner_html, close_tag = Runo::Parser.scan_inner_html(s, '!--')
+    assert_equal(
+      "baz\n  <!--bar-->\n",
+      inner_html,
+      'Parser.scan_inner_html should parse nested comments'
+    )
+  end
+
+  def test_scan_cdata
+    s = StringScanner.new 'baz ]]>'
+    inner_html, close_tag = Runo::Parser.scan_inner_html(s, '<![CDATA[')
+    assert_equal(
+      'baz',
+      inner_html,
+      'Parser.scan_inner_html should parse CDATA section'
+    )
+    assert_equal(
+      ' ]]>',
+      close_tag,
+      'Parser.scan_inner_html should parse CDATA section'
+    )
+  end
+
   def test_parse_block_tag
     result = Runo::Parser.parse_html <<'_html'
 <ul class="app-blog" id="foo"><li>hello</li></ul>
@@ -462,12 +528,109 @@ _tmpl
     assert_equal(
       {:index => <<'_html'},
 hello$(foo.message)$(foo) world
+_html
+      result[:tmpl],
+      'Parser.parse_html[:tmpl] should be a proper template'
+    )
+
+    result = Runo::Parser.parse_html <<'_html'
+hello <!-- cruel --> <ul class="app-blog" id="foo"><li>hello</li></ul> world
+_html
+    assert_equal(
+      {
+        'foo' => {
+          :klass    => 'set-dynamic',
+          :workflow => 'blog',
+          :tmpl     => {
+            :index => <<'_tmpl'.chomp,
+ <ul class="app-blog" id="@(name)">$()</ul>$(.navi)$(.submit)$(.action_create)
+_tmpl
+          },
+          :item     => {
+            'default' => {
+              :label => nil,
+              :tmpl  => {:index => '<li>hello</li>'},
+              :item  => {},
+            },
+          },
+        },
+      },
+      result[:item],
+      'Parser.parse_html should be able to parse block runo tags'
+    )
+    assert_equal(
+      {:index => <<'_html'},
+hello <!-- cruel -->$(foo.message)$(foo) world
 _html
       result[:tmpl],
       'Parser.parse_html[:tmpl] should be a proper template'
     )
   end
 
+  def test_parse_block_tag_in_comment
+    [
+      <<'_html',
+hello <!--<ul class="app-blog" id="test1"><li>hello</li></ul>--> world
+_html
+      <<'_html',
+<!--
+<ul class="app-blog" id="test2">
+  <li>hello</li>
+</ul>
+-->
+_html
+      <<'_html',
+foo <!--
+<ul class="app-blog" id="test3">
+  <li>hello</li>
+</ul>
+--> bar
+_html
+      <<'_html',
+foo <!--
+<ul class="app-blog" id="test4">
+  <li>hello</li>
+</ul>
+--> bar
+_html
+      <<'_html',
+foo <!--
+<ul class="app-blog" id="test5">
+  <!-- may_preview -->
+  <li>hello</li>
+</ul>
+--> bar
+_html
+      <<'_html',
+<![CDATA[
+  <ul class="app-blog" id="test6">
+    <!-- may_preview -->
+    <li>hello</li>
+  </ul>
+]]>
+_html
+      <<'_html',
+<!--
+<ul class="app-blog" id="test7">
+  <!-- may_preview -->
+  <li>hello</li>
+</ul>
+_html
+    ].each {|html|
+      result = Runo::Parser.parse_html html
+      assert_equal(
+        {},
+        result[:item],
+        'Parser.parse_html should skip runo tags in a comment'
+      )
+      assert_equal(
+        {:index => html},
+        result[:tmpl],
+        'Parser.parse_html should skip runo tags in a comment'
+      )
+    }
+  end
+
   def test_parse_block_tag_obsolete_runo_class
     result = Runo::Parser.parse_html <<'_html'
 <ul class="runo-blog" id="foo"><li>hello</li></ul>
@@ -1260,6 +1423,35 @@ _html
     )
   end
 
+  def test_action_tmpl_in_comment
+    result = Runo::Parser.parse_html <<'_html'
+<ul id="foo" class="app-blog">
+  <li class="model">$(text)</li>
+  <!--
+  <div class="navi"><span class="navi_prev">prev</span></div>
+  -->
+</ul>
+_html
+    assert_nil(
+      result[:item]['foo'][:tmpl][:navi],
+      'Parser.parse_html should skip action templates in a comment'
+    )
+
+    result = Runo::Parser.parse_html <<'_html'
+<ul id="foo" class="app-blog">
+  <li class="model">$(text)</li>
+  <div class="navi"><!--<span class="navi_prev">prev</span>--></div>
+</ul>
+_html
+    assert_equal(
+      <<'_html',
+  <div class="navi"><!--<span class="navi_prev">prev</span>--></div>
+_html
+      result[:item]['foo'][:tmpl][:navi],
+      'Parser.parse_html should skip action templates in a comment'
+    )
+  end
+
   def test_supplement_sd
     result = Runo::Parser.parse_html <<'_html'
 <ul id="foo" class="app-blog">

data/t/test_set_static.rb

@@ -242,6 +242,29 @@ _html
     )
   end
 
+  def test_get_tmpl_non_existing_meta
+    ss = Runo::Set::Static.new(:html => '')
+    assert_equal(
+      'foo @(foo-bar) foo',
+      ss.send(:_get_by_tmpl, {}, 'foo @(foo-bar) foo'),
+      'Set#_get_by_tmpl should keep @() of non-existing item as is'
+    )
+    assert_equal(
+      'foo  foo',
+      ss.send(:_get_by_tmpl, {}, 'foo @(bar) foo'),
+      'Set#_get_by_tmpl should evaluate non-existing @()'
+    )
+  end
+
+  def test_get_tmpl_non_existing_item
+    ss = Runo::Set::Static.new(:html => '')
+    assert_equal(
+      'foo $(foo) foo',
+      ss.send(:_get_by_tmpl, {}, 'foo $(foo) foo'),
+      'Set#_get_by_tmpl should keep non-existing $() as is'
+    )
+  end
+
   def test_recursive_tmpl
     ss = Runo::Set::Static.new(:html => <<'_html')
 <li>$()</li>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Akira FUNAI
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +09:00
+date: 2010-07-28 00:00:00 +09:00
 default_executable: runo
 dependencies: 
 - !ruby/object:Gem::Dependency