zena 1.0.0.rc2 → 1.0.0.rc3

data/History.txt

@@ -1,3 +1,26 @@
+== 1.0.0.rc3 2011-05-26
+
+* major changes
+ * Included tag in xml serialization (tag_names)
+ * Added export/import support for Roles/Columns and Relations.
+ * Fixed bugs when changing class hierarchy (move rename VirtualClass).
+ * Fixed many small bugs and issues (indexing, link date, missed errors, etc).
+ * Fixed block edit with ajax ([edit] method).
+ * Removed fulltext search (no more MyISAM tables).
+ * Fixed SQLiss scoping in queries like "Job:project" (added kpath filter).
+ * Fixed Zafu calendar and timezones in dates.
+ * Added 'foreach' method (paginated looping in SQLiss query) for console.
+ * Added 'count' method (count objects with SQLiss query) for console.
+ * Added support for scripts with Zena::Console.
+ * Added support for "select" and "having" in SQLiss.
+ * Added button to create specialized skin for current page in dev_box.
+ * Added 'query_errors' to report dynamic query errors.
+ * Created a basic admin interface (backend).
+ * Added 'js' tag, fixed many ajax bugs.
+ * Added 'crop' tag.
+ * On-the-fly creation of specialized template from dev_box.
+ * Added 'insert' option for [link].
+
 == 1.0.0.rc2 2011-02-14
 
 * major changes

data/README.rdoc

@@ -60,7 +60,7 @@ You can now login with 'admin' and the password you used to make the site.
 === 1. Original in debian etch (might need to replace jpeg by libjpeg62)
   # aptitude install build-essential apache2 mysql-server libmagick9-dev gs-gpl libssl-dev gettext libgettext-ruby libreadline5 libreadline5-dev zlib1g-dev libncurses5 libncurses5-dev unzip liburi-perl libjpeg-dev subversion ssh sudo awstats
 
-If you want to enable LateX (PDF generation)
+If you want to enable LateX (Pdf generation)
 tetex-bin tetex-extra latex-ucs
 
 For math mode (inline formulas), you will need

data/app/controllers/columns_controller.rb

@@ -1,6 +1,6 @@
 class ColumnsController < ApplicationController
   before_filter :visitor_node
-  before_filter :find_column, :except => [:index, :create, :new, :import]
+  before_filter :find_column, :except => [:index, :create, :new]
   before_filter :check_is_admin
   layout :admin_layout
 
@@ -29,34 +29,6 @@ class ColumnsController < ApplicationController
     end
   end
 
-  def export
-    data = secure(Column) do
-      Column.export
-    end
-
-    ### TODO
-  end
-
-  def import
-    attachment = params[:attachment]
-    if attachment.nil?
-      flass[:error] = "Upload failure: no definitions."
-      redirect_to :action => :index
-    else
-      data = YAML.load(attachment.read) rescue nil
-      if data.nil?
-        flash[:error] = "Could not parse yaml document"
-        redirect_to :action => :index
-      else
-        @columns = secure(Column) { Column.import(data) }.paginate(:per_page => 200)
-        @column  = VirtualClass.new('')
-        respond_to do |format|
-          format.html { render :action => 'index' }
-        end
-      end
-    end
-  end
-
   # GET /columns/1
   # GET /columns/1.xml
   def show
@@ -94,7 +66,7 @@ class ColumnsController < ApplicationController
 
     respond_to do |format|
       if @column.save
-        flash[:notice] = 'Column was successfully created.'
+        flash.now[:notice] = _('Column was successfully created.')
         format.html { redirect_to(@column) }
         format.js
         format.xml  { render :xml => @column, :status => :created, :location => @column }
@@ -111,7 +83,7 @@ class ColumnsController < ApplicationController
   def update
     respond_to do |format|
       if @column.update_attributes(params[:column])
-        flash[:notice] = 'Column was successfully updated.'
+        flash.now[:notice] = _('Column was successfully updated.')
         format.html { redirect_to(@column) }
         format.xml  { head :ok }
       else

data/app/controllers/comments_controller.rb

@@ -24,16 +24,21 @@ class CommentsController < ApplicationController
 
     @comment = secure(Comment) { Comment.new(filter_attributes(params[:comment])) }
 
-    save_if_not_spam(@comment, params)
+    if should_save(@comment, params)
+      @comment.save
+    else
+      #...
+    end
 
     respond_to do |format|
       if @comment.errors.empty?
-        flash[:notice] = _('Comment was successfully created.')
+        flash.now[:notice] = _('Comment was successfully created.')
         format.html { redirect_to zen_path(@node) } # TODO: add ':sharp => ...'
         format.js
         format.xml  { head :created, :location => comment_path(@node) }
       else
-        format.html { render :action => "new" }
+        flash[:error] = error_messages_for(:comment, :object => @comment)
+        format.html { redirect_to zen_path(@node) }
         format.js
         format.xml  { render :xml => @comment.errors.to_xml }
       end

data/app/controllers/data_entries_controller.rb

@@ -15,7 +15,7 @@ class DataEntriesController < ApplicationController
 
     respond_to do |format|
       if @data_entry.errors.empty?
-        flash[:notice] = _('Data entry was successfully created.')
+        flash.now[:notice] = _('Data entry was successfully created.')
         format.html { redirect_to data_entry_url(@data_entry) }
         format.js
         format.xml  { head :created, :location => data_entry_url(@data_entry) }

data/app/controllers/documents_controller.rb

@@ -34,7 +34,7 @@ class DocumentsController < ApplicationController
       if @node.new_record?
         @node.skin_id ||= current_site.root_node.skin_id
 
-        flash[:error] = _("Upload failed.")
+        flash.now[:error] = _("Upload failed.")
         unless @node.respond_to?('target_klass')
           # Could we find another way to fake the new object as acting like a template ?
           class << @node
@@ -43,7 +43,7 @@ class DocumentsController < ApplicationController
         end
         format.html { render :action => 'new'}
       else
-        flash[:notice] = _("Upload succeeded.")
+        flash.now[:notice] = _("Upload succeeded.")
         format.html { redirect_to document_url(@node[:zip]) }
       end
     end

data/app/controllers/nodes_controller.rb

@@ -58,7 +58,7 @@ class NodesController < ApplicationController
         begin
           do_search
         rescue ::QueryBuilder::Error => err
-          flash[:error] = err.message
+          flash.now[:error] = err.message
         end
         render_and_cache :mode => '+search', :cache => false
       end
@@ -132,7 +132,10 @@ class NodesController < ApplicationController
           @errors = other.errors
         end
       end
-    elsif p = params[:params]
+    elsif params[:change] == 'params'
+      p = params.dup
+      p.delete(:action)
+      p.delete(:controller)
       params.merge!(other.replace_attributes_in_values(p))
     end
 
@@ -209,14 +212,17 @@ class NodesController < ApplicationController
 
     respond_to do |format|
       if @node.errors.empty?
-        flash[:notice] = 'Node was successfully created.'
+        flash.now[:notice] = 'Node was successfully created.'
         format.html {
           redirect_to  params[:redir] || zen_path(@node, :mode => params[:mode])
         }
         format.js
         format.xml  { render :xml => @node.to_xml(:root => 'node'), :status => :created, :location => node_url(@node) }
       else
-        format.html { render :action => "new" }
+        format.html do
+          flash[:error] = error_messages_for('node', :object => @node)
+          redirect_to request.referer
+        end
         format.js
         format.xml  { render :xml => @node.errors, :status => :unprocessable_entity }
       end
@@ -239,13 +245,13 @@ class NodesController < ApplicationController
 
   def destroy
     respond_to do |format|
-
       format.html do
         if @node.destroy
-          flash[:notice] = "Node destroyed."
-          redirect_to zen_path(@node.parent)
+          # These flash messages tend to hang around stupidly
+          # flash[:notice] = _("Node destroyed.")
+          redirect_to params[:redir] || zen_path(@node.parent)
         else
-          flash[:notice] = "Could not destroy node."
+          flash.now[:notice] = _("Could not destroy node.")
           render :action => 'show'
         end
       end
@@ -276,9 +282,9 @@ class NodesController < ApplicationController
     @node   = version.node
     @node.backup
     if @node.errors.empty?
-      flash[:notice] = _("Backup created.")
+      flash.now[:notice] = _("Backup created.")
     else
-      flash[:error] = _("Could not create backup.")
+      flash.now[:error] = _("Could not create backup.")
     end
   end
 
@@ -502,6 +508,16 @@ class NodesController < ApplicationController
     #  archive      ---> fullpath
     def find_node
       if path = params[:path]
+        # We do not use params[:path] because Rails does url unescape
+        # and we want to do this ourselves.
+        # TEMPORARY HACK until we use the new urls with Rails 3
+        # If you change this, make sure to test with an image data (cachestamp)
+        # in a custom_base path.
+        if request.env['REQUEST_PATH']
+          # request.env['REQUEST_PATH'] is not set during testing (but this is
+          # a temporary hack anyway)
+          path = params[:path] = request.env['REQUEST_PATH'].split('/')[2..-1]
+        end
         if path.last =~ Zena::Use::Urls::ALLOWED_REGEXP
           zip    = $3
           name   = $4
@@ -517,13 +533,14 @@ class NodesController < ApplicationController
           if name =~ /^\d+$/
             @node = secure!(Node) { Node.find_by_zip(name) }
           elsif name
-            basepath = (path[0..-2] + [name]).map! {|p| String.from_url_name(p) }.join('/')
-            @node = secure!(Node) { Node.find_by_path(basepath) }
+            basepath = (path[0..-2] + [name]).map {|p| String.from_url_name(p) }.join('/')
+            @node = secure!(Node) { Node.find_by_path(basepath) || Node.find_by_path(basepath, current_site.root_id, true) }
           else
             @node = secure!(Node) { Node.find_by_zip(zip) }
           end
         else
           # bad url
+          Node.logger.warn "Path #{path.last.inspect} does not match #{Zena::Use::Urls::ALLOWED_REGEXP}"
           raise ActiveRecord::RecordNotFound
         end
       elsif params[:id]

data/app/controllers/relations_controller.rb

@@ -49,7 +49,7 @@ class RelationsController < ApplicationController
 
     respond_to do |format|
       if @relation.save
-        flash[:notice] = 'Relation was successfully created.'
+        flash.now[:notice] = _('Relation was successfully created.')
         format.html { redirect_to relation_url(@relation) }
         format.js
         format.xml  { render :xml => @relation, :status => :created, :location => relation_url(@relation) }
@@ -66,7 +66,7 @@ class RelationsController < ApplicationController
 
     respond_to do |format|
       if @relation.update_attributes(params[:relation])
-        flash[:notice] = 'Relation was successfully updated.'
+        flash.now[:notice] = _('Relation was successfully updated.')
         format.html { redirect_to relation_url(@relation) }
         format.js
         format.xml  { head :ok }

data/app/controllers/sites_controller.rb

@@ -33,7 +33,7 @@ class SitesController < ApplicationController
   def update
     respond_to do |format|
       if @site.update_attributes(params[:site])
-        flash[:notice] = 'Site was successfully updated.'
+        flash.now[:notice] = _('Site was successfully updated.')
         format.html { redirect_to site_path(@site) }
         format.js
         format.xml  { head :ok }

data/app/controllers/user_sessions_controller.rb

@@ -14,10 +14,13 @@ class UserSessionsController < ApplicationController
     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."
+        #flash.now[:notice] = _("Successfully logged in.")
         redirect_to  redirect_after_login
       else
-        flash[:notice] = "Invalid login or password."
+        flash[:notice] = _("Invalid login or password.")
+        # FIXME: find a better way to lock without blocking the process.
+        # Also lock longer and longer (exponentially).
+        sleep(2)
         redirect_to login_url
       end
     end
@@ -27,7 +30,7 @@ class UserSessionsController < ApplicationController
     if @user_session = UserSession.find
       @user_session.destroy
       reset_session
-      flash[:notice] = "Successfully logged out."
+      #flash.now[:notice] = _("Successfully logged out.")
       redirect_to params[:redirect] || home_path(:prefix => prefix)
     else
       redirect_to home_path(:prefix => prefix)

data/app/controllers/users_controller.rb

@@ -37,7 +37,7 @@ class UsersController < ApplicationController
   # xx  ==> fixed skin
   def dev_skin(skin_id = params['skin_id'])
     visitor.update_attributes('dev_skin_id' => skin_id)
-    
+
     if request.referer && !(request.referer =~ /login/)
       redirect_to request.referer
     else
@@ -78,7 +78,6 @@ class UsersController < ApplicationController
     end
   end
 
-  # TODO: test
   def update
     if skin_id = params['user']['dev_skin_id']
       return dev_skin(skin_id)
@@ -86,35 +85,38 @@ class UsersController < ApplicationController
 
     @update = params.delete(:update)
 
-    # TODO: test
-    unless params[:user][:password].blank?
-      if params[:user][:password].strip.size < 6
+    opts = params[:user]
+    unless opts[:password].blank?
+      if opts[:password].strip.size < 6
         @user.errors.add('password', 'too short')
       end
-      if !visitor.is_admin? || params[:user][:retype_password]
-        if params[:user][:password] != params[:user][:retype_password]
+
+      if !visitor.is_admin? || opts[:retype_password]
+        if opts[:password] != opts[:retype_password]
           @user.errors.add('retype_password', 'does not match new password')
         end
       end
-      unless visitor.is_admin?
-        if !@user.password_is?(params[:user][:old_password])
+
+      if !visitor.is_admin? || @user.id == visitor.id
+        if !@user.valid_password?(opts[:old_password])
           @user.errors.add('old_password', "not correct")
         end
       end
+
       if @user.errors.empty?
-        @user.password = params[:user][:password]
-        params[:user].delete(:password)
-        params[:user].delete(:retype_password)
-        params[:user].delete(:old_passowrd)
+        @user.password = opts[:password]
+        opts.delete(:password)
+        opts.delete(:retype_password)
+        opts.delete(:old_password)
       end
     end
 
     if @user.errors.empty?
       @user.update_attributes(params[:user])
       if @user.errors.empty?
-        flash[:notice] = _('information successfully updated')
+        flash.now[:notice] = _('information successfully updated')
       else
-        flash[:error ] = _('could not update user')
+        flash.now[:error ] = _('could not update user')
       end
     end
 
@@ -147,7 +149,7 @@ class UsersController < ApplicationController
         if params[:user]
           # visitor changing his/her own info : restrict fields
           params[:user].keys.each do |k|
-            params[:user].delete(k) unless [:login, :time_zone, :lang, :password, :time_zone].include?(k.to_sym)
+            params[:user].delete(k) unless [:login, :time_zone, :lang, :password, :time_zone, :retype_password, :old_password].include?(k.to_sym)
           end
         end
       else

data/app/controllers/versions_controller.rb

@@ -57,9 +57,9 @@ class VersionsController < ApplicationController
   def edit
     if params[:drive]
       if @node.redit
-        flash[:notice] = _("Version changed back to redaction.")
+        flash.now[:notice] = _("Version changed back to redaction.")
       else
-        flash[:error] = _("Could not change version back to redaction.")
+        flash.now[:error] = _("Could not change version back to redaction.")
       end
       render :action=>'update'
     else
@@ -161,46 +161,48 @@ class VersionsController < ApplicationController
 
   def propose
     if @node.propose
-      flash[:notice] = _("Redaction proposed for publication.")
+      flash.now[:notice] = _("Redaction proposed for publication.")
     else
-      flash[:error] = _("Could not propose redaction.")
+      flash.now[:error] = _("Could not propose redaction.")
     end
     do_rendering
   end
 
   def refuse
     if @node.refuse
-      flash[:notice] = _("Proposition refused.")
+      flash.now[:notice] = _("Proposition refused.")
       @redirect_url = @node.can_read? ? request.env['HTTP_REFERER'] : user_path(visitor)
     else
-      flash[:notice] = _("Could not refuse proposition.")
+      flash.now[:notice] = _("Could not refuse proposition.")
     end
     do_rendering
   end
 
   def publish
     if @node.publish
-      flash[:notice] = "Redaction published."
+      flash.now[:notice] = _("Redaction published.")
     else
-      flash[:error] = "Could not publish: #{error_messages_for(:node, :object => @node)}"
+      flash.now[:error] = _("Could not publish:") +
+        " #{error_messages_for(:node, :object => @node)}"
     end
     do_rendering
   end
 
   def remove
     if @node.remove
-      flash[:notice] = "Publication removed."
+      flash.now[:notice] = _("Publication removed.")
     else
-      flash[:error] = "Could not remove plublication."
+      flash.now[:error] = _("Could not remove publication.")
     end
     do_rendering
   end
 
   def redit
     if @node.redit
-      flash[:notice] = "Rolled back to redaction."
+      flash.now[:notice] = _("Rolled back to redaction.")
     else
-      flash[:error] = "Could not rollback: #{error_messages_for(:node, :object => @node)}"
+      flash.now[:error] = _("Could not rollback:") +
+        " #{error_messages_for(:node, :object => @node)}"
     end
     do_rendering
   end
@@ -208,9 +210,9 @@ class VersionsController < ApplicationController
   # TODO: test
   def unpublish
     if @node.unpublish
-      flash[:notice] = "Publication removed."
+      flash.now[:notice] = _("Publication removed.")
     else
-      flash[:error] = "Could not remove publication."
+      flash.now[:error] = _("Could not remove publication.")
     end
     do_rendering
   end
@@ -219,17 +221,17 @@ class VersionsController < ApplicationController
   def destroy
     if @node.destroy_version
       if @node.versions.empty?
-        flash[:notice] = "Node destroyed."
+        flash.now[:notice] = _("Node destroyed.")
         respond_to do |format|
           format.html { redirect_to zen_path(@node.parent) }
           format.js
         end
       else
-        flash[:notice] = "Version destroyed."
+        flash.now[:notice] = _("Version destroyed.")
         do_rendering
       end
     else
-      flash[:error] = "Could not destroy version."
+      flash.now[:error] = _("Could not destroy version.")
       do_rendering
     end
   end
@@ -255,7 +257,7 @@ class VersionsController < ApplicationController
       # make the flash available to rjs helpers
       @flash = flash
       respond_to do |format|
-        format.html { redirect_to @redirect_url || request.env['HTTP_REFERER'] || {:id => 0}}
+        format.html { redirect_to params[:redir] || @redirect_url || request.env['HTTP_REFERER'] || {:id => 0}}
         # js = call from 'drive' popup
         format.js   { render :action => 'update' }
       end

data/app/controllers/virtual_classes_controller.rb

@@ -1,5 +1,7 @@
 class VirtualClassesController < ApplicationController
-  before_filter :find_virtual_class, :except => [:index, :create, :new, :import]
+  before_filter :find_virtual_class, :except => [
+    :index, :create, :new, :import, :import_prepare, :export
+  ]
   before_filter :visitor_node
   before_filter :check_is_admin
   layout :admin_layout
@@ -16,7 +18,7 @@ class VirtualClassesController < ApplicationController
           @virtual_classes << klass
         end
       end
-    else  
+    else
       Node.native_classes.each do |kpath, klass|
         @virtual_classes << klass
       end
@@ -43,33 +45,69 @@ class VirtualClassesController < ApplicationController
   end
 
   def export
-    data = secure(::Role) do
-      ::Role.export
-    end
-
-    ### TODO
+    send_data(clean_yaml(::Role.export), :filename=>"roles.yml", :type => 'text/yaml')
   end
 
-  def import
+  def import_prepare
     attachment = params[:attachment]
     if attachment.nil?
-      flass[:error] = "Upload failure: no definitions."
+      flass[:error] = _("Upload failure: no definitions.")
       redirect_to :action => :index
     else
-      data = YAML.load(attachment.read) rescue nil
+      @yaml = attachment.read rescue nil
+      data = YAML.load(@yaml) rescue nil
       if data.nil?
-        flash[:error] = "Could not parse yaml document"
+        flash.now[:error] = "Could not parse yaml document"
         redirect_to :action => :index
       else
-        @virtual_classes = secure(VirtualClass) { VirtualClass.import(data) }.paginate(:per_page => 200)
-        @virtual_class  = VirtualClass.new('')
-        respond_to do |format|
-          format.html { render :action => 'index' }
+        @yaml.gsub!(/\A---\s*\n/, "--- \n")
+        current = current_compared_to(data)
+        a = clean_yaml(current).gsub('{}', '')
+        #a = Zena::CodeSyntax.new(a, 'yaml').to_html
+        b = @yaml
+        #b = Zena::CodeSyntax.new(b, 'yaml').to_html
+        @diff = Differ.diff_by_line(b, a).format_as(:html)
+
+        # UGLY HACK to not escape <ins> and <del>
+        @diff.gsub!(/<((ins|del)[^>]*)>/, '[yaml_diff[\1]]')
+        @diff.gsub!(/<\/(ins|del)>/, '[yaml_diff[/\1]]')
+        @diff = Zena::CodeSyntax.new(@diff, 'yaml').to_html
+        @diff.gsub!(/\[yaml_diff\[([^\]]+)\]\]/) do
+          "<#{$1.gsub('&quot;', '"')}>"
         end
       end
     end
   end
 
+  def import
+    data = YAML.load(params[:roles]) rescue nil
+    if data.nil?
+      flash.now[:error] = _("Could not parse yaml document")
+      redirect_to :action => :index
+    else
+      @roles_backup    = clean_yaml(::Role.export)
+      @virtual_classes = ::Role.import(data)
+      class << @virtual_classes
+        def total_pages; 1 end
+      end
+      @virtual_class   = VirtualClass.new('')
+      respond_to do |format|
+        format.html { render :action => 'index' }
+      end
+    end
+  rescue ActiveRecord::RecordInvalid => e
+    r = e.record
+    if r.respond_to?(:name)
+      flash[:error] = "#{r.class} '#{r.name}' #{e.message}"
+    else
+      flash[:error] = "#{r.class} '#{r.inspect}' #{e.message}"
+    end
+    redirect_to :action => :index
+  rescue Exception => e
+    flash.now[:error] = e.message
+    redirect_to :action => :index
+  end
+
   def show
     respond_to do |format|
       format.html # show.erb
@@ -105,7 +143,7 @@ class VirtualClassesController < ApplicationController
 
     respond_to do |format|
       if @virtual_class.save
-        flash[:notice] = 'VirtualClass was successfully created.'
+        flash.now[:notice] = _('VirtualClass was successfully created.')
         format.html { redirect_to virtual_class_url(@virtual_class) }
         format.js
         format.xml  { render :xml => @virtual_class, :status => :created, :location => virtual_class_url(@virtual_class) }
@@ -120,7 +158,7 @@ class VirtualClassesController < ApplicationController
   def update
     respond_to do |format|
       if @virtual_class.update_attributes(params[:virtual_class])
-        flash[:notice] = 'VirtualClass was successfully updated.'
+        flash.now[:notice] = _('VirtualClass was successfully updated.')
         format.html { redirect_to virtual_class_url(@virtual_class) }
         format.js
         format.xml  { head :ok }
@@ -146,4 +184,52 @@ class VirtualClassesController < ApplicationController
     def find_virtual_class
       @virtual_class = secure!(VirtualClass) { ::Role.find(params[:id])}
     end
+
+    def clean_yaml(export)
+      # We use an OrderedHash so that using diff is more consistent.
+      export.to_yaml.gsub(/: *!map:Zafu::OrderedHash */, ':')
+    end
+
+    def get_roles(definitions, res = {})
+      definitions.each do |name, definition|
+        next unless name =~ /\A[A-Z]/
+        res[name] = definition
+        get_roles(definition, res)
+      end
+      res
+    end
+    # When comparing current data with imported data, ignore untouched
+    # classes/definitions.
+    def current_compared_to(definitions)
+      current = ::Role.export
+      roles   = get_roles(definitions)
+      filter_keys(current, definitions, roles)
+      current
+    end
+
+    def filter_keys(hash_a, hash_b, roles)
+      remove_all = true
+      hash_a.keys.each do |key|
+        value_a, value_b = hash_a[key], hash_b[key]
+        if !value_b
+          if key =~ /\A[A-Z]/ && roles[key]
+            # role missing but defined elsewhere: moved
+            # do not remove
+            remove_all = false
+          elsif value_a.kind_of?(Hash)
+            if filter_keys(hash_a[key], {}, roles)
+              # nothing to be kept here
+              hash_a.delete(key)
+            end
+          else
+            # ignore missing key if we can ignore all
+            hash_a.delete(key)
+          end
+        elsif value_a.kind_of?(Hash) && value_b.kind_of?(Hash)
+          remove_all = false
+          filter_keys(hash_a[key], hash_b[key], roles)
+        end
+      end
+      remove_all
+    end
 end