Changeset 560

Timestamp:

2007-05-21 17:14:10 (2 years ago)

Author:

gaspard

Message:

[fix] parser now replaces include/with during 'parse' and not during 'render'. Better inclusion of elements far away

Files:

• trunk/lib/parser/lib/parser.rb (modified) (5 diffs)
• trunk/lib/parser/lib/rules/zafu.rb (modified) (1 diff)
• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/lib/parser/test/parser_test.rb (modified) (1 diff)
• trunk/lib/parser/test/zafu.yml (modified) (3 diffs)
• trunk/lib/parser/test/zafu_insight.yml (modified) (1 diff)

trunk/lib/parser/lib/parser.rb

@@ -141 +141 @@
-  end
-  
-  def r_with
-    return unless part = @params[:part]
-    if @context[:preflight]
-      @pass[:part] = {part => self}
-      ""
-    else
-      r_void
-    end
-  end
-  
-  def r_void
-    expand_with
+  end
+  
+  def r_ignore
-  end
-  
@@ -164 +157 @@
-  end
-  
-  def r_include
-    expand_with(:preflight=>true)
-    if @parts != {}
-      # first definitions in inclusion history have precedence
-      expand_with(:parts  => (@parts).merge(@context[:parts] || {}), :blocks => @included_blocks)
-    else
-      expand_with(:blocks => @included_blocks)
-    end
-  end
-  
-  # basic rule to display errors
-  def r_unknown
@@ -181 +164 @@
-    end
-      
-z
+r
-    inner = expand_with
-    if inner != ''
-z
+r
-    else
-      res + "/&gt;</span>"
@@ -220 +203 @@
-  
-  def include_template
+    @method = 'void'
+    text    = @text
+    
-    # fetch text
-    text = @text
-    @options[:included_history] ||= []
-    
@@ -239 +224 @@
-    enter(:void) # scan fetched text
-    if @params[:part]
-@included_blocks = [find_part(
-
-@
+included_blocks = [find_part(@blocks, 
+
+
-    end
-    
-    @blocks = []
-
+  
-    enter(:void) # normal scan on content
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    res    = self
-    found  = []
-    path.split('/').reject {|e| e==''}.each do |name|
-res.
+
-        found << name
+        blocks = res.blocks
-      else
-        return "<span class='parser_error'>'#{(found + [name]).join('/')}' not found in template '#{@params[:template]}'</span>"

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

@@ -77 +77 @@
-      @html_tag_done = true
-      (@space_before || '') + res + (@space_after || '')
+    end
+    
+    def r_ignore
+      super
+      @html_tag_done = true
+      ""
-    end
-    

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

@@ -791 +791 @@
-      end
-      @context[:trans] ? "(#{res})" : "<%= #{res} %>"
-    end
-    
-    def r_ignore
-      @html_tag_done = true
-      ""
-    end
-    

trunk/lib/parser/test/parser_test.rb

@@ -44 +44 @@
-  testfile :zafu, :zafu_asset, :zafu_insight, :zazen
-  def test_single
-self
+part_far_away
-  end
-  

trunk/lib/parser/test/zafu.yml

@@ -160 +160 @@
-unknown:
-  src:  "this looks bad: <r:system truc='lala'/>"
-z
+r
-  
-check_params:
@@ -228 +228 @@
-  src: "include_super: <r:include template='/name'><p do='with' part='super/man' do='hello'/>"
-  res: "include_super: super: hey <p>hello world!</p>"
-
+
+
+
+
+
-name_title:
-  src: "title: <h1 do='void' name='title' do='text' text='dummy'>blah <b do='void' name='comment'>nothing</b></h1>"
@@ -249 +253 @@
-  res: "from ii: keep name: title: <h1>hello world! <i>rabbit</i></h1>"
-
-include_for_reverse:
-  src: "from ifr: <r:include template='/name'><r:with part='super/comment'>IFR</r:with></r:include>"
-  res: "from ifr: super: hey ho"
-
-include_replace_same:
-  src: "from IRS: <r:include template='/include/super/man'><span do='with' part='super/man'>goldorak</span></r:include>"
-  res: "from IRS: include_super: super: hey <span>goldorak</span>"
-
-include_reverse:
-  src: "from ir: <r:include template='/include/for/reverse'><h1 do='with' part='super'><i do='void' name='comment'>none</i> <r:hello/></h1></r:include>"
-  res: "from ir: from ifr: super: <h1><i>IFR</i> hello world!</h1>"
-
-include_empty:

trunk/lib/parser/test/zafu_insight.yml

@@ -1 @@
-simple:
-  src: "<r:inspect><r:with part='a'>this is a</r:with><r:with part='b'>this is b</r:with></r:inspect>"
-  res: "[inspect {< 'a'=>['this is a'], 'b'=>['this is b']}/]"
-
-with_sub_tags:
-  src: "<r:inspect><r:with part='hello'>I say <h3 do='hello'>hello</h3></r:with></r:inspect>"
-  res: "[inspect {< 'hello'=>['I say <h3>hello world!</h3>']}/]"
-
-menu:
-  src: "var a: <r:set_context menu='true'><r:void name='a'><r:hello/></r:void></r:set_context>"
-  res: "var a: hello world!"
-
-include:
-  src: "<r:include template='/menu'><r:with part='a'>do <r:inspect/></r:with></r:include>"
-  res: "var a: do [inspect {> :menu=>'true', :name=>'a', :parts=>'ado [inspect {> :preflight=>'true'}/]'}/]"