Changeset 1207

Timestamp:

2008-10-02 14:15:18 (3 months ago)

Author:

gaspard

Message:

commit 2386d2d0768a076d7bffba7ef1ac0144afc7a07a
Author: Gaspard Bucher <gaspard@teti.ch>

Redirects should include url parameters like "?page=2".

Files:

• trunk/app/controllers/application.rb (modified) (1 diff)
• trunk/app/controllers/nodes_controller.rb (modified) (3 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/test/helpers/zena_parser/basic.yml (modified) (1 diff)
• trunk/test/integration/navigation_test.rb (modified) (1 diff)

trunk/app/controllers/application.rb

@@ -583 +583 @@
-    # 8. 'test.host/fr' the redirect for this rule is called once we are sure the request is not for document data (lang in this case can be different from what the visitor is visiting due to caching optimization)
-    def set_lang
-      # TODO: how to include zena rules in file reload (in a better way then this hack) ?
-      # load "#{RAILS_ROOT}/lib/parser/lib/rules/zena.rb" if RAILS_ENV == 'development'
-      if params[:prefix] =~ /^\d+$/
-        # this has nothing to do with set_lang...

trunk/app/controllers/nodes_controller.rb

@@ -35 +35 @@
-  # Render badly formed urls
-  def catch_all
-
+
+
+
+
+
-  end
-  
@@ -384 +388 @@
-      when 'show'
-        # show must have a 'path' parameter
+        
-        if params[:prefix] != prefix && !avoid_prefix_redirect
-          # lang changed
-          set_visitor_lang(params[:prefix])
-:mode => params[:mode]
+path_params
-        elsif params[:path] != zen_path(@node, :format=>params[:format], :mode=>params[:mode], :asset=>params[:asset]).split('/')[2..-1]
-          # badly formed url
-:mode => params[:mode]
+path_params
-        elsif params[:mode] == 'edit' && !@node.can_write?
-          # special 'edit' mode
@@ -427 +432 @@
-      @node.kind_of?(Document) && params[:format] == @node.c_ext
-    end
+    
+    # Url parameters (without format/mode/prefix...)
+    def url_params
+      res = {}
+      path_params.each do |k,v|
+        next if [:mode, :format, :asset].include?(k.to_sym)
+        res[k.to_sym] = v
+      end
+      res
+    end
+    
+    # Url parameters (without action,controller,path,prefix)
+    def path_params
+      res = {}
+      params.each do |k,v|
+        next if [:action, :controller, :path, :prefix, :id].include?(k.to_sym)
+        res[k.to_sym] = v
+      end
+      res
+    end
-end
-

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

@@ -2670 +2670 @@
-          end
-        when :test
-
+:
-            parts = [$1,$3]
-            op = {'lt' => '<','le' => '<=','eq' => '==', '=' => '==','ne' => '!=','ge' => '>=','gt' => '>'}[$2] || $2

trunk/test/helpers/zena_parser/basic.yml

@@ -539 +539 @@
-  tem: "<% if params[:f].to_i == 3 -%>three<% end -%> / <% if !params[:f].blank? -%>exist<% end -%>"
-
+if_test_param_var:
+  src: "<r:set var='year'>3000</r:set><r:if test='year eq param:f'>funky!</r:if>"
+  tem: "<% set_year = capture do %>3000<% end -%><% if set_year.to_s == params[:f].to_s -%>funky!<% end -%>"
+  
-if_in_if:
-  src: "<r:if test='id eq 22'><r:if test='1 eq 2'>strange...<r:else>wrong!</r:else></r:if><r:else>other node</r:else></r:if>"

trunk/test/integration/navigation_test.rb

@@ -144 +144 @@
-    get 'http://test.host/project29.html'
-    assert_redirected_to 'http://test.host/en/project29.html'
+    follow_redirect!
+    assert_response :success
+  end
+  
+  def test_url_without_lang_redirect_keeps_url_params
+    get 'http://test.host/project29.html?page=2'
+    assert_redirected_to 'http://test.host/en/project29.html?page=2'
+    follow_redirect!
+    assert_response :success
+  end
+  
+  def test_url_bad_class_redirect_keeps_url_params
+    get 'http://test.host/en/page29.html?page=2'
+    assert_redirected_to 'http://test.host/en/project29.html?page=2'
-    follow_redirect!
-    assert_response :success