Default passenger version is 3.0.19

Rakefile

@@ -5,7 +5,6 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
 
 require 'tasks/rails'
 

bricks/zena/zena/migrate/20130313110443_add_create_kpath_to_acl.rb → bricks/acls/zena/migrate/20130313110443_add_create_kpath_to_acl.rb

@@ -2,6 +2,8 @@ class AddCreateKpathToAcl < ActiveRecord::Migration
   def self.up
     add_column :acls, :create_kpath, :string, :limit => 200
     add_index :acls, ["create_kpath", "group_id", "action", "site_id"]
+  rescue
+    # Could be run twice (was in zena brick by mistake in zena 1.2.4pre)
   end
 
   def self.down

config/environment.rb

@@ -1,5 +1,5 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.18' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

config/gems.yml

@@ -4,7 +4,7 @@ ruby-recaptcha: '= 1.0.3'
 syntax:         '= 1.0.0'
 tzinfo:
 uuidtools:      '= 2.0.0'
-rails:          '= 2.3.11'
+rails:          '= 2.3.18'
 json:           '= 1.5.1'
 authlogic:      '= 2.1.3'
 fast_gettext:   '~> 0.4.16'
@@ -45,15 +45,15 @@ thinking-sphinx:
   optional:     yes
   brick:        sphinx
   lib:          'thinking_sphinx'
-  version:      '= 1.3.14'
+  version:      '~> 1.4.14'
 
 # needs riddle 1.0.10
 
 ts-delayed-delta:
   optional:     yes
   brick:        sphinx
   lib:          'thinking_sphinx/deltas/delayed_delta'
-  version:      '= 1.0.2'
+  version:      '= 1.1.3'
 
 delayed_job:
   optional:     yes

lib/zena/deploy/httpd.rhtml

@@ -12,8 +12,8 @@ NameVirtualHost *
 <% end %>
 
 <% if config[:app_type] == :passenger  %>
-LoadModule passenger_module /usr/lib/ruby/gems/1.8/gems/<%= config[:passenger_version] || 'passenger-3.0.17' %>/ext/apache2/mod_passenger.so
-PassengerRoot /usr/lib/ruby/gems/1.8/gems/<%= config[:passenger_version] || 'passenger-3.0.17' %>
+LoadModule passenger_module /usr/lib/ruby/gems/1.8/gems/<%= config[:passenger_version] || 'passenger-3.0.19' %>/ext/apache2/mod_passenger.so
+PassengerRoot /usr/lib/ruby/gems/1.8/gems/<%= config[:passenger_version] || 'passenger-3.0.19' %>
 PassengerRuby /usr/bin/ruby1.8
 PassengerDefaultUser www-data
 <% elsif config[:app_type] == :mongrel %>

lib/zena/use/urls.rb

@@ -407,7 +407,7 @@ def make_link(options = {})
           http_method = http_method_from_action(options[:action])
 
           if http_method == 'delete' && method != 'unlink'
-            confirm ||= '#{t("Destroy")} #{h title} ?'
+            confirm ||= '#{t("Destroy")} "#{h title}" ?'
           end
 
           if confirm

test/integration/zafu_compiler/ajax.yml

@@ -80,7 +80,7 @@ each_add_with_form:
       <li do='add'>add new</li>
       <li do='form'><input name='title'/> this is the form</li>
     </ol>
-  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_0.*toggle.*<li.*style.*none.*list1_0.*Ajax.Request.*input type='hidden' name='node\[parent_id\]' value=.29.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1/"
+  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_0.*toggle.*<li.*style.*none.*list1_0.*Ajax.Request.*name='t_url' value=.ajax/each/add/with/form/list1/"
 
 each_add_with_form_in_sub_block:
   context:
@@ -141,7 +141,7 @@ each_edit_cannot_write:
     node: 'cleanWater'
     visitor: 'anon'
   src: "<r:children><li do='each'><r:show attr='title'>blah</r:show> <r:edit>edit</r:edit></li>\n</r:children>"
-  res: "/<li id='list1_24'>it's a lake</li>.*/"
+  res: "/<li id='list1_24'>it&#39;s a lake</li>.*/"
 
 add_each_publish:
   src: "<ul do='children' id='things'><li do='each'>I <p do='title'>blah</p></li><li do='add' publish='true'/></ul>"

test/integration/zafu_compiler/context.yml

@@ -6,7 +6,7 @@ default:
 
 each_group:
   src: "<r:nodes do='group' by='kpath'><p do='each_group'><r:kpath/>: <r:each join=', ' do='title'/></p></r:nodes>"
-  res: "<p>NP: crocodiles, status title</p><p>NDI: it's a lake</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"
+  res: "<p>NP: crocodiles, status title</p><p>NDI: it&#39;s a lake</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"
 
 # set_var tested in eval.yml
 

test/integration/zafu_compiler/display.yml

@@ -255,7 +255,7 @@ icon:
   context:
     node: 'cleanWater'
   src: "<r:icon do='title'/>"
-  res: "it's a lake"
+  res: "it&#39;s a lake"
 
 img_image:
   context:

test/integration/zafu_compiler/forms.yml

@@ -87,7 +87,7 @@ select_nodes_in_ajax:
 
 select_nodes_show_attr:
   src: "<r:form><r:select name='title' nodes='images in site' attr='ext' show='title'/></r:form>"
-  res: "/name=.node\[title\].[^>]+>.*<option value=\"jpg\">flower</option>\n<option value=\"jpg\">it's a lake</option>/"
+  res: "/name=.node\[title\].[^>]+>.*<option value=\"jpg\">flower</option>\n<option value=\"jpg\">it&#39;s a lake</option>/"
 
 select_time_zone:
   src: "<r:form><r:select type='time_zone' name='settings[tz]'/></r:form>"

test/integration/zafu_compiler/query.yml

@@ -169,7 +169,7 @@ query_with_default:
     visitor: lion
     node: cleanWater
   src: "<r:query default='nodes in project' do='each' join=', ' do='title'/>"
-  res: "crocodiles, it's a lake, The lake we love, Nice Bananas, parc opening, status title, water"
+  res: "crocodiles, it&#39;s a lake, The lake we love, Nice Bananas, parc opening, status title, water"
 
 query_with_param:
   # Live compile and query from params
@@ -257,16 +257,16 @@ select_with_type:
 select_in_from:
   src: "<div do='images select title as it from projects select title as pt in site' do='each' join=', '><r:pt/>: <r:it/></div>"
   tem: '/<%=h var2.attributes\["pt"\] %>: <%=h var2.attributes\["it"\] %>/'
-  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
+  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it&#39;s a lake</div>"
 
 select_in_from_saved:
   src: "<div do='images select title as it from projects select title as pt in site' do='set' list='this' do='list' do='each' join=', '><r:pt/>: <r:it/></div>"
   tem: '/<%=h var3.attributes\["pt"\] %>: <%=h var3.attributes\["it"\] %>/'
-  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
+  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it&#39;s a lake</div>"
 
 select_group:
   src: "<div do='images select title as it from projects select title as pt in site' do='group' by='pt' do='each_group' join=' / '><r:pt/>: <r:each join=', ' do='it'/></div>"
-  res: "<div>a wiki with Zena: bird, flower / Clean Water project: it's a lake</div>"
+  res: "<div>a wiki with Zena: bird, flower / Clean Water project: it&#39;s a lake</div>"
 
 select_group_count:
   src: "<div do='images select id.count as img_count from projects select id as pid, title as pt in site group by pid' do='each' join=', '><r:pt/>: <r:img_count/></div>"
@@ -280,7 +280,7 @@ query_errors:
   context:
     c: 'badaboum'
   src: "<r:query default='nodes' select='nodes in #{params[:c]}'><r:elsif test='query_errors' do='query_errors'/></r:query>"
-  res: "<span class='query'>nodes in badaboum</span> <span class='error'>Invalid scope 'badaboum'.</span>"
+  res: "<span class='query'>nodes in badaboum</span> <span class='error'>Invalid scope &#39;badaboum&#39;.</span>"
 
 query_count:
   context:

test/integration/zafu_compiler/relations.yml

@@ -33,7 +33,7 @@ icon:
     node: 'cleanWater'
   src: "<r:icon do='title'/>"
   tem: "/ORDER BY links.id DESC/"
-  res: "it's a lake"
+  res: "it&#39;s a lake"
 
 pages:
   context:
@@ -91,7 +91,7 @@ pages_random:
 
 nodes_in_project:
   src: "<r:nodes in='project' limit='2'><r:each join=', '><r:show attr='title'/></r:each></r:nodes>"
-  res: "it's a lake, Lake Tanganyika"
+  res: "it&#39;s a lake, Lake Tanganyika"
 
 nodes_in_project_stored:
   src: "<r:void set_foo='this'><r:node where='id = 29 in site'>from <r:show attr='title'/>, look at <r:foo do='title'/>: <r:foo do='pages in project' do='each' join=', ' do='title'/></r:node></r:void>"
@@ -289,7 +289,7 @@ projects:
 
 nodes:
   src: "<r:nodes in='project'><r:each join=', ' do='show' attr='title'/></r:nodes>"
-  res: "it's a lake, Lake Tanganyika, parc opening, status title, water"
+  res: "it&#39;s a lake, Lake Tanganyika, parc opening, status title, water"
 
 menu_with_favorites:
   context:
@@ -348,7 +348,7 @@ where:
 
 where_like:
   src: "<r:images where='title like \"%ke\"' in='site' do='each' join=',' do='title'/>"
-  res: "it's a lake"
+  res: "it&#39;s a lake"
 
 else:
   src: "<r:nodes where='id = 1' in='site' else='[this]' do='each' join=',' do='title'/>"
@@ -363,7 +363,7 @@ where_not:
   context:
     node: 'cleanWater'
   src: "<r:nodes where='title ne \"status title\"' do='each' join=',' do='title'/>"
-  res: "it's a lake,Lake Tanganyika,parc opening,water"
+  res: "it&#39;s a lake,Lake Tanganyika,parc opening,water"
 
 where_two_attributes:
   src: "<r:nodes where='log_at ne event_at' in='site' do='each' join=', ' do='title'/>"
@@ -373,7 +373,7 @@ where_two_attributes:
 many_or:
   # old: or='images in site' or='tags in site'
   src: "<r:tagged in='site or images in site or tags in site' do='each' join=',' do='title'/>"
-  res: "Art,bird,Clean Water project,flower,it's a lake,News list,parc opening,Top menu"
+  res: "Art,bird,Clean Water project,flower,it&#39;s a lake,News list,parc opening,Top menu"
 
 hot_or_page:
   context:
@@ -405,11 +405,11 @@ group_by_project_sort_zip:
   context:
     visitor: ant
   src: "<r:images in='site' order='zip ASC' do='group' by='project' sort='id'><b do='project' do='title'/>: <r:each join=', ' do='title'/></r:images>"
-  res: "<b>Clean Water project</b>: it's a lake<b>a wiki with Zena</b>: bird, flower<b>Zena the wild CMS</b>: Autumn Tree"
+  res: "<b>Clean Water project</b>: it&#39;s a lake<b>a wiki with Zena</b>: bird, flower<b>Zena the wild CMS</b>: Autumn Tree"
 
 group_by_parent_sort:
   src: "<r:images in='site' order='title ASC' do='group' by='parent' sort='title'><b do='parent' do='title'/>: <r:each join=', ' do='title'/></r:images>"
-  res: "<b>a wiki with Zena</b>: bird, flower<b>Clean Water project</b>: it's a lake"
+  res: "<b>a wiki with Zena</b>: bird, flower<b>Clean Water project</b>: it&#39;s a lake"
 
 nodes_in_site_group_by_year:
   old_src: "<r:nodes in='site' group='log_at:year' order='log_at:year asc, title ASC' do='each' join=', '><r:show attr='log_at' format='%Y'/></r:nodes>"

test/integration/zafu_compiler/safe_definitions.yml

@@ -96,7 +96,7 @@ map_join:
     node: 'cleanWater'
   src: "<r:children do='map(\"title\").join(\",\")'/>"
   tem: "/var1.map\{\|_map_obj\| _map_obj.prop\['title'\]\}/"
-  res: "crocodiles,it's a lake,The lake we love,parc opening,status title,water"
+  res: "crocodiles,it&#39;s a lake,The lake we love,parc opening,status title,water"
 
 sum:
   context:

test/integration/zafu_compiler/urls.yml

@@ -264,7 +264,7 @@ target_blank:
 
 action_destroy:
   src: "<r:link action='destroy'/>"
-  res: "<a data-confirm='Destroy status title ?' href='/nodes/22' onclick='return Zena.m(this,\"delete\")'>status title</a>"
+  res: "<a data-confirm='Destroy \"status title\" ?' href='/nodes/22' onclick='return Zena.m(this,\"delete\")'>status title</a>"
 
 action_destroy_message_apos:
   context:

zena.gemspec

@@ -2474,87 +2474,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<versions>, ["= 0.3.1"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.1"])
-      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, ["= 2.3.11"])
-      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<rubyless>, ["= 0.8.8"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
-      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.9.0"])
+      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
       s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
       s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 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<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.9.0"])
       s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
       s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.1"])
+      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
     else
-      s.add_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.1"])
-      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<rails>, ["= 2.3.11"])
-      s.add_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_dependency(%q<rubyless>, ["= 0.8.8"])
-      s.add_dependency(%q<json>, ["= 1.5.1"])
-      s.add_dependency(%q<safe_yaml>, ["= 0.9.0"])
+      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_dependency(%q<open4>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_dependency(%q<versions>, ["= 0.3.1"])
       s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
       s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
       s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_dependency(%q<safe_yaml>, ["= 0.9.0"])
       s.add_dependency(%q<property>, ["= 2.3.2"])
       s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.1"])
+      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_dependency(%q<daemons>, [">= 0"])
     end
   else
-    s.add_dependency(%q<versions>, ["= 0.3.1"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<gettext>, ["= 2.1.0"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.1"])
-    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<rails>, ["= 2.3.11"])
-    s.add_dependency(%q<syntax>, ["= 1.0.0"])
     s.add_dependency(%q<rubyless>, ["= 0.8.8"])
-    s.add_dependency(%q<json>, ["= 1.5.1"])
-    s.add_dependency(%q<safe_yaml>, ["= 0.9.0"])
+    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+    s.add_dependency(%q<open4>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-    s.add_dependency(%q<differ>, ["= 0.1.2"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+    s.add_dependency(%q<versions>, ["= 0.3.1"])
     s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-    s.add_dependency(%q<gem_plugin>, [">= 0"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
     s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
     s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<gem_plugin>, [">= 0"])
+    s.add_dependency(%q<syntax>, ["= 1.0.0"])
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+    s.add_dependency(%q<safe_yaml>, ["= 0.9.0"])
     s.add_dependency(%q<property>, ["= 2.3.2"])
     s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.1"])
+    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<gettext>, ["= 2.1.0"])
+    s.add_dependency(%q<rails>, ["= 2.3.18"])
+    s.add_dependency(%q<daemons>, [">= 0"])
   end
 end