zena 1.0.0 → 1.1.0

data/lib/zena/use.rb

@@ -2,7 +2,7 @@ module Zena
   # This module is used to declare and manage the list of features used by Zena.
   module Use
     SUFFIX_NAME  = 'Methods'
-    MODULE_NAMES = %w{Controller View Zafu User}
+    MODULE_NAMES = %w{Controller View Zafu User Site Skin}
     # "Controller" => "ControllerMethods"
     MODULE_NAME  = Hash[*MODULE_NAMES.map {|n| [n, "#{n}#{SUFFIX_NAME}"]}.flatten]
 

data/lib/zena/use/action.rb

@@ -151,7 +151,7 @@ module Zena
 
         def login_path
           if params[:controller] == 'nodes'
-            url_for params.merge(:prefix => AUTHENTICATED_PREFIX)
+            zen_path(@node, :prefix => AUTHENTICATED_PREFIX)
           else
             super
           end
@@ -159,7 +159,7 @@ module Zena
 
         def logout_path
           if params[:controller] == 'nodes' && @node.public?
-            super :redirect => url_for(params.merge(:prefix => visitor.lang))
+            super :redirect => zen_path(@node, :prefix => visitor.lang)
           else
             super
           end

data/lib/zena/use/ajax.rb

@@ -7,11 +7,13 @@ module Zena
 
         # 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)
+        def ndom_id(node = @node, append_form = true)
           if node.kind_of?(Node) && !node.new_record?
             if params[:action] == 'create' && !params[:udom_id]
               return "#{params[:dom_id]}_#{node.zip}"
             end
+          elsif append_form && node.kind_of?(Node) && params[:zadd]
+            return "#{params[:dom_id]}_form"
           end
 
           @dom_id || params[:udom_id] || params[:dom_id]
@@ -42,12 +44,12 @@ module Zena
 
           if obj.new_record?
             # A. could not create object: show form with errors
-            page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
+            page.replace ndom_id, :file => template_path_from_template_url + "_form.erb"
           elsif @errors || !obj.errors.empty?
             # B. could not update/delete: show errors
             form_file = template_path_from_template_url + "_form.erb"
             if File.exist?(form_file)
-              page.replace "#{params[:dom_id]}_form", :file => form_file
+              page.replace ndom_id, :file => form_file
             else
               page.insert_html :top, params[:dom_id], :inline => render_errors
             end
@@ -71,7 +73,7 @@ module Zena
                 @dom_id = params[:dom_id]
                 page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
               end
-              if params[:done] && params[:action] == 'create'
+              if params[:done] && params[:zadd]
                 page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
                 page << params[:done]
               elsif params[:done]
@@ -98,18 +100,29 @@ module Zena
               else
                 instance_variable_set("@#{base_class.to_s.underscore}", obj.clone)
               end
-              page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
+              page.replace ndom_id, :file => template_path_from_template_url + "_form.erb"
               if params[:done]
                 page << params[:done]
-              else
+              elsif params[:zadd]
                 page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
               end
             when 'update'
-              page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
+              page.replace ndom_id, :file => template_path_from_template_url + ".erb"
               page << params[:done] if params[:done]
             when 'destroy'
-              page.visual_effect :highlight, params[:dom_id], :duration => 0.3
-              page.visual_effect :fade, params[:dom_id], :duration => 0.3
+              page << %Q{
+                new Effect.Highlight('#{ndom_id}', {
+                  duration: 0.3,
+                  afterFinish: function() {
+                    new Effect.Fade('#{ndom_id}', {
+                      duration: 0.5,
+                      afterFinish: function() {
+                      $('#{ndom_id}').remove();
+                      }
+                    });
+                  }
+                });
+              }
             when 'drop'
               case params[:done]
               when 'remove'

data/lib/zena/use/conditional.rb

@@ -1,6 +1,11 @@
 module Zena::Use::Conditional
   module ZafuMethods
 
+    def r_selenium
+      return parser_error("missing 'id'.") if @name.blank?
+      out expand_if("params[:test]==#{@name.inspect} || params[:test]=='all'")
+    end
+
     def rubyless_class_scope(class_name)
       return parser_error("Cannot scope class in list (use each before filtering).") if node.list_context?
       # capital letter ==> class conditional

data/lib/zena/use/context.rb

@@ -191,7 +191,12 @@ module Zena
               typed_string = ::RubyLess.translate(self, code)
               name = get_var_name('set_var', var)
               out "<% #{name} = #{typed_string} %>"
-              set_context_var('set_var', var, RubyLess::TypedString.new(name, typed_string.opts))
+              var_setting = {}
+              set_context_var('set_var', var, RubyLess::TypedString.new(name, typed_string.opts), var_setting)
+              # Leak into following siblings
+              self.pass(var_setting)
+              # Set inside
+              @context.merge!(var_setting)
             rescue RubyLess::NoMethodError => err
               parser_error(err.message, code)
             end

data/lib/zena/use/dates.rb

@@ -306,8 +306,8 @@ module Zena
         safe_method :date                     => :get_date
         safe_method [:date, TZInfo::Timezone] => :get_date
         safe_method :tz                       => :get_tz
-        safe_method [:parse_date, String]     => {:class => Time, :nil => true, :accept_nil => true}
-        safe_method [:parse_date, String, String] => {:class => Time, :nil => true, :accept_nil => true}
+        safe_method [:parse_date, String]     => :get_parse_date
+        safe_method [:parse_date, String, String] => :get_parse_date
         safe_method [:parse_date, String, String, TZInfo::Timezone] => {:class => Time, :nil => true, :accept_nil => true}
 
         def get_date(signature)
@@ -326,6 +326,21 @@ module Zena
           end
         end
 
+        def get_parse_date(signature)
+          tz_var = get_context_var('set_var', 'tz')
+          if signature == ['parse_date', String]
+            append = [
+              RubyLess::TypedString.new(_(DATETIME).inspect, :class => String),
+              tz_var || RubyLess::TypedString.new('visitor.tz', :class => TZInfo::Timezone),
+            ]
+          elsif signature = ['parse_date', String, String]
+            append = tz_var || RubyLess::TypedString.new('visitor.tz', :class => TZInfo::Timezone)
+          else
+            append = nil
+          end
+          {:method => 'parse_date', :class => Time, :nil => true, :accept_nil => true, :append_args => append}
+        end
+
         def r_default
           if tz_name = @params.delete(:tz)
             set_tz_code, tz_var = set_tz_var(tz_name)

data/lib/zena/use/display.rb

@@ -492,6 +492,9 @@ module Zena
               "<label>#{attribute}</label> <span>#{res}</span>"
             when 't'
               "<label>#{trans(attribute)}</label> <span>#{res}</span>"
+            when '','false'
+              # no label
+              res
             else
               if @params[:tlabel]
                 code = ::RubyLess.translate(self, "t(%Q{#{label}})")
@@ -599,13 +602,21 @@ module Zena
 
         # Find icon through a relation named 'icon' or use first image child
         def r_icon
-          finder = build_finder(:first, icon_finder)
-          expand_with_finder(finder)
+          if node.will_be?(Node)
+            finder = build_finder(:first, icon_finder)
+            expand_with_finder(finder)
+          else
+            rubyless_eval
+          end
         end
 
         # Display an image
         def r_img
-          return unless node.will_be?(Node)
+          if node.will_be?(VirtualClass)
+            return "<img src='<%= #{node}.prop['icon'] %>'/>"
+          elsif !node.will_be?(Node)
+            return
+          end
 
           if src = @params[:src]
             finder = ::RubyLess.translate(self, @params[:src]) #build_finder(:first, @params[:src])

data/lib/zena/use/forms.rb

@@ -86,14 +86,14 @@ module Zena
           return parser_error("invalid 'klass' parameter (not a Node)") unless klass <= Node
 
           res  = []
-          keys = {:klass => 'klass'}
+          keys = {:klass => 'this.klass', :parent_id => "#{node(Node)}.zip"}
           @params.each do |key, value|
             next if key == :klass
             # TODO: maybe it would be safer to check with [:"key="] and change safe_property to
             # authorize both ?
             next unless type = klass.safe_method_type([key.to_s])
             # Store how to access current value to show hidden field in form.
-            keys[key] = type[:method]
+            keys[key] = "this.#{type[:method]}"
             code = RubyLess.translate(self, value)
             if code.klass == type[:class]
               res << ":#{key} => #{code}"
@@ -112,7 +112,6 @@ module Zena
             :method     => method,
             :class      => klass,
             :nil        => true,
-            :new_record => true,
             :new_keys   => keys
           )
         end
@@ -206,10 +205,20 @@ module Zena
               opts[:form_cancel] = "#{cancel_pre}<a href='#' onclick='[\"#{dom_name}_add\", \"#{dom_name}_form\"].each(Element.toggle);return false;'>#{cancel_text}</a>#{cancel_post}\n"
             else
               # Saved form
-              opts[:id]          = "<%= ndom_id(#{node}) %>_form"
+              if @markup.tag == 'table'
+                # the normal id goes to the form wrapping the table
+                opts[:id]   = "#{node.dom_prefix}_tbl"
+                str_form_id = "\#{ndom_id(#{node})}"
+              else
+                opts[:id]   = "<%= ndom_id(#{node}) %>"
+                str_form_id = "\#{ndom_id(#{node})}_form_t"
+              end
+
+              form_id ||= "#{node.dom_prefix}_form_t"
+              opts[:id]          = "<%= ndom_id(#{node}) %>"
 
               opts[:form_tag]    = %Q{
-<% remote_form_for(:#{node.form_name}, #{node}, :url => #{node}.new_record? ? #{node.form_name.pluralize}_path : #{node.form_name}_path(#{node}.zip), :html => {:method => #{node}.new_record? ? :post : :put, :id => \"\#{ndom_id(#{node})}_form_t\"}) do |f| %>
+<% remote_form_for(:#{node.form_name}, #{node}, :url => #{node}.new_record? ? #{node.form_name.pluralize}_path : #{node.form_name}_path(#{node}.zip), :html => {:method => #{node}.new_record? ? :post : :put, :id => \"#{str_form_id}\"}) do |f| %>
 }
 
               opts[:form_cancel] = %Q{
@@ -246,16 +255,15 @@ module Zena
             set_fields << "#{node.form_name}[#{tag.params[:name]}]"
           end
 
+          if (descendants('input') || []).detect {|elem| elem.params[:type] == 'submit'}
+            # has submit
+          else
+            # Hidden submit for Firefox compatibility
+            hidden_fields['submit'] = ["<input type='submit'/>"]
+          end
+
           if template_url = @context[:template_url]
             # Ajax
-
-            if (descendants('input') || []).detect {|elem| elem.params[:type] == 'submit'}
-              # has submit
-            else
-              # Hidden submit for Firefox compatibility
-              hidden_fields['submit'] = ["<input type='submit'/>"]
-            end
-
             hidden_fields['link_id'] = "<%= #{node}.link_id %>" if @context[:has_link_id] && node.will_be?(Node)
 
             if upd = @params[:update]
@@ -273,26 +281,11 @@ module Zena
 
             hidden_fields['t_url'] = template_url
                                                                                  # This is a hack to fix wrong dom_prefix in drop+add.
-            erb_dom_id = @context[:saved_template] ? "<%= ndom_id(#{node}) %>" : (@context[:dom_prefix] || node.dom_prefix)
+            erb_dom_id = @context[:saved_template] ? "<%= ndom_id(#{node}, false) %>" : (@context[:dom_prefix] || node.dom_prefix)
 
             hidden_fields['dom_id'] = erb_dom_id
 
-            if node.will_be?(Node)
-              # Nested contexts:
-              # 1. @node
-              # 2. var1 = @node.children
-              # 3. var1_new = Node.new
-              if node.opts[:new_record] #|| @context[:saved_template]
-                if @context[:saved_template] || !@context[:in_add]
-                  # TODO: we should not add parent_id on every saved_template. Why is this needed ?
-                  parent_id = "#{node}.parent_zip"
-                else
-                  parent_id = "#{node.up.up}.zip"
-                end
-
-                hidden_fields['node[parent_id]'] = "<%= #{parent_id} %>"
-              end
-            elsif node.will_be?(Comment)
+            if node.will_be?(Comment)
               # FIXME: the "... || '@node'" is a hack and I don't understand why it's needed...
               hidden_fields['node_id'] = "<%= #{node.get(Node) || '@node'}.zip %>"
             elsif node.will_be?(DataEntry)
@@ -302,6 +295,7 @@ module Zena
 
             if add_block = @context[:add]
               params = add_block.params
+              hidden_fields['zadd'] = 'true'
               [:after, :before, :top, :bottom].each do |sym|
                 if value = params[sym]
                   hidden_fields['position'] = sym.to_s
@@ -332,16 +326,6 @@ module Zena
             end
           else
             # no ajax
-
-            if node.will_be?(Node)
-              # Nested contexts:
-              # 1. @node
-              # 2. var1 = @node.children
-              # 3. var1_new = Node.new
-              if node.opts[:new_record]
-                hidden_fields['node[parent_id]'] = "<%= #{node.up}.zip %>"
-              end
-            end
             cancel = "" # link to normal node ?
           end
 
@@ -356,6 +340,7 @@ module Zena
           hidden_fields['node[v_status]'] = Zena::Status::Pub.to_s if add_params[:publish] || auto_publish_param || @context[:publish_after_save]
 
           # All default values set in the <r:new> field should at least appear as hidden fields
+
           if new_keys = node.opts[:new_keys]
             input_keys = (
               (descendants('input') || []).map {|e| e.params[:name]} +
@@ -369,22 +354,26 @@ module Zena
             ).compact.uniq
 
             new_keys.each do |key, value|
-              next if input_keys.include?(key)
-              hidden_fields["node[#{key}]"] = "<%= #{node}.#{value} %>"
+              # Security: make sure value does not come from user input !
+              # TINT !
+              next if input_keys.include?(key) || value.nil?
+              hidden_fields["node[#{key}]"] = "<%= #{value.sub(/^this\./, "#{node}.")} %>"
             end
           end
 
           # Read @params
-          @params.each do |key, value|
+          add_params.merge(@params).each do |key, value|
+            # r_add params
+            next if [:after, :before, :top, :bottom, :focus, :publish,
             # r_form params
-            next if [:klass, :done, :on, :update].include?(key)
+                     :klass, :done, :on, :update,
             # r_each params (make_form)
-            next if [:join].include?(key)
+                     :join].include?(key)
             code = ::RubyLess.translate(self, value)
             if code.literal.kind_of?(String) || code.literal.kind_of?(Number)
-              hidden_fields[key] = "#{code.literal}"
+              hidden_fields[key.to_s] = "#{code.literal}"
             else
-              hidden_fields[key] = "<%= #{code} %>"
+              hidden_fields[key.to_s] = "<%= #{code} %>"
             end
           end
 
@@ -514,6 +503,7 @@ module Zena
             return parser_error("select id without name") unless attribute
             name = "#{attribute}_id" unless attribute[-3..-1] == '_id'
             input_id = @context[:erb_dom_id] ? ", :input_id =>\"#{erb_dom_id}_#{attribute}\"" : ''
+            # FIXME: pass object
             "<%= select_id('#{node.form_name}', #{attribute.inspect}#{input_id}) %>"
           when 'time_zone'
             out parser_error("please use [select] here")

data/lib/zena/use/html_tags.rb

@@ -40,6 +40,9 @@ module Zena
               else
                 id = nil
               end
+              if !node || node.new_record?
+                node = current_site.root_node
+              end
             end
 
             if !id.blank?

data/lib/zena/use/node_context.rb

@@ -32,23 +32,23 @@ module Zena
       end
 
       # Get an uppers NodeContext that is of the given class kind.
-      def get(klass)
-        if real_single_class <= klass
-          return self unless list_context?
-
-          res_class = self.klass
-          method = self.name
-          while res_class.kind_of?(Array)
-            method = "#{method}.first"
-            res_class = res_class.first
-          end
-          move_to(method, res_class)
-        elsif @up
-          @up.get(klass)
-        else
-          nil
-        end
-      end
+      # def get(klass)
+      #   if real_single_class <= klass
+      #     return self unless list_context?
+      #
+      #     res_class = self.klass
+      #     method = self.name
+      #     while res_class.kind_of?(Array)
+      #       method = "#{method}.first"
+      #       res_class = res_class.first
+      #     end
+      #     move_to(method, res_class)
+      #   elsif @up
+      #     @up.get(klass)
+      #   else
+      #     nil
+      #   end
+      # end
 
       # Return the 'real' class name or the superclass name if the current class is an anonymous class.
       def class_name

data/lib/zena/use/rendering.rb

@@ -28,7 +28,7 @@ module Zena
         end
 
         def help(key)
-          %Q{<div class='help'><p>#{_(key)}</p></div>}
+          %Q{<div class='help'><p>#{key}</p></div>}
         end
       end
 

data/lib/zena/use/urls.rb

@@ -65,7 +65,6 @@ module Zena
         # Path for a node. Options can be :format, :host and :mode.
         # ex '/en/document34_print.html'
         def zen_path(node, options={})
-
           return '#' unless node
 
           if anchor = options.delete(:anchor)
@@ -151,6 +150,7 @@ module Zena
             path
           else
             cachestamp = opts.delete(:cachestamp)
+            tz = opts.delete(:tz)
             list = opts.keys.map do |k|
               # FIXME: DOC
               if k.to_s == 'encode_params'
@@ -166,7 +166,7 @@ module Zena
                 end
               elsif value = opts[k]
                 if value.respond_to?(:strftime_tz)
-                  "#{k}=#{CGI.escape(value.strftime_tz(_(Zena::Use::Dates::DATETIME)))}"
+                  "#{k}=#{CGI.escape(value.strftime_tz(_(Zena::Use::Dates::DATETIME), tz))}"
                 elsif value.kind_of?(Hash)
                   "#{k}=#{value.to_query}"
                 elsif value.kind_of?(Node)
@@ -348,6 +348,15 @@ module Zena
         # <r:link update='dom_id'/>
         # <r:link page='next'/> <r:link page='previous'/> <r:link page='list'/>
         def r_link
+          # If we have a contextual timezone set, pass it to @params
+          if tz_name = @params[:tz]
+            tz_result, tz_var = set_tz_var(tz_name)
+            return tz_result unless tz_var
+            @params[:tz] = 'tz'
+          elsif tz_var = get_context_var('set_var', 'tz')
+            @params[:tz] = 'tz'
+          end
+
           if @params[:page] && @params[:page] != '[page_page]' # lets users use 'page' as pagination key
             pagination_links
           else