zena 0.16.9 → 1.0.0.beta1

data/.gitignore

@@ -1,7 +1,15 @@
 .DS_Store
+restart.txt
 config/deploy_config.rb
 config/database.yml
+config/mysql.yml
+config/psql.yml
+config/sqlite3.yml
 config/*.sphinx.conf
+coverage
+db/*.sqlite3
+db/development_structure.sql
+db/schema.rb
 db/sphinx
 db/development_structure.sql
 doc/coverage
@@ -16,6 +24,11 @@ sandbox
 sites/*
 test/fixtures/*.yml
 tmp/*
-db/*.sqlite3
-coverage
-vendor/apache2_upload_progress/*
+vendor/apache2_upload_progress/*
+zena_console.rb
+vendor/plugins/property
+vendor/plugins/querybuilder
+vendor/plugins/rubyless
+vendor/plugins/versions
+vendor/plugins/yamltest
+vendor/plugins/zafu

data/CREDITS

@@ -9,19 +9,23 @@ tablekit table editor
     Andrew Tetlaw & Millstream Web Software
     http://www.millstream.com.au/view/code/tablekit/
     add/remove columns and drag&drop support added by Gaspard Bucher
-    
+
+javascript window
+-----------------
+    Sébastien Gruhier
+    http://prototype-window.xilinus.com
+
 soft icons
 ----------
     Mark James
     http://www.famfamfam.com/lab/icons/silk/
-    
+
 xspf mp3 player
 ---------------
     Fabricio Zuardi
     http://musicplayer.sourceforge.net/
-	
+
 upload progress bar (sample application demo)
 -------------------
     Tim
     http://itblog.mcgeecorp.com/articles/2007/05/15/mongrel-upload-progress-demo
-    

data/History.txt

@@ -1,18 +1,15 @@
-== 0.16.9 2010-09-29
-
-* 1 major enhancement
-  * fixed deploy rules for mongrel and passenger
-  * fixed RubyLess dependency (breaks with newer versions)
-
-== 0.16.8 2010-08-30
-
-* 1 minor enhancement
-  * using QueryBuilder 0.5.9 to fix bug in custom queries
-
-== 0.16.7 2010-07-11
-
-* 1 minor enhancement
-  * fixed rails version in /bin/zena
+== 1.0.0.beta1 2010-07-23
+
+* major changes
+ * complete rewrite of the storage engine (Property gem)
+ * rewrite of the template engine Zafu to use RubyLess
+ * rewrite of the query compilation engine to use RubyLess and offer better introspection
+ * XML API with support for query builder queries
+ * enhanced attributes support (indexing, inheritance, type)
+ * changed bricks layout to be like gems
+ * pdf generation support
+ * started PostgreSQL support
+ * inline JS windows instead of popup with attach/dettach support
 
 == 0.16.6 2010-04-23
 

data/app/controllers/application_controller.rb

@@ -3,4 +3,5 @@ class ApplicationController < ActionController::Base
 
   include Zena::App
 
+  include Zafu::ControllerMethods
 end

data/app/controllers/columns_controller.rb

@@ -0,0 +1,130 @@
+class ColumnsController < ApplicationController
+  before_filter :visitor_node
+  before_filter :find_column, :except => [:index, :create, :new, :import]
+  before_filter :check_is_admin
+  layout :admin_layout
+
+  # GET /columns
+  # GET /columns.xml
+  def index
+    secure(Column) do
+      @columns = Column.paginate(:all, :order => 'name', :per_page => 20, :page => params[:page])
+    end
+
+    @column  = Column.new
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @columns }
+    end
+  end
+
+  def export
+    data = secure(Column) do
+      Column.export
+    end
+
+    ### TODO
+  end
+
+  def import
+    attachment = params[:attachment]
+    if attachment.nil?
+      flass[:error] = "Upload failure: no definitions."
+      redirect_to :action => :index
+    else
+      data = YAML.load(attachment.read) rescue nil
+      if data.nil?
+        flash[:error] = "Could not parse yaml document"
+        redirect_to :action => :index
+      else
+        @columns = secure(Column) { Column.import(data) }.paginate(:per_page => 200)
+        @column  = VirtualClass.new('')
+        respond_to do |format|
+          format.html { render :action => 'index' }
+        end
+      end
+    end
+  end
+
+  # GET /columns/1
+  # GET /columns/1.xml
+  def show
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.js
+      format.xml  { render :xml => @column }
+    end
+  end
+
+  # GET /columns/new
+  # GET /columns/new.xml
+  def new
+    @column = Column.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @column }
+    end
+  end
+
+  # GET /columns/1/edit
+  def edit
+    respond_to do |format|
+      format.html { render :partial => 'columns/form' }
+      format.js   { render :partial => 'columns/form', :layout => false }
+    end
+  end
+
+  # POST /columns
+  # POST /columns.xml
+  def create
+    @column = Column.new(params[:column])
+
+    respond_to do |format|
+      if @column.save
+        flash[:notice] = 'Column was successfully created.'
+        format.html { redirect_to(@column) }
+        format.js
+        format.xml  { render :xml => @column, :status => :created, :location => @column }
+      else
+        format.html { render :action => "new" }
+        format.js
+        format.xml  { render :xml => @column.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /columns/1
+  # PUT /columns/1.xml
+  def update
+    respond_to do |format|
+      if @column.update_attributes(params[:column])
+        flash[:notice] = 'Column was successfully updated.'
+        format.html { redirect_to(@column) }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @column.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /columns/1
+  # DELETE /columns/1.xml
+  def destroy
+    @column.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(columns_url) }
+      format.js
+      format.xml  { head :ok }
+    end
+  end
+
+  protected
+    def find_column
+      @column = secure!(Column) { Column.find(params[:id])}
+    end
+end

data/app/controllers/documents_controller.rb

@@ -1,5 +1,5 @@
 class DocumentsController < ApplicationController
-  before_filter :find_node, :except => [ :get_uf, :upload_progress ]
+  before_filter :find_node, :except => [ :get_uf, :upload_progress, :create ]
 
   skip_before_filter :set_lang,      :only => :upload_progress
   skip_before_filter :authorize,     :only => :upload_progress
@@ -13,6 +13,9 @@ class DocumentsController < ApplicationController
   def new
     @node = @parent.new_child(:class => Document)
 
+    # Add Template role so that we can use the same object in forms which need the Template properties.
+    @node.has_role Template
+
     respond_to do |format|
       format.html
     end
@@ -31,6 +34,15 @@ class DocumentsController < ApplicationController
 
     respond_to do |format|
       if @node.new_record?
+        # If skin id could not be set (invalid parent), make sure we have something to render.
+        @node.skin_id ||= current_site.root_node.skin_id
+        parent_id = (params[:node] || {})[:parent_id] || 0
+        class << @node
+          def parent_zip
+            parent_id
+          end
+        end
+
         flash[:error] = _("Upload failed.")
         format.html { render :action => 'new'}
       else
@@ -47,7 +59,7 @@ class DocumentsController < ApplicationController
     responds_to_parent do # execute the redirect in the iframe's parent window
       render :update do |page|
         if @node.new_record?
-          page.replace_html 'form_errors', error_messages_for(@node)
+          page.replace_html 'form_errors', error_messages_for(:node, :object => @node)
           page.call 'UploadProgress.setAsError'
         else
           page.call 'UploadProgress.setAsFinished'
@@ -93,12 +105,12 @@ class DocumentsController < ApplicationController
     def create_document
       attrs = params['node']
       file, error = get_attachment
-      attrs['c_file'] = file if file
+      attrs['file'] = file if file
       attrs['klass'] ||= 'Document'
       if error
         @node = secure!(Document) { Document.new }
         @node.attributes = attrs
-        @node.errors.add('c_file', error)
+        @node.errors.add('file', error)
       else
         @node = secure!(Document) { Document.create_node(attrs) }
       end

data/app/controllers/groups_controller.rb

@@ -1,7 +1,7 @@
 class GroupsController < ApplicationController
   before_filter :check_is_admin
   before_filter :find_group, :except => [:index, :new, :create]
-  before_filter :find_node
+  before_filter :visitor_node
   before_filter :get_users,  :except => [:show, :update]
   before_filter :get_groups, :except => [:show, :update, :index]
   before_filter :filter_users_ids, :only => [:create, :update]
@@ -78,10 +78,6 @@ class GroupsController < ApplicationController
       end
     end
 
-    def find_node
-      @node = visitor.contact
-    end
-
     def get_users
       @users  = secure!(User)  { User.find(:all, :conditions => "status >= #{User::Status[:reader]}", :order=>'login') }
     end

data/app/controllers/iformats_controller.rb

@@ -1,7 +1,7 @@
 class IformatsController < ApplicationController
   before_filter :check_is_admin
   before_filter :find_iformat, :except => [:index, :new, :create]
-  before_filter :find_node
+  before_filter :visitor_node
   layout :admin_layout
 
   def show
@@ -71,8 +71,4 @@ class IformatsController < ApplicationController
         end
       end
     end
-
-    def find_node
-      @node = visitor.contact
-    end
 end

data/app/controllers/nodes_controller.rb

@@ -18,12 +18,12 @@ Examples:
 
 =end
 class NodesController < ApplicationController
-  before_filter :check_is_admin, :only => [:export]
+  before_filter :check_is_admin,  :only => [:export]
   before_filter :find_node, :except => [:index, :create, :not_found, :catch_all, :search]
   before_filter :check_can_drive, :only => [:edit]
-  before_filter :check_path, :only  => [:index, :show]
-  after_filter  :change_lang, :only => [:create, :update, :save_text]
-  layout :popup_layout,     :only   => [:edit, :import]
+  before_filter :check_path,      :only => [:index, :show]
+  after_filter  :change_lang,     :only => [:create, :update, :save_text]
+  layout :popup_layout,           :only => [:edit, :import]
 
   include Zena::Use::Grid::ControllerMethods
 
@@ -54,6 +54,7 @@ class NodesController < ApplicationController
     do_search
     respond_to do |format|
       format.html { render_and_cache :mode => '+search', :cache => false }
+      format.xml { render :xml => @nodes ? @nodes.to_xml : []}
       format.js
     end
   end
@@ -67,7 +68,8 @@ class NodesController < ApplicationController
     end
   end
 
-  # RJS method. This is *much* better the "format.js" in the "show" controller or JS TextDocuments will pose problems.
+  # RJS method. show.js not working... ?
+  # FIXME: remove.
   def zafu
     return self.update if params[:method] == 'put'
     respond_to do |format|
@@ -108,11 +110,15 @@ class NodesController < ApplicationController
   end
 
   def show
-
     respond_to do |format|
 
       format.html { render_and_cache }
 
+      if !params[:prefix]
+        # /nodes/18.xml not treated the same as /en/page18.xml (render_and_cache)
+        format.xml { render :xml => @node.to_xml }
+      end
+
       format.any do
         if asset = params[:asset]
           # math rendered as png, ...
@@ -121,25 +127,25 @@ class NodesController < ApplicationController
           content_type = (Zena::EXT_TO_TYPE[params[:format]] || ['application/octet-stream'])[0]
           send_file(content_path, :filename=>filename, :type => content_type, :disposition=>'inline', :x_sendfile => ENABLE_XSENDFILE)
           cache_page(:content_path => content_path, :authenticated => @node.public?) # content_path is used to cache by creating a symlink
-        elsif @node.kind_of?(Document) && params[:format] == @node.version.content.ext
+        elsif @node.kind_of?(Document) && params[:format] == @node.ext
           # Get document data (inline if possible)
           content_path = nil
 
           if @node.kind_of?(Image) && !Zena::Use::ImageBuilder.dummy?
             if img_format = Iformat[params[:mode]]
-              content_path = @node.version.content.filepath(img_format)
+              content_path = @node.filepath(img_format)
               # force creation of image data
-              @node.c_file(img_format)
+              @node.file(img_format)
             end
           elsif @node.kind_of?(TextDocument)
-            send_data(@node.v_text, :filename => @node.filename, :type => 'text/css', :disposition => 'inline')
+            send_data(@node.text, :filename => @node.filename, :type => 'text/css', :disposition => 'inline')
           else
-            content_path = @node.version.content.filepath
+            content_path = @node.filepath
           end
 
           if content_path
             # FIXME RAILS: remove 'stream => false' when rails streaming is fixed
-            send_file(content_path, :filename => @node.filename, :type => @node.c_content_type, :disposition => 'inline', :stream => false, :x_sendfile => ENABLE_XSENDFILE)
+            send_file(content_path, :filename => @node.filename, :type => @node.content_type, :disposition => 'inline', :stream => false, :x_sendfile => ENABLE_XSENDFILE)
           end
 
           cache_page(:content_path => content_path, :authenticated => @node.public?) # content_path is used to cache by creating a symlink
@@ -162,33 +168,36 @@ class NodesController < ApplicationController
     attrs = params['node']
     file, file_error = get_attachment
     if file
-      attrs['c_file'] = file
+      attrs['file'] = file
       attrs['klass'] = 'Document'
     end
 
     @node = secure!(Node) { Node.create_node(attrs) }
-    @node.errors.add('c_file', file_error) if file_error
+    @node.errors.add('file', file_error) if file_error
 
     respond_to do |format|
       if @node.errors.empty?
         flash[:notice] = 'Node was successfully created.'
-        format.html { redirect_to node_url(@node) }
+        format.html { redirect_to zen_path(@node) }
         format.js
-        format.xml  { head :created, :location => node_url(@node) }
+        format.xml  { render :xml => @node, :status => :created, :location => node_url(@node) }
       else
         format.html { render :action => "new" }
         format.js
-        format.xml  { render :xml => @node.errors.to_xml }
+        format.xml  { render :xml => @node.errors, :status => :unprocessable_entity }
       end
     end
   end
 
   # modifications of the node itself (dates, groups, revert editions, etc)
   def edit
+    @node.load_roles!
+
     respond_to do |format|
       format.html do
         @title_for_layout = @node.rootpath
       end
+
       format.js do
         # zafu edit
         render :template => 'nodes/edit.rjs' # FIXME: this should not be needed. Rails bug ?
@@ -196,6 +205,34 @@ class NodesController < ApplicationController
     end
   end
 
+  def destroy
+    respond_to do |format|
+
+      format.html do
+        if @node.destroy
+          flash[:notice] = "Node destroyed."
+          redirect_to zen_path(@node.parent)
+        else
+          flash[:notice] = "Could not destroy node."
+          render :action => 'show'
+        end
+      end
+
+      format.xml  do
+        node_xml = @node.to_xml #need to be allocated before destroying
+        if node_xml && @node.destroy
+          render :xml => node_xml, :status => 200
+        else
+          @node.errors.add(:visitor, visitor.login) if RAILS_ENV == 'development'
+          render :xml => @node.errors, :status => :unprocessable_entity
+        end
+      end
+
+      format.js
+
+    end
+  end
+
   # TODO: test
   def save_text
     update
@@ -253,11 +290,12 @@ class NodesController < ApplicationController
 
   def update
     file, file_error = get_attachment
-    params['node']['c_file'] = file if file
+    params['node']['file'] = file if file
 
     @v_status_before_update = @node.v_status
     @node.update_attributes_with_transformation(params['node'])
-    @node.errors.add('c_file', file_error) if file_error
+    # What is this 'extfile' thing ?
+    @node.errors.add('extfile', file_error) if file_error
 
     if @node.errors.empty?
       flash.now[:notice] = _('node updated')
@@ -273,8 +311,8 @@ class NodesController < ApplicationController
             page.redirect_to edit_node_version_path(:node_id => @node[:zip], :id=>(@node.v_number || 0), :close => (params[:validate] ? true : nil))
           end
         end
-      end
-    else
+      end # parent iframe (upload)
+    elsif @node.errors.empty?
       respond_to do |format|
         format.html do
           if params[:edit] == 'popup'
@@ -282,8 +320,17 @@ class NodesController < ApplicationController
           else
             redirect_to zen_path(@node, :mode => params[:mode])
           end
-        end
+        end # html
+
         format.js { @flash = flash }
+
+        format.xml do
+          if @node.errors.empty?
+            render :xml => @node.to_xml, :status => :ok, :location => node_url(@node)
+          else
+            render :xml => @page.errors, :status => :unprocessable_entity
+          end
+        end # xml
       end
     end
   end
@@ -292,7 +339,7 @@ class NodesController < ApplicationController
   # TODO: test
   def attribute
     method = params[:attr]
-    if (params[:pseudo_id] || params[:name]).blank? || !%w{v_title v_text v_summary name path short_path}.include?(method)
+    if (params[:pseudo_id] || params[:name]).blank? || !%w{title text summary name path short_path}.include?(method)
       # Error
       render :text => ''
       return
@@ -315,7 +362,7 @@ class NodesController < ApplicationController
         conditions << "#{kpath}%"
       end
 
-      conditions[0] << "name LIKE ?"
+      conditions[0] << "node_name LIKE ?"
       conditions << "#{name_query}%"
 
       conditions[0] = conditions[0].join(' AND ')
@@ -327,7 +374,7 @@ class NodesController < ApplicationController
       render :text => path.join('/ ')
     else
       @text = @node.send(method)
-      if %w{v_text v_summary}.include?(method)
+      if %w{text summary}.include?(method)
         render :text => "<%= zazen(@text) %>"
       else
         render :text => @text
@@ -441,17 +488,28 @@ class NodesController < ApplicationController
       end
     end
 
+    # Make sure the current url is valid. If it is not, redirect.
     def check_path
+      # show must have a 'path' parameter unless logged in and xml format
+      if !params[:prefix] && request.format == Mime::XML
+        # xml API
+        return true
+      end
+
       case params[:action]
       when 'index'
+        # TODO: this should live in I18n (and maybe it is not needed anymore)
         # bad prefix '/so', '/rx' or '/en?lang=fr'
         if params[:prefix] != prefix
           set_visitor_lang(params[:prefix])
           # redirect if new lang could not be set
-          redirect_url = "/#{prefix}" if prefix != params[:prefix]
+          if prefix != params[:prefix]
+            # Invalid prefix
+            redirect_to "/#{prefix}" and return false
+          end
         end
       when 'show'
-        # show must have a 'path' parameter
+
         if params[:format] != 'html' && params[:cachestamp].nil?
           # maybe not seen, try to find it
           params.each do |k,v|
@@ -466,20 +524,30 @@ class NodesController < ApplicationController
         if params[:prefix] != prefix && !avoid_prefix_redirect
           # lang changed
           set_visitor_lang(params[:prefix])
-          redirect_url = zen_path(@node, path_params)
-        elsif (append_query_params("/#{params[:prefix]}/#{params[:path].join('/')}", :cachestamp => params[:cachestamp]) !=
-               zen_path(@node, :format => params[:format], :mode=>params[:mode], :asset=>params[:asset])) ||
-              (cachestamp_format?(params[:format]) && params[:cachestamp] != make_cachestamp(@node, params[:mode]))
-          # badly formed url
-          redirect_url = zen_path(@node, path_params)
-        elsif params[:mode] == 'edit' && !@node.can_write?
-          # special 'edit' mode
-          redirect_url = zen_path(@node, :format => params[:format], :asset => params[:asset])
+          redirect_to zen_path(@node, path_params) and return false
+        end
+
+        current_url  = append_query_params("/#{params[:prefix]}/#{params[:path].join('/')}", :cachestamp => params[:cachestamp])
+        base_url     = zen_path(@node,
+          :prefix => params[:prefix],
+          :format => params[:format],
+          :mode   => params[:mode],
+          :asset  => params[:asset])
+
+        if current_url != base_url
+          # Badly formed url, redirect
+          redirect_to zen_path(@node, path_params) and return false
+        end
+
+        if cachestamp_format?(params[:format]) && params[:cachestamp] != make_cachestamp(@node, params[:mode])
+          # Invalid cachestamp, redirect
+          redirect_to zen_path(@node, path_params) and return false
         end
-      end
 
-      if redirect_url
-        redirect_to redirect_url and return false
+        if params[:mode] == 'edit' && !@node.can_write?
+          # Not allowed to edit on special 'edit' mode
+          redirect_to zen_path(@node, :format => params[:format], :asset => params[:asset]) and return false
+        end
       end
 
       true
@@ -496,15 +564,22 @@ class NodesController < ApplicationController
     end
 
     def do_search
+      unless query_params = params[:q]
+        query_params = params.dup
+        %w{controller action format}.each do |key|
+          query_params.delete(key)
+        end
+      end
+
       @node = current_site.root_node
       @search_per_page = params[:per_page] ? params[:per_page].to_i : 20
-      @nodes = secure(Node) { Node.search_records(params[:q], :node => @node, :page => params[:page], :per_page => @search_per_page) }
+      @nodes = secure(Node) { Node.search_records(query_params, :node => @node, :page => params[:page], :per_page => @search_per_page) }
       @search_count = 100 # FIXME: @nodes ? @nodes.total_entries : 0
     end
 
     # Document data do not change session[:lang] and can point at cached content (no nee to redirect to AUTHENTICATED_PREFIX).
     def avoid_prefix_redirect
-      @node.kind_of?(Document) && params[:format] == @node.version.content.ext
+      @node.kind_of?(Document) && params[:format] == @node.ext
     end
 
     # Transform pseudo id into absolute paths (used after import)