Changeset 1211

Timestamp:

2008-10-04 00:08:24 (3 months ago)

Author:

gaspard

Message:

commit 9e07b2c4d5f41adbc01e3b0d88294effd9c76210
Author: Gaspard Bucher <gaspard@teti.ch>

Ignoring coverage data in doc/coverage.

Files:

• trunk/.gitignore (modified) (1 diff)
• trunk/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/doc (modified) (1 prop)
• trunk/lib/parser/lib/rules/zena.rb (modified) (8 diffs)
• trunk/test/fixtures/files/Node-test.zafu (modified) (2 diffs)
• trunk/test/helpers/application_helper_test.rb (modified) (1 diff)
• trunk/test/helpers/zena_parser/ajax.yml (modified) (1 diff)
• trunk/test/helpers/zena_parser/basic.yml (modified) (1 diff)

trunk/.gitignore

@@ -2 +2 @@
-config/deploy_config.rb
-config/database.yml
+doc/coverage
-log/
-public/images/ext/*_pv.png

trunk/app/helpers/application_helper.rb

@@ -735 +735 @@
-  end
-  
+  # list of page numbers links
+  def page_numbers(current, count, join_string = nil, max_count = nil)
+    max_count ||= 10
+    join_string ||= ''
+    join_str = ''
+    if count <= max_count
+      1.upto(count) do |p|
+        yield(p, join_str)
+        join_str = join_string
+      end
+    else
+      # only first pages (centered around current page)
+      if current - (max_count/2) > 0
+        finish = [current + (max_count/2),count].min
+      else
+        finish = [max_count,count].min
+      end
+      
+      start  = [finish - max_count + 1,1].max
+      
+      start.upto(finish) do |p|
+        yield(p, join_str)
+        join_str = join_string
+      end
+    end
+  end
+  
-  # main node before ajax stuff (the one in browser url)
-  def start_node

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

@@ -1735 +1735 @@
-      if @params[:page]
-        pagination_links
-      elsif upd = @params[:update]
-        return unless target = find_target(upd)
-        link_to_update(target)
-      else
-        make_link
@@ -1744 +1741 @@
-    
-    def make_link(options = {})
-  
+
-      default_text = options[:default_text]
-      params = @params.dup
@@ -1806 +1803 @@
-      
-      (params.keys - [:style, :class, :id, :rel, :name, :anchor, :attr, :tattr, :trans, :text, :page]).each do |k|
+        next if k.to_s =~ /if_|set_/
-        query_params[k] = params[k]
-      end
@@ -1829 +1827 @@
-            str = static ? CGI.escape(attribute) : "\#{CGI.escape(\"#{attribute}\")}"
-          end
-
+to_s.
-        end
-        pre_space + link_to_update(remote_target, :node_id => "#{lnode}.zip", :query_params => query_params_list, :default_text => default_text, :html_params => html_params)
@@ -1872 +1870 @@
-        @context[:vars] << "#{pagination_key}_previous"
-        out make_link(:default_text => "<%= set_#{pagination_key}_previous %>", :query_params => {pagination_key => "[#{pagination_key}_previous]"})
+        if descendant('else')
+          out expand_with(:in_if => true, :only => ['else', 'elsif'])
+        end
-        out "<% end -%>"
-      when 'next'
@@ -1878 +1879 @@
-        @context[:vars] << "#{pagination_key}_next"
-        out make_link(:default_text => "<%= set_#{pagination_key}_next %>", :query_params => {pagination_key => "[#{pagination_key}_next]"})
+        if descendant('else')
+          out expand_with(:in_if => true, :only => ['else', 'elsif'])
+        end
-        out "<% end -%>"
-      when 'list'
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      else
-        parser_error("unkown 'page' option #{@params[:page].inspect} should be ('previous', 'next' or 'list')")
@@ -1932 +1966 @@
-        elsif !descendant('else')
-          @blocks += [make(:void, :method=>'void', :text=>"<r:else do='[current_date]' format='%d'/>")]
+          remove_instance_variable(:@all_descendants)
-        end
-        @html_tag_done = false
@@ -2995 +3030 @@
-    
-    def text_for_link(default = nil)
-@blocks.first.kind_of?(String
+(@blocks.first.kind_of?(String) || ['else','elsif'].include?(@blocks.first.method)
-        expand_with
-      elsif default

trunk/test/fixtures/files/Node-test.zafu

@@ -33 +33 @@
-    <r:link mode='test' page='previous' do='t'>previous</r:link>
-    <r:show var='p'/>/<r:show var='p_count'/>
+    || <r:link page='list' mode='test'/> ||
-    <r:link mode='test' page='next' do='t'>next</r:link>
-  </p>
@@ -46 +47 @@
-    <r:link mode='test' update='pagir' page='previous' do='t'>previous</r:link>
-    <r:show var='p'/>/<r:show var='p_count'/>
+    || <r:link page='list' update='pagir'/> ||
-    <r:link mode='test' update='pagir' page='next' do='t'>next</r:link>
-  </p>

trunk/test/helpers/application_helper_test.rb

@@ -429 +429 @@
-  end
-  
+  def test_page_numbers
+    s = ""
+    page_numbers(2, 3, ',') {|p,j| s << "#{j}#{p}"}
+    assert_equal "1,2,3", s
+    s = ""
+    page_numbers(2, 30, ',') {|p,j| s << "#{j}#{p}"}
+    assert_equal "1,2,3,4,5,6,7,8,9,10", s
+    s = ""
+    page_numbers(14, 30, ',') {|p,j| s << "#{j}#{p}"}
+    assert_equal "10,11,12,13,14,15,16,17,18,19", s
+    s = ""
+    page_numbers(28, 30, ' | ') {|p,j| s << "#{j}#{p}"}
+    assert_equal "21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30", s
+  end
+  
-end

trunk/test/helpers/zena_parser/ajax.yml

@@ -217 +217 @@
-  src: "<div id='foo' do='block' do='nodes in site' limit='3' order='zip' paginate='pak'><r:link page='previous'/> | <r:show var='pak'/> | <r:link update='foo' page='next'/> || <r:each join=',' do='[id]'/></div>"
-  res: "/<a href='/oo/projects/cleanWater/page22.html\?pak=1'>1</a> \| 2 \| .*22/zafu\?pak=3.*dom_id=foo.*>3</a>/"
+
+link_page_list:
+  context:
+    pak: 2
+  src: "<div id='foo' do='block' do='nodes' in='site' limit='10' order='zip' paginate='pak' do='link' page='list' update='foo' join=', '/>"
+  tem: "/set_pak_page != set_pak.*tag_to_remote.*pak=#.CGI.escape..#.set_pak_page.*dom_id=foo/"
+  res: "/pak=1.*1</a>, 2, .*pak=3.*3</a>.*pak=4.*4</a>.*pak=5.*5</a>/"

trunk/test/helpers/zena_parser/basic.yml

@@ -1142 +1142 @@
-  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='next' do='t'>next</r:link></r:nodes>"
-  res: "<a href='/oo/projects/cleanWater/page22.html?pak=2'>next</a>"
+
+link_page_list:
+  context:
+    pak: 2
+  src: "<r:nodes in='site' limit='10' order='zip' paginate='pak' do='link' page='list' join=', '/>"
+  tem: "/set_pak_page != set_pak.*zen_path\(@node,:pak.*elsif true.*set_pak_page/"
+  res: "/<a href='.*page22.html\?pak=1'>1</a>, 2, .*pak=3'>3</a>.*pak=4'>4</a>.*pak=5'>5</a>/"
+
+link_page_previous_else_page1:
+  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='previous' do='else'>noprev</r:link></r:nodes>"
+  res: "noprev"
+
+link_page_previous_else_page2:
+  context:
+    pak: 2
+  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='previous' do='else'>noprev</r:link></r:nodes>"
+  res: "<a href='/oo/projects/cleanWater/page22.html?pak=1'>1</a>"
+
+link_page_list_else:
+  context:
+    pak: 2
+  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='list' join=', ' do='else'>[<r:show var='pak'/>]</r:link></r:nodes>"
+  res: "/<a.*1</a>, [2], <a.*3</a>/"