zena 1.2.3 → 1.2.4

data/lib/zena/use/calendar.rb

@@ -289,6 +289,8 @@ module Zena
                 if !c_date_code.klass <= Time
                   return parser_error("Invalid 'date' parameter. Should be a Time (found #{current_date.klass})")
                 end
+              elsif dvar = get_context_var('set_var', 'date')
+                c_date_code = dvar
               else
                 # Get current date from url for the current time_zone
                 c_date_code = RubyLess.translate(self, 'date(tz)')

data/lib/zena/use/conditional.rb

@@ -10,27 +10,28 @@ module Zena::Use::Conditional
       return parser_error("Cannot scope class in list (use each before filtering).") if node.list_context?
       # capital letter ==> class conditional
       if klass = VirtualClass[class_name]
-        if node.klass.kpath =~ %r{^#{klass.kpath}} || klass.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
+        # FIXME: This does not always work... (block inside block resets class scoping...). We should always render blocks with 'Node' class...
+        #if node.klass.kpath =~ %r{^#{klass.kpath}} || klass.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
           # Saved templates can be rendered with anything...
           # FIXME: Make sure saved templates from 'block' start with the proper node type ?
           cond     = "#{node}.kpath_match?('#{klass.kpath}')"
           new_node = node.move_to(node.name, klass)
-        else
-          # render nothing: incompatible classes
-          cond     = 'false'
-          new_node = node.move_to(node.name, klass)
-        end
+        #else
+        #  # render nothing: incompatible classes
+        #  cond     = 'false'
+        #  new_node = node.move_to(node.name, klass)
+        #end
       elsif role = Node.get_role(class_name)
-        if node.klass.kpath =~ %r{^#{role.kpath}} || role.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
-          # Saved templates can be rendered with anything...
-          # FIXME: Make sure saved templates from 'block' start with the proper node type ?
+        #if node.klass.kpath =~ %r{^#{role.kpath}} || role.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
+        #  # Saved templates can be rendered with anything...
+        #  # FIXME: Make sure saved templates from 'block' start with the proper node type ?
           cond     = "#{node}.has_role?(#{role.id})"
           new_node = node.move_to(node.name, node.klass)
-        else
-          # render nothing: incompatible classes
-          cond     = 'false'
-          new_node = node.move_to(node.name, node.klass)
-        end
+        #else
+        #  # render nothing: incompatible classes
+        #  cond     = 'false'
+        #  new_node = node.move_to(node.name, node.klass)
+        #end
       else
         return parser_error("Invalid role or class '#{class_name}'")
       end

data/lib/zena/use/dates.rb

@@ -138,11 +138,14 @@ module Zena
           else
             fld = "<input id='#{opts[:id]}' name='#{name}' type='text' value='#{value}' class='#{opts[:class]}'/>"
           end
-
+          
+          if onUpdate = opts[:onUpdate]
+            onUpdate = "onUpdate : #{onUpdate},"
+          end
           js_data << %Q{Calendar.setup({
               inputField  : "#{opts[:id]}",      // id of the input field
               button      : "#{opts[:button]}",  // trigger for the calendar (button ID)
-              singleClick : true,
+              singleClick : true,#{onUpdate}
               showsTime   : #{showsTime},
               ifFormat    : '#{dateFormat}'
           });}

data/lib/zena/use/display.rb

@@ -453,12 +453,13 @@ module Zena
           end
 
           if signature
+            # TODO: Get 'notextile' param from rubyless.
             if node = node(Node)
               {
                 :class  => String,
                 :method => 'zazen',
                 :accept_nil => true,
-                :html_safe => true,
+                :html_safe  => true,
                 :append_hash => {:node => ::RubyLess::TypedString.new(node.to_s, :class => node.klass)}
               }
             else
@@ -468,7 +469,7 @@ module Zena
             node = node(Node) || '@node'
             return nil unless attribute = get_attribute_or_eval
 
-            hash_arguments = extract_from_params(:code, :host, :line_numbers, :theme, :target) || []
+            hash_arguments = extract_from_params(:code, :notextile, :host, :line_numbers, :theme, :target) || []
 
             hash_arguments.insert(0, ":node => #{node}")
 

data/lib/zena/use/forms.rb

@@ -48,9 +48,15 @@ module Zena
               name = "node[#{name}]"
             end
             res = []
-            res << "<input type='hidden' name='#{name}' value=''/>"
+            if default = opts[:default]
+              default = fquote default.to_s
+            else
+              default = ''
+            end
+            res << "<input type='hidden' name='#{name}' value='#{default}'/>"
+            type = opts[:type] || 'checkbox'
             list.each_with_index do |value, i|
-              res << ("<input type='checkbox' name='#{name}' value='#{value}'" +
+              res << ("<input type='#{type}' name='#{name}' value='#{value}'" +
               (selected.include?(value.to_s) ? " checked='checked'/> " : '/> ') +
               "<span>#{show[i]}</span>")
             end
@@ -337,7 +343,6 @@ module Zena
               elsif params[:focus]
                 hidden_fields['done'] = "'$(\"#{erb_dom_id}_#{params[:focus]}\").focus();'"
               end
-              
             else
               # ajax form, not in 'add'
               done = RubyLess.translate_string(self, @params[:done])
@@ -506,7 +511,10 @@ module Zena
             if !tprefix.blank? && tprefix != 'false'
               options_list.map! do |e|
                 if e[0] =~ /^([^a-zA-Z]*)(.*)$/
-                  [$1 + trans("#{tprefix}_#{$2}"), e[1]]
+                  name = "#{tprefix}_#{$2}"
+                  t = trans(name)
+                  t = $2 if t == name
+                  [$1 + t, e[1]]
                 else
                   e
                 end
@@ -565,10 +573,12 @@ module Zena
             end
             value = code # @context[:in_add] ? "''" : code
             html_params = [':size => 15']
-            [:style, :class, :onclick, :size, :time].each do |key|
+            [:style, :class, :onclick, :size, :time, :id, :onUpdate].each do |key|
               html_params << ":#{key} => #{@params[key].inspect}" if @params[key]
             end
-            html_params << ":id=>\"#{node.dom_id(:erb => false)}_#{attribute}\"" if node.dom_prefix
+            if !@params[:id] and node.dom_prefix
+              html_params << ":id=>\"#{node.dom_id(:erb => false)}_#{attribute}\""
+            end
             "<%= date_box(#{node}, #{html_attributes[:name].inspect}, :value => #{value}, #{html_params.join(', ')}) %>"
           when 'id'
             return parser_error("select id without name") unless attribute
@@ -619,9 +629,18 @@ module Zena
               opts << ":show => #{show_values.split(',').map(&:strip).inspect}"
             elsif show_values = @params[:tshow]
               opts << ":show => #{translate_list(show_values).inspect}"
+            else
+              opts << ":show => #{translate_list(values, @params[:tprefix] || name).inspect}"
             end
             meth = RubyLess.translate(self, "this.#{name}")
             opts << ":selected => #{meth}"
+            if default = @params[:default]
+              opts << ":default => #{default.inspect}"
+            end
+            
+            if type = @params[:type]
+              opts << ":type => #{type.inspect}"
+            end
             attribute = name
             res = "<%= make_checkbox(#{node}, #{opts.join(', ')}) %>"
           else
@@ -654,7 +673,10 @@ module Zena
           extract_label(res, attribute)
         end
 
-        alias r_radio r_checkbox
+        def r_radio
+          @params[:type] = 'radio'
+          r_checkbox
+        end
 
         # Parse params to extract everything that is relevant to building input fields.
         # TODO: refactor and pass the @markup so that attributes are added directly
@@ -823,8 +845,13 @@ module Zena
                 set_attr  = ::RubyLess.translate(self, @params[:attr] || 'id')
                 show_attr = ::RubyLess.translate(self, @params[:show] || 'title')
               end
-
-              options_list = "[['','']] + (#{nodes} || []).map{|r| [#{show_attr}, #{set_attr}.to_s]}"
+              
+              if @params[:blank] != 'false'
+                options_list = "[['', '']] + "
+              else
+                options_list = ""
+              end
+              options_list = "#{options_list}(#{nodes} || []).map{|r| [#{show_attr}, #{set_attr}.to_s]}"
             elsif values = @params[:values]
               options_list = values.split(',').map(&:strip)
 

data/lib/zena/use/i18n.rb

@@ -251,7 +251,7 @@ module Zena
               end
             else
               if params[:controller] == 'nodes'
-                res << tag_in + "<a href='#{zen_path(@node, :lang => l)}'>#{l}</a>"
+                res << tag_in + "<a href='#{zen_path(@node, :lang => l)}'>#{l}</a>" + tag_out
               else
                 res << tag_in + link_to(l, params.merge(:lang => l)) + tag_out
               end
@@ -384,9 +384,15 @@ module Zena
 
         # Translate a string representing a list of values separated with a comma ('dog,cat,house')
         # to a list of strings.
-        def translate_list(str)
+        def translate_list(str, prefix = nil)
           if trad = trans(str, false)
             trad.split(',').map(&:strip)
+          elsif prefix
+            str.split(',').map(&:strip).map do |v|
+              k = "#{prefix}_#{v}"
+              d = trans(k)
+              d == k ? v : d
+            end
           else
             str.split(',').map(&:strip).map{|v| trans(v)}
           end

data/lib/zena/use/image_builder.rb

@@ -80,6 +80,7 @@ module Zena
 
       def initialize(h)
         params = {:height=>nil, :width=>nil, :path=>nil, :file=>nil, :actions=>[]}.merge(h)
+        node = params.delete(:node)
 
         params.each do |k,v|
           case k
@@ -105,6 +106,10 @@ module Zena
           if @img = build_image_from_file_or_path
             @width  = @img.columns
             @height = @img.rows
+            if node && node.respond_to?(:fix_sizes)
+              # Fix property
+              node.fix_sizes(@width, @height)
+            end
           end
         end
       end
@@ -331,6 +336,8 @@ module Zena
             img
           end
         end
+      rescue
+        nil
       end
     end # ImageBuilder
   end # Use

data/lib/zena/use/query_node.rb

@@ -286,12 +286,19 @@ module Zena
           "params[#{pagination_key.to_sym.inspect}]"
         end
 
+        def process_not_equal(left, right)
+          if (left == [:field, 'class'] || left == [:field, 'klass']) && (right[0] == :field || right[0] == :string)
+            process_equal(left, right, true)
+          else
+            process_op(:'<>', left, right)
+          end
+        end
+        
         # Handle special case for 'class = ' and 'role = ' and 'foo.date ='
-        def process_equal(left, right)
-          if (left == [:field, 'class'] || left == [:field, 'klass']) &&
-             (right[0] == :field || right[0] == :string)
+        def process_equal(left, right, is_not = nil)
+          if (left == [:field, 'class'] || left == [:field, 'klass']) && (right[0] == :field || right[0] == :string)
             if klass = Node.get_class(right.last)
-              "#{field_or_attr('kpath')} = #{quote(klass.kpath)}"
+              "#{field_or_attr('kpath')} #{is_not ? '<>' : '='} #{quote(klass.kpath)}"
             else
               raise ::QueryBuilder::Error.new("Unknown class #{right.last.inspect}.")
             end
@@ -311,15 +318,15 @@ module Zena
             b = right
             process([:and, [:<=, b, a], [:<, a, [:+, b, [:interval, [:integer, '1'], 'day']]]])
           else
-            super
+            process_op(:'=', left, right)
           end
         end
 
         # Handle special case for 'class like '
-        def process_like(left, right)
-          if left == [:field, 'class'] && right[0] == :field
+        def process_like(left, right, is_not = nil)
+          if (left == [:field, 'class'] || left == [:field, 'klass']) && right[0] == :field
             if klass = Node.get_class(right[1])
-              "#{field_or_attr('kpath')} LIKE #{quote(klass.kpath + '%')}"
+              "#{field_or_attr('kpath')} #{is_not ? 'NOT ' : ''}LIKE #{quote(klass.kpath + '%')}"
             else
               raise QueryBuilder::QueryException.new("Unknown class #{right.last.inspect}.")
             end
@@ -327,6 +334,15 @@ module Zena
             process_op(:like, left, right)
           end
         end
+        
+        # [:like, [:field, "class"], [:field, "Image"]]
+        def process_not(arg)
+          if (arg[1] == [:field, 'class'] || arg[1] == [:field, 'klass']) && arg[0] == :like
+            process_like(arg[1], arg[2], true)
+          else
+            super
+          end
+        end
 
         def resolve_scope_idx_fields(arg1, arg2)
           if arg1.first == :function

data/lib/zena/use/relations.rb

@@ -59,11 +59,7 @@ module Zena
 
         # Class path hierarchy. Example for (Post) : N, NN, NNP
         def split_kpath
-          @split_kpath ||= begin
-            klasses   = []
-            kpath.split(//).each_index { |i| klasses << kpath[0..i] }
-            klasses
-          end
+          @split_kpath ||= VirtualClass.split_kpath(kpath)
         end
       end
 
@@ -270,7 +266,7 @@ module Zena
             #if relation.record_count > 5
             #  # FIXME: show message ?
             #end
-            links = rel.records(:limit => 5, :order => "link_id DESC")
+            links = rel.records(:limit => 25, :order => "link_id DESC")
             res << [rel, links] if links
           end
           res

data/lib/zena/use/rendering.rb

@@ -81,13 +81,16 @@ module Zena
             zafu_node('@node', Project)
 
             respond_to do |format|
-              format.xml  { render :nothing => true, :status => "404 Not Found" }
               format.all do
-                not_found = "#{SITES_ROOT}/#{current_site.host}/public/#{prefix}/404.html"
-                if File.exists?(not_found)
-                  render :text => File.read(not_found), :status => '404 Not Found'
+                if request.format == Mime::XML
+                  render :nothing => true, :status => "404 Not Found"
                 else
-                  render_and_cache :mode => '+notFound', :format => 'html', :cache_url => "/#{prefix}/404.html", :status => '404 Not Found'
+                  not_found = "#{SITES_ROOT}/#{current_site.host}/public/#{prefix}/404.html"
+                  if File.exists?(not_found)
+                    render :text => File.read(not_found), :status => '404 Not Found'
+                  else
+                    render_and_cache :mode => '+notFound', :format => 'html', :cache_url => "/#{prefix}/404.html", :status => '404 Not Found'
+                  end
                 end
               end
             end
@@ -130,7 +133,8 @@ module Zena
           opts[:format] ||= params[:format].blank? ? 'html' : params[:format]
           #
           # cleanup before rendering
-          params.delete(:mode)
+          # params.delete(:mode)
+          
           if opts[:format] != 'html'
 
             method = "render_to_#{opts[:format]}"

data/lib/zena/use/upload.rb

@@ -149,8 +149,9 @@ module Zena
             responds_to_parent do # execute the redirect in the iframe's parent window
               render :update do |page|
                 if @node.new_record?
+                  page << "UploadProgress.setAsError(#{error_messages_for(:node, :object => @node).inspect})"
+                  Node.logger.warn "ERROR #{error_messages_for(:node, :object => @node)}"
                   page.replace_html 'form_errors', error_messages_for(:node, :object => @node)
-                  page.call 'UploadProgress.setAsError'
                 else
                   page.call 'UploadProgress.setAsFinished'
                   page.delay(1) do # allow the progress bar fade to complete
@@ -160,10 +161,11 @@ module Zena
                     if params[:reload]
                       page << "Zena.t().Zena.reload(#{params[:reload].inspect})"
                     end
-                    if params[:redir]
-                      page << "Zena.reload_and_close(#{params[:redir].inspect})"
-                    else
+                    if params[:redir] == 'more'
+                      # This is used when we want "upload more" in popup window.
                       page.redirect_to document_url(@node[:zip], :reload => params[:reload], :js => params[:js])
+                    elsif params[:redir]
+                      page << "Zena.t().window.location = #{params[:redir].gsub('NODE_ID', @node.zip.to_s).inspect}"
                     end
                   end
                 end

data/lib/zena/use/urls.rb

@@ -88,6 +88,13 @@ module Zena
 
           pre    = opts.delete(:prefix) || (visitor.is_anon? && opts.delete(:lang)) || prefix
           mode   = opts.delete(:mode)
+          if ep = opts[:encode_params]
+            ep = ep.split(',').map(&:strip)
+            if ep.delete('mode')
+              mode ||= params[:mode]
+            end
+            opts['encode_params'] = ep
+          end
 
           if host = opts.delete(:host)
             if ssl = opts.delete(:ssl)
@@ -155,10 +162,12 @@ module Zena
             list = opts.keys.map do |k|
               # FIXME: DOC
               if k.to_s == 'encode_params'
-                opts[k].split(',').map(&:strip).map do |key|
+                opts[k].map do |key|
                   value = params[key]
                   if value.kind_of?(Hash)
                     {key => value}.to_query
+                  elsif value.kind_of?(Array)
+                    {key => value.map{|v| v.blank? ? nil : v}.compact}.to_query
                   elsif !value.blank?
                     "#{key}=#{CGI.escape(value)}"
                   else
@@ -405,7 +414,7 @@ module Zena
           http_method = http_method_from_action(options[:action])
             
           if http_method == 'delete' && method != 'unlink'
-            confirm ||= '#{t("Destroy")} #{h title} ?'
+            confirm ||= '#{t("Destroy")} "#{h title}" ?'
           end
 
           if confirm
@@ -414,7 +423,7 @@ module Zena
             if confirm.literal
               markup.set_param(:"data-confirm", confirm.literal)
             else
-              markup.set_dyn_param(:"data-confirm", "<%= #{confirm} %>")
+              markup.set_dyn_param(:"data-confirm", "<%= fquote(#{confirm}) %>")
             end
           end
 
@@ -427,7 +436,7 @@ module Zena
             if true
               # Use onclick with Ajax.
               if confirm
-                markup.set_dyn_param(:onclick, "if(confirm(\"<%= #{confirm} %>\")) {new Ajax.Request(\"<%= #{href} %>\", {asynchronous:true, evalScripts:true, method:\"#{http_method}\"});} return false;")
+                markup.set_dyn_param(:onclick, "if(confirm(this.getAttribute(\"data-confirm\"))) {new Ajax.Request(\"<%= #{href} %>\", {asynchronous:true, evalScripts:true, method:\"#{http_method}\"});} return false;")
               else
                 markup.set_dyn_param(:onclick, "new Ajax.Request(\"<%= #{href} %>\", {asynchronous:true, evalScripts:true, method:\"#{http_method}\"}); return false;")
               end
@@ -732,7 +741,6 @@ module Zena
 
           # <r:link page='next'/> <r:link page='previous'/> <r:link page='list'/>
           def pagination_links
-
             return parser_error("not in pagination scope") unless pagination_key = get_context_var('paginate', 'key')
             page_direction = @params.delete(:page)
             case page_direction

data/lib/zena/use/zafu_safe_definitions.rb

@@ -179,7 +179,7 @@ module Zena
         safe_method_for Number, :fmt       => {:class => String, :pre_processor => true}
         safe_method_for Number, [:fmt, Number] => {:class => String, :pre_processor => true}
 
-        safe_method_for Range, :to_a       => {:class => [Number], :pre_processor => true}
+        safe_method_for Range, :to_a       => {:class => [Number]}
 
         safe_method_for NilClass, :to_f    => {:class => Number, :pre_processor => true}
         safe_method_for NilClass, :to_i    => {:class => Number, :pre_processor => true}