zena 0.15.2 → 0.16.0

data/app/controllers/pings_controller.rb

@@ -0,0 +1,19 @@
+class PingsController < ApplicationController
+  def show
+    whoami = {
+      'visitor' =>  "#{visitor.first_name} #{visitor.name}",
+      'site' => current_site.name,
+      'format' => request.format.to_s
+      }
+    whoami_xml = Builder::XmlMarkup.new.ping do |p|
+      p.visitor(whoami['visitor'])
+      p.site(whoami['site'])
+      p.format(whoami['format'])
+    end
+    respond_to do |wants|
+      wants.html { render :text => whoami.inspect  }
+      wants.xml { render :xml => whoami_xml }
+    end
+  end
+
+end

data/app/controllers/relations_controller.rb

@@ -5,7 +5,7 @@ class RelationsController < ApplicationController
   layout :admin_layout
 
   def index
-    secure!(Relation) do
+    secure(Relation) do
       @relations = Relation.paginate(:all, :order => 'source_role', :per_page => 20, :page => params[:page])
     end
     @relation  = Relation.new
@@ -13,6 +13,10 @@ class RelationsController < ApplicationController
       format.html # index.erb
       format.xml  { render :xml => @relations }
     end
+  rescue ActiveRecord::RecordNotFound => err
+    Node.logger.warn "NotFound: #{err.message}"
+    Node.logger.warn err.backtrace.join("\n")
+    raise err
   end
 
   def show

data/app/controllers/sites_controller.rb

@@ -1,10 +1,8 @@
-require 'net/http' if ENABLE_ZENA_UP
 class SitesController < ApplicationController
   before_filter :visitor_node
   before_filter :remove_methods, :only => [:new, :create, :destroy]
-  before_filter :find_site, :except => [:index, :create, :new, :zena_up]
+  before_filter :find_site, :except => [:index, :create, :new]
   before_filter :check_is_admin
-  before_filter :check_can_zena_up, :only => [:zena_up]
   layout :admin_layout
 
   def index
@@ -17,46 +15,6 @@ class SitesController < ApplicationController
     end
   end
 
-  # Update source code and restart application
-  def zena_up
-    # FIXME: this will not work when we move to git...
-    @current_rev = Zena::REVISION.strip.to_i
-
-    if params[:rev]
-      @target_rev = params[:rev].to_i
-    else
-      latest = Net::HTTP.get('svn.zenadmin.org', '/zena/')
-      if latest =~ /Revision (\d+)/
-        @target_rev = $1.strip.to_i
-      else
-        # error
-      end
-    end
-
-    if @target_rev
-      if params[:run] == 'start'
-        if @current_rev >= @target_rev
-          # up to date (do nothing)
-        else
-          `zena_up`
-        end
-        return redirect_to(:action => 'zena_up', :run => 'updating', :rev => @target_rev)
-      elsif params[:run] == 'updating' && @current_rev < @target_rev
-        # wait to finish
-        @state = :wait
-        headers["REFRESH"] = 30
-      elsif @current_rev >= @target_rev
-        # done
-        @state = :done
-        return redirect_to(:action => 'zena_up', :rev => @target_rev) if params[:run]
-      else
-        # status page
-      end
-    else
-      # error
-    end
-  end
-
   def show
     respond_to do |format|
       format.html
@@ -106,7 +64,4 @@ class SitesController < ApplicationController
       @site = secure!(Site) { Site.find(params[:id])}
     end
 
-    def check_can_zena_up
-      ENABLE_ZENA_UP && visitor.is_admin?
-    end
 end

data/app/controllers/user_sessions_controller.rb

@@ -0,0 +1,47 @@
+
+=begin rdoc
+Create, destroy sessions by letting users login and logout. When the user does not login, he/she is considered to be the anonymous user.
+=end
+class UserSessionsController < ApplicationController
+  skip_before_filter :set_after_login, :force_authentication?
+
+  def new
+    @node = visitor.site.root_node
+    render_and_cache :mode => '+login'
+  end
+
+  def create
+    User.send(:with_scope, :find => {:conditions => ['site_id = ?', visitor.site.id]}) do
+      @user_session = UserSession.new(:login=>params[:login], :password=>params[:password])
+      if @user_session.save
+        flash[:notice] = "Successfully logged in."
+        redirect_to  Thread.current[:after_login_url] || nodes_path
+      else
+        flash[:notice] = "Invalid login or password."
+        redirect_to login_url
+      end
+    end
+  end
+
+  def destroy
+    if @user_session = UserSession.find
+      @user_session.destroy
+      reset_session
+      flash[:notice] = "Successfully logged out."
+      redirect_to session[:after_login_url] || nodes_path
+    else
+      redirect_to session[:after_login_url] || nodes_path
+    end
+  end
+
+  private
+
+    # Our own version of set_visitor: always load the anonymous user.
+    def set_visitor
+      unless site = Site.find_by_host(request.host)
+        raise ActiveRecord::RecordNotFound.new("host not found #{request.host}")
+      end
+
+      Thread.current[:visitor] = anonymous_visitor(site)
+    end
+end

data/app/controllers/users_controller.rb

@@ -16,6 +16,7 @@ class UsersController < ApplicationController
     secure!(User) do
       @users = User.paginate(:all, :order => 'status DESC, login ASC', :page => params[:page], :per_page => 20)
     end
+
     get_groups_list
     @user   = User.new
     respond_to do |format|

data/app/controllers/versions_controller.rb

@@ -23,29 +23,29 @@ class VersionsController < ApplicationController
 
       format.all  do
         # Get document data (inline if possible)
-        if params[:format] != @node.c_ext
-          return redirect_to(params.merge(:format => @node.c_ext))
+        if params[:format] != @node.safe_content_read('ext')
+          return redirect_to(params.merge(:format => (@node.safe_content_read('ext') || 'html')))
         end
 
         if @node.kind_of?(Image) && !ImageBuilder.dummy?
           img_format = Iformat[params[:mode]]
-          data = @node.c_file(img_format)
+          data = @node.version.content.file(img_format)
           content_path = @node.version.content.filepath(img_format)
           disposition  = 'inline'
 
         elsif @node.kind_of?(TextDocument)
-          data = StringIO.new(@node.v_text)
+          data = StringIO.new(@node.version.text)
           content_path = nil
           disposition  = 'attachment'
 
         else
-          data         = @node.c_file
+          data         = @node.version.content.file
           content_path = @node.version.content.filepath
           disposition  = 'inline'
         end
         raise ActiveRecord::RecordNotFound unless data
 
-        send_data( data.read , :filename=>@node.filename, :type=>@node.c_content_type, :disposition=>disposition)
+        send_data( data.read , :filename=>@node.filename, :type=>@node.version.content.content_type, :disposition=>disposition)
         data.close
 
         # should we cache the page ?
@@ -78,6 +78,24 @@ class VersionsController < ApplicationController
         @edit = true
       end
     end
+    if params[:close] == 'true'
+      js_data << "Zena.reloadAndClose();"
+    else
+      js_data << <<-END_TXT
+      var current_sel = $('text_sel');
+      var current_tab = $('text_tab');
+
+      Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
+      Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
+      Zena.resizeElement('node_v_text');
+
+      $('node_form').getElements().each(function(input, index) {
+          new Form.Element.Observer(input, 3, function(element, value) {
+            opener.Zena.editor_preview('#{preview_node_version_path(:node_id=>@node[:zip], :id=>(@node.v_number || 0), :escape => false)}',element,value);
+          });
+      });
+      END_TXT
+    end
   end
 
   def custom_tab
@@ -131,7 +149,7 @@ class VersionsController < ApplicationController
       # elsif @node.kind_of?(Image)
       #   # view image version
       #   # TODO: how to show the image data of a version ? 'nodes/3/versions/4.jpg' ?
-      #   @node.version.text = "<img src='#{url_for(:controller=>'versions', :node_id=>@node[:zip], :id=>@node.v_number, :format=>@node.c_ext)}'/>"
+      #   @node.version.text = "<img src='#{url_for(:controller=>'versions', :node_id=>@node[:zip], :id=>@node.v_number, :format=>@node.version.content.ext)}'/>"
       # elsif @node.kind_of?(TextDocument)
       #   lang = @node.content_lang
       #   lang = lang ? " lang='#{lang}'" : ""

data/app/controllers/virtual_classes_controller.rb

@@ -5,7 +5,7 @@ class VirtualClassesController < ApplicationController
   layout :admin_layout
 
   def index
-    secure!(VirtualClass) do
+    secure(VirtualClass) do
       @virtual_classes = VirtualClass.paginate(:all, :order => 'name', :per_page => 20, :page => params[:page])
     end
     @virtual_class  = VirtualClass.new

data/app/helpers/application_helper.rb

@@ -1,4 +1,4 @@
 module ApplicationHelper
 end
 
-Bricks::Patcher.apply_patches
+Bricks.apply_patches

data/app/models/comment.rb

@@ -12,7 +12,8 @@ class Comment < ActiveRecord::Base
   safe_method       :text => String, :author_name => {:class => String, :nil => true},
                     :discussion_zip => Number
 
-  zafu_context       :replies => ["Comment"], :node => "Node"
+  safe_context      :replies => ['Comment'], :node => 'Node'
+
   attr_accessible    :title, :text, :author_name, :discussion_id, :reply_to, :status
 
   belongs_to :discussion

data/app/models/contact_content.rb

@@ -18,8 +18,8 @@ birthday::   birthday (date)
 class ContactContent < ActiveRecord::Base
   include RubyLess::SafeClass
   safe_method    :created_at => Time, :updated_at => Time, :fullname => String, :initials => String,
-                 :address => String, :zip => {:class => Number, :method => 'id'}
-  safe_attribute :name, :first_name, :city, :country, :telephone, :mobile, :email
+                 :address => String
+  safe_attribute :name, :first_name, :city, :country, :telephone, :mobile, :email, :zip
 
   attr_protected     :site_id
 

data/app/models/data_entry.rb

@@ -15,15 +15,14 @@ A visitor can edit a data entry if he/she has write access to the reference node
 class DataEntry < ActiveRecord::Base
   include RubyLess::SafeClass
   safe_attribute :created_at, :updated_at, :date, :text, :value_a, :value_b
-  safe_method    :value => {:class => Number, :nil => true, :method => 'value_a'},
-                 :node_a_zip => {:class => Number, :nil => true},
-                 :node_b_zip => {:class => Number, :nil => true},
-                 :node_c_zip => {:class => Number, :nil => true},
-                 :node_d_zip => {:class => Number, :nil => true}
+  safe_context   :value => {:class => Number, :method => 'value_a'},
+                 :node_a_zip => Number, :node_b_zip => Number,
+                 :node_c_zip => Number, :node_d_zip => Number,
+                 :node_a => 'Node', :node_b => 'Node', :node_c => 'Node',
+                 :node_d => 'Node', :nodes => ['Node'], :author => 'Contact', :user => 'User'
 
   attr_protected :site_id
 
-  zafu_context  :node_a => "Node", :node_b => "Node", :node_c => "Node", :node_d => "Node", :nodes => ["Node"], :author => "Contact", :user => "User"
 
   NodeLinkSymbols   = [:node_a,    :node_b,    :node_c,    :node_d]
   NodeLinkSymbolsId = [:node_a_id, :node_b_id, :node_c_id, :node_d_id]

data/app/models/document.rb

@@ -35,8 +35,6 @@ c_content_type:: file content-type
 class Document < Node
   safe_method :filename => String
 
-  before_validation :document_before_validation
-
   class << self
 
     def version_class
@@ -56,7 +54,7 @@ class Document < Node
         content_type = file.content_type
       elsif ct = attrs['c_content_type'] || ((attrs['version_attributes'] || {})['content_attributes'] || {})['content_type']
         content_type = ct
-      elsif attrs['name'] =~ /^.*\.(\w+)$/ && types = EXT_TO_TYPE[$1.downcase]
+      elsif attrs['name'] =~ /^.*\.(\w+)$/ && types = Zena::EXT_TO_TYPE[$1.downcase]
         content_type = types[0]
       end
 
@@ -104,10 +102,8 @@ class Document < Node
   end
 
   private
-
-    # Make sure name is unique
-    def document_before_validation
-      base = self[:name]
+    def set_defaults
+      base = name
       base = version.title if base.blank?
       if base.blank? && file = version.content.file
         base = file.original_filename
@@ -124,23 +120,31 @@ class Document < Node
           version.title = $1
         end
       end
+      super
+    end
 
+    # Make sure name is unique
+    def node_before_validation
       # we are in a scope, we cannot just use the normal validates_...
       # FIXME: remove 'with_exclusive_scope' once scopes are clarified and removed from 'secure'
       Node.send(:with_exclusive_scope) do
         if new_record?
-          cond = ["name = ? AND parent_id = ? AND kpath LIKE 'ND%'",              self[:name], self[:parent_id]]
+          cond = ["name = ? AND parent_id = ? AND kpath LIKE 'ND%'", self[:name], self[:parent_id]]
         else
           cond = ["name = ? AND parent_id = ? AND kpath LIKE 'ND%' AND id != ? ", self[:name], self[:parent_id], self[:id]]
         end
-        taken_name = Node.find(:all, :conditions=>cond, :order=>"LENGTH(name) DESC", :limit => 1)
-        if taken_name = taken_name[0]
+
+        if taken_name = Node.find(:first, :select => 'name', :conditions => cond, :order => "LENGTH(name) DESC")
           if taken_name =~ /^#{self[:name]}-(\d)/
             self[:name] = "#{self[:name]}-#{$1.to_i + 1}"
+            i = $1.to_i + 1
           else
             self[:name] = "#{self[:name]}-1"
+            i = 1
           end
+          version.title = "#{version.title}-#{i}" unless version.title.blank?
         end
       end
+      super
     end
 end

data/app/models/document_content.rb

@@ -13,7 +13,6 @@ content_type::    file content_type
 class DocumentContent < ActiveRecord::Base
 
   # readable
-
   include RubyLess::SafeClass
   safe_method           :size => Number, :name => String, :content_type => String, :ext => String, :file => File
 
@@ -79,8 +78,7 @@ class DocumentContent < ActiveRecord::Base
     digest = Digest::SHA1.hexdigest(self[:id].to_s)
     # make sure name is not corrupted
     fname = name.gsub(/[^a-zA-Z\-_0-9]/,'')
-    # TODO: could we replace site by current_site ?
-    "#{SITES_ROOT}#{site.data_path}/#{mode}/#{digest[0..0]}/#{digest[1..1]}/#{digest[2..2]}/#{fname}"
+    "#{SITES_ROOT}#{current_site.data_path}/#{mode}/#{digest[0..0]}/#{digest[1..1]}/#{digest[2..2]}/#{fname}"
   end
 
   # Return true if this content is not used by any version.
@@ -120,15 +118,15 @@ class DocumentContent < ActiveRecord::Base
           self[:size] = @new_file.stat.size
         end
 
-        if EXT_TO_TYPE[self.ext].nil? || !EXT_TO_TYPE[self.ext].include?(self.content_type)
+        if Zena::EXT_TO_TYPE[self.ext].nil? || !Zena::EXT_TO_TYPE[self.ext].include?(self.content_type)
           self.ext = @new_file.original_filename.split('.').last
         end
       end
 
       # is this extension valid ?
-      extensions = TYPE_TO_EXT[content_type]
+      extensions = Zena::TYPE_TO_EXT[content_type]
       if extensions && content_type != 'application/octet-stream' # use 'bin' extension only if we do not have any other ext.
-        self[:ext] = extensions.include?(self.ext.downcase) ? self.ext.downcase : extensions[0]
+        self[:ext] = (self.ext && extensions.include?(self.ext.downcase)) ? self.ext.downcase : extensions[0]
       else
         # unknown content_type or 'application/octet-stream' , just keep the extension we have
         self[:ext] ||= 'bin'

data/app/models/iformat.rb

@@ -9,12 +9,12 @@ class Iformat < ActiveRecord::Base
 
   class << self
     def [](fmt)
-      Thread.current.visitor.site.iformats[fmt]
+      Thread.current[:visitor].site.iformats[fmt]
     end
 
     def list
       res = []
-      Thread.current.visitor.site.iformats.merge(formats_for_site(visitor.site.id, false)).each do |k,v|
+      Thread.current[:visitor].site.iformats.merge(formats_for_site(visitor.site.id, false)).each do |k,v|
         next if k == :updated_at || k.nil?
         if v.kind_of?(Iformat)
           res << v

data/app/models/image_content.rb

@@ -14,6 +14,8 @@ height(format)::  image height in pixel using the given format
 ImageContent also provides a +crop+ pseudo attribute to crop an image. See crop=.
 =end
 class ImageContent < DocumentContent
+  include Zena::Use::Upload::UploadedFile
+
   safe_method      :width => Number, :height => Number, :exif => 'ExifData'
   attr_accessible  :content_type, :file, :crop
 
@@ -49,7 +51,7 @@ class ImageContent < DocumentContent
   def cropped_file(format)
     original   = format['original'] || @loaded_file || self.file
     x, y, w, h = format['x'].to_f, format['y'].to_f, format['w'].to_f, format['h'].to_f
-    new_type   = format['format'] ? EXT_TO_TYPE[format['format'].downcase][0] : nil
+    new_type   = format['format'] ? Zena::EXT_TO_TYPE[format['format'].downcase][0] : nil
     max        = format['max_value'].to_f * (format['max_unit'] == 'Mb' ? 1024 : 1) * 1024
 
     # crop image
@@ -61,14 +63,9 @@ class ImageContent < DocumentContent
     file = Tempfile.new(name)
     File.open(file.path, "wb") { |f| f.syswrite(img.read) }
 
-    ctype = EXT_TO_TYPE[img.format.downcase][0]
-    fname = "#{name}.#{TYPE_TO_EXT[ctype][0]}"
-    (class << file; self; end;).class_eval do
-      alias local_path path if defined?(:path)
-      define_method(:original_filename) { fname }
-      define_method(:content_type) { ctype }
-    end
-    file
+    ctype = Zena::EXT_TO_TYPE[img.format.downcase][0]
+    fname = "#{name}.#{Zena::TYPE_TO_EXT[ctype][0]}"
+    uploaded_file(file, fname, ctype)
   end
 
   # Set content file, will refuse to accept the file if it is not an image.