zena 1.0.0.beta2 → 1.0.0.beta3

data/.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
+*.swp
+*.gem
 restart.txt
 config/deploy_config.rb
 config/database.yml

data/History.txt

@@ -1,3 +1,15 @@
+== 1.0.0.beta3 2010-09-17
+
+* major changes
+ * created Zena::Remote API
+ * fixed Ajax operations and tests
+ * fixed forms to create/update new objects
+ * added dynamic translations
+ * better querybuilder integration relative to SELECT clauses
+ * fixed date parsing
+ * added safe 'send' method
+ * added support to create and update Roles
+
 == 1.0.0.beta2 2010-07-24
 
 * major changes

data/app/controllers/application_controller.rb

@@ -3,5 +3,4 @@ class ApplicationController < ActionController::Base
 
   include Zena::App
 
-  include Zafu::ControllerMethods
 end

data/app/controllers/columns_controller.rb

@@ -7,8 +7,18 @@ class ColumnsController < ApplicationController
   # GET /columns
   # GET /columns.xml
   def index
+    roles = {}
     secure(Column) do
-      @columns = Column.paginate(:all, :order => 'name', :per_page => 20, :page => params[:page])
+      @columns = Column.paginate(:all, :order => 'role_id ASC, name ASC', :per_page => 20, :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
+
+        if role_a == role_b
+          a.name <=> b.name
+        else
+          role_a <=> role_b
+        end
+      end
     end
 
     @column  = Column.new

data/app/controllers/nodes_controller.rb

@@ -3,22 +3,23 @@
 
  basepath          class and zip   optional mode   format
 
- /projects/art/    project24       -print          .html
+ /projects/art/    project24       _print          .html
 
 Examples:
  /current/art/project24.html            << a project inside the 'art' page
  /note24.html                           << a Note's page
  /note24_print.html                     << a Note in 'print' mode
- /current/art.html                      << 'art' page (this page has custom base set = no class or zip shown)
- /current/art-print.html                << 'art' page in 'print' mode
+ /current/art.html                      << 'art' page (this page has custom base set, this means no class or zip shown)
+ /current/art_print.html                << 'art' page in 'print' mode
  /current/art/project24/image28.html    << image page (for comments, etc)
- /current/art/project24/image28.jpg     << full image
- /current/art/project24/image28_pv.jpg  << image in the 'pv' format
- /current/art/project24/image28_pv.html << image page in 'print' mode
+ /current/art/project24/image28.jpg     << full image data
+ /current/art/project24/image28_pv.jpg  << image in the 'pv' image format
+ /current/art/project24/image28_print.html << image page in 'print' mode
 
 =end
 class NodesController < ApplicationController
   before_filter :check_is_admin,  :only => [:export]
+  before_filter :check_api_group
   before_filter :find_node, :except => [:index, :create, :not_found, :catch_all, :search]
   before_filter :check_can_drive, :only => [:edit]
   before_filter :check_path,      :only => [:index, :show]
@@ -50,15 +51,46 @@ class NodesController < ApplicationController
     raise ActiveRecord::RecordNotFound
   end
 
+  # Find nodes starting from root node
   def search
-    do_search
     respond_to do |format|
-      format.html { render_and_cache :mode => '+search', :cache => false }
-      format.xml { render :xml => @nodes ? @nodes.to_xml : []}
-      format.js
+      format.html do
+        begin
+          do_search
+        rescue QueryBuilder::Error => err
+          flash[:error] = err.message
+        end
+        render_and_cache :mode => '+search', :cache => false
+      end
+
+      format.xml do
+        begin
+          do_search
+          if @nodes.kind_of?(Fixnum)
+            # count
+            render :xml => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<count type=\"integer\">#{@nodes}</count>\n"
+          elsif @nodes
+            render :xml => Array(@nodes).to_xml(:root => 'nodes')
+          else
+            render :xml => [].to_xml(:root => 'nodes')
+          end
+        rescue QueryBuilder::Error => err
+          render :xml => [{:message => err.message}].to_xml(:root => 'errors'), :status => 401
+        end
+      end
+
+      format.js do
+        do_search
+        render :action => 'search'
+      end
     end
   end
 
+  # Find nodes starting from a given node
+  def find
+    search
+  end
+
   # this should not be needed.... but format.js never gets called otherwize.
   def asearch
     do_search
@@ -180,7 +212,7 @@ class NodesController < ApplicationController
         flash[:notice] = 'Node was successfully created.'
         format.html { redirect_to zen_path(@node) }
         format.js
-        format.xml  { render :xml => @node, :status => :created, :location => node_url(@node) }
+        format.xml  { render :xml => @node.to_xml(:root => 'node'), :status => :created, :location => node_url(@node) }
       else
         format.html { render :action => "new" }
         format.js
@@ -312,13 +344,19 @@ class NodesController < ApplicationController
           end
         end
       end # parent iframe (upload)
-    elsif @node.errors.empty?
+    else
       respond_to do |format|
         format.html do
-          if params[:edit] == 'popup'
-            redirect_to edit_node_version_path(:node_id => @node[:zip], :id => 0, :close => (params[:validate] ? true : nil))
+          if @node.errors.empty?
+            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])
+            end
           else
-            redirect_to zen_path(@node, :mode => params[:mode])
+            # FIXME: Render referring page would be better
+            # Get mode and details from request.referer
+            render_and_cache :mode => 'edit', :cache => false
           end
         end # html
 
@@ -564,6 +602,13 @@ class NodesController < ApplicationController
     end
 
     def do_search
+      if @node
+        default_scope = 'self'
+      else
+        @node = current_site.root_node
+        default_scope = 'site'
+      end
+
       unless query_params = params[:q]
         query_params = params.dup
         %w{controller action format}.each do |key|
@@ -571,10 +616,18 @@ class NodesController < ApplicationController
         end
       end
 
-      @node = current_site.root_node
-      @search_per_page = params[:per_page] ? params[:per_page].to_i : 20
-      @nodes = secure(Node) { Node.search_records(query_params, :node => @node, :page => params[:page], :per_page => @search_per_page) }
-      @search_count = 100 # FIXME: @nodes ? @nodes.total_entries : 0
+      if request.format != Mime::XML || params[:page] || params[:per_page]
+        @search_per_page = params[:per_page] ? params[:per_page].to_i : 20
+        @nodes = secure(Node) { Node.search_records(query_params, :node => @node, :default => {:scope => default_scope}, :page => params[:page], :per_page => @search_per_page) }
+        @search_count = 100 # FIXME: @nodes ? @nodes.total_entries : 0
+      else
+        # XML without pagination
+        @nodes = secure(Node) { Node.search_records(query_params, :node => @node, :default => {:scope => default_scope}) }
+      end
+
+      if @nodes.kind_of?(Node)
+        @nodes = [@nodes]
+      end
     end
 
     # Document data do not change session[:lang] and can point at cached content (no nee to redirect to AUTHENTICATED_PREFIX).
@@ -608,5 +661,12 @@ class NodesController < ApplicationController
     def check_can_drive
       raise ActiveRecord::RecordNotFound unless @node.can_drive?
     end
+
+    def check_api_group
+      return true if request.format != Mime::XML || visitor.api_authorized?
+
+      render :xml => [{:message => 'Not in API group.'}].to_xml(:root => 'errors'), :status => 401
+      false
+    end
 end
 

data/app/controllers/versions_controller.rb

@@ -111,8 +111,6 @@ class VersionsController < ApplicationController
         source[k] || '').format_as(:html).gsub(/(\s+)<\/del>/, '</del>\1')
     end
 
-    puts target.inspect
-
     show
   end
 

data/app/controllers/virtual_classes_controller.rb

@@ -6,7 +6,7 @@ class VirtualClassesController < ApplicationController
 
   def index
     secure(VirtualClass) do
-      @virtual_classes = VirtualClass.paginate(:all, :order => 'kpath', :per_page => 20, :page => params[:page])
+      @virtual_classes = Role.paginate(:all, :order => 'kpath', :per_page => 20, :page => params[:page])
     end
 
     last_kpath = @virtual_classes.last.kpath
@@ -16,7 +16,17 @@ class VirtualClassesController < ApplicationController
       end
     end
 
-    @virtual_classes.sort! {|a, b| a.kpath <=> b.kpath }
+    @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 <=> a_type
+      else
+        a.kpath <=> b.kpath
+      end
+    end
 
     @virtual_class  = VirtualClass.new('')
 
@@ -80,7 +90,12 @@ class VirtualClassesController < ApplicationController
   end
 
   def create
-    @virtual_class = VirtualClass.new(params[:virtual_class])
+    type = params[:virtual_class].delete(:type)
+    if type == 'Role'
+      @virtual_class = Role.new(params[:virtual_class])
+    else
+      @virtual_class = VirtualClass.new(params[:virtual_class])
+    end
 
     respond_to do |format|
       if @virtual_class.save
@@ -97,8 +112,6 @@ class VirtualClassesController < ApplicationController
   end
 
   def update
-    @virtual_class = VirtualClass.find(params[:id])
-
     respond_to do |format|
       if @virtual_class.update_attributes(params[:virtual_class])
         flash[:notice] = 'VirtualClass was successfully updated.'
@@ -125,6 +138,6 @@ class VirtualClassesController < ApplicationController
 
   protected
     def find_virtual_class
-      @virtual_class = secure!(VirtualClass) { VirtualClass.find(params[:id])}
+      @virtual_class = secure!(VirtualClass) { Role.find(params[:id])}
     end
 end

data/app/models/column.rb

@@ -12,11 +12,15 @@ class Column < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => :site_id
   validate :name_not_in_models
 
+  safe_method :name => String
+
   class << self
     include Zena::Acts::Secure
 
     def roles_for_form
-      secure(Role) { Role.all(:order => 'kpath ASC') }.map {|r| [r.name, r.id]}
+      secure(Role) { Role.all(:order => 'name ASC') }.map do |role|
+        [role.name, role.id]
+      end
     end
 
     # Import a hash of virtual class definitions and try to build the virtual classes.

data/app/models/comment.rb

@@ -10,7 +10,7 @@ class Comment < ActiveRecord::Base
 
   safe_attribute    :title, :created_at, :updated_at, :status
   safe_method       :text => String, :author_name => {:class => String, :nil => true},
-                    :discussion_zip => Number
+                    :discussion_id => Number
 
   safe_context      :replies => ['Comment'], :node => 'Node'
 
@@ -64,11 +64,6 @@ class Comment < ActiveRecord::Base
     self[:id]
   end
 
-  # needed by zafu to group
-  def discussion_zip
-    self[:discussion_id]
-  end
-
   # TODO: test
   def can_write?
     is_author? && discussion.open?

data/app/models/node.rb

@@ -162,7 +162,6 @@ class Node < ActiveRecord::Base
                 :score => Number, :comments_count => Number,
                 :custom_a => Number, :custom_b => Number
 
-  # FIXME: remove 'zip' and use :id => {:class => Number, :method => 'zip'}
   # same with parent_zip, section_zip, etc...
 
 
@@ -808,7 +807,7 @@ class Node < ActiveRecord::Base
       transform_attributes(attributes, base_node)
     end
 
-    def safe_method_type(signature)
+    def safe_method_type(signature, receiver = nil)
       if signature.size > 1
         RubyLess::SafeClass.safe_method_type_for(self, signature)
       else
@@ -818,6 +817,13 @@ class Node < ActiveRecord::Base
         elsif method =~ /^(.+)_((id|zip|status|comment)(s?))\Z/ && !instance_methods.include?(method)
           key = $3 == 'id' ? "zip#{$4}" : $2
           {:method => "rel[#{$1.inspect}].try(:other_#{key})", :nil => true, :class => ($4.blank? ? Number : [Number])}
+        elsif receiver && query = receiver.opts[:query]
+          # Resolve by using information in the SELECT part of the query that found this node
+          if query.select_keys.include?(method)
+            {:class => String, :method => "attributes[#{method.inspect}]", :nil => true}
+          else
+            nil
+          end
         else
           nil
         end
@@ -1395,6 +1401,19 @@ class Node < ActiveRecord::Base
     secure(Node) { Node.find_node_by_pseudo(string, base_node || self) }
   end
 
+  safe_method [:send, String] => {:class => String, :nil => true, :method => 'safe_send'}
+
+  # Safe dynamic method dispatching when the method is not known during compile time. Currently this
+  # only works for methods without arguments.
+  def safe_send(method)
+    # We need to load roles or all properties will be ignored
+    load_roles!
+
+    return nil unless type = safe_method_type([method])
+    res = eval(type[:method])
+    res ? res.to_s : nil
+  end
+
   protected
 
     # after node is saved, make sure it's children have the correct section set
@@ -1721,7 +1740,6 @@ class Node < ActiveRecord::Base
         end
       end
     end
-
 end
 
 Bricks.apply_patches

data/app/models/role.rb

@@ -8,6 +8,27 @@ class Role < ActiveRecord::Base
   before_validation :set_defaults
   validate :check_can_save
 
+  include RubyLess
+  safe_method :columns => {:class => ['Column'], :method => 'columns.values', :nil => false}
+  safe_method :name => String
+
+  def superclass
+    if new_record?
+      Node
+    else
+      Node.get_class_from_kpath(kpath)
+    end
+  end
+
+  def superclass=(klass)
+    if k = Node.get_class(klass)
+      self.kpath = k.kpath
+    else
+      errors.add('superclass', 'invalid')
+    end
+  end
+
+
   private
     def set_defaults
       self.site_id = visitor.site.id

data/app/models/site.rb

@@ -19,11 +19,11 @@ The #Site model holds configuration information for a site:
 class Site < ActiveRecord::Base
   include RubyLess
   safe_method  :host => String, :lang_list => [String]
-  safe_context :root => {:class => Node, :method => 'root_node'}
+  safe_context :root => {:class => 'Node', :method => 'root_node'}
 
   validate :valid_site
   validates_uniqueness_of :host
-  attr_accessible :name, :languages, :default_lang, :authentication, :http_auth, :auto_publish, :redit_time
+  attr_accessible :name, :languages, :default_lang, :authentication, :http_auth, :auto_publish, :redit_time, :api_group_id
   has_many :groups, :order => "name"
   has_many :nodes
   has_many :users
@@ -229,6 +229,11 @@ class Site < ActiveRecord::Base
     @site_group ||= Group.find(self[:site_group_id])
   end
 
+  # Return the API group: the one in which API visitors must be to use the API.
+  def api_group
+    @api_group ||= Group.find_by_id(self[:api_group_id])
+  end
+
   # Return true if the given user is an administrator for this site.
   def is_admin?(user)
     admin_user_ids.include?(user[:id])

data/app/models/template.rb

@@ -93,14 +93,14 @@ class Template < TextDocument
               self.text = <<END_TXT
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" do='void' lang="en" set_lang='[v_lang]' xml:lang='en'>
+<html xmlns='http://www.w3.org/1999/xhtml' do='void' lang='\#{v.lang}' xml:lang='en'>
 <head do='void' name='head'>
   <title do='title_for_layout' do='show' attr='title' name='page_title'>page title</title>
   <!-- link href='favicon.png' rel='shortcut icon' type='image/png' / -->
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
   <r:void name='stylesheets'>
     <r:stylesheets/>
-    <link href="style.css" rel="Stylesheet" type="text/css"/>
+    <link href='style.css' rel='Stylesheet' type='text/css'/>
   </r:void>
 
   <r:javascripts/>