zena 1.2.4 → 1.2.5

data/lib/zena/use/ancestry.rb

@@ -10,7 +10,7 @@ module Zena
         TITLE_ML_JOIN = %Q{INNER JOIN idx_nodes_ml_strings AS id1 ON id1.node_id = nodes.id AND id1.key = 'title'}
 
         # (slow). Find a node by it's path. This is used during node importation when stored as zml files or to resolve custom_base url until we have an "alias" table.
-        def find_by_path(path, parent_id = current_site.root_id, multilingual = false)
+        def find_by_path(path, parent_id = current_site.orphan_id, multilingual = false)
           res  = nil
           path = path.split('/') unless path.kind_of?(Array)
           last = path.size - 1

data/lib/zena/use/authlogic.rb

@@ -50,7 +50,8 @@ module Zena
             User.send(:with_scope, :find => {:conditions => ['site_id = ?', site.id]}) do
               if user = token_visitor || registered_visitor || anonymous_visitor(site)
                 user.asset_host = @asset_host
-                Thread.current[:visitor] = user
+                # Make sure we load alias site in visitor
+                setup_visitor(user, site)
               end
             end
           end

data/lib/zena/use/display.rb

@@ -236,6 +236,7 @@ module Zena
         safe_method  [:sprintf,     String, Number]                     => {:class => String, :method => 'sprintf'}
         safe_method  [:search_box,  {:ajax => String, :type => String}] => {:class => String, :method => 'search_box', :html_safe => true}
         safe_context [:admin_links, {:list => String}]                  => [String]
+        safe_method :uuid => String
 
         # Return sprintf formated entry. Return '' for values eq to zero.
         def sprintf_unless_zero(fmt, value)
@@ -246,6 +247,11 @@ module Zena
         def search_box(opts={})
           render_to_string(:partial=>'search/form', :locals => {:ajax => opts[:ajax], :type => opts[:type]})
         end
+        
+        # Return a random string that can be used as id (starts with a character)
+        def uuid
+          'u' + UUIDTools::UUID.random_create.to_s.gsub('-','')[0..8]
+        end
 
         # Return the 'zip' of the node corresponding to the browser url (start node). This value is kept
         # accross all Ajax calls.

data/lib/zena/use/query_builder.rb

@@ -1,7 +1,7 @@
 module Zena
   module Use
     module QueryBuilder
-      DATE_FIELD_REGEXP = %r{\d+[\.-/]\d+[\.-/]\d+}
+      DATE_FIELD_REGEXP = %r{\d+[\.\-/]\d+[\.\-/]\d+}
       module ViewMethods
         include RubyLess
         # Pseudo string comming from params.

data/lib/zena/use/query_node.rb

@@ -105,7 +105,7 @@ module Zena
         end
       end
 
-      class Compiler < QueryBuilder::Processor
+      class Compiler < ::QueryBuilder::Processor
         attr_reader :context # ?
         set_main_table 'nodes'
         set_main_class 'Node'
@@ -328,7 +328,7 @@ module Zena
             if klass = Node.get_class(right[1])
               "#{field_or_attr('kpath')} #{is_not ? 'NOT ' : ''}LIKE #{quote(klass.kpath + '%')}"
             else
-              raise QueryBuilder::QueryException.new("Unknown class #{right.last.inspect}.")
+              raise ::QueryBuilder::QueryException.new("Unknown class #{right.last.inspect}.")
             end
           else
             process_op(:like, left, right)
@@ -577,7 +577,7 @@ module Zena
                 set_main_class(klass)
                 kpath_filter = ".kpath LIKE #{quote("#{klass.kpath}%")}" unless klass.kpath == 'N'
               else
-                raise QueryBuilder::QueryException.new("Unknown class #{klass} in scope '#{class_name}:#{scope}'.")
+                raise ::QueryBuilder::QueryException.new("Unknown class #{klass} in scope '#{class_name}:#{scope}'.")
               end
             else
               klass = nil

data/lib/zena/use/rendering.rb

@@ -171,21 +171,28 @@ module Zena
               render :inline => result[:data]
               
             else
-              if zafu_headers
-                if disposition = zafu_headers.delete('Content-Disposition')
-                  result.delete(:filename) if disposition =~ /filename\s*=/
-                  result[:disposition] = disposition
-                end
+              
+              if disposition = zafu_headers.delete('Content-Disposition')
+                result.delete(:filename) if disposition =~ /filename\s*=/
+                result[:disposition] = disposition
+              end
 
-                if type = zafu_headers.delete('Content-Type')
-                  result[:type] = type
-                end
+              if type = zafu_headers.delete('Content-Type')
+                result[:type] = type
+              end
 
-                if filename = zafu_headers.delete('filename')
-                  result[:filename] = filename
+              if filename = zafu_headers.delete('filename')
+                result[:filename] = filename
+              end
+              
+              if status = zafu_headers.delete('Status')
+                if (status.to_i / 100) == 3
+                  redirect_to zafu_headers.delete('Location'), :status => status.to_i
+                else
+                  render :status => status.to_i
                 end
-
                 headers.merge!(zafu_headers)
+                return
               end
 
               if data = result.delete(:data)
@@ -195,7 +202,9 @@ module Zena
               else
                 # Should never happen
                 raise Exception.new("Render '#{params[:format]}' should return either :file or :data (none found).")
-              end
+              end  
+              headers.merge!(zafu_headers)
+              
             end
 
             cache_page(:content_data => result[:data], :content_path => result[:file]) if opts[:cache]
@@ -205,7 +214,26 @@ module Zena
               render_to_string :file => template_url(opts), :layout => false
             else
               render :file => template_url(opts), :layout => false, :status => opts[:status]
+              
+              if status = zafu_headers.delete('Status')
+                # reset rendering
+                response.content_type = nil
+                erase_render_results
+                reset_variables_added_to_assigns
+                
+                if (status.to_i / 100) == 3
+                  redirect_to zafu_headers.delete('Location'), :status => status.to_i
+                else
+                  render :status => status.to_i
+                end
+                
+                headers.merge!(zafu_headers)
+                
+                return
+              end
+              
               headers.merge!(zafu_headers)
+              
               cache_page(:url => opts[:cache_url]) if opts[:cache]
             end
           end
@@ -239,7 +267,13 @@ module Zena
                     :content_data  => response.body,
                     :node_id       => @node[:id]
                     }.merge(opts)
-            secure!(CachedPage) { CachedPage.create(opts) }
+            if secure!(CachedPage) { CachedPage.create(opts) }
+              true
+            else
+              false
+            end
+          else
+            false
           end
         end
 

data/lib/zena/use/test_helper.rb

@@ -9,7 +9,7 @@ module Zena
       # Set visitor for unit testing
       def login(fixture)
         user = users(fixture)
-        Thread.current[:visitor] = user
+        setup_visitor(user, user.site)
         user.ip = '10.0.0.44'
         $_test_site = user.site.name
         ::I18n.locale = user.lang

data/lib/zena/use/urls.rb

@@ -93,7 +93,7 @@ module Zena
             if ep.delete('mode')
               mode ||= params[:mode]
             end
-            opts['encode_params'] = ep
+            opts[:encode_params] = ep
           end
 
           if host = opts.delete(:host)
@@ -155,6 +155,7 @@ module Zena
         end
 
         def append_query_params(path, opts)
+          
           if opts == {}
             path
           else
@@ -162,7 +163,9 @@ module Zena
             list = opts.keys.map do |k|
               # FIXME: DOC
               if k.to_s == 'encode_params'
-                opts[k].map do |key|
+                list = opts[k]
+                list = list.split(',').map(&:strip) unless list.kind_of?(Array)
+                list.map do |key|
                   value = params[key]
                   if value.kind_of?(Hash)
                     {key => value}.to_query
@@ -277,7 +280,7 @@ module Zena
         def host_with_port
           @host_with_port ||= begin
             port = request.port
-            if port.blank? || port.to_s == '80'
+            if port.blank? || port.to_s == '80' || port.to_s == '443'
               current_site.host
             else
               "#{current_site.host}:#{port}"
@@ -502,107 +505,6 @@ module Zena
           # We wrap without callbacks (before_wrap, after_wrap) so that the link
           # is used as raw text in these callbacks.
           markup.wrap(text)
-=begin
-          query_params = options[:query_params] || {}
-          default_text = options[:default_text]
-          params = {}
-          (options[:params] || @params).each do |k,v|
-            next if v.nil?
-            params[k] = v
-          end
-
-          opts = {}
-
-          if href = params.delete(:href)
-            if lnode = get_context_var('set_var', value) && stored.klass <= Node
-              # using stored node
-            else
-              lnode, klass = build_finder(:first, href, {})
-              return unless lnode
-              return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
-            end
-          else
-            # obj
-            if node_class == Version
-              lnode = "#{node}.node"
-              opts[:lang] = "#{node}.lang"
-            elsif node.will_be?(Node)
-              lnode = node
-            else
-              lnode = @context[:previous_node]
-            end
-          end
-
-          if fmt = params.delete(:format)
-            if fmt == 'data'
-              opts[:format] = "#{node}.ext"
-            else
-              opts[:format] = fmt.inspect
-            end
-          end
-
-          if mode = params.delete(:mode)
-            opts[:mode] = mode.inspect
-          end
-
-          if anchor = params.delete(:anchor)
-            opts[:anchor] = anchor.inspect
-          end
-
-          if anchor_in = params.delete(:in)
-            finder, klass = build_finder(:first, anchor_in, {})
-            return unless finder
-            return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
-            opts[:anchor_in] = finder
-          end
-
-          if @html_tag && @html_tag != 'a'
-            # FIXME: can we remove this ?
-            # html attributes do not belong to anchor
-            pre_space = ''
-            html_params = {}
-          else
-            html_params = get_html_params(params.merge(@html_tag_params), :link)
-            pre_space = @space_before || ''
-            @html_tag_done = true
-          end
-
-          (params.keys - [:style, :class, :id, :rel, :name, :anchor, :attr, :tattr, :trans, :text]).each do |k|
-            next if k.to_s =~ /if_|set_|\A_/
-            query_params[k] = params[k]
-          end
-
-          # TODO: merge these two query_params cleanup things into something cleaner.
-          else
-            # direct link
-            query_params.each do |k,v|
-              if k == :date
-                if v == 'current_date'
-                  query_params[k] = current_date
-                elsif v =~ /\A\d/
-                  query_params[k] = v.inspect
-                elsif v =~ /\[/
-                  attribute, static = parse_attributes_in_value(v.gsub('"',''), :erb => false)
-                  query_params[k] = "\"#{attribute}\""
-                else
-                  query_params[k] = node_attribute(v)
-                end
-              else
-                attribute, static = parse_attributes_in_value(v.gsub('"',''), :erb => false)
-                query_params[k] = "\"#{attribute}\""
-              end
-            end
-
-            query_params.merge!(opts)
-
-            opts_str = ''
-            query_params.keys.sort {|a,b| a.to_s <=> b.to_s }.each do |k|
-              opts_str << ",:#{k.to_s.gsub(/[^a-z_A-Z_]/,'')}=>#{query_params[k]}"
-            end
-
-            pre_space + "<a#{params_to_html(html_params)} href='<%= zen_path(#{lnode}#{opts_str}) %>'>#{text_for_link(default_text)}</a>"
-          end
-=end
         end
 
 

data/lib/zena/use/zafu_safe_definitions.rb

@@ -117,7 +117,9 @@ module Zena
         def self.first_proc
           @@first_proc ||= Proc.new do |receiver, method|
             if elem = receiver.opts[:elem] || receiver.klass.first
-              RubyLess::TypedString.new("#{receiver.raw}.first", :class => elem, :nil => true)
+              # All query contexts are only opened if they are not empty.
+              could_be_nil = !receiver.opts[:query]
+              RubyLess::TypedString.new("#{receiver.raw}.first", :class => elem, :nil => could_be_nil, :query => receiver.opts[:query])
             else
               # should never happen
               raise RubyLess::NoMethodError.new(receiver.raw, receiver.klass, ['first'])
@@ -157,7 +159,8 @@ module Zena
         
         safe_method :now    => {:method => 'Time.now', :class => Time}
         safe_method :string_hash => {:method => 'StringHash.new', :class => StringHash}
-        safe_method [:string_hash, Hash] => {:method => 'StringHash.from_hash', :class => StringHash}
+        safe_method [:string_hash, Hash]   => {:method => 'StringHash.from_hash',   :class => StringHash}
+        safe_method [:string_hash, String] => {:method => 'StringHash.from_string', :class => StringHash}
         safe_method [:h, String] => {:class => String, :accept_nil => true}
         safe_method_for String, [:gsub, Regexp, String] => {:class => String, :pre_processor => true}
         safe_method_for String, :upcase    => {:class => String, :pre_processor => true}
@@ -166,8 +169,10 @@ module Zena
         safe_method_for String, :url_name  => {:class => String, :pre_processor => true, :method => :url_name}
         safe_method_for String, :to_i      => {:class => Number, :pre_processor => true}
         safe_method_for String, :to_s      => {:class => String, :pre_processor => true}
-        safe_method_for String, [:limit, Number]  => {:class => String, :pre_processor => true, :html_safe => true}
-        safe_method_for String, [:limit, Number, String]  => {:class => String, :pre_processor => true, :html_safe => true}
+        safe_method_for String, :size      => {:class => Number, :pre_processor => true}
+        safe_method_for String, [:limit, Number]  => {:class => String, :pre_processor => true}
+        safe_method_for String, [:limit, Number, String]  => {:class => Number, :pre_processor => true}
+        
         safe_method_for String, :to_f      => {:class => Number, :pre_processor => true}
         safe_method_for String, :to_json   => {:class => String, :pre_processor => true}
         safe_method_for String, [:split, String] => {:class => [String], :pre_processor => true}

data/lib/zena/use/zafu_templates.rb

@@ -261,6 +261,7 @@ module Zena
             return default_template_url(opts) unless zafu_url
             
             rel_path  = current_site.zafu_path + "/#{zafu_url}/#{lang_path}/_main.erb"
+            
             path      = SITES_ROOT + rel_path
             if !File.exists?(path) || params[:rebuild]
               if @node && klass = VirtualClass.find_by_kpath(template.tkpath)

data/locale/app.pot

@@ -407,6 +407,10 @@ msgstr ""
 msgid "site_img"
 msgstr ""
 
+#: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
+msgid "alias_img"
+msgstr ""
+
 #: app/views/sites/_li.erb:11
 msgid "no API"
 msgstr ""

data/locale/de/zena.po

@@ -1612,11 +1612,15 @@ msgstr "%H:%M"
 #: app/views/sites/_form.erb:22 lib/gettext_strings.rb:38
 #, fuzzy
 msgid "site group"
-msgstr "<img src='/images/group.png' title='group'/>"
+msgstr "<img src='/images/group.png' alt='group' title='group'/>"
 
 #: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
 msgid "site_img"
-msgstr "<img src='/images/world.png' title='site'/>"
+msgstr "<img src='/images/world.png' alt='site' title='site'/>"
+
+#: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
+msgid "alias_img"
+msgstr "<img src='/images/world_link.png' alt='alias' title='alias'/>"
 
 #: app/views/sites/index.erb:1 lib/zena/use/display.rb:279
 msgid "sites"

data/locale/en/zena.po

@@ -480,7 +480,7 @@ msgstr "Acl with highest priority is tested first."
 #: app/views/acls/_form.rhtml:47
 msgid "acl_query_help"
 msgstr ""
-"SQLiss query to fetch all the nodes for which this acl authorizes access."
+"SQLiss query to fetch all the nodes for which this acl authorizes access (Ruby)."
 
 #: lib/zena/use/display.rb:282
 msgid "acls"
@@ -1595,7 +1595,11 @@ msgstr "<img src='/images/group.png' alt='group'/>"
 
 #: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
 msgid "site_img"
-msgstr "<img src='/images/world.png' alt='site'/>"
+msgstr "<img src='/images/world.png' alt='site' title='site'/>"
+
+#: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
+msgid "alias_img"
+msgstr "<img src='/images/world_link.png' alt='alias' title='alias'/>"
 
 #: app/views/sites/index.erb:1 lib/zena/use/display.rb:279
 msgid "sites"

data/locale/fr/zena.po

@@ -1545,7 +1545,11 @@ msgstr "groupe de site"
 
 #: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
 msgid "site_img"
-msgstr "<img src='/images/world.png' alt='site'/>"
+msgstr "<img src='/images/world.png' alt='site' title='site'/>"
+
+#: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
+msgid "alias_img"
+msgstr "<img src='/images/world_link.png' alt='alias' title='alias'/>"
 
 #: app/views/sites/index.erb:1 lib/zena/use/display.rb:279
 msgid "sites"

data/locale/it/zena.po

@@ -480,7 +480,7 @@ msgstr "Acl with highest priority is tested first."
 
 #: app/views/acls/_form.rhtml:47
 msgid "acl_query_help"
-msgstr "SQLiss query to fetch all the nodes for which this acl authorizes access."
+msgstr "SQLiss query to fetch all the nodes for which this acl authorizes access (Ruby)."
 
 #: lib/zena/use/display.rb:282
 msgid "acls"
@@ -1658,7 +1658,11 @@ msgstr "<img src='/images/group.png' alt='group'/>"
 #: app/views/sites/_li.erb:2
 #: lib/gettext_strings.rb:34
 msgid "site_img"
-msgstr "<img src='/images/world.png' alt='site'/>"
+msgstr "<img src='/images/world.png' alt='site' title='site'/>"
+
+#: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
+msgid "alias_img"
+msgstr "<img src='/images/world_link.png' alt='alias' title='alias'/>"
 
 #: app/views/sites/index.erb:1
 #: lib/zena/use/display.rb:279