zena 1.0.0.beta3 → 1.0.0.rc1

data/lib/zena/use/ajax.rb

@@ -21,6 +21,11 @@ module Zena
             if !@node.errors.empty?
               page << "alert(#{@node.errors.first.join(': ')});"
               page << "return false;" # How to avoid 'onSuccess' ?
+            elsif params[:udom_id] == '_page'
+              # reload page
+              page << "document.location.href = document.location.href;"
+            else
+              # ?
             end
             return
           end
@@ -133,7 +138,6 @@ module Zena
           @toggle_ids ||= {}
           unless list = @toggle_ids[group_name]
             list = @toggle_ids[group_name] = []
-            other = yield
 
             if other = yield
               found = other.rel[role].other_zips
@@ -203,21 +207,34 @@ module Zena
 
           node = pre_filter_node
 
-          # We do not want to have duplicate ids so we use our own dom prefix.
-          set_dom_prefix(node)
+          if @name.blank?
+            # make sure we have a scope
+            set_dom_prefix(node)
+          end
+
+          # We do not want to use the same id as the 'each' loop but we also want to
+          # avoid changing the node context
+          @drag_prefix ||= root.get_unique_name('drag', true).gsub(/[^\d\w\/]/,'_')
+          markup.set_id(node.dom_id(:dom_prefix => @drag_prefix))
 
-          markup.set_id(node.dom_id)
           markup.append_param(:class, 'drag')
 
           drag = 'drag_handle' if drag == 'true'
 
-          js_options = drag == 'all' ? ['false'] : [drag.inspect]
+          if drag == 'all'
+            js_options = ['false']
+          else
+            unless @blocks.detect{|b| b.kind_of?(String) ? b =~ /class=.#{drag}/ : (b.params[:class] == drag || (b.markup && b.markup.params[:class] == drag))}
+              handle = "<span class='#{drag}'>&nbsp;</span>"
+            end
+            js_options = [drag.inspect]
+          end
 
           if revert = @params.delete(:revert)
             js_options << (%w{true false}.include?(revert) ? revert : revert.inspect)
           end
 
-          markup.pre_wrap[:drag] = "<% add_drag_id(\"#{node.dom_id(:erb => false)}\", #{js_options.join(', ').inspect}) -%>"
+          markup.pre_wrap[:drag] = "#{handle}<% add_drag_id(\"#{node.dom_id(:dom_prefix => @drag_prefix, :erb => false)}\", #{js_options.join(', ').inspect}) %>"
         end
 
         # Display an input field to filter a remote block
@@ -246,7 +263,7 @@ module Zena
           end
           out "</div></form>"
           if @params[:live] || @params[:update]
-            out "<% filter_form(#{node}, \"#{dom_id}_f\") -%>"
+            out "<% filter_form(#{node}, \"#{dom_id}_f\") %>"
           end
         end
 
@@ -287,8 +304,7 @@ module Zena
           end
 
           query_params << ", :url => #{make_href(self.name, :action => 'drop')}"
-          markup.pre_wrap[:drop] = "<% add_drop_id(\"#{dom_id}\"#{query_params}) -%>"
-
+          markup.pre_wrap[:drop] = "<% add_drop_id(\"#{dom_id}\"#{query_params}) %>"
           r_block
         end
 
@@ -304,7 +320,7 @@ module Zena
           dom_id = node.dom_id(:erb => false)
           markup.set_id(node.dom_id)
           markup.append_param(:class, 'toggle')
-          out "<% add_toggle_id(\"#{dom_id}\", #{var.inspect}, #{role.inspect}) { #{finder} } -%>#{expand_with}"
+          out "<% add_toggle_id(\"#{dom_id}\", #{var.inspect}, #{RubyLess.translate_string(self, role)}) { #{finder} } %>#{expand_with}"
         end
 
         def process_toggle
@@ -334,7 +350,7 @@ module Zena
           markup.tag ||= 'div'
 
           markup.append_param(:class, 'toggle')
-          markup.pre_wrap[:toggle] = "<% add_toggle_id(\"#{dom_id}\", #{"#{var}_tog".inspect}, #{role.inspect}) { #{finder} } -%>"
+          markup.pre_wrap[:toggle] = "<% add_toggle_id(\"#{dom_id}\", #{"#{var}_tog".inspect}, #{RubyLess.translate_string(self, role)}) { #{finder} } %>"
         end
 
         def r_unlink
@@ -367,7 +383,7 @@ module Zena
           opts[:default_text] = _('btn_tiny_del')
           @params[:class] ||= 'unlink'
 
-          out "<% if #{node}.can_write? && #{node}.link_id -%>#{wrap(make_link(opts))}<% end -%>"
+          out "<% if #{node}.can_write? && #{node}.link_id %>#{wrap(make_link(opts))}<% end %>"
 
          #tag_to_remote
          #"<%= tag_to_remote({:url => node_path(#{node_id}) + \"#{opts[:method] != :put ? '/zafu' : ''}?#{action.join('&')}\", :method => #{opts[:method].inspect}}) %>"
@@ -377,7 +393,7 @@ module Zena
          #  else
          #    inner = _('btn_tiny_del')
          #  end
-         #  out "#{inner}</a><% else -%>#{inner}<% end -%>"
+         #  out "#{inner}</a><% else %>#{inner}<% end %>"
          #elsif node.will_be?(DataEntry)
          #  text = get_text_for_erb
          #  if text.blank?
@@ -387,6 +403,16 @@ module Zena
          #end
         end
 
+        protected
+
+          def need_ajax?(each_block)
+            return false unless each_block
+            # Inline editable
+            super ||
+            # unlink
+            each_block.descendant('unlink')
+          end
+
       end
     end # Ajax
   end # Use

data/lib/zena/use/ancestry.rb

@@ -0,0 +1,210 @@
+module Zena
+  module Use
+    # This module handles the creation and maintenance of a 'fullpath' and cached project/section_id.
+    module Ancestry
+      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}'}
+        end
+
+        # (slow). Find a node by it's path. This is used during node importation when stored as zml files.
+        def find_by_path(path, parent_id = current_site.root_id)
+          res  = nil
+          path = path.split('/') unless path.kind_of?(Array)
+          last = path.size - 1
+          path.each_with_index do |title, i|
+            klass = i == last ? self : Node
+            unless p = klass.find(:first,
+                :select     => i == last ? 'nodes.*' : 'nodes.id',
+                :joins      => title_join,
+                :conditions => ["parent_id = ? AND id1.value = ? AND #{secure_scope('nodes')}", parent_id, title]
+              )
+              # Block as soon as we cannot find an element
+              return nil
+            end
+            parent_id = p['id']
+            res = p if i == last
+          end
+          res
+        end
+
+        # (slow). Transform a list of zips into a fullpath.
+        def fullpath_map(path, sym = :node)
+          path = path.split('/') unless path.kind_of?(Array)
+          zips = path.reject{|e| e == '..'}
+          case sym
+          when :title
+            opts = {
+              :select => 'zip, id1.value AS title',
+              :joins  => title_join,
+              :conditions => ["zip IN (?) AND #{secure_scope('nodes')}", zips],
+            }
+          when :node
+            opts = {
+              :conditions => ["zip IN (?) AND #{secure_scope('nodes')}", zips],
+            }
+          else
+            # not supported
+            raise Exception.new("#{sym} not supported for fullpath_map")
+          end
+
+
+          list = Node.find(:all, opts)
+
+          list = Hash[*(list.map{|e| [e['zip'].to_i, sym == :node ? e : e[sym.to_s]]}).flatten]
+
+          path.map do |zip|
+            zip == '..' ? '..' : (list[zip.to_i] || (sym == :node ? nil : '*'))
+          end.compact
+        end
+      end # ClassMethods
+
+      module ModelMethods
+        include RubyLess
+        safe_context       :ancestors => {:class => ['Node'], :method => 'z_ancestors'}
+        safe_method        :fullpath => String, :short_path => String
+
+        def self.included(base)
+          base.class_eval do
+            # We do not use before_save to make sure this happens after 'zip' is set in 'node_before_create'.
+            before_create :rebuild_paths
+            before_update :rebuild_paths
+            after_save    :rebuild_children_fullpath
+            extend ClassMethods
+          end
+        end
+
+        # Return the list of ancestors as a Zafu compatible context.
+        def z_ancestors
+          anc = ancestors
+          anc.empty? ? nil : anc
+        end
+
+        # Return true if the current node is an ancestor for the given child
+        def ancestor?(child)
+          child.fullpath =~ %r{\A#{fullpath}}
+        end
+
+        # Return the list of ancestors (without self): [root, obj, obj]
+        # ancestors to which the visitor has no access are removed from the list
+        def ancestors(start=[])
+          if self[:id] == current_site[:root_id]
+            []
+          elsif self[:parent_id].nil?
+            []
+          else
+            path = fullpath.split('/')[0..-2]
+            [current_site.root_node].compact + (secure(Node) { Node.fullpath_map(path, :node) } || [])
+          end
+        end
+
+        # url base path. If a node is in 'projects' and projects has custom_base set, the
+        # node's basepath becomes 'projects', so the url will be 'projects/node34.html'.
+        # The basepath is cached. If rebuild is set to true, the cache is updated.
+        def basepath
+          self[:basepath]
+        end
+
+        # (slow). Return an array with the node title and the last two parents' titles.
+        def short_path
+          path = fullpath.split('/')
+          if path.size > 2
+            ['..'] + fullpath_as_title(path[-2..-1])
+          else
+            fullpath_as_title(path)
+          end
+        end
+
+        def pseudo_id(root_node, sym)
+          case sym
+          when :zip
+            self.zip
+          when :relative_path
+            full = self.fullpath
+            root = root_node ? root_node.fullpath : ''
+            "(#{fullpath_as_title(full.rel_path(root)).map(&:to_filename).join('/')})"
+          end
+        end
+
+        # (slow). Transform a list of zips into a fullpath.
+        def fullpath_as_title(path = fullpath)
+          if path == self.fullpath
+            @fullpath_as_title ||= secure(Node) { Node.fullpath_map(path, :title) }
+          else
+            secure(Node) { Node.fullpath_map(path, :title) }
+          end
+        end
+
+        private
+
+          def rebuild_paths
+            # rebuild cached fullpath / basepath
+            rebuild_fullpath
+            rebuild_basepath
+            # we should use a full rebuild when there are corrupt values,
+            # if fullpath was blank, we have no way to find all children
+            @need_rebuild_children_fullpath = !new_record? && (fullpath_changed? || basepath_changed?) && !fullpath_was.blank?
+
+            true
+          end
+
+          def rebuild_fullpath
+            return unless new_record? || parent_id_changed? || fullpath.nil?
+            if parent = parent(false)
+              path = parent.fullpath.split('/') + [zip]
+            else
+              path = []
+            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 || ""
+            else
+              self[:basepath] = ""
+            end
+          end
+
+          def rebuild_children_fullpath
+            return true unless @need_rebuild_children_fullpath
+
+            # Update descendants
+            fullpath_new = self.fullpath
+            fullpath_new = "#{fullpath_new}/" if fullpath_was == ''
+            fullpath_re  = fullpath_changed? ? %r{\A#{self.fullpath_was}} : nil
+
+            bases = [self.basepath]
+
+            i = 0
+            batch_size = 100
+            while true
+              list  = Zena::Db.fetch_attributes(['id', 'fullpath', 'basepath', 'custom_base'], 'nodes', "fullpath LIKE #{Zena::Db.quote("#{fullpath_was}/%")} AND site_id = #{current_site.id} ORDER BY fullpath ASC LIMIT #{batch_size} OFFSET #{i * batch_size}")
+
+              break if list.empty?
+              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']
+                  bases << rec['basepath']
+                else
+                  while rec['fullpath'].size <= bases.last.size
+                    bases.pop
+                  end
+                  rec['basepath'] = bases.last
+                end
+                id = rec.delete('id')
+                Zena::Db.execute "UPDATE nodes SET #{rec.map {|k,v| "#{Zena::Db.connection.quote_column_name(k)}=#{Zena::Db.quote(v)}"}.join(', ')} WHERE id = #{id}"
+              end
+              # 50 more
+              i += 1
+            end
+            true
+          end
+      end # ModelMethods
+    end # Ancestry
+  end # Use
+end # Zena

data/lib/zena/use/authlogic.rb

@@ -1,6 +1,10 @@
 module Zena
   module Use
     module Authlogic
+      class RenderSession < ActiveRecord::Base
+        set_table_name :sessions
+      end
+
       module Common
 
         def visitor
@@ -31,7 +35,7 @@ module Zena
           end
 
           def set_visitor
-            unless site = Site.find_by_host(request.host)
+            unless site = forge_cookie_with_http_auth || Site.find_by_host(request.host)
               raise ActiveRecord::RecordNotFound.new("host not found #{request.host}")
             end
 
@@ -74,6 +78,31 @@ module Zena
             end
           end
 
+          # Create a fake cookie based on HTTP_AUTH using session_id and render_token. This is
+          # only used for requests to localhost.
+          def forge_cookie_with_http_auth
+            if request.host == 'localhost' && request.port == Zena::ASSET_PORT
+              authenticate_with_http_basic do |login, password|
+                # login    = visitor.id
+                # password = persistence_token
+
+                # Temporary user to find site
+                user = User.find(login)
+                if user && site = user.site
+                  # OK, we can set host
+                  request.env['HTTP_HOST'] = "#{site.host}:#{Zena::ASSET_PORT}"
+                  # forge cookie
+                  cookies['user_credentials'] = "#{password}::#{login}"
+                  site
+                else
+                  raise ActiveRecord::RecordNotFound
+                end
+              end
+            else
+              nil
+            end
+          end
+
           # Secured in site with scope in set_visitor
           def http_visitor(site)
             if request.format == Mime::XML

data/lib/zena/use/calendar.rb

@@ -126,6 +126,164 @@ module Zena
         end
       end # ViewMethods
 
+      module ZafuMethods
+        # Calendar methods need a rewrite...
+=begin
+        def r_calendar
+          if @context[:block] == self
+            # called from self (storing template / rendering)
+            if role = @params[:assign_as]
+              assign_calendar(role)
+            else
+              display_calendar
+            end
+          else
+            # This is called first to prepare calendar
+            if @params[:assign_as]
+              fld = 'date'
+              table_name = 'links'
+            else
+              fld = @params[:date] || 'event_at'
+              if ['log_at', 'created_at', 'updated_at', 'event_at'].include?(fld) # TODO: use rubyless to learn type
+                table_name = 'nodes'
+              elsif fld == 'l_date'
+                fld = 'date'
+                table_name = 'links'
+              else
+                return parser_error("Invalid 'date' value for calendar (#{fld.inspect}).")
+              end
+            end
+
+            @date_scope = "TABLE_NAME[#{table_name}].#{fld} >= '\#{start_date.strftime('%Y-%m-%d')}' AND TABLE_NAME[#{table_name}].#{fld} <= '\#{end_date.strftime('%Y-%m-%d')}'"
+
+            new_dom_scope
+
+            # SAVED TEMPLATE
+            template = expand_block(self, :block => self, :saved_template => true)
+            out helper.save_erb_to_url(template, template_url)
+
+            # INLINE
+            out expand_block(self, :block => self, :saved_template => false)
+          end
+        end
+
+        private
+          def display_calendar
+            size     = (params[:size]  || 'large').to_sym
+            finder   = params[:select] || 'notes in project'
+
+            if @blocks == []
+              # add a default <r:link/> block
+              if size == :tiny
+                @blocks = [make(:void, :method=>'void', :text=>"<em do='link' date='current_date' do='[current_date]' format='%d'/><r:else do='[current_date]' format='%d'/>")]
+              else
+                @blocks = [make(:void, :method=>'void', :text=>"<span do='show' date='current_date' format='%d'/><ul><li do='each' do='link' attr='name'/></ul><r:else do='[current_date]' format='%d'/>")]
+              end
+              remove_instance_variable(:@all_descendants)
+            elsif !descendant('else')
+              @blocks += [make(:void, :method=>'void', :text=>"<r:else do='[current_date]' format='%d'/>")]
+              remove_instance_variable(:@all_descendants)
+            end
+
+            @html_tag_done = false
+            @html_tag_params[:id] = erb_dom_id
+            @html_tag_params[:class] ||= "#{size}cal"
+            @html_tag ||= 'div'
+
+            finder, klass = build_finder_for(:all, finder, @params, [@date_scope])
+            return unless finder
+            return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
+
+            cell_code = "<% if #{list_var} = nodes_#{list_var}[cal_#{list_var}.strftime('%Y-%m-%d %H')] %>#{expand_with(:in_if => true, :list => list_var, :date => "cal_#{list_var}", :saved_template => nil, :dom_prefix => nil, :in_calendar => true)}<% end %>"
+
+            render_html_tag(calendar_code(finder, "", cell_code, "", params))
+          end
+
+          # manage links from @node ---- reference ----> ...
+          # <div do='calendar' assign='reference' to='main' split_hours='12' />
+          def assign_calendar(as_role)
+            size = (params[:size]  || 'large').to_sym
+            @html_tag_done = false
+            @html_tag_params[:id] = erb_dom_id
+            @html_tag_params[:class] ||= "#{size}cal"
+            @html_tag ||= 'div'
+            if rel = RelationProxy.find_by_role(as_role.singularize)
+              role = rel.this_role
+            else
+              return parser_error("Invalid role #{as_role.inspect}.")
+            end
+            finder, klass = build_finder_for(:all, role, @params, [@date_scope])
+            return unless finder
+            return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
+
+            # SAVED TEMPLATE ========
+            template_url  = self.template_url + 'cell'
+            template      = "<%= cal_assign_cell(@node, #{role.inspect}, #{@params[:used].inspect}) %>"
+            out helper.save_erb_to_url(template, template_url)
+
+            # we call update on node 'B'
+            # A (main)
+            # ... B (other node)
+            #     calendar (in B context) ---- role --->
+
+            cell_prefix_code = "<span><%= day_#{list_var}.strftime('%d').to_i %></span><ul>"
+            cell_code = "<%= #{list_var} = nodes_#{list_var}[cal_#{list_var}.strftime('%Y-%m-%d %H')]; #{node}.linked_node = #{list_var} ? #{list_var}.first : nil; cal_assign_cell(#{node}, #{role.inspect}, #{@params[:used].inspect}, params[:s] || @node.zip, cal_#{list_var}, #{template_url.inspect}) %>"
+            cell_postfix_code = "</ul>"
+            render_html_tag(calendar_code(finder, cell_prefix_code, cell_code, cell_postfix_code, params))
+          end
+
+          def calendar_code(finder, cell_prefix_code, cell_code, cell_postfix_code, params)
+            type = params[:type] ? params[:type].to_sym : :month
+            size = (params[:size] || 'large').to_sym
+            ref_date = params[:assign_as] ? 'l_date' : (params[:date] || 'event_at')
+
+            case type
+            when :month
+              title = "\"\#{_(Date::MONTHNAMES[main_date.mon])} \#{main_date.year}\""
+              prev_date = "\#{main_date.advance(:months => -1).strftime(\"%Y-%m-%d\")}"
+              next_date = "\#{main_date.advance(:months =>  1).strftime(\"%Y-%m-%d\")}"
+            when :week
+              title = "\"\#{_(Date::MONTHNAMES[main_date.mon])} \#{main_date.year}\""
+              prev_date = "\#{main_date.advance(:days => -7).strftime(\"%Y-%m-%d\")}"
+              next_date = "\#{main_date.advance(:days => +7).strftime(\"%Y-%m-%d\")}"
+            else
+              return parser_error("invalid type (should be 'month' or 'week')")
+            end
+
+            if hours = @params[:split_hours]
+              hours = hours.split(',').map{|l| l.to_i}
+              hours << 0
+              hours = hours.uniq.sort
+              # I feel all this would be much better if we could use "each_group" but then how do we access hours ?
+              week_code = "<% week.step(week+6,1) do |day_#{list_var}| %>
+              <td<%= cal_class(day_#{list_var},#{current_date}) %>>#{cell_prefix_code}<% #{hours.inspect}.each do |set_hour|; cal_#{list_var} = Time.utc(day_#{list_var}.year,day_#{list_var}.month,day_#{list_var}.day,set_hour) %>#{cell_code}<% end %>#{cell_postfix_code}</td>
+              <% end %>"
+              (@context[:vars] ||= []) << "hour"
+            else
+              hours = nil
+              week_code = "<% week.step(week+6,1) do |day_#{list_var}| %>
+              <td<%= cal_class(day_#{list_var},#{current_date}) %>><% cal_#{list_var} = Time.utc(day_#{list_var}.year,day_#{list_var}.month,day_#{list_var}.day) %>#{cell_prefix_code}#{cell_code}#{cell_postfix_code}</td>
+              <% end %>"
+            end
+
+            res = %Q{
+              <h3 class='title'>
+              <span><%= link_to_remote(#{_('img_prev_page').inspect}, :url => #{base_class.to_s.underscore}_path(#{node_id}) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=#{dom_id}&date=#{prev_date}&#{start_node_s_param(:string)}\", :method => :get) %></span>
+              <span class='date'><%= link_to_remote(#{title}, :url => #{base_class.to_s.underscore}_path(#{node_id}) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=#{dom_id}&#{start_node_s_param(:string)}\", :method => :get) %></span>
+              <span><%= link_to_remote(#{_('img_next_page').inspect}, :url => #{base_class.to_s.underscore}_path(#{node_id}) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=#{dom_id}&date=#{next_date}&#{start_node_s_param(:string)}\", :method => :get) %></span>
+              </h3>
+              <table cellspacing='0' class='#{size}cal#{@params[:assign_as] ? " assign" : ''}'>
+                <tr class='head'><%= cal_day_names(#{size.inspect}) %></tr>
+                  <% start_date, end_date = cal_start_end(#{current_date}, #{type.inspect}) %>
+                  <% cal_weeks(#{ref_date.to_sym.inspect}, #{finder}, start_date, end_date, #{hours.inspect}) do |week, nodes_#{list_var}| %>
+                  <tr class='body'>
+                    #{week_code}
+                  </tr>
+                <% end %>
+              </table>}
+          end
+=end
+      end # ZafuMethods
     end # Calendar
   end # Use
 end # Zena