zena 1.2.1 → 1.2.2

data/app/models/note.rb

@@ -42,7 +42,8 @@ class Note < Node
 
   def export_keys
     h = super
-    h[:dates].merge!('log_at' => log_at, 'event_at' => event_at)
+    h[:dates].merge!('log_at' => log_at) unless log_at.blank?
+    h[:dates].merge!('event_at' => event_at) unless event_at.blank?
     h
   end
 

data/app/models/relation.rb

@@ -1,5 +1,5 @@
 class Relation < ActiveRecord::Base
-  EXPORT_FIELDS   = %w{target_kpath target_icon target_unique source_role source_icon source_unique rel_group}
+  EXPORT_FIELDS   = %w{target_name target_icon target_unique source_role source_icon source_unique rel_group}
 
   before_validation :singularize_roles
   validate        :valid_relation
@@ -21,11 +21,16 @@ class Relation < ActiveRecord::Base
   def export
     res = Zafu::OrderedHash.new
     EXPORT_FIELDS.each do |key|
-      value = self[key]
-      if !value.blank?
-        res[key] = value
+      if key == 'target_name'
+        res[key] = VirtualClass.find_by_kpath(self['target_kpath']).name
+      else
+        value = self[key]
+        if !value.blank?
+          res[key] = value
+        end
       end
     end
+    
     res
   end
 

data/app/models/relation_proxy.rb

@@ -1,3 +1,4 @@
+# This is a mess and would need a rewrite...
 class RelationProxy < Relation
   include RubyLess
 
@@ -35,8 +36,7 @@ class RelationProxy < Relation
     # Find a relation proxy for a role through a given node.
     # The finder makes sure the class path is compatible with the node's class/virtual_class given as parameter.
     def get_proxy(node, role)
-      # TODO: use find_by_role(role, node.kpath) when all tests are clear
-      rel = find_by_role(role)
+      rel = find_by_role(role, node.new_record? ? nil : node.kpath)
       if rel && (node.new_record? || node.kpath =~ /\A#{rel.this_kpath}/)
         rel.start = node
         rel

data/app/models/role.rb

@@ -51,7 +51,7 @@ class Role < ActiveRecord::Base
             raise Exception.new("Importation needs to start with a real class: '#{name}' is not a real class.")
           else
             # start importing
-            res += import_all(klass, definition, post_import)
+            res += import_vclass(nil, name, definition, post_import)
           end
         end
 
@@ -119,7 +119,7 @@ class Role < ActiveRecord::Base
 
       def import_vclass(superclass, name, definition, post_import)
         res = []
-        vclass = ::Role.find_by_name_and_site_id(name, current_site.id)
+        vclass = VirtualClass[name]
         if vclass && vclass.class != VirtualClass
           # Change from role to vclass ?
           # Reject
@@ -129,7 +129,7 @@ class Role < ActiveRecord::Base
           vclass = VirtualClass.new(:name => name, :superclass => superclass)
           vclass.save!
         end
-
+        
         res << vclass
 
         # 2. create or update columns (never delete)
@@ -153,7 +153,8 @@ class Role < ActiveRecord::Base
             # We do not clear attributes (import is ADD/UPDATE only).
           end
         end
-        vclass.save!
+        
+        vclass.save! unless vclass.real_class?
 
         # 5. create or update sub-classes
         res += import_all(vclass, definition, post_import)
@@ -248,7 +249,13 @@ class Role < ActiveRecord::Base
       end
       Relation::EXPORT_FIELDS.each do |key|
         value = definition[key]
-        if !value.blank?
+        if key == 'target_name' && !value.blank?
+          if target = VirtualClass[value]
+            relation['target_kpath'] = target.kpath
+          else
+            raise Exception.new("Could not find a target named '#{value}' to create relation '#{name}'.")
+          end
+        elsif !value.blank?
           relation[key] = value
         end
       end

data/app/models/site.rb

@@ -56,7 +56,7 @@ class Site < ActiveRecord::Base
 
   validate :valid_site
   validates_uniqueness_of :host
-  attr_accessible :name, :languages, :default_lang, :authentication, :http_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
   has_many :groups, :order => "name"
   has_many :nodes
   has_many :users
@@ -70,7 +70,7 @@ class Site < ActiveRecord::Base
   include Zena::Use::MLIndex::SiteMethods
 
   @@attributes_for_form = {
-    :bool => %w{authentication http_auth auto_publish},
+    :bool => %w{authentication http_auth auto_publish ssl_on_auth},
     :text => %w{name languages default_lang},
   }
 
@@ -118,8 +118,8 @@ class Site < ActiveRecord::Base
 
       unless admin_user.save
         # rollback
-        Site.connection.execute "DELETE FROM #{Site.table_name} WHERE id = #{site.id}"
-        Site.connection.execute "DELETE FROM zips WHERE site_id = #{site.id}"
+        Zena::Db.execute "DELETE FROM #{Site.table_name} WHERE id = #{site.id}"
+        Zena::Db.execute "DELETE FROM zips WHERE site_id = #{site.id}"
         raise Exception.new("Could not create admin user for site [#{host}] (site#{site[:id]})\n#{admin_user.errors.map{|k,v| "[#{k}] #{v}"}.join("\n")}")
       end
 
@@ -221,6 +221,7 @@ class Site < ActiveRecord::Base
 
   property.string 'usr_prototype_attributes'
   property.boolean 'expire_in_dev'
+  property.boolean 'ssl_on_auth'
 
   Site.attributes_for_form[:text] << 'usr_prototype_attributes'
   Site.attributes_for_form[:bool] << 'expire_in_dev'
@@ -348,7 +349,7 @@ class Site < ActiveRecord::Base
   end
 
   def iformats_updated!
-    Site.connection.execute "UPDATE sites SET formats_updated_at = (SELECT updated_at FROM iformats WHERE site_id = #{self[:id]} ORDER BY iformats.updated_at DESC LIMIT 1) WHERE id = #{self[:id]}"
+    Zena::Db.execute "UPDATE sites SET formats_updated_at = (SELECT updated_at FROM iformats WHERE site_id = #{self[:id]} ORDER BY iformats.updated_at DESC LIMIT 1) WHERE id = #{self[:id]}"
     if $iformats
       $iformats[self[:id]] = @iformats = nil
     end
@@ -366,7 +367,7 @@ class Site < ActiveRecord::Base
   end
 
   def iformats_updated!
-    Site.connection.execute "UPDATE sites SET formats_updated_at = (SELECT updated_at FROM iformats WHERE site_id = #{self[:id]} ORDER BY iformats.updated_at DESC LIMIT 1) WHERE id = #{self[:id]}"
+    Zena::Db.execute "UPDATE sites SET formats_updated_at = (SELECT updated_at FROM iformats WHERE site_id = #{self[:id]} ORDER BY iformats.updated_at DESC LIMIT 1) WHERE id = #{self[:id]}"
     if $iformats
       $iformats[self[:id]] = @iformats = nil
     end
@@ -382,9 +383,9 @@ class Site < ActiveRecord::Base
         FileUtils.rmtree(File.join(path, elem))
       end
 
-      Site.connection.execute "DELETE FROM caches WHERE site_id = #{self[:id]}"
-      Site.connection.execute "DELETE FROM cached_pages_nodes WHERE cached_pages_nodes.node_id IN (SELECT nodes.id FROM nodes WHERE nodes.site_id = #{self[:id]})"
-      Site.connection.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
 
     if clear_zafu

data/app/models/skin.rb

@@ -1,4 +1,12 @@
 # A skin is a container for templates and css to render a full site or sectioon
 # of a site.
 class Skin < Section
+  def skin_name
+    title.to_filename
+  end
+  
+  def self.text_from_fs_skin(brick_name, skin_name, path, opts)
+    # dummy implementation
+    nil
+  end
 end

data/app/models/string_hash.rb

@@ -0,0 +1,65 @@
+class StringHash < Hash
+  include RubyLess
+  
+  def self.from_string(str)
+    from_hash(JSON.parse(str))
+  end
+  
+  def self.from_hash(hash)
+    obj = new
+    hash.each do |k,v|
+      obj[k.to_s] = v.to_s
+    end
+    obj
+  end
+  
+  def self.[](value)
+    from_hash(value)
+  end
+  
+  # Deserialization used by Property
+  def self.json_create(serialized)
+    if data = serialized['data']
+      StringHash[data]
+    else
+      nil
+    end
+  end
+  
+  def []=(k, v)
+    if v.blank?
+      delete(k.to_s)
+    else
+      super(k.to_s, v.to_s)
+    end
+  end
+  
+  def merge!(value)
+    value.each do |k,v|
+      self[k] = v
+    end
+    self
+  end
+  
+  def merge(value)
+    obj = dup
+    value.each do |k,v|
+      obj[k] = v
+    end
+    obj
+  end
+  
+  # Serialization used by Property
+  def to_json(*args)
+    { 'json_class' => 'StringHash', 'data' => Hash[self] }.to_json
+  end
+  
+  # This is used in case we show a form with the StringHash so that the value
+  # is not serialized to junk. This is the other side of "from_string".
+  def to_s
+    Hash[self].to_json
+  end
+
+  safe_context [:[], String] => String
+  safe_method :keys => [String]
+end

data/app/models/text_document.rb

@@ -15,7 +15,7 @@ class TextDocument < Document
   class << self
     # Return true if a new text document can be created with the content_type. Used by the superclass Document to choose the corret subclass when creating a new object.
     def accept_content_type?(content_type)
-      (content_type =~ /^(text|image\/svg\+xml|x-javascript)/) && 
+      (content_type =~ /(^text|^image\/svg\+xml|x-javascript)/) && 
       (Zena::TYPE_TO_EXT[content_type.chomp] != ['rtf'])
     end
 

data/app/models/user.rb

@@ -24,6 +24,8 @@ things they can/cannot do :
 TODO: when a user is 'destroyed', pass everything he owns to another user or just mark the user as 'deleted'...
 =end
 class User < ActiveRecord::Base
+  attr_accessor :zafu_cache
+  
   include Property
   RESCUE_SKIN_ID = -1
   ANY_SKIN_ID    = 0

data/app/models/virtual_class.rb

@@ -58,8 +58,16 @@ class VirtualClass < Role
   safe_method  [:relations, String] => {:class => ['RelationProxy'], :method => 'filtered_relations'}
   # All columns defined for a VirtualClass (kpath based).
   safe_method :all_columns => {:class => ['Column'], :method => 'safe_columns'}
-
-
+  
+  # Methods on VirtualClass['Post'] instances, not nodes.
+  def self.safe_method_type(signature, receiver)
+    if signature.first == 'new'
+      {:method => 'zafu_new', :class => receiver.literal}
+    else
+      super
+    end
+  end
+  
   class Cache
     def initialize
       clear_cache!
@@ -343,7 +351,16 @@ class VirtualClass < Role
 
           # In order to use types other then String, we use the overwritten property's
           # type.
-          if type = safe_column_types[method]
+          if type_name = query.types[method]
+            klass = Node.cast_to_class(type_name)
+            if klass == String
+              return {:method => "attributes[#{method.inspect}]", :nil => true, :class => klass}
+            elsif klass
+              return {:method => "rcast(#{method.inspect}, #{type_name.inspect})", :nil => true, :class => klass}
+            else
+              return nil
+            end
+          elsif type = safe_column_types[method]
             return type.merge(:method => "attributes[#{method.inspect}]", :nil => true)
           elsif type = real_class.safe_method_type(signature)
             return type.merge(:nil => true)
@@ -474,6 +491,11 @@ class VirtualClass < Role
   def new_instance(hash={})
     real_class.new(hash, self)
   end
+  
+  # Build new nodes instances of this VirtualClass from zafu.
+  def zafu_new(hash={})
+    real_class.new(Node.transform_attributes(hash.stringify_keys), self)
+  end
 
   # Create new nodes instances of this VirtualClass
   def create_instance(*args)
@@ -509,8 +531,9 @@ class VirtualClass < Role
     def rebuild_kpath(superclass)
       index = 0
       kpath = nil
-      while index < self[:name].length
-        try_kpath = superclass.kpath + self[:name][index..index].upcase
+      try_keys = "#{name}ABCDEFGHIJKLMNOPQRSTUCWXYZ1234567890"
+      while index < try_keys.length
+        try_kpath = superclass.kpath + try_keys[index..index].upcase
         if found = VirtualClass.find_by_kpath(try_kpath)
           if found.id && found.id == self[:id]
             kpath = try_kpath
@@ -568,10 +591,11 @@ class VirtualClass < Role
 
     def propagate_kpath_change
       if kpath_changed?
+        new_kpath = self.kpath
         old_kpath = kpath_was
-        Zena::Db.execute "UPDATE nodes SET kpath = '#{kpath}' WHERE vclass_id = #{self.id} AND site_id = #{current_site.id}"
-        Zena::Db.execute "UPDATE roles SET kpath = '#{kpath}' WHERE kpath = '#{old_kpath}' AND site_id = #{current_site.id} AND (type = 'Role' or type IS NULL)"
-        # Find templates
+        Zena::Db.execute "UPDATE nodes SET kpath = '#{new_kpath}' WHERE vclass_id = #{self.id} AND site_id = #{current_site.id}"
+        Zena::Db.execute "UPDATE roles SET kpath = '#{new_kpath}' WHERE kpath = '#{old_kpath}' AND site_id = #{current_site.id} AND (type = 'Role' or type IS NULL)"
+        # ========================================= Update templates
         idx_templates = IdxTemplate.all(
           :conditions => ['tkpath = ? AND site_id = ?', old_kpath, site_id]
         )
@@ -591,8 +615,17 @@ class VirtualClass < Role
             end
           end
         end
-
-        # Sub-classes
+        
+        # ========================================= Update relations
+        Relation.all(
+          :conditions => ['source_kpath = ? or target_kpath = ?', old_kpath, old_kpath]
+        ).each do |rel|
+          rel.source_kpath = new_kpath if rel.source_kpath == old_kpath
+          rel.target_kpath = new_kpath if rel.target_kpath == old_kpath
+          rel.save!
+        end
+        
+        # ========================================= Update sub-classes
         if sub_classes = secure(VirtualClass) { VirtualClass.all(
             :conditions => ['kpath LIKE ?', "#{old_kpath}_"]
             )}

data/app/views/comments/create.rjs

@@ -1,32 +1 @@
-#if @errors
-#  page.replace_html 'comment_errors', :inline => render_errors
-#elsif @comment.new_record?
-#  page.replace_html "add_comment_form#{@comment.reply_to || ''}", :partial=>'comments/form'
-#  page.replace_html "comment_errors#{@comment.reply_to || ''}", :inline=>error_messages_for(:comment, :object => @comment)
-#else
-#  if @comment.reply_to
-#    page.remove "add_comment_form#{@comment.reply_to}"
-#    page.insert_html :bottom, "replies_to#{@comment.reply_to}", :partial=>'comments/li', :collection=>[@comment]
-#  else
-#    page.insert_html :before, "add_comment#{@node.zip}", :partial=>'comments/li', :collection=>[@comment]
-#    page.toggle "add_comment#{@node.zip}", "add_comment_form#{@node.zip}"
-#  end
-#  page.visual_effect :highlight, "comment#{@comment[:id]}", :duration => 0.3
-#end
-update_page_content(page, @comment)
-=begin
-if @comment.new_record?
-  page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
-else
-  pos = params[:position] || :before
-  ref = params[:reference] || "#{params[:dom_id]}_add"
-  page.insert_html pos.to_sym, ref, :file => template_path_from_template_url + ".erb"
-  @comment = Comment.new
-  page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
-  if params[:done]
-    page << params[:done]
-  else
-    page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
-  end
-end
-=end
+update_page_content(page, @comment)

data/app/views/comments/edit.rjs

@@ -1,2 +1,2 @@
-page.replace "#{params[:dom_id]}_#{@comment.zip}", :file => template_path_from_template_url + "_form.erb"
+page.replace "#{params[:dom_id]}_#{@comment.zip}", :file => template_path_from_template_url('_form')
 page << "$('#{params[:dom_id]}_form_t').focusFirstElement();"

data/app/views/comments/update.rjs

@@ -1 +1 @@
-page.replace "#{params[:dom_id]}.#{@comment.zip}", :file => template_path_from_template_url + ".erb"
+page.replace "#{params[:dom_id]}.#{@comment.zip}", :file => template_path_from_template_url

data/app/views/documents/show.rhtml

@@ -12,6 +12,6 @@
         <td class='preview'><p><%= img_tag(@node, :mode=>'pv') %></p><p class='size'><%= fsize(@node.size) %></p></td>
         <td class='description'><h3 class='title s<%= @node.version.status %>'><span class='doc_id'><%= @node[:zip] %></span> <%= @node.title %> <%= node_actions(@node, :actions => :all) %></h3><p class='summary'><%= zazen(@node.summary) %></p></td></tr>
     </table>
-    <p class='btn_validate'><%= link_to _("upload more"), new_document_path(:parent_id => @node.parent_zip) %> // <%= link_to_function _('close'), "Zena.reload_and_close();" %></p>
+    <p class='btn_validate'><%= link_to _("upload more"), new_document_path(:parent_id => @node.parent_zip, :js => params[:js], :reload => params[:reload]) %> // <%= link_to_function _('close'), "Zena.t().Windows.close(#{win_id(@node.parent_zip, 'add_doc').inspect});" %></p>
   </div>
 </div>

data/app/views/groups/_form.rhtml

@@ -32,6 +32,13 @@
       <% if !@group.new_record? -%>
       <tr><td class='label'><%= _('replace by') %></td><td><%= select('group', 'replace_by', @groups.map{|g| [g[:name], g[:id]]} , {:include_blank => true}) %></td></tr>
       <% end -%>
+      <tr>
+	    <td class='label'><%= _('auto_publish') %></td>
+		<td>
+		  <input type='hidden' name='group[auto_publish]' value=''/>
+		  <input type='checkbox' name='group[auto_publish]' value='1'<%= @group.auto_publish? ? " checked='checked'" : '' %>/> <%= _('auto_publish') %>
+		</td>
+	  </tr>
       <tr><td colspan='2'><input type='submit' class='btn_validate' value='<%= _('validate') %>'/></td></tr>
     </table>
   </form>

data/app/views/groups/_li.rhtml

@@ -8,6 +8,6 @@ else
 end %>
 <tr id='group<%= li[:id] %>'>
   <td class="adm_icon"><%= link_to_remote( _("img_#{icon}"), :update=>"group#{li[:id]}", :url=>edit_group_path(li), :method=>:get) %></td>
-  <td class="name"><%= li.name %></td>
+  <td class="name"><%= li.name %><%= li.auto_publish? ? '*' : '' %></td>
   <td class="users"><%= li.active_users.map {|u| (u.login || 'anon') }.join(', ') %></td>
 </tr>

data/app/views/nodes/500.html

@@ -7,7 +7,8 @@
 </head>
 
 <body style='font-family:Helvetica, Arial, sans-serif;'>
-  <div style='display:table; margin:50px auto; background:#aaa; height:200px; width:600px; border:1px solid black;'>
+  <!-- The zena_error500 is used we running automated tests. Do not change -->
+  <div id='zena_error500' style='display:table; margin:50px auto; background:#aaa; height:200px; width:600px; border:1px solid black;'>
   <h2 style='font-size:18px; text-align:center; margin-top:20px; border:1px solid red; border-width:1px 0; background:#faa; padding:10px;'>Sorry... An error prevented the requested page from rendering</h2>
   <p style='text-align:center; text-style:italic;'>This problem has been logged and will be acted upon.</p>
   </div>