zena 1.2.1 → 1.2.2

data/History.txt

@@ -1,4 +1,41 @@
-== 1.2.0 2012-05-01
+== 1.2.2 2012-08-30
+
+* Major changes
+ * Basic zjs to batch create/update nodes (with grid.js).
+ * Zafu is not a separate gem anymore.
+ * Added simple support for JS Tags (used to define grid colums).
+ * Enabled rebuilding of templates on partial query.
+ * Enabled 'hash' property type.
+ * Enabled javascript on toggle.
+ * Enabled "fs_skin" brick to use zafu stored in brick file system.
+ * No need to use '>' or '<' in html params. \' escape works. Yeah !!
+ * Enabled "static" assets with symlink to skins in fs_skin bricks (/static/[brick]-[skin]/xxx.css => bricks/[brick]/skins/[skin]/static/xxx.css)
+ * No more strict scoping: "set" variables are rewritten if type matches.
+ * Added support for new in rubyless (Post.new, Post.new(:title => 'foo')).
+ * Added support for type in custom queries and SQLiss select "nodes select created_at as ti:time"
+
+* Minor changes
+ * Fixed label traduction for param.
+ * Enable ajax response on Node destroy (use dummy update parameter).
+ * Added 'sum' method on array. <===== TODO: Document
+ * Added 'loading' option to [filter].
+ * Added 'master_template' zafu method to access the master template used for compilation.
+ * Fixed creation of modules bug.
+ * Using latest QueryBuilder (fixes default scope bug).
+ * Added 'ssl_on_auth' option to force https after (and during) login. <=== TODO: Document
+ * Removing evaluated strings if copy_id is blank.
+ * Exporting relations by class name instead of kpath (may differ from site to site).
+ * Using any character to build kpath if no character from the class name can be used.
+ * Going through reverse order in console's foreach in case we destroy nodes.
+ * Added support for "target" in [zazen] when rendering links.
+ * Fixed kpath propagation to relations on kpath change.
+ * Fixed [block] in [block] with [filter] bug.
+ * Added support for KPATH_VALUE(ClassName) in custom queries. <==== TODO: Document
+ * Fixed class scoping Contact? when current node is more specialized.
+ * Fixed bug on syntax error in Acl query.
+ * Fixed cache expire bug (some pages were not properly removed).
+
+== 1.2.0, 1.2.1 2012-05-01
 
 * Major changes
  * Added 'remove_from_db' method to remove a site from the database.

data/app/controllers/documents_controller.rb

@@ -61,14 +61,16 @@ class DocumentsController < ApplicationController
         else
           page.call 'UploadProgress.setAsFinished'
           page.delay(1) do # allow the progress bar fade to complete
-            if params[:redir]
-              page << "Zena.reload_and_close(#{params[:redir].inspect})"
-            end
             if params[:js]
               page << params[:js]
             end
-            if !params[:redir] && !params[:js]
-              page.redirect_to document_url(@node[:zip])
+            if params[:reload]
+              page << "Zena.t().Zena.reload(#{params[:reload].inspect})"
+            end
+            if params[:redir]
+              page << "Zena.reload_and_close(#{params[:redir].inspect})"
+            else
+              page.redirect_to document_url(@node[:zip], :reload => params[:reload], :js => params[:js])
             end
           end
         end

data/app/controllers/nodes_controller.rb

@@ -235,9 +235,19 @@ class NodesController < ApplicationController
         format.html {
           redirect_to  params[:redir] || zen_path(@node, :mode => params[:mode], :new => 'true')
         }
-        format.js
+        format.js do
+          if params[:zjs]
+            attrs = {'id' => @node.zip}
+            params[:node].each do |k,v|
+              v = @node.zafu_eval(k, params[:opts])
+              attrs[k] = v
+            end
+            render :json => attrs.to_json, :status => :created
+          end
+        end
         format.xml  { render :xml => @node.to_xml(:root => 'node'), :status => :created, :location => node_url(@node) }
       else
+        # ERROR
         format.html do
           flash[:error] = error_messages_for('node', :object => @node)
           if request.referer
@@ -246,7 +256,11 @@ class NodesController < ApplicationController
             raise ActiveRecord::RecordNotFound
           end
         end
-        format.js
+        format.js do
+          if params[:zjs]
+            render :json => @node.errors, :status => :unprocessable_entity
+          end
+        end
         format.xml  { render :xml => @node.errors, :status => :unprocessable_entity }
       end
     end
@@ -279,7 +293,7 @@ class NodesController < ApplicationController
         end
       end
 
-      format.xml  do
+      format.xml do
         node_xml = @node.to_xml #need to be allocated before destroying
         if node_xml && @node.destroy
           render :xml => node_xml, :status => 200
@@ -289,7 +303,21 @@ class NodesController < ApplicationController
         end
       end
 
-      format.js
+      format.js do
+        
+        if params[:zjs]
+          node_json = @node.to_json
+          if @node.destroy
+            render :json => node_json, :status => 200
+          else
+            render :json => @node.errors, :status => :unprocessable_entity
+          end
+        else
+          @parent = @node.parent
+          @node.destroy
+          # update_page_content(page, @parent)
+        end
+      end
 
     end
   end
@@ -410,7 +438,21 @@ class NodesController < ApplicationController
           end
         end # html
 
-        format.js { @flash = flash }
+        format.js do
+          @flash = flash
+          if params[:zjs]
+            if @node.errors.empty?
+              attrs = {}
+              params[:node].each do |k,v|
+                v = @node.zafu_eval(k, params[:opts])
+                attrs[k] = v
+              end
+              render :json => attrs.to_json, :status => :ok
+            else
+              render :json => @node.errors, :status => :unprocessable_entity
+            end
+          end
+        end
 
         format.xml do
           if @node.errors.empty?
@@ -544,7 +586,6 @@ class NodesController < ApplicationController
           if path = request.env['REQUEST_PATH'].split('/')[2..-1]
             params[:path] = path
           else
-            Node.logger.warn("REQUEST_PATH: #{request.env['REQUEST_PATH'].inspect}")
             path = params[:path]
           end
         end

data/app/controllers/user_sessions_controller.rb

@@ -28,13 +28,14 @@ class UserSessionsController < ApplicationController
   end
 
   def destroy
+    port = request.port == 80 ? '' : ":#{request.port}"
     if @user_session = UserSession.find
       @user_session.destroy
       reset_session
       #flash.now[:notice] = _("Successfully logged out.")
-      redirect_to params[:redirect] || home_path(:prefix => prefix)
+      redirect_to "http://#{current_site.host}#{port}#{params[:redirect] || home_path(:prefix => prefix)}"
     else
-      redirect_to home_path(:prefix => prefix)
+      redirect_to "http://#{current_site.host}#{port}#{home_path(:prefix => prefix)}"
     end
   end
 
@@ -52,5 +53,13 @@ class UserSessionsController < ApplicationController
     def redirect_after_login
       session.delete(:after_login_path) || home_path(:prefix => AUTHENTICATED_PREFIX)
     end
-
+    
+    # Overwrite redirect on https rules for this controller
+    def redirect_to_https
+      if params[:action] == 'destroy'
+        # ignore
+      else
+        redirect_to :protocol => "https://" if current_site.ssl_on_auth && !ssl_request? && !local_request?
+      end
+    end
 end

data/app/controllers/virtual_classes_controller.rb

@@ -133,9 +133,15 @@ class VirtualClassesController < ApplicationController
   end
 
   def create
-    type = params[:virtual_class].delete(:type)
+    attrs = params[:virtual_class]
+    type = attrs.delete(:type)
     if type == 'Role'
-      @virtual_class = ::Role.new(params[:virtual_class])
+      # Remove invalid attributes
+      accessible = ::Role.accessible_attributes
+      attrs.each do |k,v|
+        attrs.delete(k) if v.blank? or !accessible.include?(k)
+      end
+      @virtual_class = ::Role.new(attrs)
     else
       @virtual_class = VirtualClass.new(params[:virtual_class])
     end

data/app/models/acl.rb

@@ -29,7 +29,7 @@ class Acl < ActiveRecord::Base
   end
 
   def authorize?(base_node, params, request)
-    res = Node.find_by_sql(eval(make_query(base_node, params, request).to_s))
+    res = Node.find_by_sql(eval(make_query(base_node, params, request).to_s)) rescue nil
     if res.empty?
       nil
     else
@@ -95,8 +95,11 @@ class Acl < ActiveRecord::Base
         errors.add(:query, err.message)
       end
       nil
+    rescue RubyLess::SyntaxError => err
+      errors.add(:query, err.message.strip)
+      nil
     rescue => err
-      errors.add(:query, err.message)
+      errors.add(:query, err.message.strip)
       nil
     end
 end

data/app/models/cached_page.rb

@@ -68,12 +68,13 @@ class CachedPage < ActiveRecord::Base
     end
 
     # Remove cached pages related to the given node.
-    def expire_with(node, opts = {})
-      if opts
-        expire(node.cached_pages.find(:all, opts))
+    def expire_with(node, filter = nil)
+      if filter
+        list = CachedPage.find(:all, :conditions => filter[:conditions], :joins => "INNER JOIN cached_pages_nodes AS cpn ON cpn.cached_page_id = cached_pages.id AND cpn.node_id = #{node.id}")
       else
-        expire(node.cached_pages)
+        list = node.cached_pages
       end
+      expire(list)
     end
 
     private
@@ -127,7 +128,6 @@ class CachedPage < ActiveRecord::Base
     def cached_page_on_destroy
       # allow ../public for single site mode
       filepath = "#{SITES_ROOT}#{path.gsub(%r{\.\./(?!public)},'NO/')}" # just in case...
-      CachedPage.logger.info "remove #{filepath}"
       # if symlink points to a dead file, exist? returns false...
       FileUtils.rm(filepath) if File.exist?(filepath) || File.symlink?(filepath)
       CachedPage.connection.execute "DELETE FROM cached_pages_nodes WHERE cached_page_id = '#{id}'"

data/app/models/column.rb

@@ -1,7 +1,7 @@
 class Column < ActiveRecord::Base
   include RubyLess
   include Property::StoredColumn
-  TYPES_FOR_FORM   = %w{string datetime integer float}
+  TYPES_FOR_FORM   = %w{string datetime integer float hash}
 
   INDICES_FOR_FORM = %w{string ml_string datetime integer float}
 
@@ -70,16 +70,39 @@ class Column < ActiveRecord::Base
   end
 
   def type_cast(value)
+    if value.blank?
+      return nil
+    end
     if ptype == 'datetime'
-      if value.blank?
-        nil
-      elsif value.kind_of?(Time)
+      if value.kind_of?(Time)
         value
       elsif value.kind_of?(String)
         value.to_utc(_(Zena::Use::Dates::DATETIME), visitor.tz)
       else
         nil
       end
+    elsif ptype == 'hash'
+      if value.kind_of?(Hash)
+        StringHash.from_hash(value)
+      elsif value.kind_of?(String)
+        StringHash.from_string(value)
+      end
+    else
+      nil
+    end
+  end
+  
+  def merge_hash(orig, value)
+    unless orig.kind_of?(StringHash)
+      orig = StringHash.from_hash(orig)
+    end
+    orig.merge!(value)
+    return orig
+  end
+  
+  def klass
+    if ptype == 'hash'
+      StringHash
     else
       nil
     end

data/app/models/group.rb

@@ -13,7 +13,7 @@ class Group < ActiveRecord::Base
 
   include RubyLess
   safe_method             :name => String
-  attr_accessible         :name, :user_ids, :replace_by # FIXME: add user_ids ? + add users validation (are in site)
+  attr_accessible         :name, :user_ids, :replace_by, :auto_publish # FIXME: add user_ids ? + add users validation (are in site)
   has_and_belongs_to_many :users, :order=>'login'
   validates_presence_of   :name
   validate                :valid_group

data/app/models/node.rb

@@ -185,6 +185,7 @@ class Node < ActiveRecord::Base
   before_create      :node_before_create
   after_save         :spread_project_and_section
   after_create       :node_after_create
+  after_destroy      :node_after_destroy
   attr_protected     :zip, :id, :section_id, :project_id, :publish_from, :created_at, :updated_at
   attr_protected     :site_id
 
@@ -208,6 +209,7 @@ class Node < ActiveRecord::Base
   safe_property  :title, :text, :summary
 
   safe_attribute :created_at, :updated_at, :event_at, :log_at, :publish_from, :basepath, :inherit, :position
+  safe_attribute :idx_datetime1, :idx_datetime2, :idx_float1, :idx_float2, :idx_string1, :idx_string2, :idx_integer1, :idx_integer2
 
 
   # safe_node_context defined in Enrollable
@@ -245,7 +247,9 @@ class Node < ActiveRecord::Base
                      :user => 'User',
                      :author => author_proc,
                      :vclass => {:class => 'VirtualClass', :method => 'virtual_class'},
-                     :new_record? => Boolean
+                     :new_record? => Boolean,
+                     [:eval, String] => {:class => String, :method => 'zafu_eval'},
+                     [:eval, String, Hash] => {:class => String, :method => 'zafu_eval'}
 
   # This is needed so that we can use secure_scope and secure in search.
   extend  Zena::Acts::Secure
@@ -290,6 +294,50 @@ class Node < ActiveRecord::Base
   def v_number
     version.number
   end
+  
+  Caster = ::ActiveRecord::ConnectionAdapters::Column
+  
+  # Return class of cast value.
+  def self.cast_to_class(type)
+    case type
+      when :string    then String
+      when :text      then String
+      when :integer   then Number
+      when :float     then Number
+      when :decimal   then Number
+      when :datetime  then Time
+      when :timestamp then Time
+      when :time      then Time
+      when :date      then Time
+      when :binary    then String
+      when :boolean   then Boolean
+      else nil
+    end
+  end
+  
+  # Read with cast to an appropriate instance. This is used along with
+  # custom select in QueryBuilder queries.
+  def rcast(key, type)
+    @rcast_cache ||= {}
+    @rcast_cache[key] ||= begin
+      value = @attributes[key]
+      return nil if value.nil?
+      case type
+        when :string    then value
+        when :text      then value
+        when :integer   then value.to_i rescue value ? 1 : 0
+        when :float     then value.to_f
+        when :decimal   then Caster.value_to_decimal(value)
+        when :datetime  then Caster.string_to_time(value)
+        when :timestamp then Caster.string_to_time(value)
+        when :time      then Caster.string_to_time(value)
+        when :date      then Caster.string_to_time(value)
+        when :binary    then Caster.binary_to_string(value)
+        when :boolean   then Caster.value_to_boolean(value)
+        else value
+      end
+    end
+  end
 
   # This is an adaptation of Versions::Multi code to use our special v_ shortcut
   # to access version attributes.
@@ -307,6 +355,9 @@ class Node < ActiveRecord::Base
   include Zena::Use::ScopeIndex::ModelMethods
 
   include Zena::Use::QueryNode::ModelMethods
+  
+  # Used by zafu_eval when parsing dates.
+  include Zena::Use::Dates::ModelMethods
 
   @@native_node_classes = {'N' => self}
   @@native_node_classes_by_name = {'Node' => self}
@@ -624,7 +675,7 @@ class Node < ActiveRecord::Base
       end
 
       entries = Dir.entries(folder).reject { |f| f =~ /^[\.~]|^__/ }.map do |filename|
-        String.from_filename(filename)
+        [filename, String.from_filename(filename)]
       end.sort
 
       index  = 0
@@ -633,17 +684,16 @@ class Node < ActiveRecord::Base
         catch (:next_entry) do
           type = current_obj = sub_folder = document_path = nil
           versions = []
-          filename = entries[index]
+          filename, title = *entries[index]
 
           path     = File.join(folder, filename)
 
           if File.stat(path).directory?
             type       = :folder
-            title      = filename
             sub_folder = path
             attrs      = defaults.dup
             attrs['v_lang'] ||= visitor.lang
-          elsif filename =~ /^(.+?)(\.\w\w|)(\.\d+|)\.zml$/  # bird.jpg.en.zml
+          elsif title =~ /^(.+?)(\.\w\w|)(\.\d+|)\.zml$/  # bird.jpg.en.zml
             # node content in yaml
             type      = :node
             title     = "#{$1}#{$4}"
@@ -654,7 +704,7 @@ class Node < ActiveRecord::Base
             attrs['title'] = title
             attrs['v_lang']    = lang || attrs['v_lang'] || visitor.lang
             versions << attrs
-          elsif filename =~ /^((.+?)\.(.+?))(\.\w\w|)(\.\d+|)$/ # bird.jpg.en
+          elsif title =~ /^((.+?)\.(.+?))(\.\w\w|)(\.\d+|)$/ # bird.jpg.en
             type      = :document
             title     = $1
             attrs     = defaults.dup
@@ -665,7 +715,6 @@ class Node < ActiveRecord::Base
           else
             # Document without extension
             type      = :document
-            title     = filename
             attrs     = defaults.dup
             lang      = nil
             attrs['v_lang'] = lang || attrs['v_lang'] || visitor.lang
@@ -674,9 +723,9 @@ class Node < ActiveRecord::Base
           end
 
           index += 1
-          while entries[index] =~ /^#{title}(\.\w\w|)(\.\d+|)\.zml$/ # bird.jpg.en.zml
+          while entries[index] && entries[index][1] =~ /^#{title}(\.\w\w|)(\.\d+|)\.zml$/ # bird.jpg.en.zml
             lang   = $1.blank? ? visitor.lang : $1[1..-1]
-            path   = File.join(folder,entries[index])
+            path   = File.join(folder,entries[index][0])
 
             # we have a zml file. Create a version with this file
             # no need for base_node (this is done after all with parse_assets in the controller)
@@ -848,10 +897,14 @@ class Node < ActiveRecord::Base
 
       copy_node = new_attributes.delete(:_copy)
       attributes = new_attributes.stringify_keys
-
+      
       if copy_node || attributes['copy_id']
-        copy_node ||= Node.find_by_zip(attributes.delete('copy_id'))
-        attributes = copy_node.replace_attributes_in_values(attributes)
+        if !copy_node && attributes['copy_id'].blank?
+          attributes = Node.new.replace_attributes_in_values(attributes)
+        else
+          copy_node ||= Node.find_by_zip(attributes.delete('copy_id'))
+          attributes = copy_node.replace_attributes_in_values(attributes)
+        end
       end
 
       if !res['parent_id'] && p = attributes['parent_id']
@@ -936,6 +989,23 @@ class Node < ActiveRecord::Base
   def zafu_versions
     versions.all(:order => 'number desc')
   end
+  
+  # Enable dynamic property evaluation
+  def zafu_eval(str, opts = {})
+    value = safe_eval(str)
+    if value.kind_of?(String)
+      value
+    elsif value.kind_of?(Time)
+      format_date(value, opts)
+    elsif value.kind_of?(Array)
+      value.join(',')
+    else
+      value.to_s
+    end
+  rescue RubyLess::Error
+    nil
+  end
+  
   # Remove loaded version and properties on reload.
   def reload
     @version    = nil
@@ -1326,12 +1396,12 @@ class Node < ActiveRecord::Base
     visitor.commentator? && discussion && discussion.open?
   end
 
-  # TODO: test
-  def sweep_cache(opts = {})
-    return if current_site.being_created?
+  def sweep_cache(filter = nil)
+    return true if current_site.being_created?
 
     # Clear element cache
-    Cache.sweep(:visitor_id=>self[:user_id], :visitor_groups=>[rgroup_id, wgroup_id, dgroup_id], :kpath=>self.vclass.kpath)
+    # Partial cache not used
+    # Cache.sweep(:visitor_id=>self[:user_id], :visitor_groups=>[rgroup_id, wgroup_id, dgroup_id], :kpath=>self.vclass.kpath)
 
     # Clear full result cache
 
@@ -1340,11 +1410,12 @@ class Node < ActiveRecord::Base
     # FIXME: use self + modified relations instead of parent/project
     [self, self.real_project(false), self.real_section(false), self.parent(false)].compact.uniq.each do |obj|
       # destroy all pages in project, parent and section !
-      CachedPage.expire_with(obj, opts)
+      CachedPage.expire_with(obj, filter)
     end
 
     # clear assets
     FileUtils::rmtree(asset_path(''))
+    true
   end
 
   # Include data entry verification in multiversion's empty? method.
@@ -1635,15 +1706,18 @@ class Node < ActiveRecord::Base
         Discussion.create(:node_id=>self[:id], :lang=>v_lang, :inside => false)
       end
     end
+    
+    def node_after_destroy
+      sweep_cache
+    end
 
     # Called after a node is 'unpublished'
     def after_unpublish
       if !self[:publish_from] && !@new_record_before_save
         # not published any more. 'unpublish' documents
         sync_documents(:unpublish)
-      else
-        true
       end
+      sweep_cache
     end
 
     def after_redit
@@ -1653,8 +1727,10 @@ class Node < ActiveRecord::Base
 
     # Called after a node is 'removed'
     def after_remove
-      return true if @new_record_before_save
-      sync_documents(:remove)
+      if !@new_record_before_save
+        sync_documents(:remove)
+      end
+      sweep_cache
     end
 
     # Called after a node is 'proposed'
@@ -1671,8 +1747,15 @@ class Node < ActiveRecord::Base
 
     # Called after a node is published
     def after_publish
-      return true if @new_record_before_save
-      sync_documents(:publish)
+      if !@new_record_before_save
+        sync_documents(:publish)
+      end
+      sweep_cache
+    end
+    
+    # Called after a node is modified and directly published.
+    def after_auto_publish
+      sweep_cache
     end
 
     # Publish, refuse, propose the Documents of a redaction
@@ -1709,7 +1792,6 @@ class Node < ActiveRecord::Base
     # This method is run whenever 'apply' is called.
     def after_all
       return unless super
-      sweep_cache
       if @add_comment
         # add comment
         @discussion ||= self.discussion