Fixed encode_params in Ajax request.

History.txt

@@ -1,3 +1,8 @@
+== 1.2.5
+
+* Minor changes
+ * Fixed encode_params in Ajax requests.
+
 == 1.2.4 2013-06-13
 
 * Major changes

lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.2.4'
+  VERSION        = '1.2.5'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

lib/zena/use/urls.rb

@@ -162,7 +162,9 @@ def append_query_params(path, opts)
             list = opts.keys.map do |k|
               # FIXME: DOC
               if k.to_s == 'encode_params'
-                opts[k].map do |key|
+                list = opts[k]
+                list = list.split(',').map(&:strip) unless list.kind_of?(Array)
+                list.map do |key|
                   value = params[key]
                   if value.kind_of?(Hash)
                     {key => value}.to_query

test/integration/zafu_compiler/ajax.yml

@@ -386,6 +386,13 @@ link_page_next:
   src: "<div id='foo' do='block' do='nodes in site' limit='3' order='id asc' paginate='pak'><r:link page='previous'/> | <r:pak/> | <r:link update='foo' page='next'/></div>"
   res: "/<a href='/oo/projects-list/Clean-Water-project/page22.html\?pak=1'>1</a> \| 2 \| .*22/zafu\?dom_id=foo.*pak=3.*>3</a>/"
 
+link_page_next_encode_params:
+  context:
+    pak: 2
+    foo: Hop
+  src: "<div id='foo' do='block' do='nodes in site' limit='3' order='id asc' paginate='pak'><r:link update='foo' page='next' encode_params='foo'/></div>"
+  res: "/Ajax.*foo=Hop/"
+
 link_page_list:
   context:
     pak: 2

zena.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
@@ -2477,87 +2477,87 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
-      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
       s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_runtime_dependency(%q<daemons>, [">= 0"])
-      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
       s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
-      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
       s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
     else
+      s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<rubyless>, ["= 0.8.10"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_dependency(%q<json>, ["= 1.5.1"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
       s.add_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_dependency(%q<daemons>, [">= 0"])
-      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
       s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_dependency(%q<property>, ["= 2.3.2"])
-      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_dependency(%q<property>, ["= 2.3.2"])
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<open4>, [">= 0"])
+      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
       s.add_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
     end
   else
+    s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<rubyless>, ["= 0.8.10"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rails>, ["= 2.3.18"])
+    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
     s.add_dependency(%q<json>, ["= 1.5.1"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
     s.add_dependency(%q<gem_plugin>, [">= 0"])
-    s.add_dependency(%q<daemons>, [">= 0"])
-    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
     s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-    s.add_dependency(%q<rails>, ["= 2.3.18"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-    s.add_dependency(%q<property>, ["= 2.3.2"])
-    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     s.add_dependency(%q<syntax>, ["= 1.0.0"])
-    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<gettext>, ["= 2.1.0"])
+    s.add_dependency(%q<property>, ["= 2.3.2"])
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<open4>, [">= 0"])
+    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
     s.add_dependency(%q<differ>, ["= 0.1.2"])
-    s.add_dependency(%q<gettext>, ["= 2.1.0"])
+    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
   end
 end