Changeset 1132

Timestamp:

2008-08-14 21:18:56 (5 months ago)

Author:

gaspard

Message:

Added 'alt_reverse' option to [each] to display stripes starting at the bottom of the list.
Added special 'stored' value 'start.id' to get, the zip of the start page (client browser page) deep in nested ajax calls.

Files:

• trunk/lib/parser/lib/rules/zena.rb (modified) (4 diffs)
• trunk/test/helpers/zena_parser/ajax.yml (modified) (1 diff)
• trunk/test/helpers/zena_parser/basic.yml (modified) (1 diff)

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

@@ -1429 +1429 @@
-        
-        @params[:alt_class] ||= @html_tag_params.delete(:alt_class)
-raise # TODO
+# FIXME
-        if @params[:alt_class] || @params[:join]
-          join = @params[:join] || ''
-          join = join.gsub(/&lt;([^%])/, '<\1').gsub(/([^%])&gt;/, '\1>')
+          out "<% #{var}_max_index = #{list}.size - 1 -%>" if @params[:alt_reverse]
-          out "<% #{list}.each_with_index do |#{var},#{var}_index| -%>"
-          out "<%= #{var}_index > 0 ? #{join.inspect} : '' %>"
-          
-          if alt_class = @params[:alt_class]
+            alt_test = @params[:alt_reverse] == 'true' ? "(#{var}_max_index - #{var}_index) % 2 != 0" : "#{var}_index % 2 != 0"
-            if html_class = @html_tag_params.delete(:class)
-var}_index % 2 != 0
+alt_test}
-            else
-var}_index % 2 != 0
+alt_test}
-            end
-          else
@@ -2578 +2580 @@
-                "#{node}[:id] == #{node_name}[:id]"
-              when 'start'
-#{node_name}
+@node
-              when 'parent'
-                "#{node}[:id] == #{node_name}[:parent_id]"
@@ -2699 +2701 @@
-    
-    def node_attribute(str, opts={})
+      return "(params[:s] || @node[:zip]).to_i" if str == 'start.id'
-      attribute, att_node, klass = get_attribute_and_node(str)
-      return 'nil' unless attribute
@@ -2926 +2929 @@
-      else
-        attribute = res[:name]
-
+ || attribute == 's'
-          res[:name] = attribute
-        else

trunk/test/helpers/zena_parser/ajax.yml

@@ -180 +180 @@
-start_id:
-  src: "<r:form><input type='hidden' name='s' set_value='[start.id]'/></r:form>"
-.
+/<input name='s' type='hidden' value='22'/>/

trunk/test/helpers/zena_parser/basic.yml

@@ -448 +448 @@
-  src: "<ol do='pages'><li do='each' alt_class='blue' do='[name]'/></ol>"
-  res: "<ol><li>status</li><li class=\"blue\">track</li></ol>"
+
+each_alternate_class_reverse:
+  context:
+    node: 'cleanWater'
+  src: "<ol do='pages'><li do='each' alt_class='blue' alt_reverse='true' do='[name]'/></ol>"
+  res: "<ol><li class=\"blue\">status</li><li>track</li></ol>"
-
-each_alternate_class_two: