zena 1.0.0.beta3 → 1.0.0.rc1

data/lib/zena/deploy.rb

@@ -13,7 +13,8 @@ Assumed:
 ========== USAGE ==========
 
 1. Copy the file 'deploy_config_example.rb' to 'deploy_config.rb' and edit the entries in this new file.
-2. Run => cap initial_setup
+2. Run => cap deploy:setup
+3. Run => cap deploy
 3. Run => cap mksite -s host='example.com' -s pass='secret' -s lang='en'
 
 If anything goes wrong, ask the mailing list (lists.zenadmin.org) or read the content of this file to understand what went wrong...
@@ -26,6 +27,7 @@ require 'erb'
 require File.join(File.dirname(__FILE__), 'info')
 require File.join(File.dirname(__FILE__), '..', 'bricks')
 
+
 Capistrano::Configuration.instance(:must_exist).load do
 
   set :templates, File.join(File.dirname(__FILE__), 'deploy')
@@ -291,6 +293,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "Apache2 initial setup"
   task :apache2_setup, :roles => :web do
+    # TODO: can we move this into the mongrel brick?
     if self[:mongrel_port]
       self[:ports] = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
     end

data/lib/zena/deploy/httpd.rhtml

@@ -15,12 +15,12 @@ PassengerDefaultUser www-data
 </Proxy>
 <% end %>
 
-<ifmodule mode_expires.c>
+<IfModule mod_expires.c>
   ExpiresActive on
   ExpiresDefault A0
   ExpiresByType image/jpeg "access plus 1 year"
   ExpiresByType image/gif "access plus 1 year"
   ExpiresByType image/png "access plus 1 year"
   ExpiresByType text/css "access plus 1 year"
-  ExpiresByType application/x-javascript "access plus 1 year"
-</ifmodule>
+  ExpiresByType application/javascript "access plus 1 year"
+</IfModule>

data/lib/zena/deploy/vhost.rhtml

@@ -63,7 +63,7 @@
   RewriteRule ^([^.]+)$ $1.html [QSA]
 
   # Redirect all non-static requests to cluster
-	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME}%{QUERY_STRING} !-f
   RewriteRule ^/(.*)$ balancer://<%= config[:balancer] %>%{REQUEST_URI} [P,QSA,L]
 <% elsif config[:app_type] == :passenger %>
   PassengerAppRoot <%= config[:app_root] %>

data/lib/zena/foxy_parser.rb

@@ -294,6 +294,8 @@ module Zena
         prop.each do |key, value|
           if key == 'cached_role_ids'
             prop[key] = value.split(',').map {|role_name| FoxyParser.id(site, role_name.strip)}
+          elsif value.kind_of?(Date)
+            prop[key] = Time.utc(value.year, value.month, value.day)
           elsif value.kind_of?(String)
             value.gsub!(%r{\[FILE:(.*?)\]}) do
               File.read("#{Zena::ROOT}/#{$1}")
@@ -315,8 +317,8 @@ module Zena
             v[:header_keys] << 'groups'
           end
 
-          v[:header_keys] << 'contact'
-          v['contact'] ||= k
+          v[:header_keys] << 'node'
+          v['node'] ||= k
 
           if v['status']
             v[:header_keys] << 'status'
@@ -349,13 +351,6 @@ module Zena
             add_template(template, name)
           end
 
-          if !node.has_key?('node_name')
-            node['node_name'] = name
-            node[:header_keys] << 'node_name'
-          end
-
-          node['node_name'] = node['node_name'].url_name
-
           if node.keys.include?('title') || node.keys.detect {|k| k =~ /^v_/}
             # need version defaults
             @defaults.each do |key,value|
@@ -364,6 +359,11 @@ module Zena
             end
           end
 
+          if !node.has_key?('_id')
+            node['_id'] = name
+            node[:header_keys] << '_id'
+          end
+
           # FIXME: better filtering, in a hurry right now
           prop_field = nil
           %w{text title summary comment}.each do |k|
@@ -426,11 +426,6 @@ module Zena
         end
 
         build_inherited_fields
-
-        # build fullpath
-        elements.each do |k, node|
-          make_paths(node, k)
-        end
       end
 
       def make_paths(node, name)
@@ -439,7 +434,7 @@ module Zena
             parent_fullpath = make_paths(parent, node['parent'])
             # Unquote content if it was an empty quoted string.
             parent_fullpath = '' if parent_fullpath == "''"
-            node['fullpath'] = (parent_fullpath.split('/') + [node['node_name'] || name]).join('/')
+            node['fullpath'] = (parent_fullpath.split('/') + [node['zip']]).join('/')
             klass = if roles[site] && vc = roles[site][node['class']]
               vc['real_class']
             else
@@ -519,7 +514,7 @@ module Zena
 
       def insert_headers
         node  = elements[name]
-        # we compute 'zip' here so that the order of the file is kept
+        # we compute 'zip' here so that the order of the elements in file is kept
         @zip_counter[site] ||= 0
         if node['zip']
           if node['zip'] > @zip_counter[site]
@@ -530,6 +525,9 @@ module Zena
           node['zip'] = @zip_counter[site]
         end
 
+        # build fullpath
+        make_paths(node, name)
+
         super
       end
 
@@ -641,7 +639,7 @@ module Zena
           version['status'] = Zena::Status[version['status'].to_sym]
 
           version['prop'] ||= {}
-          version['prop']['title'] ||= raw_nodes[version['node']]['node_name'] || version['node']
+          version['prop']['title'] ||= version['node']
 
           if prop = version.delete('prop')
             version['properties'] = make_prop(prop) unless prop.blank?
@@ -790,7 +788,9 @@ module Zena
         super
         elements.each do |name, col|
           if !col['role']
-            col['role'], col['name'] = name.split('_')
+            if name =~ %r{^([^_]+)_(.+)$}
+              col['role'], col['name'] = $1, $2
+            end
             col[:header_keys] << :role
             col[:header_keys] << :name
           end
@@ -798,6 +798,25 @@ module Zena
       end
   end
 
+
+  class FoxyRolesParser < FoxyParser
+    private
+      def set_defaults
+        super
+
+        elements.each do |name, col|
+          if prop = col.delete('prop')
+            col[:header_keys] << :properties
+            col['properties'] = make_prop(prop) unless prop.blank?
+          end
+        end
+      end
+
+      def make_prop(prop)
+        Role.encode_properties(Property::Properties[prop])
+      end
+  end
+
   class FoxyNodesRolesParser < FoxyParser
     private
       def set_defaults

data/lib/zena/info.rb

@@ -1,14 +1,4 @@
-
-if defined?(RAILS_ROOT)
-  SITES_ROOT = "#{RAILS_ROOT}/sites"
-end
-
-AUTHENTICATED_PREFIX = "oo"
-PASSWORD_SALT = "jf93jfnvnas09093nas0923" # type anything here (but change this line !)
-ZENA_CALENDAR_LANGS = ["en", "fr", "de"] # FIXME: build this dynamically from existing files
-ENABLE_XSENDFILE = false
-
 module Zena
-  VERSION = '1.0.0.beta3'
-  ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-end
+  VERSION        = '1.0.0.rc1'
+  ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+end

data/lib/zena/migrator.rb

@@ -85,7 +85,6 @@ module Zena
       raise StandardError.new("This database does not yet support migrations") unless ActiveRecord::Base.connection.supports_migrations?
       self.class.init_bricks_migration_table
       @direction, @migrations_path, @brick_name, @target_version = direction, migrations_path, brick_name, target_version
-      @brick_name = nil if @brick_name == 'zena' # use NULL so that rails migrations work the same
     end
 
     def migrated

data/lib/zena/parser/zafu_rules.rb

@@ -1,3 +1,6 @@
+=begin
+FIXME: remove if tests pass.
+=end
 module Zena
   module Parser
 
@@ -22,6 +25,7 @@ module Zena
 
         # puts "[#{@space_before}(#{@method})#{@space_after}]"
         if @params =~ /\A([^>]*?)do\s*=('|")([^\2]*?[^\\])\2([^>]*)\Z/
+          #puts $~.to_a.inspect
           # we have a sub 'do'
           @params = parse_params($1)
           @sub_do = $3 # this is used by replace_with
@@ -150,11 +154,12 @@ module Zena
           opts.merge!(:method=>$1, :params=>$2)
           opts.merge!(:text=>'') if $3 != ''
           make(:void, opts)
-        elsif @text =~ /\A<(\w+)([^>]*?)do\s*=('([^>]*?[^\\]|)'|"([^>]*?[^\\]|)")([^>]*?)(\/?)>/
+        #elsif @text =~ /\A<(\w+)([^>]*?)do\s*=('([^>]*?[^\\]|)'|"([^>]*?[^\\]|)")([^>]*?)(\/?)>/
+        elsif @text =~ /\A<(\w+)([^>]*?)do\s*=('|")([^\3]*?[^\\])\3([^>]*?)(\/?)>/
           #puts "DO:#{$~.to_a.inspect}" # do tag
           eat $&
-          opts.merge!(:method=>($4||$5), :html_tag=>$1, :html_tag_params=>$2, :params=>$6)
-          opts.merge!(:text=>'') if $7 != ''
+          opts.merge!(:method=> $4, :html_tag=>$1, :html_tag_params=>$2, :params=>$5)
+          opts.merge!(:text=>'') if $6 != ''
           make(:void, opts)
         elsif @options[:form] && @text =~ /\A<(input|select|textarea|form)([^>]*?)(\/?)>/
           eat $&
@@ -236,4 +241,4 @@ module Zena
       end
     end # ZafuRules
   end # Parser
-end # Zena
+end # Zena

data/lib/zena/parser/zazen_rules.rb

@@ -112,7 +112,7 @@ module Zena
           else
             store @helper._('[documents]')
           end
-        elsif @text =~ /\A\!([^0-9]{0,2})(#{PSEUDO_ID_REGEXP})(_([^\/\!]+)|)(\/([^\!]*)|)\!(:([^\s]+)|)/m
+        elsif @text =~ /\A\!([^0-9:]{0,2})(#{PSEUDO_ID_REGEXP})(_([^\/\!]+)|)(\/([^\!]*)|)\!(:([^:\(][^\s]+|#{PSEUDO_ID_REGEXP}(_[a-zA-Z]+|))|)/m
           # image !<.:art++_pv/blah blah!:12
           #puts "SHORCUT IMAGE:#{$~.to_a.inspect}"
           eat $&
@@ -136,7 +136,7 @@ module Zena
               if node.kind_of?(Document)
                 store @helper.make_image(:style=>style, :id=>node[:zip].to_s, :node=>node, :mode=>mode, :title=>title, :link=>link, :images=>@context[:images])
               else
-                store "[#{node.fullpath} is not a document]"
+                store "[#{node.fullpath_as_title.join('/')} is not a document]"
               end
             end
           elsif @translate_ids
@@ -144,7 +144,7 @@ module Zena
           else
             store "[#{id} not found]"
           end
-        elsif @text =~ /\A\!([^0-9]{0,2})([0-9]+)(_([^\/\!]+)|)(\/([^\!]*)|)\!(:([^\s]+)|)/m
+        elsif @text =~ /\A\!([^0-9]{0,2})([0-9]+)(_([^\/\!]+)|)(\/([^\!]*)|)\!(:([^:\(][^\s]+|#{PSEUDO_ID_REGEXP}(_[a-zA-Z]+|))|)/m
           # image !<.12_pv/blah blah!:12
           #puts "IMAGE:[#{$&}]"
           eat $&
@@ -204,9 +204,9 @@ module Zena
             else
               id = "#{node.zip}#{mode_format}"
               if format == '.data'
-                title = "#{node.fullpath}#{mode}.#{node.ext}#{dash}"
+                title = "#{node.fullpath_as_title.join('/')}#{mode}.#{node.ext}#{dash}"
               else
-                title = "#{node.fullpath}#{mode_format}"
+                title = "#{node.fullpath_as_title.join('/')}#{mode_format}"
               end
               if id =~ /(.*?)#(.*)/
                 id, anchor = $1, $2

data/lib/zena/parser/zena_rules.rb

@@ -13,7 +13,7 @@ module Zena
           @method = 'zazen'
           @params[:attr] = $1
         elsif @method =~ /\A(\w+)\s+(\w+)\s+(.+)$/
-          # 'pages where node_name ...'
+          # 'pages where title ...'
           @params[:select] = @method
           @method = 'context'
         end

data/lib/zena/remote/interface.rb

@@ -147,7 +147,7 @@ module Zena
         private
           def process_find(count, query, options)
             if query.kind_of?(String)
-              # Consider string as pseudo sql
+              # Consider string as SQLiss
               result = get(find_url, :query => options.merge(:qb => query, :_find => count))
 
             elsif query.kind_of?(Fixnum)

data/lib/zena/site_worker.rb

@@ -2,8 +2,8 @@ module Zena
   class SiteWorker < Struct.new(:site_id, :action, :page)
     include Zena::Acts::Secure
 
-    # Execute operations on 50 nodes at a time
-    CHUNK_SIZE = 50
+    # Execute operations on 250 nodes at a time
+    CHUNK_SIZE = 250
 
     def self.perform(site, action, page = 1)
       action = new(site.id, action, page)
@@ -36,7 +36,7 @@ module Zena
         :conditions => ['site_id = ?', site_id],
         :limit  => CHUNK_SIZE,
         :offset => (page - 1) * CHUNK_SIZE,
-        :order => 'id ASC'
+        :order => 'id DESC'
       )
       secure_result(nodes)
     end

data/lib/zena/test_controller.rb

@@ -31,14 +31,9 @@ module Zena
 
     def test_compile
 
-      if klass = params.delete(:class)
-        klass = Node.get_class(klass)
-      else
-        klass = Node
-      end
+      klass = VirtualClass[params.delete(:class) || 'Node']
 
-      klass = Zena::Acts::Enrollable.make_class(klass)
-      render :text => Zena::ZafuCompiler.new_with_url(@test_url, :helper => zafu_helper).to_erb(:dev => params['dev'], :node => Zafu::NodeContext.new('@node', klass))
+      render :text => Zena::ZafuCompiler.new_with_url(@test_url, :helper => zafu_helper).to_erb(:dev => params['dev'], :node => Zena::Use::NodeContext.new('@node', klass))
     rescue => err
       render :text => ([err.message] + err.backtrace[0..4]).join("    \n").tap {|x| puts x}
     end
@@ -99,11 +94,16 @@ module Zena
 
     def get_template_text(path, base_path)
       folder = base_path.blank? ? [] : base_path[1..-1].split('/')
-      path = path[1..-1] if path[0..0] == '/' # just ignore the 'relative' or 'absolute' tricks.
-      url = (folder + path.split('/')[1..-1]).join('_')
+      if path[0..0] == '/'
+        # just ignore the 'relative' or 'absolute' tricks.
+        test_path = path[1..-1]
+      else
+        test_path = path
+      end
+      url = (folder + test_path.split('/')[1..-1]).join('_')
 
       if test = @@templates[url]
-        [test['src'], path]
+        [test['src'], test_path]
       else
         # 'normal' include
         @expire_with_nodes = {}

data/lib/zena/use/action.rb

@@ -39,6 +39,22 @@ module Zena
         safe_method :login_path  => String
         safe_method :logout_path => String
 
+        # These methods are used by swap to create the href
+        safe_method [:next_in_list, String, String] => {:class => String, :method => 'next_in_list_s', :accept_nil => true}
+        safe_method [:next_in_list, Number, String] => {:class => Number, :method => 'next_in_list_i', :accept_nil => true}
+
+        def next_in_list_s(str, list)
+          list = list.to_s.split(',').map(&:strip)
+          str  = str.to_s
+          list[((list.index(str) || -1) + 1) % list.size]
+        end
+
+        def next_in_list_i(nb, list)
+          list = list.to_s.split(',').map(&:to_f)
+          nb   = nb.to_f
+          list[((list.index(nb) || -1) + 1) % list.size]
+        end
+
         # Shows 'login' or 'logout' button.
         # Is this used ? Or do we just use the zafu tag alone ?
         # def login_link(opts={})
@@ -153,6 +169,16 @@ module Zena
           base.before_process :filter_actions
         end
 
+        def r_debug
+          %Q{
+<pre style='background:white; color:black; border:1px solid red; display:table;'>
+class #{node.klass}: #{Array(node.klass).first.columns.keys.join(', ')}
+</pre>
+          }
+        end
+
+        alias r_d r_debug
+
         def r_login_link
           if dynamic_blocks?
             @markup.tag ||= 'a'
@@ -165,16 +191,16 @@ module Zena
 
             out markup.wrap(expand_if("visitor.is_anon?", self.node, else_markup))
           else
-            out "<% if visitor.is_anon? -%>"
+            out "<% if visitor.is_anon? %>"
             out "<%= link_to #{_('login').inspect}, login_path %>"
-            out "<% else -%>"
+            out "<% else %>"
             out "<%= link_to #{_('logout').inspect}, logout_path %>"
-            out "<% end -%>"
+            out "<% end %>"
           end
         end
 
         def r_visitor_link
-          out "<% if !visitor.is_anon? -%>"
+          out "<% if !visitor.is_anon? %>"
           if dynamic_blocks?
             @markup.tag ||= 'a'
             link = '<%= user_path(visitor) %>'
@@ -187,9 +213,9 @@ module Zena
               out wrap(markup.wrap(expand_with))
             end
           else
-            out wrap("<%= link_to visitor.fullname, user_path(visitor) %>")
+            out wrap("<%= link_to visitor.node.title, user_path(visitor) %>")
           end
-          out "<% end -%>"
+          out "<% end %>"
         end
 
         def r_action
@@ -224,6 +250,40 @@ module Zena
             end
           end
         end
+
+
+        # TODO: test
+        def r_swap
+          if upd = @params[:update]
+            if upd == '_page'
+              block = '_page'
+            elsif block = find_target(upd)
+              # ok
+              if ancestor('block') || ancestor('each')
+                # FIXME: not used
+                upd_both = '&upd_both=true'
+              else
+                upd_both = ''
+              end
+            else
+              return
+            end
+          elsif block = (ancestor('block') || ancestor('each'))
+            # ancestor: ok
+            block = self
+          elsif parent && block = parent.descendant('block')
+            # sibling: ok
+            upd_both = ''
+          else
+            return parser_error("missing 'block' in same parent")
+          end
+
+          return parser_error("missing 'states' parameter") unless @params[:states]
+
+          # This will be RubyLess evaluated
+          query_params = {"node[#{@params[:attr]}]" => "\#{next_in_list(this.#{@params[:attr]}, %Q{#{@params[:states]}})}"}
+          out make_link(:update => block, :action => 'update', :query_params => query_params, :method => :put)
+        end
       end # ZafuMethods
     end # Action
   end # Use