zena 1.0.0.rc2 → 1.0.0.rc3

data/lib/zena/deploy/vhost.rhtml

@@ -1,7 +1,7 @@
 # zena apache2 vhost for <%= config[:host] %>
 # automatically generated file
 
-<VirtualHost *>
+<VirtualHost *<%= config[:ssl] ? ':443' : '' %>>
   ServerName <%= config[:host] %>
 
   DocumentRoot <%= config[:sites_root] %>/<%= config[:host] %>/public
@@ -95,4 +95,12 @@
   LogFormat '"%r" %{output_info}n/%{input_info}n (%{ratio_info}n%%)' deflate
   CustomLog <%= config[:sites_root] %>/<%= config[:host] %>/log/deflate.log deflate
   <% end %>
+
+  <% if config[:ssl] %>
+  SSLEngine on
+  SSLCertificateFile /etc/ssl/<%= config[:host] %>.crt
+  SSLCertificateKeyFile /etc/ssl/<%= config[:host] %>.key
+  SSLCACertificateFile /etc/ssl/<%= config[:ssl_pem] %>
+  SSLVerifyClient None
+  <% end %>
 </VirtualHost>

data/lib/zena/deploy.rb

@@ -149,7 +149,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   #========================== MANAGE HOST   =========================#
   desc "create a new site [-s host='...' -s pass='...' -s lang='...']"
   task :mksite, :roles => :app do
-    run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' LANG='#{self[:lang] || 'en'}'"
+    run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' HOST_LANG='#{self[:lang] || 'en'}'"
     create_vhost
     create_awstats
     logrotate
@@ -307,12 +307,17 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     run "test -e /etc/apache2/sites-enabled/000-default && a2dissite default || echo 'default already disabled'"
-    run "test -e /etc/apache2/mods-enabled/rewrite.load || a2enmod rewrite"
-    run "test -e /etc/apache2/mods-enabled/deflate.load || a2enmod deflate"
-    run "test -e /etc/apache2/mods-enabled/proxy_balancer.load || a2enmod proxy_balancer"
-    run "test -e /etc/apache2/mods-enabled/proxy.load || a2enmod proxy"
-    run "test -e /etc/apache2/mods-enabled/proxy_http.load || a2enmod proxy_http"
-    run "test -e /etc/apache2/mods-enabled/expires.load || a2enmod expires"
+
+    modules = %w{rewrite deflate proxy_balancer proxy proxy_http expires}
+    if self[:ssl]
+      modules << 'ssl'
+      # Default in debian: no need to change ports.
+      # /etc/apache2/ports.conf:
+      # Listen 443
+    end
+    modules.each do |mod|
+      run "test -e /etc/apache2/mods-enabled/#{mod}.load || a2enmod #{mod}"
+    end
     run "/etc/init.d/apache2 force-reload"
   end
 

data/lib/zena/foxy_parser.rb

@@ -411,7 +411,7 @@ module Zena
             records = [
               { 'id'           => Zena::FoxyParser::id(site, "#{name}_#{node['v_lang'] || node['ref_lang']}"),
                 'publish_from' => node['v_publish_from'],
-                'status'       => Zena::Status[node['v_status'].to_sym],
+                'status'       => Zena::Status[(node['v_status'] || 'pub').to_sym],
                 'lang'         => node['v_lang'] || node['ref_lang']
               }
             ]
@@ -602,6 +602,7 @@ module Zena
                 version['lang'] ||= node['ref_lang']
                 version['user_id'] ||= Zena::FoxyParser::multi_site_id(node['user'])
                 if prop = version.delete('prop')
+                  version['idx_text_high'] = prop['title']
                   version['properties'] = make_prop(prop) unless prop.blank?
                 end
 
@@ -642,6 +643,7 @@ module Zena
           version['prop']['title'] ||= version['node']
 
           if prop = version.delete('prop')
+            version['idx_text_high'] = prop['title']
             version['properties'] = make_prop(prop) unless prop.blank?
           end
 

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.0.0.rc2'
+  VERSION        = '1.0.0.rc3'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/parser/zafu_tags.rb

@@ -1,3 +1,4 @@
+# This should be removed (it is used by zazen but I do not know why)
 module Zena
   module Parser
     module ZafuTags

data/lib/zena/parser/zazen_rules.rb

@@ -203,7 +203,7 @@ module Zena
               store "\"#{title}\":#{id}"
             else
               id = "#{node.zip}#{mode_format}"
-              if format == '.data'
+              if format == '.data' && node.kind_of?(Document)
                 title = "#{node.fullpath_as_title.join('/')}#{mode}.#{node.ext}#{dash}"
               else
                 title = "#{node.fullpath_as_title.join('/')}#{mode_format}"

data/lib/zena/remote/node.rb

@@ -13,7 +13,10 @@ module Zena
       def attributes=(new_attributes)
         raise Exception.new("Invalid attributes. Expecting a hash, found #{new_attributes.inspect}") unless new_attributes.kind_of?(Hash)
         new_attributes.stringify_keys.each do |key, value|
-          if value.kind_of?(Array)
+          writer = "#{key}=".to_sym
+          if self.respond_to?(writer)
+            self.send(writer, value)
+          elsif value.kind_of?(Array)
             # setting multiple ids
             key = "#{key}_ids" unless key =~ /_ids$/
             @attributes[key] = value.map do |elem|
@@ -34,6 +37,10 @@ module Zena
         end
       end
 
+      def tag_names=(list)
+        @attributes['tag_names'] = SerializableArray.new('tag_names', 'tag', list)
+      end
+
       def id
         @attributes['id']
       end
@@ -48,8 +55,13 @@ module Zena
             @attributes[key] = elem.id
           elsif elem.kind_of?(Array)
             key = "#{key}_ids" unless key =~ /_ids?$/
-            @attributes[key] = elem.map do |value|
-              value.kind_of?(Remote::Node) ? value.id : value
+            if elem == []
+              # Fix for strange handling of empty array by to_xml and such.
+              @attributes[key] = nil
+            else
+              @attributes[key] = elem.map do |value|
+                value.kind_of?(Remote::Node) ? value.id : value
+              end
             end
           else
             @attributes[$1] = elem

data/lib/zena/remote/serializable_array.rb

@@ -0,0 +1,19 @@
+module Zena
+  module Remote
+    class SerializableArray < Array
+      def initialize(name, elem_name, elements)
+        @name, @elem_name = name, elem_name
+        replace(elements)
+      end
+
+      def to_xml(opts)
+        builder = opts[:builder]
+        builder.tag!(@name, :type => :array) do
+          each do |elem|
+            builder.tag!(@elem_name, elem.to_s, :type => :string)
+          end
+        end
+      end
+    end
+  end # Remote
+end # Zena

data/lib/zena/remote.rb

@@ -1,6 +1,7 @@
 require 'active_support'
 require 'zena/remote/interface'
 require 'zena/remote/klass'
+require 'zena/remote/serializable_array'
 require 'zena/remote/node'
 require 'zena/remote/connection'
 

data/lib/zena/routes.rb

@@ -56,8 +56,13 @@ module Zena
                                 :member     => { :crop_form => :get }
 
       resources :relations
-      resources :virtual_classes, :collection => {:import => :post}
-      resources :columns,         :collection => {:import => :post}
+      resources :virtual_classes, :collection => {
+                      :import_prepare => :post,
+                      :import => :post,
+                      :export => :get,
+                    }
+
+      resources :columns
 
       resources :sites,
                     :member     => { :clear_cache => :post }

data/lib/zena/site_worker.rb

@@ -19,7 +19,7 @@ module Zena
     def perform(site = nil)
       if site.nil?
         site ||= Site.find(site_id)
-        Thread.current[:visitor] = site.anon
+        Thread.current[:visitor] = site.any_admin
       end
 
       if nodes = get_nodes
@@ -44,5 +44,15 @@ module Zena
     def page_count
       (Node.count(:conditions => ['site_id = ?', site_id]) / CHUNK_SIZE) + 1
     end
+
+    # Return a textual description of the operation.
+    def info
+      if site_id == current_site.id
+        "#{action}, #{_('page')} #{page}/#{page_count}"
+      else
+        # Do not show jobs from other sites
+        "-"
+      end
+    end
   end
 end # Zena

data/lib/zena/unit/test_case.rb

@@ -17,6 +17,74 @@ module Zena
         # Ignore since we include helpers in the TestCase itself
       end
 
+      # Specific helpers to validate model relations and queries with SQLiss
+      def main_date
+        raise "The test uses 'validate_query' without defining @main_date" unless @main_date
+        return @main_date.strftime("'%Y-%m-%d'")
+      end
+
+      # Test a query (useful with complex custom queries). Usage:
+      #
+      #    validate_query "emp_comp_dates where log_at is not null", [
+      #      { :title    => 'Creativity',
+      #        :priority => '5',
+      #        :log_at   => '2010-06-01',
+      #        :event_at => '2011-06-01',
+      #      },
+      #      { :title    => 'Leadership',
+      #        :priority => '5',
+      #        :log_at   => '2003-01-01',
+      #        :event_at => nil, # forever
+      #      },
+      #    ]
+      #
+      def validate_query(query, expected_list)
+        list = subject.find(:all, query.gsub('&lt;', '<').gsub('&gt;', '>'), :errors => true)
+        if expected_list.nil? || expected_list.empty?
+          assert_equal nil, list
+        elsif expected_list.first.kind_of?(String)
+          assert_equal expected_list, list.map(&:title)
+        elsif list.nil?
+          assert_equal expected_list, list
+        elsif list.kind_of?(::QueryBuilder::Error)
+          assert_equal expected_list, list.to_s
+        else
+          proto = expected_list.first.keys
+          sz = [expected_list.size, list.size].max
+
+          (0..(sz-1)).to_a.each do |i|
+            record   = list[i]
+            expected = expected_list[i]
+            if not record
+              assert_equal expected[:title], nil
+            elsif not expected
+              assert_equal nil, map_to_proto(proto, record)
+            else
+              if expected[:title] != record.title
+                assert_equal expected[:title], map_to_proto(proto, record)
+              else
+                expected.keys.each do |key|
+                  value = format_date(record[key] || record.send(key))
+                  assert_equal expected[key], value, "(#{record.title} #{key} expected to be #{expected[key].inspect} but was #{value.inspect}"
+                end
+              end
+            end
+          end
+        end
+      end
+
+      private
+        def format_date(date)
+          if date.respond_to?(:strftime)
+            date.strftime('%Y-%m-%d')
+          else
+            date
+          end
+        end
+
+        def map_to_proto(proto, record)
+          Hash[*proto.map{|k| [k, format_date(record[k] || record.send(k))]}.flatten]
+        end
     end
   end
 end

data/lib/zena/use/action.rb

@@ -27,12 +27,16 @@ module Zena
             tag = "<a href='#{url}' target='_blank' title='#{title}' onclick=\"Zena.open_window('#{url}', '#{id}', event);return false;\">"
           else
             query = query.empty? ? '' : "?#{query.join('&')}"
-            tag  = "<a href='/nodes/#{node_zip}/versions/0/#{action}#{query}' onclick='Zena.put(this);return false;' title ='#{title}'>"
+            tag  = "<a href='/nodes/#{node_zip}/versions/0/#{action}#{query}' onclick='Zena.m(this, \"put\");return false;' title ='#{title}'>"
           end
           "#{tag}#{text}</a>"
         end
       end
 
+      module ControllerMethods
+        include Common
+      end
+
       module ViewMethods
         include Common
         include RubyLess
@@ -270,7 +274,6 @@ class #{node.klass}: #{Array(node.klass).first.columns.keys.join(', ')}
             end
           elsif block = (ancestor('block') || ancestor('each'))
             # ancestor: ok
-            block = self
           elsif parent && block = parent.descendant('block')
             # sibling: ok
             upd_both = ''
@@ -285,6 +288,7 @@ class #{node.klass}: #{Array(node.klass).first.columns.keys.join(', ')}
           out make_link(:update => block, :action => 'update', :query_params => query_params, :method => :put)
         end
       end # ZafuMethods
+
     end # Action
   end # Use
 end # Zena

data/lib/zena/use/ajax.rb

@@ -2,24 +2,29 @@ module Zena
   module Use
     module Ajax
       module ViewMethods
+        include RubyLess
+        safe_method :ajax? => {:class => Boolean, :method => 'params[:s]'}
+
         # Return the DOM id for a node. We had to name this method 'ndom_id' because we want
         # to avoid the clash with Rails' dom_id method.
         def ndom_id(node)
-          if node.new_record?
-            "#{params[:dom_id]}_form"
-          elsif params[:action] == 'create' && !params[:udom_id]
-            "#{params[:dom_id]}_#{node.zip}"
-          else
-            @dom_id || params[:udom_id] || params[:dom_id]
+          if node.kind_of?(Node)
+            if node.new_record?
+              return "#{params[:dom_id]}_form"
+            elsif params[:action] == 'create' && !params[:udom_id]
+              return "#{params[:dom_id]}_#{node.zip}"
+            end
           end
+
+          @dom_id || params[:udom_id] || params[:dom_id]
         end
 
         # RJS to update a page after create/update/destroy
         def update_page_content(page, obj)
           unless params[:dom_id]
             # simply reply with failure or success
-            if !@node.errors.empty?
-              page << "alert(#{@node.errors.first.join(': ')});"
+            if !obj.errors.empty?
+              page << "alert(#{obj.errors.first.join(': ')});"
               page << "return false;" # How to avoid 'onSuccess' ?
             elsif params[:udom_id] == '_page'
               # reload page
@@ -30,8 +35,8 @@ module Zena
             return
           end
 
-          if params[:t_id] && @node.errors.empty?
-            @node = secure(Node) { Node.find_by_zip(params[:t_id])}
+          if params[:t_id] && obj.errors.empty?
+            obj = secure(Node) { Node.find_by_zip(params[:t_id])}
           end
 
           base_class = obj.kind_of?(Node) ? Node : obj.class
@@ -84,14 +89,13 @@ module Zena
             case params[:action]
             when 'edit'
               page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
-              puts "$('#{params[:dom_id]}_form_t').focusFirstElement();"
               page << "$('#{params[:dom_id]}_form_t').focusFirstElement();"
             when 'create'
               pos = params[:position]  || :before
               ref = params[:reference] || "#{params[:dom_id]}_add"
               page.insert_html pos.to_sym, ref, :file => template_path_from_template_url + ".erb"
               if obj.kind_of?(Node)
-                @node = @node.parent.new_child(:class => @node.class)
+                @node = obj.parent.new_child(:class => obj.class)
               else
                 instance_variable_set("@#{base_class.to_s.underscore}", obj.clone)
               end
@@ -115,7 +119,11 @@ module Zena
               end
               page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
             else
-              page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
+              if position = params[:insert]
+                page.call 'Zena.insert_inner', params[:dom_id], position, render(:file => template_path_from_template_url + ".erb")
+              else
+                page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
+              end
             end
           end
           page << render_js(false)
@@ -179,43 +187,46 @@ module Zena
 
       module ZafuMethods
         def self.included(base)
-          # TODO: move process_drag, process_toggle in 'before_wrap' callback so that 'node' properly set.
+          # TODO: move process_toggle in 'before_wrap' callback so that 'node' is properly set.
           base.before_process :process_drag, :process_toggle
           base.before_wrap    :wrap_with_drag
         end
 
-        def wrap_with_drag(text)
-          if @wrap_with_drag
-            @wrap_with_drag.wrap(text)
-          else
-            text
-          end
+        def process_drag
+          @drag_param = @params.delete(:draggable)
         end
 
         # Force an id on the current tag and record the DOM_ID to make the element draggable.
-        def process_drag
-          return unless drag = @params.delete(:draggable)
+        def wrap_with_drag(text)
+          # do not render drag in make_form
+          return text unless @drag_param && !@context[:make_form]
+          drag = @drag_param
 
-          if @markup.params[:id]
-            # we do not mess with it
-            markup = @wrap_with_drag = Zafu::Markup.new('span')
+          if @markup.params[:id] || (@markup.done && @method == 'link') # hack to rewrap link...
+            # we do not mess with the original but use our own markup
+            markup = @wrap_markup = Zafu::Markup.new('span')
           else
             markup = @markup
           end
 
           markup.tag ||= 'div'
 
-          node = pre_filter_node
-
           if @name.blank?
             # make sure we have a scope
-            set_dom_prefix(node)
+            node.dom_prefix = dom_name
           end
 
-          # We do not want to use the same id as the 'each' loop but we also want to
-          # avoid changing the node context
-          @drag_prefix ||= root.get_unique_name('drag', true).gsub(/[^\d\w\/]/,'_')
-          markup.set_id(node.dom_id(:dom_prefix => @drag_prefix))
+          if erb_dom_id = markup.dyn_params[:id]
+            # id set, get erb id
+          else
+            # We do not want to use the same id as the 'each' loop but we also want to
+            # avoid changing the node context
+            @drag_prefix ||= root.get_unique_name('drag', true).gsub(/[^\d\w\/]/,'_')
+            erb_dom_id = node.dom_id(:dom_prefix => @drag_prefix)
+            markup.set_id(erb_dom_id)
+          end
+
+          dom_id = erb_dom_id[/<%=\s*(.*?)\s*%>/,1]
 
           markup.append_param(:class, 'drag')
 
@@ -234,7 +245,13 @@ module Zena
             js_options << (%w{true false}.include?(revert) ? revert : revert.inspect)
           end
 
-          markup.pre_wrap[:drag] = "#{handle}<% add_drag_id(\"#{node.dom_id(:dom_prefix => @drag_prefix, :erb => false)}\", #{js_options.join(', ').inspect}) %>"
+          markup.pre_wrap[:drag] = "#{handle}<% add_drag_id(#{dom_id}, #{js_options.join(', ').inspect}) %>"
+
+          if @markup == markup
+            text
+          else
+            markup.wrap(text)
+          end
         end
 
         # Display an input field to filter a remote block
@@ -243,13 +260,24 @@ module Zena
             return unless block = find_target(upd)
           else
             return parser_error("missing 'block' in same parent") unless parent && block = parent.descendant('block')
+            if block.name.blank?
+              block.name ||= unique_name
+            end
+            upd = block.name
           end
 
           return parser_error("cannot use 's' as key (used by start_node)") if @params[:key] == 's'
 
+          # Move up in case we are in a list.
+          if self.node.list_context?
+            node = self.node.up(Node)
+          else
+            node = self.node
+          end
+          node.dom_prefix = dom_name
           dom_id = node.dom_id(:erb => false)
 
-          out %Q{<%= form_remote_tag(:url => zafu_node_path(#{node}.zip), :method => :get, :html => {:id => \"#{dom_id}_f\"}) %>
+          out %Q{<%= form_remote_tag(:url => zafu_node_path(#{node}), :method => :get, :html => {:id => \"#{dom_id}_f\"}) %>
           <div class='hidden'>
             <input type='hidden' name='t_url' value='#{template_url(upd)}'/>
             <input type='hidden' name='dom_id' value='#{upd}'/>
@@ -271,25 +299,22 @@ module Zena
         def r_drop
           if parent.method == 'each' && @method == parent.single_child_method
             # We reuse the 'each' block.
-            markup = parent.markup
-            # Make sure the parent has a proper dom_prefix.
-            parent.set_dom_prefix
+            target = parent
           else
-            set_dom_prefix
-            markup = @markup
+            node.dom_prefix = dom_name
+            target = self
           end
 
+          # Make sure the target has a proper dom_prefix.
+          # FIXME: Test without, not sure this is needed anymore
+          #target.node.dom_prefix = target.dom_name
+
+          node = target.node
+          markup = target.markup
+
           markup.tag ||= 'div'
 
-          # This dom_id detection code is crap but it fixes the drop in each bug.
-          if dom_id = markup.dyn_params[:id]
-            if dom_id =~ /<%= %Q\{(.*)\} %>/
-              dom_id = $1
-            end
-          else
-            dom_id = node.dom_id(:list => false, :erb => false)
-            markup.set_id(node.dom_id(:list => false))
-          end
+          dom_id, dom_prefix = get_dom_id(target)
 
           markup.append_param(:class, 'drop') unless markup.params[:class] =~ /drop/
 
@@ -300,11 +325,11 @@ module Zena
           end
 
           if role = @params.delete(:set) || @params.delete(:add)
-            @params["node[#{role}_id]"] = '\#{id}'
+            @params["node[#{role}_id]"] = '\\#{id}'
           end
 
-          query_params << ", :url => #{make_href(self.name, :action => 'drop')}"
-          markup.pre_wrap[:drop] = "<% add_drop_id(\"#{dom_id}\"#{query_params}) %>"
+          query_params << ", :url => #{make_href(target, :action => 'drop')}"
+          markup.pre_wrap[:drop] = "<% add_drop_id(#{dom_id}#{query_params}) %>"
           r_block
         end
 
@@ -316,7 +341,7 @@ module Zena
           finder = RubyLess.translate(self, finder)
           return parser_error("Invalid class 'for' parameter: #{finder.klass}") unless finder.klass <= Node
 
-          set_dom_prefix
+          node.dom_prefix = dom_name
           dom_id = node.dom_id(:erb => false)
           markup.set_id(node.dom_id)
           markup.append_param(:class, 'toggle')
@@ -342,7 +367,7 @@ module Zena
           if dom_id = @markup.params[:id]
             # we do not mess with it
           else
-            set_dom_prefix
+            node.dom_prefix = dom_name
             markup.set_id(node.dom_id)
             dom_id = node.dom_id(:erb => false)
           end
@@ -403,6 +428,22 @@ module Zena
          #end
         end
 
+        # Add some js at end of document/partial
+        def r_js
+          if @blocks.detect {|b| !b.kind_of?(String)}
+            out "<% js_data << capture do %>"
+            out expand_with
+            out "<% end %>"
+          else
+            txt = @blocks.join('')
+            out "<% js_data << #{txt.inspect} %>"
+          end
+        end
+
+        def r_ajax?
+          r_if(RubyLess.translate(self, 'ajax?'))
+        end
+
         protected
 
           def need_ajax?(each_block)
@@ -413,6 +454,39 @@ module Zena
             each_block.descendant('unlink')
           end
 
+          # Returns ruby for dom_id.
+          #
+          # FIXME: HACK
+          # This dom_id detection code is crap but it fixes the drop in each bug.
+          def get_dom_id(target)
+            if dom_id = target.markup.dyn_params[:id] || target.markup.params[:id]
+              if dom_id =~ /^<%=\s+(.*?)\s+%>$/
+                dom_id = $1
+              else
+                dom_id = "%Q{#{dom_id}}"
+              end
+
+            elsif target.context
+              # @context set, so node is available
+              dom_id = "%Q{#{target.node.dom_id(
+                :list => target.method == 'each',
+                :erb => false
+              )}}"
+
+              target.markup.set_id(node.dom_id(
+                :list => target.method == 'each'
+              ))
+            else
+              # Has not been rendered yet, does not have a dom_prefix set.
+              dom_id = "%Q{#{target.dom_name}}"
+
+              target.markup.set_id(node.dom_id(
+                :list => target.method == 'each'
+              ))
+            end
+
+            return [dom_id, target.context ? target.node.dom_prefix : target.dom_name]
+          end
       end
     end # Ajax
   end # Use