zena 1.1.3 → 1.2.0

data/History.txt

@@ -1,3 +1,25 @@
+== 1.2.0
+
+* Major changes
+ * Added 'remove_from_db' method to remove a site from the database.
+ * Fixed asset caching PLEASE FIX YOUR VHOST FILES: rake zena:create_vhost -s host='xxxxx'.
+ * Fixed deadlock_retry (a bug in the error message aborted the retry).
+ * Created 'spreadsheet' brick to ease xlsx and csv generation. <===== TODO: Document
+ * Better JS based grid editor.
+
+* Minor changes
+ * Enabled Acl during document upload.
+ * Fixed a bug when using [edit] in a list with [add].
+ * Fixed 'unknown this' bug in [calendar] when rendering in a [block].
+ * Enabled 'alt_class' to work on multiple elements ([each]).
+ * Fixed ajax bugs with dom_ids in nested partials.
+ * Better Acl display, comments on relations.
+ * Support for 'to_date' on time object with proper timezone translation. <===== TODO: Document
+ * Time to 'year' should use timezone.
+ * Added tprefix to [select] (with default value) to ease translated options for select. <===== TODO: Document
+ * Fixed bug when using [input] checkbox with param.
+ * Added jobs list in admin links.
+
 == 1.1.3 2011-11-09
 
 * Major changes
@@ -263,4 +285,4 @@
 == 0.11.1 2009-04-03
 
 * Minor enhancements
-  * Better testing of custom queries using latest querybuilder (0.5.2)
+  * Better testing of custom queries using latest querybuilder (0.5.2)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2009 Gaspard Bucher
+Copyright (c) 2007-2012 Gaspard Bucher
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.rdoc

@@ -108,18 +108,5 @@ Versions:
 monit (debian package to monitor your mongrel processes)
 
 
-=== Very experimental webDAV
-Should not be used for production.
-
-add this to nodes_controller macros:
-  act_as_railsdav
-  include Zena::WebDav
-
-add this to 'config/environment.rb'
-  require File.join(File.dirname(__FILE__), '../lib/webdav_adapter')
-
-install railsdav
-  # script/plugin install http://svn.liverail.net/svn/plugins/railsdav
-
-install dependencies
-  # sudo gem install mime-types, unicode
+=== Install MySQL on Lion (with rbenv: remove the sudo)
+http://stackoverflow.com/questions/6340174/mysql-gem-on-osx-10-7-lion

data/app/controllers/acls_controller.rb

@@ -6,7 +6,7 @@ class AclsController < ApplicationController
 
   def index
     secure(Acl) do
-      @acls = Acl.paginate(:all, :order => 'priority DESC, name ASC', :per_page => 20, :page => params[:page])
+      @acls = Acl.paginate(:all, :order => 'action ASC, priority DESC, name ASC', :per_page => 20, :page => params[:page])
     end
     @acl = Acl.new
 

data/app/controllers/documents_controller.rb

@@ -61,7 +61,15 @@ class DocumentsController < ApplicationController
         else
           page.call 'UploadProgress.setAsFinished'
           page.delay(1) do # allow the progress bar fade to complete
-            page.redirect_to document_url(@node[:zip])
+            if params[:redir]
+              page << "Zena.reload_and_close(#{params[:redir].inspect})"
+            end
+            if params[:js]
+              page << params[:js]
+            end
+            if !params[:redir] && !params[:js]
+              page.redirect_to document_url(@node[:zip])
+            end
           end
         end
       end
@@ -90,9 +98,10 @@ class DocumentsController < ApplicationController
     def find_node
 
       if params[:id]
-        @node = secure!(Document) { Document.find_by_zip(params[:id]) }
+        @node = visitor.find_node(nil, params[:id], nil, request)
+        raise ActiveRecord::RecordNotFound unless @node.kind_of?(Document)
       elsif parent_zip = (params[:node] || params)[:parent_id]
-        @parent = secure!(Node) { Node.find_by_zip(parent_zip)}
+        @parent = visitor.find_node(nil, parent_zip, nil, request)
       else
         # TODO: a better error message
         raise ActiveRecord::RecordNotFound

data/app/controllers/nodes_controller.rb

@@ -25,8 +25,6 @@ class NodesController < ApplicationController
   before_filter :check_path,      :only => [:index, :show]
   layout :popup_layout,           :only => [:edit, :import]
 
-  include Zena::Use::Grid::ControllerMethods
-
   def index
     if @node = secure(Node) { Node.find(current_site.root_id) }
       respond_to do |format|
@@ -235,7 +233,7 @@ class NodesController < ApplicationController
       if @node.errors.empty?
         flash.now[:notice] = 'Node was successfully created.'
         format.html {
-          redirect_to  params[:redir] || zen_path(@node, :mode => params[:mode])
+          redirect_to  params[:redir] || zen_path(@node, :mode => params[:mode], :new => 'true')
         }
         format.js
         format.xml  { render :xml => @node.to_xml(:root => 'node'), :status => :created, :location => node_url(@node) }

data/app/controllers/sites_controller.rb

@@ -23,6 +23,13 @@ class SitesController < ApplicationController
     end
   end
 
+  def jobs
+    @jobs = @site.respond_to?(:jobs) ? @site.jobs : []
+    respond_to do |format|
+      format.html
+    end
+  end
+
   def edit
     respond_to do |format|
       format.html

data/app/controllers/versions_controller.rb

@@ -74,7 +74,7 @@ class VersionsController < ApplicationController
       @edit = true
     end
     if params[:close] == 'true'
-      js_data << "Zena.reloadAndClose();"
+      js_data << "Zena.reload_and_close();"
     else
       js_data << <<-END_TXT
       Zena.editor_setup('#{preview_node_version_path(:node_id=>@node[:zip], :id=>(@node.version.number || 0), :escape => false)}');

data/app/controllers/virtual_classes_controller.rb

@@ -63,18 +63,17 @@ class VirtualClassesController < ApplicationController
         @yaml.gsub!(/\A---\s*\n/, "--- \n")
         current = current_compared_to(data)
         a = clean_yaml(current).gsub('{}', '')
-        #a = Zena::CodeSyntax.new(a, 'yaml').to_html
+        a = Zena::CodeSyntax.new(a, 'yaml').to_html
         b = @yaml
-        #b = Zena::CodeSyntax.new(b, 'yaml').to_html
+        b = Zena::CodeSyntax.new(b, 'yaml').to_html
         @diff = Differ.diff_by_line(b, a).format_as(:html)
 
         # UGLY HACK to not escape <ins> and <del>
-        @diff.gsub!(/<((ins|del)[^>]*)>/, '[yaml_diff[\1]]')
-        @diff.gsub!(/<\/(ins|del)>/, '[yaml_diff[/\1]]')
-        @diff = Zena::CodeSyntax.new(@diff, 'yaml').to_html
-        @diff.gsub!(/\[yaml_diff\[([^\]]+)\]\]/) do
-          "<#{$1.gsub('&quot;', '"')}>"
-        end
+        #@diff.gsub!(/<((ins|del)[^>]*)>/, '_ZYAML__\2_')
+        #@diff.gsub!(/<\/(ins|del)>/, '_ZYAMLC__\1_')
+        #@diff = Zena::CodeSyntax.new(@diff, 'yaml').to_html
+        #@diff.gsub!(/_ZYAML__(\w+)_/, '<\1 class="differ">')
+        #@diff.gsub!(/_ZYAMLC__(\w+)_/, '</\1>')
       end
     end
   end

data/app/models/acl.rb

@@ -77,9 +77,10 @@ class Acl < ActiveRecord::Base
       @node   = node
       @params = params
       @asset_host = request ? request.port.to_i == Zena::ASSET_PORT : false
+      query_str = safe_eval(self.query)
 
       # We add a stupid order clause to avoid the 'order by title' thing.
-      query = Node.build_query(:first, self.query + ' order by id asc',
+      query = Node.build_query(:first, query_str + ' order by id asc',
         :node_name       => '@node',
         :main_class      => @node.virtual_class,
         :rubyless_helper => self
@@ -94,7 +95,7 @@ class Acl < ActiveRecord::Base
         errors.add(:query, err.message)
       end
       nil
-    rescue ::RubyLess::Error => err
+    rescue => err
       errors.add(:query, err.message)
       nil
     end

data/app/models/relation_proxy.rb

@@ -160,7 +160,7 @@ class RelationProxy < Relation
         end
         attributes_to_update[:id] = v.map{|r| r.id.to_i}
       else
-        attributes_to_update[:id] = v.map(&:to_i)
+        attributes_to_update[:id] = v.select {|e| !e.blank?}.map(&:to_i)
       end
     else
       attributes_to_update[:id] = v.blank? ? nil : v.to_i
@@ -176,6 +176,7 @@ class RelationProxy < Relation
     if zip_values.kind_of?(Array)
       attributes_to_update[:id] = []
       zip_values.each do |zip|
+        next if zip.blank?
         if id = secure(Node) { Node.translate_pseudo_id(zip,  :id, @start) }
           # ok
           id_to_zip[id] = zip

data/app/models/role.rb

@@ -22,6 +22,7 @@ class Role < ActiveRecord::Base
   include RubyLess
   # Columns defined in the role.
   safe_method :columns     => {:class => ['Column'], :method => 'defined_safe_columns'}
+  safe_method [:column, String] => {:class => 'Column', :nil => true, :method => 'defined_safe_column'}
 
   safe_method :name => String
 
@@ -191,6 +192,21 @@ class Role < ActiveRecord::Base
     @safe_column ||= defined_columns.values.sort {|a,b| a.name <=> b.name}
   end
 
+  # By default, all defined columns are safe (see )
+  def defined_safe_column(name)
+    if real_class?
+      # Get columns from the 'native' schema of the real class (this schema is a Property::Role,
+      # not a VirtualClass or ::Role).
+      #
+      # Only columns explicitly declared safe are safe here
+      if real_class.safe_method_type(name)
+        real_class.schema.defined_columns[name]
+      end
+    else
+      defined_columns[name]
+    end
+  end
+
   def export
     res = Zafu::OrderedHash.new
     res['type'] = real_class? ? 'Class' : type

data/app/models/site.rb

@@ -16,6 +16,39 @@ The #Site model holds configuration information for a site:
 +default_lang+::    The default language of the site.
 =end
 class Site < ActiveRecord::Base
+  CLEANUP_SQL = [
+    ['attachments'         , 'site_id = ?'],
+    ['cached_pages'        , 'site_id = ?'],
+    ['cached_pages_nodes'  , 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['caches'              , 'site_id = ?'],
+    ['columns'             , 'site_id = ?'],
+    ['comments'            , 'site_id = ?'],
+    ['data_entries'        , 'site_id = ?'],
+    ['discussions'         , 'site_id = ?'],
+    ['groups_users'        , 'group_id IN (SELECT id FROM groups WHERE site_id = ?)'],
+    ['groups'              , 'site_id = ?'],
+
+    ['idx_nodes_datetimes' , 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['idx_nodes_floats'    , 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['idx_nodes_integers'  , 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['idx_nodes_ml_strings', 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['idx_nodes_strings'   , 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['idx_projects'        , 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['idx_templates'       , 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+
+    ['iformats'            , 'site_id = ?'],
+    ['links'               , 'source_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['links'               , 'target_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+
+    ['nodes_roles'         , 'node_id IN (SELECT id FROM nodes WHERE site_id = ?)'],
+    ['relations'           , 'site_id = ?'],
+    ['roles'               , 'site_id = ?'],
+    ['sites'               , 'id = ?'],
+    ['users'               , 'site_id = ?'],
+    ['versions'            , 'site_id = ?'],
+    ['zips'                , 'site_id = ?'],
+    ['nodes'               , 'site_id = ?'],
+  ]
   ACTIONS = %w{clear_cache rebuild_index}
   include RubyLess
   safe_method  :host => String, :lang_list => [String], :default_lang => String
@@ -439,6 +472,21 @@ class Site < ActiveRecord::Base
     true
   end
 
+  # This is only called from the console (not accessible through controllers)
+  def remove_from_db
+    node_cleanup = nil
+    site_id = self.id.to_s
+    CLEANUP_SQL.each do |table, clause|
+      clause = clause.gsub('?', site_id)
+      begin
+        Zena::Db.execute("DELETE FROM #{table} WHERE (#{clause})")
+      rescue => err
+        puts clause
+        puts err
+      end
+    end
+  end
+
   private
     def valid_site
       errors.add(:host, 'invalid') if self[:host].nil? || (self[:host] =~ /^\./) || (self[:host] =~ /[^\w\.\-]/)

data/app/models/text_document.rb

@@ -15,7 +15,8 @@ class TextDocument < Document
   class << self
     # Return true if a new text document can be created with the content_type. Used by the superclass Document to choose the corret subclass when creating a new object.
     def accept_content_type?(content_type)
-      (content_type =~ /^(text)/ && Zena::TYPE_TO_EXT[content_type.chomp] != ['rtf']) || (content_type =~ /x-javascript|xml/)
+      (content_type =~ /^(text|image\/svg\+xml|x-javascript)/) && 
+      (Zena::TYPE_TO_EXT[content_type.chomp] != ['rtf'])
     end
 
     # Return true if the content_type can change independantly from the file

data/app/models/user.rb

@@ -14,7 +14,8 @@ If you want to give administrative rights to a user, simply put him/her into the
 
 Users have access rights defined by the groups they belong to. They also have a 'status' indicating the kind of
 things they can/cannot do :
-+:user+::        (60): can read/write/publish
++:admin+::       (60): can read/write/publish in any group, can create users/groups
++:user+::        (50): can read/write/publish
 +:commentator+:: (40): can write comments
 +:moderated+::   (30): can write moderated comments
 +:reader+::      (20): can only read

data/app/models/zip.rb

@@ -1,6 +1,7 @@
 
 # Dummy model for zip counter...
 # TODO: there might be a better way to avoid errors when loading fixtures "zips.yml"
-class Zip
+class ZipClass < ActiveRecord::Base
+  set_table_name :zips
 end
 

data/app/views/acls/index.rhtml

@@ -12,6 +12,16 @@
     <th><%= _('exec group') %></th>
     <th><%= _('exec skin') %></th>
   </tr>
-  <%= render :partial=>'acls/li',  :collection => @acls %>
+
+  <% action = nil; @acls.each do |acl| -%>
+    <% if acl.action != action; action= acl.action -%>
+    <tr>
+      <th class='nav sub constant' colspan='9'>
+        <%= action %>
+      </th>
+    </tr>
+    <% end -%>
+    <%= render :partial=>'acls/li',  :collection=>[acl] %>
+  <% end -%>
   <%= render :partial=>'acls/add' %>
 </table>

data/app/views/documents/show.rhtml

@@ -12,6 +12,6 @@
         <td class='preview'><p><%= img_tag(@node, :mode=>'pv') %></p><p class='size'><%= fsize(@node.size) %></p></td>
         <td class='description'><h3 class='title s<%= @node.version.status %>'><span class='doc_id'><%= @node[:zip] %></span> <%= @node.title %> <%= node_actions(@node, :actions => :all) %></h3><p class='summary'><%= zazen(@node.summary) %></p></td></tr>
     </table>
-    <p class='btn_validate'><%= link_to _("upload more"), new_document_path(:parent_id => @node.parent_zip) %> // <%= link_to_function _('close'), "Zena.reloadAndClose();" %></p>
+    <p class='btn_validate'><%= link_to _("upload more"), new_document_path(:parent_id => @node.parent_zip) %> // <%= link_to_function _('close'), "Zena.reload_and_close();" %></p>
   </div>
 </div>

data/app/views/relations/_add.erb

@@ -1,7 +1,7 @@
 <tr id='add_relation' class='btn_add'>
   <td class='add'><%= link_to_function _('btn_relation_add'), "['add_relation', 'add_relation_form'].each(Element.toggle); $('relation_source_role').focus();" %></td>
-  <td colspan='3' class='add_relation'></td>
+  <td colspan='4' class='add_relation'></td>
 </tr>
 <tr id='add_relation_form' style='display:none;'>
   <%= render :partial=>'relations/form' %>
-</tr>
+</tr>

data/app/views/relations/_form.erb

@@ -5,7 +5,7 @@
     link_to_function _('btn_x'), "['add_relation', 'add_relation_form'].each(Element.toggle)"
   end %>
 </td>
-<td class="add" colspan="3">
+<td class="add" colspan="4">
   <div id='relation_errors'><%= error_messages_for(:relation, :object => @relation) %></div>
   <% unless @relation.new_record? %>
   <%= form_remote_tag(:url => relation_path(@relation), :method => :put ) %>
@@ -36,6 +36,9 @@
       <td class="light" ><%= text_field('relation', 'target_icon', :size=>18 ) %></td>
       <td class="dark" ><%= text_field('relation', 'source_icon', :size=>18 ) %></td>
     </tr>
+    <tr><td colspan='3'>
+      <%= text_area('relation', 'comment', :rows => 2, :cols => 40) %></td>
+    </td></tr>
     <tr><td colspan='3'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
   </table>
   </form>
@@ -44,4 +47,4 @@
   <p class='destroy'><%= _('destroy relation (with all links)') %> <input type='submit' value='<%= _('destroy') %>'></p>
   </form>
   <% end -%>
-</td>
+</td>

data/app/views/relations/_li.erb

@@ -25,4 +25,7 @@
   </td>
 <% end -%>
   </td>
-</tr>
+  <td class='comment zazen'>
+    <%= li.comment ? zazen(li.comment) : '' %>
+  </td>
+</tr>

data/app/views/relations/index.erb

@@ -1,9 +1,9 @@
 <h2 class='title'><%= _('relations') %></h2>
 <table id='relation_list' class='admin' cellspacing="0">
-  <tr><th class='nav' colspan='4'><%= will_paginate @relations %></th></tr>
+  <tr><th class='nav' colspan='5'><%= will_paginate @relations %></th></tr>
   <% @classes.keys.sort.each do |kpath| -%>
     <tr class='virtual_class'>
-      <th class='nav sub constant' colspan='4'>
+      <th class='nav sub constant' colspan='5'>
         <span class='kpath'><%= kpath %></span> <%= VirtualClass.find_by_kpath(kpath).to_s %>
       </th>
     </tr>
@@ -12,4 +12,4 @@
     <% end -%>
   <% end -%>
   <%= render :partial=>'relations/add' %>
-</table>
+</table>

data/app/views/sites/_form.erb

@@ -25,7 +25,7 @@
     <tr><td class='label'><%= _('options') %></td><td>
     <% Site.attributes_for_form[:bool].each do |sym| -%>
     <input type='hidden' name='site[<%= sym %>]' value=''/>
-    <input type='checkbox' name='site[<%= sym %>]' value='1'<%= @site[sym] ? " checked='checked'" : '' %>/> <%= _(sym.to_s) %><br/>
+    <input type='checkbox' name='site[<%= sym %>]' value='1'<%= @site.send(sym) ? " checked='checked'" : '' %>/> <%= _(sym.to_s) %><br/>
     <% end -%>
     </td></tr>
     <% if !@site.new_record? %>

data/app/views/sites/_job.erb

@@ -0,0 +1,4 @@
+<tr id='job<%= job[:id] %>'>
+  <td><%= format_date(job.run_at, :format =>_(Zena::Use::Dates::DATETIME)) %></td>
+  <td><%= job.info %></td>
+</tr>

data/app/views/sites/index.erb

@@ -1,6 +1,6 @@
 <h2 class='title'><%= _('sites') %></h2>
 
 <table id='site_list' class='admin' cellspacing="0">
-  <tr><th class='nav' colspan='10'><%= will_paginate @sites %>
+  <tr><th class='nav' colspan='10'><%= will_paginate @sites %></th></tr>
   <%= render :partial=>'sites/li',  :collection=>@sites %>
 </table>

data/app/views/sites/jobs.erb

@@ -0,0 +1,10 @@
+<h2 class='title'><%= _('jobs') %></h2>
+
+<table id='tasks_list' class='admin jobs' cellspacing="0">
+  <tr>
+    <th do='t'>execution</th>
+    <th do='t'>info</th>
+    <th do='t'></th>
+  </tr>
+  <%= render :partial=>'sites/job',  :collection=>@jobs %>
+</table>

data/app/views/templates/document_create_tabs/_file.rhtml

@@ -1,5 +1,8 @@
 <%= upload_form_tag(:action => 'upload') %>
 <%= hidden_field 'node', 'parent_id', :value=>@node.parent_zip  %>
+<% [:redir, :js].each do |p|; next unless params[p] %>
+<input type='hidden' name='<%= p %>' value='<%= h params[p] %>'/>
+<% end %>
 <p class="btn_validate"><input type="submit" value='<%= _('validate') %>'/></p>
 
 <%= upload_field %>

data/app/views/zafu/default/Node-+search.zafu

@@ -6,13 +6,13 @@
 
     <ul id='search_results' do='search_results'>
       <li class='result_entry' do='each'>
-        <p class='result_image' do='Document'>
+        <p class='result_image' do='Document?'>
           <r:link format='data' do='img' alt_src='icon' mode='pv'/>
           <r:else do='link' do='img' alt_src='icon' mode='pv'/>
         </p>
         <p class='result_name'><r:link/></p>
         <p class='result_path'><r:show attr='short_path'/></p>
-        <r:summary/>
+        <r:zazen attr='summary'/>
         <div class='clear'></div>
       </li>
       <r:else>

data/bricks/acls/zena/init.rb

@@ -1 +1,2 @@
-Zena.use Bricks::Acls
+Zena.use Bricks::Acls
+Site::CLEANUP_SQL.unshift ['acls', 'site_id = ?']

data/bricks/acls/zena/test/integration/acl_integration_test.rb

@@ -82,7 +82,7 @@ class AclIntegrationTest < Zena::Integration::TestCase
             Zena::Db.execute "UPDATE acls SET format = 'csv' WHERE id = #{acls_id(:rap)}"
             login(:hades)
             # Create special mode template
-            secure(Template) { Template.create(:parent_id => nodes_id(:sky), :title => 'Node--csv', :text => 'foo;<r:title/>') }
+            secure(Template) { Template.create(:parent_id => nodes_id(:sky), :title => 'Node--csv', :text => %q{<r:spreadsheet><r:row><r:cell>foo</r:cell><r:cell eval='title'/></r:row></r:spreadsheet>}) }
             post 'http://erebus.host/session', :login=>'demeter', :password=>'demeter'
           end
 
@@ -94,7 +94,7 @@ class AclIntegrationTest < Zena::Integration::TestCase
           should 'allow given mode' do
             get "http://erebus.host/oo/project#{nodes_zip(:queen)}.csv"
             assert_response :success
-            assert_equal 'foo;My Queen', response.body
+            assert_equal "foo;My Queen;\n", response.body
           end
         end # with fixed format
 
@@ -144,7 +144,7 @@ class AclIntegrationTest < Zena::Integration::TestCase
       context 'with acl for create enabled' do
         setup do
           # The visitor can create objects in assigned_project as direct parent
-          Zena::Db.execute "UPDATE acls SET query = 'assigned_project', action = 'create' WHERE id = #{acls_id(:rap)}"
+          Zena::Db.execute "UPDATE acls SET query = '%q{assigned_project}', action = 'create' WHERE id = #{acls_id(:rap)}"
           @create_url = "http://erebus.host/nodes?node[parent_id]=#{nodes_zip(:queen)}&node[klass]=Page&node[title]=foobar"
         end
 
@@ -197,7 +197,7 @@ class AclIntegrationTest < Zena::Integration::TestCase
       context 'with acl for update enabled' do
         setup do
           # The visitor can update objects in assigned_project
-          Zena::Db.execute "UPDATE acls SET query = 'nodes in project from assigned_project', action = 'update' WHERE id = #{acls_id(:rap)}"
+          Zena::Db.execute "UPDATE acls SET query = '%q{nodes in project from assigned_project}', action = 'update' WHERE id = #{acls_id(:rap)}"
           @update_url = "http://erebus.host/nodes/#{nodes_zip(:persephone)}?node[title]=foobar"
         end
 
@@ -241,7 +241,7 @@ class AclIntegrationTest < Zena::Integration::TestCase
       context 'with acl for delete enabled' do
         setup do
           # The visitor can delete objects in assigned_project
-          Zena::Db.execute "UPDATE acls SET query = 'nodes in project from assigned_project', action = 'delete' WHERE id = #{acls_id(:rap)}"
+          Zena::Db.execute "UPDATE acls SET query = '%q{nodes in project from assigned_project}', action = 'delete' WHERE id = #{acls_id(:rap)}"
           @delete_url = "http://erebus.host/nodes/#{nodes_zip(:persephone)}"
         end
 

data/bricks/acls/zena/test/sites/erebus/acls.yml

@@ -6,7 +6,7 @@ rap:
   # can read
   action:          read
   # all 'assigned_projects' and the visitor's home node
-  query:           assigned_projects or self
+  query:           "%q{assigned_projects or self}"
   # by receiving the 'erebus' access group
   exec_group:      erebus
   # and viewing it through the 'sky' Skin.
@@ -25,7 +25,7 @@ self:
   # can read
   action:          read
   # self
-  query:           nodes where 1=0
+  query:           '%q{nodes where 1=0}'
   # by receiving the 'erebus' access group
   exec_group:      erebus
   # and viewing it through the 'sky' Skin.

data/bricks/acls/zena/test/unit/acl_test.rb

@@ -59,7 +59,7 @@ class AclTest < Zena::Unit::TestCase
         visitor.instance_eval do
           @group_ids = self.group_ids + [erebus_id]
         end
-        assert subject.update_attributes(:query => 'nodes where 1 = #{asset_host? ? 1 : 0} in site')
+        assert subject.update_attributes(:query => "'nodes where 1 = \#{asset_host? ? 1 : 0} in site'")
         assert_nil subject.authorize?(base_node, {:id => nodes_zip(:over_zeus)}, mock_request)
         assert_equal 'A plan to overrule Zeus', subject.authorize?(base_node, {:id => nodes_zip(:over_zeus)}, mock_request(:get, {}, 80)).title
       end
@@ -103,7 +103,7 @@ class AclTest < Zena::Unit::TestCase
 
           context 'with many acls' do
             setup do
-              Zena::Db.execute "UPDATE acls SET query = 'nodes in project from assigned_project', action = 'read' WHERE id = #{acls_id(:self)}"
+              Zena::Db.execute "UPDATE acls SET query = \"'nodes in project from assigned_project'\", action = 'read' WHERE id = #{acls_id(:self)}"
             end
 
             should 'try acls in turn' do