zena 1.0.0.beta3 → 1.0.0.rc1

data/History.txt

@@ -1,3 +1,32 @@
+== 1.0.0.rc1 2011-02-11
+
+* major changes
+ * Changed 'date' for 'main_date'
+ * Added 'redir' option on node update/create (also added 'mode')
+
+== 1.0.0.beta5
+
+* major changes
+ * Using VirtualClass as proxy for type compilation (RubyLess, Zafu).
+ * Caching Roles and VirtualClass.
+ * Added 'integer' property with index.
+ * Added query_parse (parse form content such as '>34' or '10..34').
+ * Enable setting relations with SQLiss.
+ * Changed class filter from '<r:Contact>' to '<r:Contact?>'.
+ * Added VirtualClass introspection from zafu with [grid] and Node [send] methods.
+ * Added relation groups.
+ * Added 'map' and 'join' support to Array in RubyLess.
+ * Added dynamic values support for [toggle].
+
+== 1.0.0.beta4
+
+* major changes
+ * Removed BaseContact and Reference classes.
+ * Removed super user (not needed anymore).
+ * Upgraded to Property 2.0 (should resolve memory leak)
+ * Added support for Scoped indices.
+ * Added support for field indices.
+
 == 1.0.0.beta3 2010-09-17
 
 * major changes

data/Rakefile

@@ -26,6 +26,8 @@ begin
     gemspec.version = Zena::VERSION
     gemspec.rubyforge_project = 'zena'
 
+    gemspec.files.exclude 'config/routes.rb'
+
     # Gem dependecies
     Zena.gem_configuration.each do |gem_name, gem_config|
       if gem_config

data/TODO_ZENA_1_0

@@ -1,23 +1,13 @@
-List of things to discuss
-=========================
-
-Relation between zena, custom applications and bricks:
-
-1. custom models
-2. custom migrations
-3. custom zafu rules
-4. custom tests
-
-Folder structure should be like a rails application with some elements missing (all zena controllers, views, helpers, etc). It
-should still launch in Passenger and all other servers like mongrel.
-
-my_app
-  +-- app             (same structure as a brick)
-  |    +-- models     (custom application stuff)
-  |    +-- controllers
-  |    +-- helpers
-  |    +-- zafu       (custom zafu tags)
-  +-- bricks
-  +-- config
-  +-- sites
-  +-- vendor
+TODO
+====
+
+0. change url ! to /fr/pasdfj94859
+1. POST ! instead of GET during preview (long articles !!!)
+2. Change fullpath to zip/zip/zip
+3. Update tags API: tags => [String] (tag_names), tag_list => String, tag_links => ['Link']
+3. Rename virtual_classes_controller to roles_controller
+4. kill node_name
+
+5. secure XML API (get cookie: do not send login each time)
+6. index log_at/event_at/custom_a/custom_b with idx_datetime1, ...
+7. move values from log_at/event_at/custom_a/custom_b in properties

data/app/controllers/columns_controller.rb

@@ -9,7 +9,7 @@ class ColumnsController < ApplicationController
   def index
     roles = {}
     secure(Column) do
-      @columns = Column.paginate(:all, :order => 'role_id ASC, name ASC', :per_page => 20, :page => params[:page]).sort! do |a, b|
+      @columns = Column.paginate(:all, :order => 'role_id ASC, name ASC', :per_page => 200, :page => params[:page]).sort! do |a, b|
         role_a = (roles[a.role_id] ||= a.role).name
         role_b = (roles[b.role_id] ||= b.role).name
 

data/app/controllers/comments_controller.rb

@@ -22,7 +22,7 @@ class CommentsController < ApplicationController
   def create
     @discussion.save if @discussion.new_record? && @node.can_comment?
 
-    @comment = secure!(Comment) { Comment.new(filter_attributes(params[:comment])) }
+    @comment = secure(Comment) { Comment.new(filter_attributes(params[:comment])) }
 
     save_if_not_spam(@comment, params)
 
@@ -90,8 +90,8 @@ class CommentsController < ApplicationController
 
   # TODO:test
   def index
-    @node = visitor.contact
-    secure!(Node) do
+    @node = visitor.node
+    secure(Node) do
       # TODO: preload node
       @comments = Comment.paginate :all,
                         :select => "comments.*, nodes.zip AS node_zip",
@@ -100,6 +100,7 @@ class CommentsController < ApplicationController
                         :conditions=>"status > #{Zena::Status[:rem]} AND (#{secure_scope('nodes')})",
                         :per_page => 10, :page => params[:page]
     end
+    @comments ||= []
   end
 
   # TODO: test

data/app/controllers/documents_controller.rb

@@ -11,10 +11,8 @@ class DocumentsController < ApplicationController
 
   # add a new document to the current node
   def new
-    @node = @parent.new_child(:class => Document)
-
-    # Add Template role so that we can use the same object in forms which need the Template properties.
-    @node.has_role Template
+    # Use the Template class so that we can use the same object in forms which need the Template properties.
+    @node = @parent.new_child(:class => Template)
 
     respond_to do |format|
       format.html
@@ -34,16 +32,15 @@ class DocumentsController < ApplicationController
 
     respond_to do |format|
       if @node.new_record?
-        # If skin id could not be set (invalid parent), make sure we have something to render.
         @node.skin_id ||= current_site.root_node.skin_id
-        parent_id = (params[:node] || {})[:parent_id] || 0
-        class << @node
-          def parent_zip
-            parent_id
-          end
-        end
 
         flash[: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
+            def target_klass; nil; end
+          end
+        end
         format.html { render :action => 'new'}
       else
         flash[:notice] = _("Upload succeeded.")

data/app/controllers/nodes_controller.rb

@@ -57,7 +57,7 @@ class NodesController < ApplicationController
       format.html do
         begin
           do_search
-        rescue QueryBuilder::Error => err
+        rescue ::QueryBuilder::Error => err
           flash[:error] = err.message
         end
         render_and_cache :mode => '+search', :cache => false
@@ -74,7 +74,7 @@ class NodesController < ApplicationController
           else
             render :xml => [].to_xml(:root => 'nodes')
           end
-        rescue QueryBuilder::Error => err
+        rescue ::QueryBuilder::Error => err
           render :xml => [{:message => err.message}].to_xml(:root => 'errors'), :status => 401
         end
       end
@@ -170,7 +170,7 @@ class NodesController < ApplicationController
               @node.file(img_format)
             end
           elsif @node.kind_of?(TextDocument)
-            send_data(@node.text, :filename => @node.filename, :type => 'text/css', :disposition => 'inline')
+            send_data(@node.text, :filename => @node.filename, :type => @node.content_type, :disposition => 'inline')
           else
             content_path = @node.filepath
           end
@@ -210,7 +210,9 @@ class NodesController < ApplicationController
     respond_to do |format|
       if @node.errors.empty?
         flash[:notice] = 'Node was successfully created.'
-        format.html { redirect_to zen_path(@node) }
+        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
@@ -223,11 +225,9 @@ class NodesController < ApplicationController
 
   # modifications of the node itself (dates, groups, revert editions, etc)
   def edit
-    @node.load_roles!
-
     respond_to do |format|
       format.html do
-        @title_for_layout = @node.rootpath
+        @title_for_layout = title_for_layout
       end
 
       format.js do
@@ -317,10 +317,11 @@ class NodesController < ApplicationController
   end
 
   def export
-    send_file(@node.archive.path, :filename=>"#{@node.name}.tgz", :type => 'application/x-gzip', :x_sendfile => ENABLE_XSENDFILE)
+    send_file(@node.archive.path, :filename=>"#{@node.title}.tgz", :type => 'application/x-gzip', :x_sendfile => ENABLE_XSENDFILE)
   end
 
   def update
+    params['node'] ||= {}
     file, file_error = get_attachment
     params['node']['file'] = file if file
 
@@ -351,12 +352,30 @@ class NodesController < ApplicationController
             if params[:edit] == 'popup'
               redirect_to edit_node_version_path(:node_id => @node[:zip], :id => 0, :close => (params[:validate] ? true : nil))
             else
-              redirect_to zen_path(@node, :mode => params[:mode])
+              redirect_to params[:redir] || zen_path(@node, :mode => params[:mode])
             end
           else
-            # FIXME: Render referring page would be better
-            # Get mode and details from request.referer
-            render_and_cache :mode => 'edit', :cache => false
+            begin
+              if request.referer
+                route = ActionController::Routing::Routes.recognize_path(request.referer[%r{https?://[^/]+(.*)},1])
+              else
+                route = {:action => 'show'}
+              end
+              if route[:action] == 'index'
+                mode = '+index'
+              elsif route[:action] == 'search'
+                mode = '+search'
+              elsif path = route[:path]
+                if path.last =~ Zena::Use::Urls::ALLOWED_REGEXP
+                  zip  = $3
+                  name = $4
+                  mode = $5 == '' ? nil : $5[1..-1]
+                end
+              end
+            rescue ActionController::RoutingError
+              mode = nil
+            end
+            render_and_cache :mode => mode, :cache => false
           end
         end # html
 
@@ -366,7 +385,7 @@ class NodesController < ApplicationController
           if @node.errors.empty?
             render :xml => @node.to_xml, :status => :ok, :location => node_url(@node)
           else
-            render :xml => @page.errors, :status => :unprocessable_entity
+            render :xml => @node.errors, :status => :unprocessable_entity
           end
         end # xml
       end
@@ -389,6 +408,8 @@ class NodesController < ApplicationController
       node_id = secure!(Node) { Node.translate_pseudo_id(id_query, :id, @node)}
       @node = secure!(Node) { Node.find(node_id) }
     elsif name_query = params[:name]
+      # Get attribute by name
+      # TODO: test
       if name_query =~ /^(.*)\.[a-z]{2,3}$/
         name_query = $1
       end
@@ -400,11 +421,8 @@ class NodesController < ApplicationController
         conditions << "#{kpath}%"
       end
 
-      conditions[0] << "node_name LIKE ?"
-      conditions << "#{name_query}%"
-
-      conditions[0] = conditions[0].join(' AND ')
-      @node = secure!(Node) { Node.find(:first, :conditions => conditions, :order => "zip DESC")}
+      name_query = "#{name_query}%"
+      @node = secure!(Node) { Node.find_by_title(name_query, :conditions => conditions, :order => "zip DESC", :like => true)}
     end
 
     if %w{path short_path}.include?(method)
@@ -484,7 +502,7 @@ class NodesController < ApplicationController
     #  archive      ---> fullpath
     def find_node
       if path = params[:path]
-        if path.last =~ /\A(([a-zA-Z]+)([0-9]+)|([a-zA-Z0-9\-\*]+))(_[a-zA-Z]+|)(\..+|)\Z/
+        if path.last =~ Zena::Use::Urls::ALLOWED_REGEXP
           zip    = $3
           name   = $4
           params[:mode] = $5 == '' ? nil : $5[1..-1]
@@ -499,7 +517,7 @@ class NodesController < ApplicationController
           if name =~ /^\d+$/
             @node = secure!(Node) { Node.find_by_zip(name) }
           elsif name
-            basepath = (path[0..-2] + [name]).join('/')
+            basepath = (path[0..-2] + [name]).map! {|p| String.from_url_name(p) }.join('/')
             @node = secure!(Node) { Node.find_by_path(basepath) }
           else
             @node = secure!(Node) { Node.find_by_zip(zip) }
@@ -516,7 +534,7 @@ class NodesController < ApplicationController
         @link = Link.find_through(@node, params[:link_id])
       end
 
-      @title_for_layout = @node.rootpath if @node
+      @title_for_layout = title_for_layout
     end
 
     def set_format(format)

data/app/controllers/users_controller.rb

@@ -37,6 +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
@@ -59,8 +60,12 @@ class UsersController < ApplicationController
     if params[:groups]
       params[:user][:group_ids] = params[:groups].values
     end
+
     get_groups_list
-    @user = User.create(params[:user])
+
+    params[:user][:node_attributes] = params[:node]
+
+    @user = secure(User) { User.create(params[:user]) }
   end
 
   # TODO: test
@@ -130,7 +135,7 @@ class UsersController < ApplicationController
     end
 
     def get_groups_list
-      @groups = secure!(Group) { Group.find(:all, :order=>'name') }
+      @groups = secure!(Group) { Group.find(:all, :order => 'name ASC') }
     end
 
     # Only allow if user is admin or the current user is the visitor
@@ -142,7 +147,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, :first_name, :name, :time_zone, :lang, :email, :password, :time_zone].include?(k.to_sym)
+            params[:user].delete(k) unless [:login, :time_zone, :lang, :password, :time_zone].include?(k.to_sym)
           end
         end
       else

data/app/controllers/versions_controller.rb

@@ -63,7 +63,7 @@ class VersionsController < ApplicationController
       end
       render :action=>'update'
     else
-      @title_for_layout = @node.rootpath
+      @title_for_layout = title_for_layout
       if @node.kind_of?(TextDocument)
         if params['parse_assets']
           @node.text = @node.parse_assets(@node.text, self, 'text')
@@ -85,7 +85,7 @@ class VersionsController < ApplicationController
   def custom_tab
     render :file => template_url(:mode=>'+edit', :format=>'html'), :layout=>false
   rescue ActiveRecord::RecordNotFound
-    render :inline => "no custom form for this class (#{@node.klass})"
+    render :action => 'custom_tab'
   end
 
   # TODO: test/improve or remove (experiments)

data/app/controllers/virtual_classes_controller.rb

@@ -5,13 +5,19 @@ class VirtualClassesController < ApplicationController
   layout :admin_layout
 
   def index
-    secure(VirtualClass) do
-      @virtual_classes = Role.paginate(:all, :order => 'kpath', :per_page => 20, :page => params[:page])
+    secure(::Role) do
+      @virtual_classes = ::Role.paginate(:all, :order => 'kpath', :per_page => 200, :page => params[:page])
     end
 
-    last_kpath = @virtual_classes.last.kpath
-    Node.native_classes.each do |kpath, klass|
-      if kpath < last_kpath
+    if last = @virtual_classes.last
+      last_kpath = last.kpath
+      Node.native_classes.each do |kpath, klass|
+        if kpath < last_kpath
+          @virtual_classes << klass
+        end
+      end
+    else  
+      Node.native_classes.each do |kpath, klass|
         @virtual_classes << klass
       end
     end
@@ -19,8 +25,8 @@ class VirtualClassesController < ApplicationController
     @virtual_classes.sort! do |a, b|
       if a.kpath == b.kpath
         # Order VirtualClass first
-        b_type = b.kind_of?(Role) ? b.class.to_s : 'V' # sort real classes like VirtualClass
-        a_type = a.kind_of?(Role) ? a.class.to_s : 'V'
+        b_type = b.kind_of?(::Role) ? b.class.to_s : 'V' # sort real classes like VirtualClass
+        a_type = a.kind_of?(::Role) ? a.class.to_s : 'V'
 
         b_type <=> a_type
       else
@@ -37,8 +43,8 @@ class VirtualClassesController < ApplicationController
   end
 
   def export
-    data = secure(VirtualClass) do
-      VirtualClass.export
+    data = secure(::Role) do
+      ::Role.export
     end
 
     ### TODO
@@ -92,7 +98,7 @@ class VirtualClassesController < ApplicationController
   def create
     type = params[:virtual_class].delete(:type)
     if type == 'Role'
-      @virtual_class = Role.new(params[:virtual_class])
+      @virtual_class = ::Role.new(params[:virtual_class])
     else
       @virtual_class = VirtualClass.new(params[:virtual_class])
     end
@@ -138,6 +144,6 @@ class VirtualClassesController < ApplicationController
 
   protected
     def find_virtual_class
-      @virtual_class = secure!(VirtualClass) { Role.find(params[:id])}
+      @virtual_class = secure!(VirtualClass) { ::Role.find(params[:id])}
     end
 end

data/app/helpers/documents_helper.rb

@@ -7,9 +7,6 @@ module DocumentsHelper
     Dir.entries(File.join(Zena::ROOT, 'app', 'views', 'templates', 'document_create_tabs')).sort.each do |file|
       next unless file =~ /^_(.*).rhtml$/
       tab_name = $1
-      if !%w{file import}.include?(tab_name) && !@node.has_role?(tab_name.camelize.constantize)
-        next
-      end
       tabs << tab_name
     end
     tabs

data/app/helpers/users_helper.rb

@@ -0,0 +1,17 @@
+module UsersHelper
+
+  def node_form
+    node_back = @node # store contextual node
+    begin
+      @node = @user.node || visitor.prototype
+      begin
+        res =render :file => template_url(:mode => '+user', :format => 'html')
+      rescue ActiveRecord::RecordNotFound
+        res = render :file => 'versions/custom_tab'
+      end
+    ensure
+      @node = node_back
+    end
+    res
+  end
+end