zena 1.2.7 → 1.2.8

data/lib/zafu/process/context.rb

@@ -53,6 +53,10 @@ module Zafu
               end
               @markup.set_param(:'data-a', sort_attr)
               @markup.set_dyn_param(:'data-p', "<%= #{node}.#{RubyLess.translate(node.klass, sort_attr)} %>")
+              if sort_attr == 'l_status'
+                @markup.set_dyn_param(:'data-l', "<%= #{node}.link_id %>")
+              end
+              
               s = 'drag_handle' if s == 'true'
               unless s == 'all' || @blocks.detect{|b| b.kind_of?(String) ? b =~ /class=.#{s}/ : (b.params[:class] == s || (b.markup && b.markup.params[:class] == s))}
                 before_wrap << "<span class='#{s}'>&nbsp;</span>"

data/lib/zena/acts/secure_node.rb

@@ -72,7 +72,7 @@ module Zena
         # * super user
         # * members of +write_group+ if there status is at least 'user'.
         def can_write?(vis=visitor, ugps=visitor.group_ids)
-          ( ugps.include?(wgroup_id) && visitor.user?)  # write group
+          !current_site.site_readonly? && ( ugps.include?(wgroup_id) && visitor.user?)  # write group
         end
 
         # Returns true if the current visitor can see redactions (unpublished versions)
@@ -101,7 +101,7 @@ module Zena
         # * super user
         # * members of +drive_group+ if member status is at least 'user'
         def can_drive?(vis=visitor, ugps=visitor.group_ids)
-          ( vis.user? && (ugps.include?(dgroup_id) || draft?) )
+          !current_site.site_readonly? && ( vis.user? && (ugps.include?(dgroup_id) || draft?) )
         end
 
         # 'can_drive?' before attribute change
@@ -111,7 +111,7 @@ module Zena
 
         # 'can_drive?' without draft? exceptions
         def full_drive?(vis=visitor, ugps=visitor.group_ids)
-          ( vis.user? && ugps.include?(dgroup_id) )
+          !current_site.site_readonly? && ( vis.user? && ugps.include?(dgroup_id) )
         end
 
         # 'full_drive?' before attribute change

data/lib/zena/app.rb

@@ -20,6 +20,7 @@ Zena.use  [
   Zena::Use::Upload,
   Zena::Use::Urls,
   Zena::Use::ZafuAttributes,
+  Zena::Use::ZafuEval,
   Zena::Use::ZafuSafeDefinitions,
   Zena::Use::ZafuTemplates,
   Zena::Use::Zazen,

data/lib/zena/deploy.rb

@@ -164,7 +164,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   desc "create a new site alias [-s host='...' -s alias='...' -s pass='...']"
   task :mkalias, :roles => :app do
-    run "#{in_current} rake zena:mksite HOST='#{self[:host]}' ALIAS='#{self[:alias]}' RAILS_ENV='production'"
+    run "#{in_current} rake zena:mkalias HOST='#{self[:host]}' ALIAS='#{self[:alias]}' RAILS_ENV='production'"
     
     # Same as mksite
     self[:host] = self[:alias]

data/lib/zena/deploy/template.rb

@@ -50,5 +50,5 @@ inside('app/controllers') do
   end
 end
 
-rake 'zena:assets OVERWRITE_ASSETS=true'
+rake 'zena:all_assets OVERWRITE_ASSETS=true'
 rake 'zena:fix_rakefile'

data/lib/zena/foxy_parser.rb

@@ -438,7 +438,7 @@ module Zena
             begin
               eval(klass).kpath =~ /^#{Page.kpath}/
               if node['custom_base']
-                node['basepath'] = node['fullpath']
+                node['basepath'] = node['fullpath'].split('/')[1..-1].join('/')
               else
                 node['basepath'] = parent['basepath']
               end
@@ -447,8 +447,8 @@ module Zena
             end
           else
             # If we do not quote the content, FoxyParser will insert NULL.
+            node['fullpath'] = "#{node['zip']}"
             node['basepath'] = "''"
-            node['fullpath'] = "''"
           end
         end
         node['fullpath']
@@ -785,6 +785,9 @@ module Zena
             col[:header_keys] << :role
             col[:header_keys] << :name
           end
+          if !col['versioned']
+            col['versioned'] = 1
+          end
         end
       end
   end

data/lib/zena/info.rb

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

data/lib/zena/site_worker.rb

@@ -58,8 +58,8 @@ module Zena
 
     # Return a textual description of the operation.
     def info
-      if site_id == current_site.site_id
-        "#{action}, #{_('page')} #{page}/#{page_count}"
+      if site_id == current_site.id
+        "<b>#{action}</b>, #{_('page')} #{page}/#{page_count}"
       else
         # Do not show jobs from other sites
         "-"

data/lib/zena/test_controller.rb

@@ -5,7 +5,7 @@ module Zena
     include Zena::Use::Fixtures
     include Zena::Use::TestHelper
     helper_method :get_template_text, :template_url_for_asset, :save_erb_to_url
-    skip_before_filter :set_visitor
+    skip_before_filter :set_visitor, :redirect_to_https
     prepend_before_filter :set_context
 
     include  Zena::Use::HtmlTags::ViewMethods
@@ -70,11 +70,14 @@ module Zena
 
     # We skip authlogic
     def set_context
-      login(params[:user])
+      login(params[:user], request.host)
       set_visitor_lang(params[:prefix])
       @node = secure!(Node) { Node.find(params[:node_id])}
       @text = params[:text]
       @test_url  = params[:url]
+      if f = params.delete(:flash)
+        flash.now[:error] = f
+      end
       params.delete(:user_id)
       params.delete(:user)
       params.delete(:prefix)

data/lib/zena/use/action.rb

@@ -41,6 +41,11 @@ module Zena
 
       module ControllerMethods
         include Common
+
+        # /login?lang=fr
+        def login_path
+          super(:lang => params[:lang] || visitor.lang)
+        end
       end
 
       module ViewMethods
@@ -154,11 +159,13 @@ module Zena
             end
           end
         end
-
+        
+        # /oo
         def login_path
           if params[:controller] == 'nodes'
-            zen_path(@node, :prefix => AUTHENTICATED_PREFIX)
+            zen_path(@node, :prefix => AUTHENTICATED_PREFIX, :lang => visitor.lang)
           else
+            # ?
             super
           end
         end

data/lib/zena/use/ajax.rb

@@ -37,7 +37,15 @@ module Zena
             end
             return
           end
-
+          
+          # Make sure we render requests in chronological order
+          page << "if (Zena.stampOk('#{params[:dom_id]}', #{params[:zs].to_i})) {"
+            # We cannot 'return' in Firefox, the eval script is not in a function
+            do_update_page_content(page, obj)
+          page << "}"
+        end
+        
+        def do_update_page_content(page, obj)
           if params[:t_id] && obj.errors.empty?
             obj = secure(Node) { Node.find_by_zip(params[:t_id])}
             @node = obj
@@ -47,6 +55,12 @@ module Zena
 
           if obj.new_record?
             # A. could not create object: show form with errors
+            # FIXME: We should return the errors as JSON (at least if the form does not exist)
+            
+            obj.errors.each_error do |er, msg|
+              Rails.logger.warn "  [#{err}] #{msg}"
+            end
+
             page.replace ndom_id, :file => template_path_from_template_url('_form')
           elsif @errors || !obj.errors.empty?
             # B. could not update/delete: show errors
@@ -191,15 +205,17 @@ module Zena
           list << dom_id
         end
 
-        def filter_form(node, dom_id, loading, upd)
+        def filter_form(node, form_id, loading, upd)
           if loading
             loading = "\n#{loading}($('#{upd}'));"
           else
             loading = ''
           end
           # Disable 'redir' parameter during preview or filter.
-          js_data << %Q{new Form.Observer('#{dom_id}', 0.3, function(element, value) {#{loading}
-            var data = Form.serialize('#{dom_id}').gsub(/&redir=/,'&no_redir=')
+          js_data << %Q{new Form.Observer('#{form_id}', 0.3, function(element, value) {#{loading}
+            var data = Form.serialize('#{form_id}', {hash: true})
+            delete data.redir
+            data.zs = Zena.stamp(data.dom_id)
             new Ajax.Request('#{zafu_node_path(node)}', {asynchronous:true, evalScripts:true, method:'post', parameters:data})
           });}
         end

data/lib/zena/use/ancestry.rb

@@ -2,6 +2,78 @@ module Zena
   module Use
     # This module handles the creation and maintenance of a 'fullpath' and cached project/section_id.
     module Ancestry
+      
+      def self.basepath_from_fullpath(fullpath)
+        return '' if !fullpath # This happens with pseudo root/home when node is not accessible
+        fullpath.split('/')[1..-1].join('/')
+      end
+      
+      # Makes a fullpath from the node's zip and parent zip Array.
+      # Returns fullpath as an Array.
+      def self.make_fullpath(zip, parent_fullpath)
+        if parent_fullpath
+          parent_fullpath + [zip]
+        else
+          [zip]
+        end
+      end
+      
+      # Rebuild basepath and return new value
+      def self.make_basepath(fullpath, custom_base, parent_basepath)
+        if custom_base
+          fullpath[1..-1]
+        else
+          parent_basepath || []
+        end
+      end
+      
+      # Forces rebuild of paths. Returns the new paths.
+      def self.rebuild_paths(rec, parent_fullpath, parent_basepath)
+        id, zip, custom_base = rec['id'], rec['zip'], rec['custom_base']
+        custom_base = custom_base == true || custom_base == Zena::Db::TRUE_RESULT
+        fullpath = make_fullpath(zip, parent_fullpath)
+        basepath = make_basepath(fullpath, custom_base, parent_basepath)
+        new_paths = {'fullpath' => fullpath.join('/'), 'basepath' => basepath.join('/')}
+        if !new_paths.keys.inject(true){|s,e| s && rec[e] == new_paths[e]}
+          # Need to save
+          log = "[#{zip}] Fix paths: #{rec['fullpath']} => #{new_paths['fullpath']}, #{rec['basepath']} => #{new_paths['basepath']}"
+          Rails.logger.warn log
+          if RAILS_ENV != 'test'
+            # When running rake task
+            puts log
+          end
+          Zena::Db.execute "UPDATE nodes SET #{new_paths.map {|k,v| "#{Zena::Db.connection.quote_column_name(k)}=#{Zena::Db.quote(v)}"}.join(', ')} WHERE id = #{id} AND site_id = #{current_site.id}"
+        end
+        return fullpath, basepath
+      end
+      
+      # Forces a full recursive basepath and fullpath rebuild. If parent_fullpath and parent_basepath
+      # are nil, base is the root node. parent_fullpath and parent_basepath should be provided as Array.
+      def self.rebuild_all_paths(rec, parent_fullpath = nil, parent_basepath = nil, visited = {})
+        raise Zena::InvalidRecord, "Infinit loop in 'ancestors'. Node zip = #{rec['zip']}." if visited[rec['id']]
+        fullpath, basepath = rebuild_paths(rec, parent_fullpath, parent_basepath)
+        visited[rec['id']] = true
+        
+        # Do the same for each child. Depth first. Batch of 100 for children listing.
+        i = 0
+        batch_size = 100
+        while true
+          list  = Zena::Db.fetch_attributes(['id', 'zip', 'custom_base', 'fullpath', 'basepath'], 'nodes', "parent_id = #{rec['id']} AND site_id = #{current_site.id} ORDER BY id ASC LIMIT #{batch_size} OFFSET #{i * batch_size}")
+
+          break if list.empty?
+          list.each do |child|
+            rebuild_all_paths(child, fullpath, basepath, visited)
+          end
+
+          if list.size == batch_size
+            # 100 more
+            i += 1
+          else
+            break
+          end
+        end
+      end
+      
       module ClassMethods
         def title_join
           %Q{INNER JOIN idx_nodes_ml_strings AS id1 ON id1.node_id = nodes.id AND id1.key = 'title' AND id1.lang = '#{visitor.lang}'}
@@ -10,7 +82,7 @@ module Zena
         TITLE_ML_JOIN = %Q{INNER JOIN idx_nodes_ml_strings AS id1 ON id1.node_id = nodes.id AND id1.key = 'title'}
 
         # (slow). Find a node by it's path. This is used during node importation when stored as zml files or to resolve custom_base url until we have an "alias" table.
-        def find_by_path(path, parent_id = current_site.root_id, multilingual = false)
+        def find_by_path(path, parent_id = current_site.home_id, multilingual = false)
           res  = nil
           path = path.split('/') unless path.kind_of?(Array)
           last = path.size - 1
@@ -61,6 +133,7 @@ module Zena
             zip == '..' ? '..' : (list[zip.to_i] || (sym == :node ? nil : '*'))
           end.compact
         end
+        
       end # ClassMethods
 
       module ModelMethods
@@ -103,7 +176,7 @@ module Zena
           elsif parent_id.nil?
             []
           else
-            path = fullpath.split('/')[0..-2]
+            path = fullpath.split('/')[1..-2]
             [current_site.root_node].compact + (secure(Node) { Node.fullpath_map(path, :node) } || [])
           end
         end
@@ -137,8 +210,10 @@ module Zena
         end
 
         # (slow). Transform a list of zips into a fullpath.
-        def fullpath_as_title(path = fullpath)
-          if path == self.fullpath
+        def fullpath_as_title(path = nil)
+          if !path
+            # When using fullpath, we remove first element (root)
+            path = fullpath.split('/')[1..-1]
             # secure returns nil instead of [] so we fix this.
             @fullpath_as_title ||= secure(Node) { Node.fullpath_map(path, :title) } || []
           else
@@ -162,22 +237,20 @@ module Zena
           def rebuild_fullpath
             return unless new_record? || parent_id_changed? || fullpath.nil?
             if parent = parent(false)
-              path = parent.fullpath.split('/') + [zip]
+              self[:fullpath] = Ancestry.make_fullpath(zip, parent.fullpath.split('/')).join('/')
             else
-              path = []
+              self[:fullpath] = Ancestry.make_fullpath(zip, nil).join('/')
             end
-            self.fullpath = path.join('/')
           end
-
+          
           def rebuild_basepath
             return unless new_record? || parent_id_changed? || custom_base_changed? || basepath.nil?
-            if custom_base
-              self[:basepath] = self.fullpath
-            elsif parent = parent(false)
-              self[:basepath] = parent.basepath || ""
+            if parent = parent(false)
+              parent_basepath = parent.basepath.split('/')
             else
-              self[:basepath] = ""
+              parent_basepath = nil
             end
+            self[:basepath] = Ancestry.make_basepath(self.fullpath.split('/'), custom_base, parent_basepath).join('/')
           end
 
           def rebuild_children_fullpath
@@ -185,7 +258,7 @@ module Zena
 
             # Update descendants
             fullpath_new = self.fullpath
-            fullpath_new = "#{fullpath_new}/" if fullpath_was == ''
+            fullpath_new = "#{fullpath_new}/" if fullpath_was.blank?
             fullpath_re  = fullpath_changed? ? %r{\A#{self.fullpath_was}} : nil
 
             bases = [self.basepath]
@@ -199,7 +272,7 @@ module Zena
               list.each do |rec|
                 rec['fullpath'].sub!(fullpath_re, fullpath_new) if fullpath_re
                 if rec['custom_base'] == Zena::Db::TRUE_RESULT
-                  rec['basepath'] = rec['fullpath']
+                  rec['basepath'] = Ancestry.basepath_from_fullpath(rec['fullpath'])
                   bases << rec['basepath']
                 else
                   while rec['fullpath'].size <= bases.last.size
@@ -215,6 +288,7 @@ module Zena
             end
             true
           end
+          
       end # ModelMethods
     end # Ancestry
   end # Use

data/lib/zena/use/authlogic.rb

@@ -75,6 +75,11 @@ module Zena
             raise ActiveRecord::RecordNotFound unless visitor.is_admin?
             @admin = true
           end
+          
+          # Returns true if the site is not in readonly mode.
+          def check_not_readonly
+            raise ActiveRecord::ReadOnlyRecord if current_site.site_readonly?
+          end
 
           def lang
             visitor.lang
@@ -136,9 +141,10 @@ module Zena
           def redirect_to_https
             if current_site.ssl_on_auth
               if !ssl_request? && !visitor.is_anon? && !local_request?
-                redirect_to :protocol => "https://" 
+                # Note that this does not work for PUT or DELETE verbs...
+                redirect_to(params.merge({:protocol => 'https'}), :flash => flash)
               elsif ssl_request? && visitor.is_anon?
-                redirect_to :protocol => "http://" 
+                redirect_to(params.merge({:protocol => 'http'}), :flash => flash)
               end
             end
           end

data/lib/zena/use/context.rb

@@ -22,6 +22,7 @@ module Zena
         safe_method :visitor_node => visitor_node_proc
         safe_method :main => Proc.new {|h, r, s| {:method => '@node', :class => VirtualClass['Node']}}
         safe_method :root => Proc.new {|h, r, s| {:method => 'visitor.site.root_node', :class => VirtualClass['Project'], :nil => true}}
+        safe_method :home => Proc.new {|h, r, s| {:method => 'visitor.site.home_node', :class => visitor.site.home_node.vclass, :nil => true}}
         safe_method :site => {:class => Site, :method => 'visitor.site'}
 
         # Group an array of records by key.

data/lib/zena/use/display.rb

@@ -325,102 +325,6 @@ module Zena
             nil
           end
         end
-
-=begin
-        def title(node, opts = {})
-          if node.kind_of?(Version)
-            node = node.node
-          end
-          title_params = {}
-
-          title_params[:check_lang] = @params[:check_lang] if @params.include?(:check_lang)
-
-          if @params[:link]
-            value, static = parse_attributes_in_value(@params[:link], :erb => false)
-            link_param = ", :link=>\"#{value}\""
-          else
-            link_param = ''
-          end
-
-          res = "<%= show_title(:node=>#{node}#{link_param}#{params_to_erb(title_params)}"
-          if @params[:text]
-            res << ", :text=>#{@params[:text].inspect}"
-          elsif @params[:attr]
-            res << ", :text=>#{node_attribute(@params[:attr])}"
-          end
-
-          if @params.include?(:project)
-            res << ", :project=>#{@params[:project] == 'true'}"
-          end
-          res << ")"
-          if @params[:actions]
-            res << " + node_actions(:node=>#{node}#{params_to_erb(:actions=>@params[:actions], :publish_after_save=>auto_publish_param)})"
-          end
-          res << "%>"
-          res
-        end
-          # TODO: test
-          # display the title with necessary id and checks for 'lang'. Options :
-          # * :link if true, the title is a link to the object's page
-          #   default = true if obj is not the current node '@node'
-          # * :project if true , the project name is added before the object title as 'project / .....'
-          #   default = obj project is different from current node project
-          # if no options are provided show the current object title
-          def title(obj, opts={})
-
-            unless opts.include?(:link)
-              # we show the link if the object is not the current node or when it is being created by zafu ajax.
-              opts[:link] = (obj[:id] != @node[:id] || params[:t_url]) ? 'true' : nil
-            end
-
-            unless opts.include?(:project)
-              opts[:project] = (obj.get_project_id != @node.get_project_id && obj[:id] != @node[:id])
-            end
-
-            title = opts[:text] || obj.title
-            if opts[:project] && project = obj.project
-              title = "#{project.name} / #{title}"
-            end
-
-            title += check_lang(obj) unless opts[:check_lang] == 'false'
-            title  = "<span id='title#{obj.zip}'>#{title}</span>"
-
-            if (link = opts[:link]) && opts[:link] != 'false'
-              if link =~ /\A(\d+)/
-                zip = $1
-                obj = secure(Node) { Node.find_by_zip(zip) }
-                link = link[(zip.length)..-1]
-                if link[0..0] == '_'
-                  link = link[1..-1]
-                end
-              end
-              if link =~ /\Ahttp/
-                "<a href='#{link}'>#{title}</a>"
-              else
-                link_opts = {}
-                if link == 'true'
-                  # nothing special for the link format
-                elsif link =~ /(\w+\.|)data$/
-                  link_opts[:mode] = $1[0..-2] if $1 != ''
-                  if obj.kind_of?(Document)
-                    link_opts[:format] = obj.ext
-                  else
-                    link_opts[:format] = 'html'
-                  end
-                elsif link =~ /(\w+)\.(\w+)/
-                  link_opts[:mode]   = $1
-                  link_opts[:format] = $2
-                elsif !link.blank?
-                  link_opts[:mode]   = link
-                end
-                "<a href='#{zen_path(obj, link_opts)}'>#{title}</a>"
-              end
-            else
-              title
-            end
-          end
-      end
-=end
       end # ViewMethods
 
       module ZafuMethods
@@ -524,7 +428,7 @@ module Zena
         def extract_label(res, attribute)
           return res if @params[:type] == 'hidden'
           attribute ||= @params[:param]
-          if (label = param(:label) || param(:tlabel)) && attribute
+          if (label = @params[:tlabel] || param(:label) || param(:tlabel)) && attribute
             case label
             when 'true'
               "<label>#{attribute}</label> <span>#{res}</span>"