Changeset 591

Timestamp:

2007-06-01 17:14:29 (2 years ago)

Author:

gaspard

Message:

[new] zafu ignore tag can be written as <li do=>blah</li>
[change] lang links now use 'em' instead of 'b' for current lang
[new] added options for lang_links and show_path zafu tags

Files:

• trunk/app/helpers/application_helper.rb (modified) (3 diffs)
• trunk/lib/parser/lib/rules/zafu.rb (modified) (2 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (2 diffs)
• trunk/lib/parser/test/parser_test.rb (modified) (1 diff)
• trunk/lib/parser/test/zafu.yml (modified) (1 diff)
• trunk/test/helpers/basic.yml (modified) (1 diff)

trunk/app/helpers/application_helper.rb

@@ -874 +874 @@
-  def show_path(opts={})
-    node = opts[:node] || @node
+    tag  = opts[:tag] || 'li'
+    join = opts[:join] || ' / '
-    nav = []
-    node.ancestors.each do |obj|
@@ -880 +882 @@
-    
-    nav << "<a href='#{url_for(zen_path(node))}' class='current'>#{node.name}</a>"
-
-
+
-  end
-  
@@ -969 +970 @@
-      ""
-    else
+      if opts[:tag]
+        tag_in  = "<#{opts[:tag]}>"
+        tag_out = "</#{opts[:tag]}>"
+      else
+        tag_in = tag_out = ''
+      end
-      res = []
-      visitor.site.lang_list.sort.each do |l|
-        if l == lang
-
+
+
+
+
+
-        else
-          if visitor.is_anon? && params[:prefix]
-link_to(l, :overwrite_params => {:prefix => l})
+tag_in + link_to(l, :overwrite_params => {:prefix => l}) + tag_out
-          else
-link_to(l, :overwrite_params => {:lang   => l})
+tag_in + link_to(l, :overwrite_params => {:lang   => l}) + tag_out
-          end
-        end
-      end
-
+opts[:join] || 
-    end
-  end

trunk/lib/parser/lib/rules/zafu.rb

@@ -80 +80 @@
-    
-    def r_ignore
-      super
-      @html_tag_done = true
-
-
+
+
+
+
-    
-    def r_rename_asset
@@ -247 +248 @@
-      # puts "TAG(#{@method}): [#{@text}]"
-      if @text =~ /\A<r:([\w_]+)([^>]*?)(\/?)>/
-}
+
-        eat $&
-        opts.merge!(:method=>$1, :params=>$2)
-        opts.merge!(:text=>'') if $3 != ''
-        make(:void, opts)
-|")([^\3]*?[^\\])\3
-[#{$&}]
+([^>]*?[^\\]|)'|"([^>]*?[^\\]|)")
+#{$~.to_a.inspect
-        eat $&
-$4, :html_tag=>$1, :html_tag_params=>$2, :params=>$5
-6
+($4||$5), :html_tag=>$1, :html_tag_params=>$2, :params=>$6
+7
-        make(:void, opts)
-      elsif @end_tag && @text =~ /\A<#{@end_tag}([^>]*?)(\/?)>/
-[#{$&}]
+#{$~.to_a.inspect
-        flush $&
-        @end_tag_count += 1 unless $2 == '/'
-      elsif @text =~ /\A<(link|img|script)/
-}
+
-        make(:asset)
-      elsif @text =~ /\A[^>]*?>/

trunk/lib/parser/lib/rules/zena.rb

@@ -1 @@
-
-
-
+
+
+
+
-  
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-end
-
@@ -42 +46 @@
-          class_eval <<-END
-            def r_#{name}
-
+\#{params_to_erb(@params)}
-            end
-          END

trunk/lib/parser/test/parser_test.rb

@@ -44 +44 @@
-  testfile :zafu, :zafu_asset, :zafu_insight, :zazen
-  def test_single
-nclude_part_far_awa
+gnore_do_empt
-  end
-  

trunk/lib/parser/test/zafu.yml

@@ -14 +14 @@
-  src: "<div class='test'><p>some <i>funny</i> text</p></div>"
-  res: "<div class='test'><p>some <i>funny</i> text</p></div>"
+
+ignore_tag:
+  src: "there is <li do='ignore'>delete me</li>nothing"
+  res: "there is nothing"
+
+ignore_do_empty:
+  src: "there is <li do=''>delete me</li>nothing left"
+  res: "there is nothing left"
-
-hello_skip_content:

trunk/test/helpers/basic.yml

@@ -225 +225 @@
-  src: "<div id='lang' do='lang_links'><a>en</a> | <b>fr</b></div>"
-  tem: "<div id='lang'><%= lang_links(:node=>@node) %></div>"
-b
+em
-
-show_path: