zena 0.15.0 → 0.15.1

data/History.txt

@@ -1,3 +1,17 @@
+== 0.15.1 2009-10-27
+
+* 2 major enhancements:
+  * Passenger support (deploy, upload progress)
+  * JS popup & gallery support (setting in image formats)
+
+* 6 minor enhancements:
+  * fixed some deployment tasks (capistrano)
+  * fixed zena:setup task to copy files instead of symlink
+  * better versions list and diff select
+  * internal 'js_data' hook to insert javascript at end of page
+  * custom queries are loaded from bricks (bricks/brick_name/queries/test.host.yml)
+  * Fixed skin importation from zipped xhtml template
+
 == 0.15.0 2009-10-16
 
 * 5 major enhancements:

data/{README.txt → README.rdoc}

@@ -1,33 +1,27 @@
 == DESCRIPTION:
 
-CMS based on Ruby on Rails, (c) Gaspard Bucher, teti.ch 2007-2009, licenced under MIT
+CMS with super natural powers, based on Ruby on Rails
 
-This version of zena is *TOTALLY UNUSABLE* for the moment. It is the result of the slow migration from Rails 1.2.3 to Rails 2.x. You will need the latest rails edge with some patches which you can find here: http://github.com/gaspard/rails/tree/master.
+website: http://zenadmin.org
+licence: MIT
 
-== Creating the database
-You need to set collation and charset to utf8 when creating the database. Example :
-# create database zena DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+== Getting started
 
-== Development/testing
-1. Create the database using a mysql client
-   create database zena_dev DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+ # sudo gem sources -a http://gems.github.com
+ # sudo gem install zena
+ # zena myapp
 
-2. Rename 'config/database_example.yml' to 'config/database.yml' and update it's content
+== Details
 
-3. Migrate the database and add initialize db (from within zena directory)
-   rake zena:migrate
+Have a look at the generator used by 'zena' command:
 
-4. Create a first site or load fixtures
-   rake zena:mksite HOST=localhost PASSWORD=secret LANG=en
+http://github.com/zena/zena/blob/master/config/zena.rb
 
-5. Start server
-   script/server
-
-6. Connect to site 'http://localhost:3000'
+== Production
 
-7. Login with 'admin' and 'secret'
+THE INSTRUCTIONS BELOW NO LONGER APPLY (they need an update since the way to go is
+to use zena as a gem).
 
-== Production
 You should use capistrano to ease deployment. See 'config/delploy.rb'.
 
 Manual deployment is done with the following commands:

data/app/controllers/documents_controller.rb

@@ -55,7 +55,12 @@ class DocumentsController < ApplicationController
   end
 
   def upload_progress
-    # mimic apache2 mod_upload_progress
+    # When using the mod_upload_progress module, this is never hit:
+    # <Location /upload_progress>
+    #   ReportUploads On
+    # </Location>
+    #
+    # When using Mongrel: mimic apache2 mod_upload_progress
     #
     # if (!found) {
     #   response = apr_psprintf(r->pool, "new Object({ 'state' : 'starting' })");
@@ -89,7 +94,7 @@ class DocumentsController < ApplicationController
   # TODO: test
   # display an upload field.
   def file_form
-    render :inline=>"<%= link_to_function(_('cancel'), \"['file', 'file_form'].each(Element.toggle);$('file_form').innerHTML = '';\")%><input id='attachment#{params[:uuid]}' name='attachment' class='file' type='file' />"
+    render :inline=>"<%= link_to_function(_('cancel'), \"['file', 'file_form'].each(Element.toggle);$('file_form').innerHTML = '';\")%><input id='attachment#{params[:uuid]}' name='attachment' onchange=\"Zena.get_filename('attachment#{params[:uuid]}','node_v_title'); $('node_v_title').focus(); $('node_v_title').select();\" class='file' type='file' />"
   end
 
   # TODO: test

data/app/controllers/nodes_controller.rb

@@ -210,6 +210,9 @@ class NodesController < ApplicationController
   def import
     defaults = params[:node]
     klass = defaults.delete(:klass)
+    if klass == 'Skin' && !defaults.has_key?('v_status')
+      defaults['v_status'] = Zena::Status[:pub]
+    end
     @nodes = secure!(Node) { Node.create_nodes_from_folder(
       :klass    => klass,
       :archive  => params[:attachment],
@@ -471,6 +474,7 @@ class NodesController < ApplicationController
     # Transform pseudo id into absolute paths (used after import)
     def parse_assets(nodes)
       nodes.each do |n|
+        n.errors.instance_variable_get(:@errors).delete('asset')
         next unless n.errors.empty?
         attrs = {}
 

data/app/models/iformat.rb

@@ -71,6 +71,45 @@ class Iformat < ActiveRecord::Base
 
   # :size=>:force, :width=>280, :height=>120, :gravity=>Magick::NorthGravity
   def as_hash
+    if self[:popup]
+      if self[:popup] =~ /^(\w+?)\s*\((.*)\)/
+        popup = {:name => $1}
+        show = $2.split(',').map(&:strip)
+        options = {}
+        popup[:show] = show.map do |k|
+          if k == 'link'
+            options['v_title'] = 'link'
+            'v_title'
+          else
+            k
+          end
+        end
+        popup[:options] = options
+      elsif self[:popup] =~ /^(\w+?)\s*(\{.*\})\s*$/
+        popup = {:name => $1}
+        options = JSON.load($2) rescue {}
+        unless popup[:show] = options.delete('show')
+          popup[:show] = options.keys.sort do |a,b|
+            # keep sort order
+            self[:popup].index(a) <=> self[:popup].index(b)
+          end
+          popup[:options] = {}
+          options.each do |k,v|
+            next if v == true
+            popup[:options][k] = v
+          end
+        end
+      else
+        popup = {
+          :name    => self[:popup],
+          :options => {'v_title' => 'link'},
+          :show    => ['navigation','v_title','v_summary']
+        }
+      end
+    else
+      popup = nil
+    end
+
     h = {
       :name    => self[:name],
       :size    => size.to_sym,
@@ -78,7 +117,9 @@ class Iformat < ActiveRecord::Base
       :height  => height,
       :gravity => eval("Magick::#{gravity}"),
     }
-    h.merge(:hash_id => ImageBuilder.hash_id(h))
+    h.merge!(:hash_id => ImageBuilder.hash_id(h))
+    h.merge!(:popup => popup) if popup
+    h
   end
 
   # This is a unique identifier used to cache images with format:
@@ -128,6 +169,7 @@ class Iformat < ActiveRecord::Base
 
     def iformat_before_validation
       self[:site_id] = visitor.site[:id]
+      self[:popup] = nil if self[:popup].blank?
       if self.size == SIZES.index('keep')
         self[:width] = nil
         self[:height] = nil

data/app/models/skin.rb

@@ -13,8 +13,7 @@ class Skin < Section
 
     def update_skin_name
       return unless @need_skin_name_update
-      # FIXME: escape correctly against sql injection
       # FIXME: when moving a template or a page that is a parent of a template: we must sync skin_name after spread_project_and_section.
-      Skin.connection.execute "UPDATE nodes,template_contents SET template_contents.skin_name = #{Skin.connection.quote(name)} WHERE nodes.id = template_contents.node_id AND nodes.section_id = #{self[:id]} AND template_contents.site_id = '#{self[:site_id]}'"
+      Skin.connection.execute "UPDATE template_contents SET skin_name = #{Zena::Db.quote(name)} WHERE template_contents.node_id IN (SELECT id FROM nodes WHERE nodes.section_id = #{Zena::Db.quote(self[:id])}) AND template_contents.site_id = #{Zena::Db.quote(self[:site_id])}"
     end
 end

data/app/models/text_document.rb

@@ -69,7 +69,7 @@ class TextDocument < Document
           if new_src = helper.send(:template_url_for_asset, :src => src, :current_folder=>current_folder, :parse_assets => true)
             "url(#{quote}#{new_src}#{quote})"
           else
-            errors.add('base', "could not find asset #{src.inspect}")
+            errors.add('asset', '{{asset}} not found', :asset => src.inspect)
             "url(#{quote}#{src}#{quote})"
           end
         end
@@ -96,7 +96,7 @@ class TextDocument < Document
           if url =~ /\A\/\w\w.*?(\d+)(_\w+|)\./
             zip, mode = $1, $2
             unless asset = secure(Node) { Node.find_by_zip(zip) }
-              errors.add('base', "could not find asset node #{zip}")
+              errors.add('asset', '{{zip}} not found', :zip => zip)
               "url(#{quote}#{url}#{quote})"
             end
             if asset.fullpath =~ /\A#{current_folder}\/(.+)/

data/app/models/version.rb

@@ -191,6 +191,7 @@ class Version < ActiveRecord::Base
     { 'content_id' => (content_class ? (content_id || id) : nil),
       'user_id'    => visitor.id,
       'node'       => self.node,
+      'number'     => self.number,
       'dyn'        => self.dyn,
       'status'     => Zena::Status[:red],
       'lang'       => visitor.lang }

data/app/views/documents/new.rhtml

@@ -12,7 +12,7 @@
 </div>
 
 <%#= css_edit %>
-<%= javascript_start %>
+<% javascript_tag do -%>
 var current_tab = $('<%= partial[0] %>_tab');
 var current_sel = $('<%= partial[0] %>_sel');
-<%= javascript_end %>
+<% end -%>

data/app/views/iformats/_form.rhtml

@@ -5,7 +5,7 @@
     link_to_function _('btn_x'), "['add_iformat', 'add_iformat_form'].each(Element.toggle)"
   end %>
 </td>
-<td class="add" colspan="5">
+<td class="add" colspan="6">
   <div id='iformat_errors'><%= error_messages_for(@iformat) %></div>
   <% unless @iformat.name.blank? %>
   <%= form_remote_tag(:url => iformat_path(@iformat.pseudo_id), :method => :put ) %>
@@ -13,11 +13,12 @@
   <%= form_remote_tag(:url => iformats_path ) %>
   <% end %>
   <table cellspacing='0' class='edit_iformat'>
-    <tr><td class='label'><%= _("name")%>      </td><td><%= text_field('iformat', 'name',        :size=>15 ) %></td></tr>
+    <tr><td class='label'><%= _("name")%>      </td><td><%= text_field('iformat', 'name', :size=>15 ) %></td></tr>
     <tr><td class='label'><%= _("type")%>      </td><td><%= select('iformat', 'size',  Iformat::SIZES, :selected => @iformat.size ) %></td></tr>
-    <tr><td class='label'><%= _("width")%></td><td><%= text_field('iformat', 'width',        :size=>15 ) %></td></tr>
-    <tr><td class='label'><%= _("height")%></td><td><%= text_field('iformat', 'height',        :size=>15 ) %></td></tr>
+    <tr><td class='label'><%= _("width")%></td><td><%= text_field('iformat', 'width', :size=>15 ) %></td></tr>
+    <tr><td class='label'><%= _("height")%></td><td><%= text_field('iformat', 'height', :size=>15 ) %></td></tr>
     <tr><td class='label'><%= _("gravity")%></td><td><%= select('iformat', 'gravity',  Iformat::GRAVITY, :selected => @iformat.gravity ) %></td></tr>
+    <tr><td class='label'><%= _("popup")%>      </td><td><%= text_area('iformat', 'popup', :cols=>20, :rows=>2 ) %></td></tr>
     <tr><td colspan='2'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
   </table>
   </form>

data/app/views/iformats/_li.rhtml

@@ -11,5 +11,6 @@
   <td><%= li.size %></td>
   <td><%= li.width %></td>
   <td><%= li.height %></td>
+  <td><%= li.popup %></td>
   <td><%= li.gravity %></td>
 </tr>

data/app/views/iformats/index.rhtml

@@ -1,7 +1,7 @@
 <h3><%= _('manage classes') %></h3>
 
 <table id='iformat_list' class='admin' cellspacing="0">
-  <tr><th class='nav' colspan='6'>&nbsp;</th></tr>
+  <tr><th class='nav' colspan='7'>&nbsp;</th></tr>
   <%= render :partial=>'iformats/li',  :collection=>@iformats %>
   <%= render :partial=>'iformats/add' %>
 </table>

data/app/views/nodes/_import_results.rhtml

@@ -12,7 +12,7 @@
         <% else -%>
         <td><%= node.errors.empty? ? (node[:create_or_update]) : 'error' %></td>
         <td><%= _('%{count} versions') % {:count => node.instance_variable_get(:@versions_count)} %></td>
-        <td><%= !node.errors.empty? ? node.errors.map {|k,v| "[#{k}] #{v}"}.join(', ') : 'ok' %></td>
+        <td><%= !node.errors.empty? ? error_messages_for(node) : 'ok' %></td>
         <% end -%>
       </tr>
     <% end -%>

data/app/views/nodes/edit.html.erb

@@ -11,7 +11,7 @@
 </div>
 
 <%#= css_edit %>
-<%= javascript_start %>
+<% javascript_tag do -%>
 var current_tab = $('<%= partial[0] %>_tab');
 var current_sel = $('<%= partial[0] %>_sel');
-<%= javascript_end %>
+<% end -%>

data/app/views/templates/edit_tabs/_custom.rhtml

@@ -1,6 +1,6 @@
-<%= javascript_start %>
+<% javascript_tag do -%>
 var custom_loaded = false;
 function load_custom_tab() {
   new Ajax.Updater('custom_tab', '/nodes/<%= @node.zip %>/versions/0/custom_tab', {asynchronous:true, evalScripts:true, method:'get'});
 }
-<%= javascript_end %>
+<% end -%>

data/app/views/templates/edit_tabs/_document.rhtml

@@ -1,8 +1,8 @@
 <label for="node_c_file"><%= _("document file")  %></label>
-<div id="file"><%= link_to_remote(_("change document"), :update=>'file_form', :url=>file_form_documents_path, :method => :get, :complete=>"['file', 'file_form'].each(Element.toggle);") %></div>
+<div id="file" class='toggle_div'><%= link_to_remote(_("change"), :update=>'file_form', :url=>file_form_documents_path(:uuid => @uuid), :method => :get, :complete=>"['file', 'file_form'].each(Element.toggle);$('attachment#{@uuid}').click();") %></div>
+<div id="file_form" class='toggle_div' style='display:none;'></div>
+
 <label for='node_c_content_type'><%= _('content type') %></label>
 <input  id='node_c_content_type' type='text' name='node[c_content_type]' value='<%= @node.c_content_type %>'/><br/>
 
-<div id="file_form" style='display:none;'></div>
-
 <%= @node.c_version_id == @node.v_id ? "<b id='original_caution'>#{_('you are editing the original')}</b>" : "" %>

data/app/views/versions/_tr.rhtml

@@ -1,10 +1,9 @@
 <tr class="v<%= tr.status %>">
-  <td class="box"><%= version_actions( tr, :actions => 'view') %></td>
-  <td class="box" style='cursor:pointer;' onclick="Zena.diff_select(this);"><%= tr.number %></td>
+  <td class="box"><%= version_actions(tr, :actions => 'view') %></td>
+  <td class="number" onclick="Zena.diff_select(this);"><%= tr.number %></td>
   <td class="box"><%= tr.lang %></td>
-  <td class="status"><%= _("status_#{tr.status}") %></td>
+  <td class="actions"><%= version_actions(tr) %></td>
   <td class="sign"><%= tr.user.initials %></td>
+  <td class="date"><%= format_date(tr.created_at, 'age') %></td>
   <td class="comment"><%= tr.comment %></td>
-  <td class="date"><%= tformat_date(tr.created_at, 'datetime') %></td>
-  <td class="actions"><%= version_actions(tr) %></td>
-</tr>
+</tr>

data/app/views/versions/edit.rhtml

@@ -31,7 +31,7 @@
 </div>
 
 <%#= css_edit %>
-<%= javascript_start %>
+<% javascript_tag do -%>
 var current_sel = $('<%= partial[0] %>_sel');
 var current_tab = $('<%= partial[0] %>_tab');
 Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
@@ -51,5 +51,5 @@ $('node_form').getElements().each(function(input, index) {
     });
 });
 
-<%= javascript_end %>
+<% end -%>
 <iframe id="UploadIFrame" name="UploadIFrame" src="about:blank"></iframe>

data/bin/zena

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'zena/root'
+require 'zena/info'
 
-exec "rails -m #{File.join(Zena::ROOT, 'config', 'zena.rb').inspect} #{ARGV.first}"
+exec "rails -m #{File.join(Zena::ROOT, 'lib', 'zena', 'deploy', 'template.rb').inspect} #{ARGV.first}"

data/bricks/captcha/patch/application_controller.rb

@@ -4,7 +4,7 @@ class ApplicationController
 
   private
     def save_if_not_spam(obj, params)
-      (!visitor.is_anon? || validate_recap(params, obj.errors, :rcc_pub => current_site.d_recaptcha_pub, :rcc_priv => current_site.d_recaptcha_priv)) && obj.save
+      (!visitor.is_anon? || validate_recap(params, obj.errors, :rcc_pub => current_site.dyn['recaptcha_pub'], :rcc_priv => current_site.dyn['recaptcha_priv'])) && obj.save
     end
 end
 

data/bricks/captcha/zafu/captcha.rb

@@ -14,7 +14,7 @@ module Bricks
 
       def r_mail_hide
         text = get_text_for_erb
-        "<%= visitor.is_anon? ? mail_hide(#{text},:mh_pub => #{visitor.site.d_mail_hide_pub.inspect}, :mh_priv => #{visitor.site.d_mail_hide_priv.inspect}#{get_recaptcha_params}) : #{text} %>"
+        "<%= visitor.is_anon? ? mail_hide(#{text},:mh_pub => #{visitor.site.dyn['mail_hide_pub'].inspect}, :mh_priv => #{visitor.site.dyn['mail_hide_priv'].inspect}#{get_recaptcha_params}) : #{text} %>"
       end
 
       def get_recaptcha_params