zena 1.2.4 → 1.2.5

data/History.txt

@@ -1,3 +1,21 @@
+== 1.2.5 2013-07-15
+
+* Major changes
+ * To support video streaming: redirect on first document cache. WARNING: This 
+   implies changes to vhost files !
+ * WARN: Properties in list context do not resolve with first element anymore. "first" prefix needed.
+ * Enable VirtualClass on native classes !
+ * Added 'activity' brick which records visitor's last "seen_at" date. <== TODO: Document
+
+* Minor changes
+ * Fixed encode_params in Ajax requests.
+ * Fixed cached path in vhost file.
+ * Added "uuid" method (generates a unique id). <== TODO: Document
+ * Added support for JSON String in [string_hash] <== TODO: Document
+ * Added 'login_info' to Node.
+ * Added 'group_names' to User class.
+ * Fixed [headers] when 'Status' is set (change to redirect on 300).
+ 
 == 1.2.4 2013-06-13
 
 * Major changes

data/app/controllers/nodes_controller.rb

@@ -203,14 +203,19 @@ class NodesController < ApplicationController
           else
             content_path = @node.filepath
           end
-
+          
+          # content_path is used to cache by creating a symlink
+          cache_ok = cache_page(:content_path  => content_path, :authenticated => @node.v_public?)
+          
           if content_path
-            # FIXME RAILS: remove 'stream => false' when rails streaming is fixed
-            send_file(content_path, :filename => @node.filename, :type => @node.content_type, :disposition => 'inline', :stream => false, :x_sendfile => ENABLE_XSENDFILE)
+            if @node.v_public? && cache_ok
+              # This is the simplest working solution to save cached version and use apache for serving (all xsendfile and such do not work with video streaming).
+              redirect_to data_path(@node, :mode => params[:mode]) + "?1"
+            else
+              # FIXME RAILS: remove 'stream     => false' when rails streaming is fixed
+              send_file(content_path, :filename => @node.filename, :type => @node.content_type, :disposition => 'inline', :stream => false, :x_sendfile => ENABLE_XSENDFILE)
+            end
           end
-
-          # content_path is used to cache by creating a symlink
-          cache_page(:content_path => content_path, :authenticated => @node.v_public?)
         else
           render_and_cache
           # FIXME: redirect to document format should occur in render_and_cache

data/app/controllers/sites_controller.rb

@@ -54,8 +54,9 @@ class SitesController < ApplicationController
   end
   
   def clear_cache
-    @site = secure!(Site) { Site.first }
-    @site.clear_cache
+    secure!(Site) { Site.all }.each do |site|
+      site.clear_cache
+    end
     redirect_to '/'
   end
 

data/app/controllers/user_sessions_controller.rb

@@ -58,7 +58,7 @@ class UserSessionsController < ApplicationController
         raise ActiveRecord::RecordNotFound.new("host not found #{request.host}")
       end
 
-      Thread.current[:visitor] = anonymous_visitor(site)
+      setup_visitor(anonymous_visitor(site), site)
     end
 
     def redirect_after_login

data/app/controllers/virtual_classes_controller.rb

@@ -10,11 +10,12 @@ class VirtualClassesController < ApplicationController
     secure(::Role) do
       @virtual_classes = ::Role.paginate(:all, :order => 'kpath', :per_page => 200, :page => params[:page])
     end
-
+    
+    list = @virtual_classes.map(&:name)
     if last = @virtual_classes.last
       last_kpath = last.kpath
       Node.native_classes.each do |kpath, klass|
-        if kpath < last_kpath
+        if kpath < last_kpath && !list.include?(klass.name)
           @virtual_classes << klass
         end
       end

data/app/models/document.rb

@@ -124,7 +124,7 @@ class Document < Node
       # Try to find a virtual sub-class accepting the content type
       vclass = nil
       VirtualClass[base.to_s].sub_classes.each do |v|
-        next if v.real_class?
+        next if v.real_class != base
         
         if content_type =~ v.content_type_re
           vclass = v
@@ -207,7 +207,7 @@ class Document < Node
       end
     end
 
-    # Make sure the new file
+    # Make sure the new file is OK with current class.
     def valid_content_type
       return true unless prop.content_type_changed?
 

data/app/models/node.rb

@@ -225,7 +225,8 @@ class Node < ActiveRecord::Base
                      :data_b => {:class => ['DataEntry'], :zafu => {:data_root => 'node_b'}},
                      :data_c => {:class => ['DataEntry'], :zafu => {:data_root => 'node_c'}},
                      :data_d => {:class => ['DataEntry'], :zafu => {:data_root => 'node_d'}},
-                     :traductions => ['Version'], :discussion  => 'Discussion'
+                     :traductions => ['Version'], :discussion  => 'Discussion',
+                     :login_info => 'User'
 
   # we use safe_method because the columns can be null, but the values are never null
   safe_method        :kpath => String, :user_zip => Number, :user_id => Number,
@@ -1205,6 +1206,10 @@ class Node < ActiveRecord::Base
   def user
     secure!(User) { o_user }
   end
+  
+  def login_info
+    secure(User) { User.find(:first, :conditions => {:node_id => self.id})}
+  end
 
   # Find all data entries linked to the current node
   def data

data/app/models/note.rb

@@ -1,33 +1,9 @@
 =begin rdoc
-A note is a 'dated' element. It is typically used for blog entries or/and calendar events.
-
-=== dates
-
-On top of the Node's dates (+created_at+, +updated_at+, +publish_from+), a note uses the following:
-
-log_at::    used to sort/display blog entries
-event_at::  used in calendars
-
-These two dates enable you to announce an event in the blog list a couple of days before it actually occurs (event_at). All dates are stored internally as 'utc' and are converted to/from the visitor's current timezone.
-
-=== links
-
-Default links for Notes are:
-
-calendars::  make this note appear in the given calendar (there is one calendar per project). By default the note is not included in its project's calendar.
-projects::   make this note appear in the blog of the given project. A note always appear in its project.
-
-=== subclasses
-
-
-=== subclasses to implement before 1.0
-Task::       manage things to be done (parent = Note = Todo). The parent provides the 'due date'.
-Letter::     like the name says...
-Request::    subclass of Todo. Manage user/client requests.
-Bug::        (the class we most need!). subclass of Request.
-Milestone::  special event used when choosing a Request/Bug's parent.
+This class is not really useful anymore since 'event_at' and 'log_at' are obsolete. This class is really used for
+testing having a virtual class 'Note' with a real ruby class of the same Name.
 =end
 class Note < Node
+  
   class << self
 
     def select_classes

data/app/models/role.rb

@@ -271,12 +271,18 @@ class Role < ActiveRecord::Base
 
     def validate_role
       errors.add('base', 'You do not have the rights to change roles.') unless visitor.is_admin?
-      if new_record?
-        errors.add('superclass', 'invalid') unless @superclass.kind_of?(VirtualClass) && @superclass.kpath
-      end
 
-      if @superclass && self.class == ::Role
-        self.kpath = @superclass.kpath
+      if name == 'Node'
+        self.kpath = 'N'
+        errors.add('base', 'cannot create role of name "Node"') if self.class == ::Role
+      else
+        if new_record?
+          errors.add('superclass', 'invalid') unless @superclass.kind_of?(VirtualClass) && @superclass.kpath
+        end
+
+        if @superclass && self.class == ::Role
+          self.kpath = @superclass.kpath
+        end
       end
     end
 

data/app/models/site.rb

@@ -6,7 +6,8 @@ A zena installation supports many sites. Each site is uniquely identified by it'
 The #Site model holds configuration information for a site:
 
 +host+::            Unique host name. (teti.ch, zenadmin.org, dev.example.org, ...)
-+root_id+::         Site root node id. This is the only node in the site without a parent.
++orphan_id+::       Site seed node id. This is the only node in the site without a parent.
++root_id+::         This is the apparent root of the site.
 +anon_id+::         Anonymous user id. This user is the 'public' user of the site. Even if +authorize+ is set to true, this user is needed to configure the defaults for all newly created users.
 +public_group_id+:: Id of the 'public' group. Every user of the site (with 'anonymous user') belongs to this group.
 +site_group_id+::   Id of the 'site' group. Every user except anonymous are part of this group. This group can be seen as the 'logged in users' group.
@@ -16,6 +17,7 @@ The #Site model holds configuration information for a site:
 +default_lang+::    The default language of the site.
 =end
 class Site < ActiveRecord::Base
+  attr_accessor :alias # = site alias (different settings + domain)
   CLEANUP_SQL = [
     ['attachments'         , 'site_id = ?'],
     ['cached_pages'        , 'site_id = ?'],
@@ -54,12 +56,13 @@ class Site < ActiveRecord::Base
   CACHE_PATH  = Bricks.raw_config['cache_path']  || '/public'
   
   include RubyLess
-  safe_method  :host => String, :lang_list => [String], :default_lang => String
-  safe_method  :root => Proc.new {|h, r, s| {:method => 'root_node', :class => VirtualClass['Project'], :nil => true}}
+  safe_method  :host   => String, :lang_list => [String], :default_lang => String, :master_host => String
+  safe_method  :root   => Proc.new {|h, r, s| {:method => 'root_node',   :class => VirtualClass['Project'], :nil => true}}
+  safe_method  :orphan => Proc.new {|h, r, s| {:method => 'orphan_node', :class => VirtualClass['Project'], :nil => true}}
 
   validate :valid_site
   validates_uniqueness_of :host
-  attr_accessible :name, :languages, :default_lang, :authentication, :http_auth, :ssl_on_auth, :auto_publish, :redit_time, :api_group_id
+  attr_accessible :name, :languages, :default_lang, :authentication, :http_auth, :ssl_on_auth, :auto_publish, :redit_time, :api_group_id, :root_zip
   has_many :groups, :order => "name"
   has_many :nodes
   has_many :users
@@ -74,7 +77,12 @@ class Site < ActiveRecord::Base
 
   @@attributes_for_form = {
     :bool => %w{authentication http_auth auto_publish ssl_on_auth},
-    :text => %w{name languages default_lang},
+    :text => %w{languages default_lang},
+  }
+  
+  @@alias_attributes_for_form = {
+    :bool => %w{authentication auto_publish ssl_on_auth},
+    :text => %w{},
   }
 
   class << self
@@ -117,7 +125,7 @@ class Site < ActiveRecord::Base
         :lang  => site.default_lang, :status => User::Status[:admin])
       admin_user.site = site
 
-      Thread.current[:visitor] = admin_user
+      setup_visitor(admin_user, site)
 
       unless admin_user.save
         # rollback
@@ -174,6 +182,8 @@ class Site < ActiveRecord::Base
       raise Exception.new("Could not publish root node for site [#{host}] (site#{site[:id]})\n#{root.errors.map{|k,v| "[#{k}] #{v}"}.join("\n")}") unless (root.v_status == Zena::Status::Pub || root.publish)
 
       site.root_id = root[:id]
+      site.orphan_id = root[:id]
+      
       # Make sure safe definitions on Time/Array/String are available on prop_eval validation.
       Zena::Use::ZafuSafeDefinitions
       # Should not be needed since we load PropEval in Node, but it does not work
@@ -210,15 +220,27 @@ class Site < ActiveRecord::Base
       site.instance_variable_set(:@being_created, false)
       site
     end
+    
+    def master_sites
+      Site.all(:conditions => ['master_id is NULL'])
+    end
 
     def find_by_host(host)
       host = $1 if host =~ /^(.*)\.$/
-      self.find(:first, :conditions => ['host = ?', host]) rescue nil
+      if site = self.find(:first, :conditions => ['host = ?', host]) rescue nil
+        if id = site.master_id
+          # The loaded site is an alias, load master site.
+          master = self.find(:first, :conditions => ['id = ?', id])
+          master.alias = site
+          site = master
+        end
+      end
+      site
     end
 
     # List of attributes that can be configured in the admin form
-    def attributes_for_form
-      @@attributes_for_form
+    def attributes_for_form(is_alias = false)
+      is_alias ? @@alias_attributes_for_form : @@attributes_for_form
     end
   end
 
@@ -229,31 +251,31 @@ class Site < ActiveRecord::Base
   Site.attributes_for_form[:text] << 'usr_prototype_attributes'
   Site.attributes_for_form[:bool] << 'expire_in_dev'
   attr_accessible :usr_prototype_attributes, :expire_in_dev
-
+  
   # Return path for static/cached content served by proxy: RAILS_ROOT/sites/_host_/public
   # If you need to serve from another directory, we do not store the path into the sites table
   # for security reasons. The easiest way around this limitation is to symlink the 'public' directory.
   def public_path
-    "/#{self[:host]}#{PUBLIC_PATH}"
+    "/#{host}#{PUBLIC_PATH}"
   end
   
   # This is the place where cached files should be stored in case we do not want
   # to store the cached file inside the public directory.
   def cache_path
-    "/#{self[:host]}#{CACHE_PATH}"
+    "/#{host}#{CACHE_PATH}"
   end
 
   # Return path for documents data: RAILS_ROOT/sites/_host_/data
   # You can symlink the 'data' directory if you need to keep the data in some other place.
   def data_path
-    "/#{self[:host]}/data"
+    "/#{master_host}/data"
   end
 
   # Return the path for zafu rendered templates: RAILS_ROOT/sites/_host_/zafu
   def zafu_path
-    "/#{self[:host]}/zafu"
+    "/#{master_host}/zafu"
   end
-
+  
   # Return the anonymous user, the one used by anonymous visitors to visit the public part
   # of the site.
   def anon
@@ -268,8 +290,12 @@ class Site < ActiveRecord::Base
   # Return the root node or a dummy if the visitor cannot view root
   # node (such as during a 404 or login rendering).
   def root_node
-    @root ||= secure(Node) { Node.find(self.root_id) } ||
-              Node.new(:title => host)
+    @root ||= secure(Node) { Node.find(root_id) } || Node.new(:title => host)
+  end
+  
+  # Return the orphan node.
+  def orphan_node
+    @orphan ||= secure(Node) { Node.find(orphan_id) } || Node.new(:title => host)
   end
 
   # Return the public group: the one in which every visitor belongs.
@@ -298,16 +324,6 @@ class Site < ActiveRecord::Base
     @admin_user_ids ||= secure!(User) { User.find(:all, :conditions => "status >= #{User::Status[:admin]}") }.map {|r| r[:id]}
   end
 
-  # Return true if the site is configured to force authentication
-  def authentication?
-    self[:authentication]
-  end
-
-  # Return true if the site is configured to automatically publish redactions
-  def auto_publish?
-    self[:auto_publish]
-  end
-
   # Set redit time from a string of the form "1d 4h 5s" or "4 days"
   def redit_time=(val)
     if val.kind_of?(String)
@@ -337,6 +353,64 @@ class Site < ActiveRecord::Base
   def lang_list
     (self[:languages] || "").split(',').map(&:strip)
   end
+  
+  ###### Alias handling
+  def is_alias?
+    !self[:master_id].blank?
+  end
+  
+  # This is the host of the master site.
+  def master_host
+    self[:host]
+  end
+  
+  # Host with aliasing (returns alias host if alias is loaded)
+  def host
+    @alias && @alias.host || master_host
+  end
+  
+  def ssl_on_auth
+    @alias && @alias.prop['ssl_on_auth'] || self.prop['ssl_on_auth']
+  end
+  
+  # Return true if the site is configured to automatically publish redactions
+  def auto_publish?
+    @alias && @alias[:auto_publish] || self[:auto_publish]
+  end
+  
+  # Return true if the site is configured to force authentication
+  def authentication?
+    @alias && @alias[:authentication] || self[:authentication]
+  end
+  
+  def root_id
+    @root_id ||= @alias && @alias[:root_id] || self[:root_id]
+  end
+  
+  def root_zip
+    root_node.zip
+  end
+  
+  def root_zip=(zip)
+    if id = secure(Node) { Node.translate_pseudo_id(zip) }
+      self[:root_id] = id
+    else
+      @root_zip_error = _('could not be found')
+    end
+  end
+  
+  def create_alias(hostname)
+    raise "Hostname '#{hostname}' already exists" if Site.find_by_host(hostname)
+    ali = Site.new(self.attributes)
+    ali.host = hostname
+    ali.master_id = self.id
+    ali.orphan_id = self.orphan_id
+    ali.root_id   = self.root_id
+    ali.prop      = self.prop
+    ali.save
+    ali
+  end
+  ######
 
   def being_created?
     @being_created
@@ -383,24 +457,36 @@ class Site < ActiveRecord::Base
   end
 
   def clear_cache(clear_zafu = true)
-    path = "#{SITES_ROOT}#{self.cache_path}"
-    Site.logger.error("\n-----------------\nCLEAR CACHE FOR SITE #{host}\n-----------------\n")
+    paths = ["#{SITES_ROOT}#{self.cache_path}"]
+    aliases = Site.all(:conditions => {:master_id => self.id})
+    aliases.each do |site|
+      paths << "#{SITES_ROOT}#{site.cache_path}"
+    end
+    Site.logger.error("\n-----------------\nCLEAR CACHE FOR SITE #{host} (#{aliases.map(&:host).join(', ')})\n-----------------\n")
 
-    if File.exist?(path)
-      Dir.foreach(path) do |elem|
-        next unless elem =~ /^(\w\w\.html|\w\w|login\.html)$/
-        FileUtils.rmtree(File.join(path, elem))
-      end
+    paths.each do |path|
+      if File.exist?(path)
+        Dir.foreach(path) do |elem|
+          next unless elem =~ /^(\w\w\.html|\w\w|login\.html)$/
+          FileUtils.rmtree(File.join(path, elem))
+        end
 
-      Zena::Db.execute "DELETE FROM caches WHERE site_id = #{self[:id]}"
-      Zena::Db.execute "DELETE FROM cached_pages_nodes WHERE cached_pages_nodes.node_id IN (SELECT nodes.id FROM nodes WHERE nodes.site_id = #{self[:id]})"
-      Zena::Db.execute "DELETE FROM cached_pages WHERE site_id = #{self[:id]}"
+        Zena::Db.execute "DELETE FROM caches WHERE site_id = #{self[:id]}"
+        Zena::Db.execute "DELETE FROM cached_pages_nodes WHERE cached_pages_nodes.node_id IN (SELECT nodes.id FROM nodes WHERE nodes.site_id = #{self[:id]})"
+        Zena::Db.execute "DELETE FROM cached_pages WHERE site_id = #{self[:id]}"
+      end
     end
-
+    
+    # Clear zafu
     if clear_zafu
-      path = "#{SITES_ROOT}#{self.zafu_path}"
-      if File.exist?(path)
-        FileUtils.rmtree(path)
+      paths = ["#{SITES_ROOT}#{self.zafu_path}"]
+      aliases.each do |site|
+        paths << "#{SITES_ROOT}#{site.cache_path}"
+      end
+      paths.each do |path|
+        if File.exist?(path)
+          FileUtils.rmtree(path)
+        end
       end
     end
 
@@ -510,8 +596,19 @@ class Site < ActiveRecord::Base
   private
     def valid_site
       errors.add(:host, 'invalid') if self[:host].nil? || (self[:host] =~ /^\./) || (self[:host] =~ /[^\w\.\-]/)
-      errors.add(:languages, 'invalid') unless self[:languages].split(',').inject(true){|i,l| (i && l =~ /^\w\w$/)}
-      errors.add(:default_lang, 'invalid') unless self[:languages].split(',').include?(self[:default_lang])
+      
+      if !is_alias?
+        errors.add(:languages, 'invalid') unless self[:languages].split(',').inject(true){|i,l| (i && l =~ /^\w\w$/)}
+        errors.add(:default_lang, 'invalid') unless self[:languages].split(',').include?(self[:default_lang])
+      else
+        self[:languages] = nil
+        self[:default_lang] = nil
+      end
+      
+      if @root_zip_error
+        errors.add('root_id', @root_zip_error)
+        @root_zip_error = nil
+      end
     end
 
 end