zena 1.0.0.beta3 → 1.0.0.rc1

data/lib/zena/use/conditional.rb

@@ -2,6 +2,7 @@ module Zena::Use::Conditional
   module ZafuMethods
 
     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
       if klass = get_class(class_name)
         if klass.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
@@ -19,11 +20,11 @@ module Zena::Use::Conditional
           # 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, klass)
+          new_node = node.move_to(node.name, node.klass)
         else
           # render nothing: incompatible classes
           cond     = 'false'
-          new_node = node.move_to(node.name, klass)
+          new_node = node.move_to(node.name, node.klass)
         end
       else
         return parser_error("Invalid role or class '#{class_name}'")

data/lib/zena/use/context.rb

@@ -2,12 +2,26 @@ module Zena
   module Use
     module Context
       module ViewMethods
+
+        # Dynamic resolution of the author class from the user prototype
+        def self.visitor_node_proc
+          Proc.new do |h, r, s|
+            res = {:method => 'visitor.node', :nil => true}
+            if prototype  = visitor.prototype
+              res[:class] = prototype.vclass
+            else
+              res[:class] = VirtualClass['Node']
+            end
+            res
+          end
+        end
+
         include RubyLess
-        safe_method :start => {:method => 'start_node', :class => Node}
+        safe_method :start => Proc.new {|h, r, s| {:method => 'start_node', :class => VirtualClass['Node']}}
         safe_method :visitor => User
-        safe_method :visitor_node => {:method => 'visitor.contact', :class => BaseContact, :nil => true}
-        safe_method :main => {:method => '@node', :class => Node}
-        safe_method :root => {:method => 'visitor.site.root_node', :class => Node, :nil => true}
+        safe_method :visitor_node => visitor_node_proc
+        safe_method :main => Proc.new {|h, r, s| {:method => '@node', :class => VirtualClass['Node']}}
+        safe_method :root => Proc.new {|h, r, s| {:method => 'visitor.site.root_node', :class => VirtualClass['Node'], :nil => true}}
         safe_method :site => {:class => Site, :method => 'visitor.site'}
 
         # Group an array of records by key.
@@ -98,21 +112,30 @@ module Zena
           join_str = ''
           if count <= max_count
             1.upto(count) do |p|
-              yield(p, join_str)
+              yield(p, join_str, p)
               join_str = join_string
             end
           else
             # only first pages (centered around current page)
             if current - (max_count/2) > 0
-              finish = [current + (max_count/2),count].min
+              max = current + (max_count/2)
             else
-              finish = [max_count,count].min
+              max = max_count
+            end
+
+            if count > max
+              finish = end_dots = max
+            else
+              finish = count
             end
 
             start  = [finish - max_count + 1,1].max
+            if start > 1
+              start_dots = start
+            end
 
             start.upto(finish) do |p|
-              yield(p, join_str)
+              yield(p, join_str, (p == start_dots || p == end_dots) ? '…' : p.to_s)
               join_str = join_string
             end
           end
@@ -121,6 +144,13 @@ module Zena
 
       module ZafuMethods
 
+        # Resolve class for @post ==> Post, etc.
+        def get_class(class_name)
+          VirtualClass[class_name] || super
+        rescue
+          nil
+        end
+
         # Enter a new context (<r:context find='all' select='pages'>). This is the same as '<r:pages>...</r:pages>'). It is
         # considered better style to use '<r:pages>...</r:pages>' instead of the more general '<r:context>' because the tags
         # give a clue on the context at start and end. Another way to open a context is the 'do' syntax: "<div do='pages'>...</div>".
@@ -136,7 +166,7 @@ module Zena
           return parser_error("cannot be used outside of a list") unless node.list_context?
           return parser_error("missing 'by' clause") unless key = @params[:by]
 
-          #sort_key = @params[:sort] || 'node_name'
+          #sort_key = @params[:sort] || 'title'
           # if node.will_be?(DataEntry) && DataEntry::NodeLinkSymbols.include?(key.to_sym)
           #   key = "#{key}_id"
           #   #sort_block = "{|e| (e.#{key} || {})[#{sort_key.to_sym.inspect}]}"
@@ -156,11 +186,11 @@ module Zena
           end
 
           #if sort_block
-          #  out "<% grp_#{list_var} = sort_array(#{group_array}) #{sort_block} -%>"
+          #  out "<% grp_#{list_var} = sort_array(#{group_array}) #{sort_block} %>"
           #else
           #end
           method = "group_array(#{node}) {|e| #{key}}"
-          out "<% if #{var} = #{method} -%>"
+          out "<% if #{var} = #{method} %>"
             open_node_context({:method => method}, :node => node.move_to(var, [node.klass], :query => node.opts[:query])) do
               if child['each_group']
                 out expand_with
@@ -169,7 +199,7 @@ module Zena
                 r_each
               end
             end
-          out "<% end -%>"
+          out "<% end %>"
 
           #if descendant('each_group')
           #  out expand_with(:group => var)

data/lib/zena/use/dates.rb

@@ -5,7 +5,7 @@ module Zena
 
         # This is like strftime but with better support for i18n (translate day names, month abbreviations, etc)
         def format_date(thedate, opts = {})
-          return '' unless thedate
+          return '' if thedate.blank?
 
           theformat, tz_name, lang = opts[:format], opts[:tz], opts[:lang]
           format = theformat || '%Y-%m-%d %H:%M:%S'
@@ -28,10 +28,8 @@ module Zena
             begin
               adate    = Date.parse(thedate)
               utc_date = adate
-
             rescue
-              # only return error if there is a format (without = used in sql query)
-              return theformat ? "<span class='parser_error'>invalid date #{thedate.inspect}</span>" : Time.now.strftime('%Y-%m-%d %H:%M:%S')
+              return "<span class='parser_error'>invalid date #{thedate.inspect}</span>"
             end
           else
             adate    = thedate
@@ -116,12 +114,15 @@ module Zena
       	  rnd_id = rand(100000000000)
       	  defaults = {  :id=>"datef#{rnd_id}", :button=>"dateb#{rnd_id}", :display=>"dated#{rnd_id}" }
       	  opts = defaults.merge(opts)
-      	  date = obj.send(name)
+      	  date = opts[:value] || obj.safe_send(name)
       	  value = tformat_date(date,'datetime')
-          if opts[:size]
-            fld = "<input id='#{opts[:id]}' name='node[#{name}]' type='text' size='#{opts[:size]}' value='#{value}' />"
+      	  # TODO: migrate code to Zafu::Markup (needs Zafu 0.7.7)
+      	  # fld = Zafu::Markup.new('input')
+      	  # fld.params = (opts[:html] || {}).merge(:name => "node[#{name}]", :id => opts[:id], :type => 'text', :value => value)
+      	  if opts[:size]
+            fld = "<input id='#{opts[:id]}' name='node[#{name}]' type='text' size='#{opts[:size]}' value='#{value}' class='#{opts[:class]}'/>"
           else
-            fld = "<input id='#{opts[:id]}' name='node[#{name}]' type='text' value='#{value}' />"
+            fld = "<input id='#{opts[:id]}' name='node[#{name}]' type='text' value='#{value}' class='#{opts[:class]}'/>"
           end
       		<<-EOL
       <span class="date_box"><img src="/calendar/iconCalendar.gif" id="#{opts[:button]}" alt='#{_('date selection')}'/>
@@ -250,11 +251,11 @@ module Zena
         include RubyLess
         safe_method_for Time, :year       => {:class => Number, :pre_processor => true}
         safe_method_for Time, [:strftime, String] => {:class => String, :pre_processor => true}
-        safe_method :date                 => :get_date
+        safe_method :main_date            => :get_date
         safe_method [:parse_date, String] => {:class => Time, :nil => true, :accept_nil => true}
 
         def get_date(signature)
-          if var = get_context_var('set_var', 'date')
+          if var = get_context_var('set_var', 'main_date')
             {:class => var.klass, :method => var, :nil => var.could_be_nil?}
           else
             {:class => Time, :method => 'main_date'}
@@ -279,7 +280,7 @@ EOL
         end
 
         # Select a date for the current context
-        def r_date
+        def r_main_date
           return nil unless code = get_attribute_or_eval
 
           if format = @params[:format]
@@ -300,9 +301,9 @@ EOL
           else
             return parser_error("should evaluate to a String or Time (found #{code.klass})")
           end
-          v = get_var_name('set_var', 'date')
-          out "<% #{v} = #{code} -%>"
-          set_context_var('set_var', 'date', RubyLess::TypedString.new(v, :class => Time, :nil => could_be_nil))
+          v = get_var_name('set_var', 'main_date')
+          out "<% #{v} = #{code} %>"
+          set_context_var('set_var', 'main_date', RubyLess::TypedString.new(v, :class => Time, :nil => could_be_nil))
           out expand_with
         end
 

data/lib/zena/use/display.rb

@@ -8,7 +8,7 @@ module Zena
           else
             finder = 'image'
           end
-          "#{finder} group by id,l_id order by l_id desc, position asc, node_name asc"
+          "#{finder} group by id,l_id order by l_id desc, position asc"
         end
       end # Common
 
@@ -466,9 +466,44 @@ module Zena
             res = show_string(method)
           end
 
-          res
+          res = extract_label(res, @params, @params[:attr])
+
+          if @params[:blank] == 'hide'
+            "<% if !#{method}.blank? %>#{@markup.wrap(res)}<% end %>"
+          else
+            res
+          end
         end
 
+        def extract_label(res, params, attribute)
+          if (label = params[:label] || params[:tlabel]) && attribute
+            case label
+            when 'true'
+              "<label>#{attribute}</label> <span>#{res}</span>"
+            when 't'
+              "<label>#{trans(attribute)}</label> <span>#{res}</span>"
+            else
+              if params[:tlabel]
+                code = ::RubyLess.translate(self, "t(%Q{#{label}})")
+              else
+                code = ::RubyLess.translate_string(self, label)
+              end
+              if code.literal
+                "<label>#{code.literal}</label> <span>#{res}</span>"
+              else
+                "<label><%= #{code} %></label> <span>#{res}</span>"
+              end
+            end
+          else
+            res
+          end
+        end
+
+        # ??? <r:h do='foasfa'/> ?
+        # def r_h
+        #   out "<%= h ??? %>"
+        # end
+
         # Insert javascript asset tags
         def r_javascripts
           if @params[:list] == 'all' || @params[:list].nil?
@@ -493,16 +528,16 @@ module Zena
         # Used by zafu templates that act as layouts (adminLayout for example) to insert the content if present
         # or render.
         def r_content_for_layout
-          "<% if content_for_layout = yield -%><%= content_for_layout %><% else -%>" +
+          "<% if content_for_layout = yield %><%= content_for_layout %><% else %>" +
           expand_with +
-          "<% end -%>"
+          "<% end %>"
         end
 
         # Display the page's default title
         def r_title_for_layout
-          "<% if @title_for_layout -%><%= @title_for_layout %><% elsif @node && !@node.new_record? -%><%= @node.rootpath %><% elsif @node.parent -%><%= @node.parent.rootpath %><% else -%>" +
+          "<% if @title_for_layout %><%= @title_for_layout %><% elsif @node && !@node.new_record? %><%= @node.title %><% elsif @node.parent %><%= @node.parent.short_path %><% else %>" +
           expand_with +
-          "<% end -%>"
+          "<% end %>"
         end
 
         # Show html to add open a popup window to add a document.
@@ -512,7 +547,7 @@ module Zena
           @markup.append_param(:class, 'btn_add')
           node = self.node.list_context? ? self.node.up : self.node
           res = node_action_link('add_doc', "<%= #{node}.zip %>", :text => text_for_link(''))
-          "<% if #{node}.can_write? -%>#{wrap(res)}<% end -%>"
+          "<% if #{node}.can_write? %>#{wrap(res)}<% end %>"
         end
 
         # Find icon through a relation named 'icon' or use first image child
@@ -574,6 +609,18 @@ module Zena
           end
         end
 
+        def r_grid
+          return parser_error("not in a list context") unless node.list_context?
+          return parser_error("not a Node list") unless node.single_class <= Node
+          klass = "#{node.single_class.name}"
+          @blocks = [make(:void, :method => 'void', :text => %Q{<table class='grid'>
+            <tr do='#{klass}' do='roles'><th class='role' colspan='\#{columns.size}' do='each' do='name'/></tr>
+            <tr do='#{klass}' do='roles' do='each' do='columns'><th do='each' do='name'/></tr>
+            <tr do='each'><r:#{klass} do='roles' do='each' do='columns'><td do='each' do='@node.send(name)'/></r:#{klass}></tr>
+          </table>})]
+          expand_with
+        end
+
         private
           def show_number(method)
             if fmt = @params[:format]

data/lib/zena/use/error_rendering.rb

@@ -6,6 +6,7 @@ module Zena
         #TODO: test
         def error_messages_for(type, opts={})
           super unless type == 'node'
+
           obj = opts[:object]
           return '' if obj.errors.empty?
           res = ["<table class='#{opts[:class] || 'errors'}'>"]

data/lib/zena/use/field_index.rb

@@ -0,0 +1,20 @@
+module Zena
+  module Use
+    module FieldIndex
+      module ModelMethods
+        def self.included(base)
+          # Declare all columns starting with idx_ as field index
+          ::Column.add_field_index(base.column_names.select {|col| col =~ /\Aidx_/})
+
+#          base.alias_method_chain :property_field_index, :field_index
+        end
+
+        def property_field_index
+          if version.status == Zena::Status[:pub]
+            super
+          end
+        end
+      end # ModelMethods
+    end # FieldIndex
+  end # Use
+end # Zena

data/lib/zena/use/fixtures.rb

@@ -122,21 +122,24 @@ module Zena
               end
             end
 
-            define_method(table_name + "_id") do |fixture|
+            define_method(table_name + "_id") do |*fixtures|
               raise Exception.new("$_test_site is blank!") if $_test_site.blank?
-              Zena::FoxyParser::id($_test_site, fixture)
+              res = fixtures.map {|f| Zena::FoxyParser::id($_test_site, f) }
+              fixtures.size > 1 ? res : res.first
             end
           end
 
           if table_name == 'nodes' || table_name == 'zips'
-            define_method(table_name + "_zip") do |fixture|
-              # needed by additions_test
-              fixture_name = table_name == 'zips' ? fixture.to_s : "#{$_test_site}_#{fixture}"
-              if fix = @@loaded_fixtures[table_name][fixture_name]
-                fix.instance_eval { @fixture['zip'].to_i }
-              else
-                raise StandardError, "No fixture with name '#{fixture_name}' found for table '#{table_name}'"
+            define_method(table_name + "_zip") do |*fixtures|
+              res = fixtures.map do |fixture|
+                fixture_name = table_name == 'zips' ? fixture.to_s : "#{$_test_site}_#{fixture}"
+                if fix = @@loaded_fixtures[table_name][fixture_name]
+                  fix.instance_eval { @fixture['zip'].to_i }
+                else
+                  raise StandardError, "No fixture with name '#{fixture_name}' found for table '#{table_name}'"
+                end
               end
+              fixtures.size > 1 ? res : res.first
             end
           end
 

data/lib/zena/use/forms.rb

@@ -9,39 +9,71 @@ module Zena
           klass.new_instance(Node.transform_attributes(params))
         end
 
-        def make_checkbox(node, values, relation_name, attribute)
-          relation_proxy = node.relation_proxy(relation_name)
-          return nil unless values && relation_proxy
-
-          res = []
-          role = relation_proxy.other_role
-
-          if relation_proxy.unique?
-            current_value = relation_proxy.other_id
-
-            res << "<div class='input_radio'>"
-            values.each do |value|
-              res << "<span><input type='radio' name='node[#{role}_id]' value='#{value.zip}'"
-              res << (current_value == value.id ? " checked='checked'/> " : '/> ')
-              res << value.prop[attribute]
-              res << '</span> '
+        def make_checkbox(node, opts)
+          if relation_name = opts[:role]
+            values, attribute = opts[:list], opts[:attr]
+            relation_proxy = node.relation_proxy(relation_name)
+            return nil unless values && relation_proxy
+
+            res = []
+            role = relation_proxy.other_role
+
+            if relation_proxy.unique?
+              current_value = relation_proxy.other_id
+              values.each do |value|
+                res << ("<input type='radio' name='node[#{role}_id]' value='#{value.zip}'" +
+                (current_value == value.id ? " checked='checked'/> " : '/> ') +
+                "<span>#{value.prop[attribute]}</span>")
+              end
+              res << "<input type='radio' name='node[#{role}_id]' value=''/> <span>#{_('none')}</span>"
+            else
+              current_values = relation_proxy.other_ids
+              res << "<input type='hidden' name='node[#{role}_ids][]' value=''/>"
+              values.each do |value|
+                res << ("<span><input type='checkbox' name='node[#{role}_ids][]' value='#{value.zip}'" +
+                (current_values.include?(value.id) ? " checked='checked'/> " : '/> ') +
+                "<span>#{value.prop[attribute]}</span>")
+              end
             end
-            res << '</div>'
-
-            res << "<span><input type='radio' name='node[#{role}_id]' value=''/> #{_('none')}</span>"
+            res.join('')
           else
-            current_values = relation_proxy.other_ids
-            res << "<div class='input_checkbox'>"
-            values.each do |value|
-              res << "<span><input type='checkbox' name='node[#{role}_ids][]' value='#{value.zip}'"
-              res << (current_values.include?(value.id) ? " checked='checked'/> " : '/> ')
-              res << value.prop[attribute]
-              res << '</span> '
+            # literal values
+            list, name, selected = opts[:list], opts[:name], opts[:selected]
+            show = opts[:show] || list
+            if selected.kind_of?(Array)
+              selected = selected.map(&:to_s)
+              name = "node[#{name}][]"
+            else
+              selected = [selected.to_s]
+              name = "node[#{name}]"
+            end
+            res = []
+            res << "<input type='hidden' name='#{name}' value=''/>"
+            list.each_with_index do |value, i|
+              res << ("<input type='checkbox' name='#{name}' value='#{value}'" +
+              (selected.include?(value.to_s) ? " checked='checked'/> " : '/> ') +
+              "<span>#{show[i]}</span>")
+            end
+            res.join('')
+          end
+        end
+
+        # Find a params value from an input name (q[foo] ==> safe params[q][foo])
+        def param_value(name)
+          # q[foo.bar][xxx]
+          list = name.gsub(']','').split('[')
+          # q foo.bar xxx
+          base = params
+          while true
+            key = list.shift
+            if base.kind_of?(Hash)
+              base = base[key]
+            else
+              return nil
             end
-            res << '</div>'
-            res << "<input type='hidden' name='node[#{role}_ids][]' value=''/>"
+            break if list.empty?
           end
-          res.join('')
+          base
         end
       end # ViewMethods
 
@@ -61,7 +93,12 @@ module Zena
             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]
-            res << ":#{key} => #{RubyLess.translate_string(self, value)}"
+            code = RubyLess.translate(self, value)
+            if code.klass == type[:class]
+              res << ":#{key} => #{code}"
+            else
+              out parser_error("invalid type for '#{key}' (found #{code.klass}, expected #{type[:class]})")
+            end
           end
 
           if res == []
@@ -71,10 +108,11 @@ module Zena
           end
 
           expand_with_finder(
-            :method   => method,
-            :class    => klass,
-            :nil      => true,
-            :new_keys => keys
+            :method     => method,
+            :class      => klass,
+            :nil        => true,
+            :new_record => true,
+            :new_keys   => keys
           )
         end
 
@@ -110,7 +148,7 @@ module Zena
           if name
             type ||= node.klass.safe_method_type([name])
             # do we have a property ?
-            if type && (node.klass.column_names.include?(name) || node.klass.schema.column_names.include?(name))
+            if type && (node.real_class.column_names.include?(name) || node.klass.column_names.include?(name))
               # create an input field
               out make_input(form_helper, name, type[:class], textarea)
             else
@@ -144,6 +182,12 @@ module Zena
           dom_name = node.dom_prefix
           opts[:form_helper] = 'f'
 
+          if upd = @params[:update]
+            if target = find_target(upd)
+              @context[:template_url] = target.template_url
+            end
+          end
+
           if template_url = @context[:template_url]
             # Ajax
 
@@ -161,11 +205,11 @@ module Zena
 }
 
               opts[:form_cancel] = %Q{
-<% if #{node}.new_record? -%>
+<% if #{node}.new_record? %>
   <p class='btn_x'><a href='#' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></p>
-<% else -%>
+<% else %>
   <p class='btn_x'><%= link_to_remote(#{_('btn_x').inspect}, :url => #{node.form_name}_path(#{node}.zip) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=\#{params[:dom_id]}#{@context[:has_link_id] ? "&link_id=\#{#{node}.link_id}" : ''}\", :method => :get) %></p>
-<% end -%>
+<% end %>
 }
             end
           else
@@ -194,7 +238,7 @@ module Zena
             set_fields << "#{node.form_name}[#{tag.params[:name]}]"
           end
 
-          if template_url = @context[:template_url] # @context[:dom_prefix] || @params[:update]
+          if template_url = @context[:template_url]
             # Ajax
 
             if (descendants('input') || []).detect {|elem| elem.params[:type] == 'submit'}
@@ -206,21 +250,23 @@ module Zena
 
             hidden_fields['link_id'] = "<%= #{node}.link_id %>" if @context[:has_link_id] && node.will_be?(Node)
 
-            # if upd = @params[:update] || add_params[:update]
-            #   if target = find_target(upd)
-            #     hidden_fields['u_url']   = target.template_url
-            #     hidden_fields['udom_id'] = target.erb_dom_id
-            #     hidden_fields['u_id']    = "<%= #{@context[:parent_node]}.zip %>" if @context[:in_add]
-            #     hidden_fields['s']       = start_node_s_param(:value)
-            #   end
+            if upd = @params[:update]
+              if target = find_target(upd)
+                hidden_fields['u_url']   = target.template_url
+                hidden_fields['udom_id'] = upd # target.node.dom_prefix ? (but target.node is not set yet...)
+                # hidden_fields['u_id']    = "<%= #{@context[:parent_node]}.zip %>" if @context[:in_add]
+                hidden_fields['s']       = "<%= start_node_zip %>"
+              end
             # elsif (block = ancestor('block')) && node.will_be?(DataEntry)
             #   # updates template url
             #   hidden_fields['u_url']   = block.template_url
             #   hidden_fields['udom_id'] = block.erb_dom_id
-            # end
+            end
 
             hidden_fields['t_url'] = template_url
 
+
+            # t_id = node zip to use when rendering partial (enable back when we have a use case).
             # if t_id = @params[:t_id]
             #   hidden_fields['t_id']  = parse_attributes_in_value(t_id)
             # end
@@ -235,7 +281,9 @@ module Zena
               # 1. @node
               # 2. var1 = @node.children
               # 3. var1_new = Node.new
-              hidden_fields['node[parent_id]'] = "<%= #{@context[:in_add] ? "#{node.up.up}.zip" : "#{node}.parent_zip"} %>"
+              if node.opts[:new_record]
+                hidden_fields['node[parent_id]'] = "<%= #{@context[:in_add] ? "#{node.up.up}.zip" : "#{node}.parent_zip"} %>"
+              end
             elsif node.will_be?(Comment)
               # FIXME: the "... || '@node'" is a hack and I don't understand why it's needed...
               hidden_fields['node_id'] = "<%= #{node.up || '@node'}.zip %>"
@@ -276,7 +324,16 @@ module Zena
             end
           else
             # no ajax
-            # FIXME
+
+            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
 
@@ -321,39 +378,49 @@ module Zena
         end
 
         def r_textarea
-          out make_textarea(@markup.params.merge(@params))
+          params = @markup.params.merge(@params)
+          res = make_textarea(params)
+          extract_label(res, params, params[:name])
         end
 
         # <r:select name='klass' root_class='...'/>
-        # <r:select name='parent_id' values='projects in site'/>
+        # <r:select name='parent_id' nodes='projects in site'/>
+        # <r:select name='parent_id' values='a,b,c'/>
         # TODO: optimization (avoid loading full AR to only use [id, name])
         def r_select
           html_attributes, attribute = get_input_params()
-          return parser_error("missing name") unless attribute
-
-          if value = @params[:selected]
-            selected = ::RubyLess.translate_string(self, value)
-          elsif @context[:in_filter]
-            selected = "params[#{attribute.to_sym.inspect}].to_s"
-          elsif %w{parent_id}.include?(attribute)
-            selected = "#{node}.parent_zip.to_s"
-          elsif attribute == 'copy_id'
-            selected = 'nil'
-          elsif attribute =~ /^(.*)_id$/
-            # relation
-            selected = "#{node}.rel[#{$1.inspect}].other_zip.to_s"
+          # TEMPORARY HACK UNTIL WE FIX get_input_params to return a single hash with
+          # {:html => { prepared html attributes }, :raw => {:value => '..', :name => '..', :param => '..'}}
+          if param = @params[:param]
+            selected  = "params[#{param.to_sym.inspect}].to_s"
+            attribute = param
           else
-            selected = "#{node}.prop[#{attribute.inspect}].to_s"
+            return parser_error("missing name") unless attribute
+
+            if value = @params[:selected]
+              selected = ::RubyLess.translate_string(self, value)
+            elsif @context[:in_filter]
+              selected = "params[#{attribute.to_sym.inspect}].to_s"
+            elsif %w{parent_id}.include?(attribute)
+              selected = "#{node}.parent_zip.to_s"
+            elsif attribute == 'copy_id'
+              selected = 'nil'
+            elsif attribute =~ /^(.*)_id$/
+              # relation
+              selected = "#{node}.rel[#{$1.inspect}].other_zip.to_s"
+            else
+              selected = "#{node}.prop[#{attribute.inspect}].to_s"
+            end
           end
 
           html_id = html_attributes[:id] ? " id='#{html_attributes[:id]}'" : ''
-          if @context[:in_filter]
+          if @context[:in_filter] || @params[:param]
             select_tag = "<select#{html_id} name='#{attribute}'>"
           else
             select_tag = "<select#{html_id} name='#{node.form_name}[#{attribute}]'>"
           end
 
-          if klass = @params[:root_class]
+          res = if klass = @params[:root_class]
             class_opts = ''
             class_opts << ", :without => #{@params[:without].inspect}" if @params[:without]
             # do not use 'selected' if the node is not new
@@ -366,19 +433,28 @@ module Zena
           else
             parser_error("missing 'nodes', 'root_class' or 'values'")
           end
+
+          extract_label(res, @params, attribute)
         end
 
 
         def r_input
           html_attributes, attribute = get_input_params()
-          case @params[:type]
+          # TODO: get attribute type from get_input_params
+          res = case @params[:type]
           when 'select' # FIXME: why is this only for classes ?
             out parser_error("please use [select] here")
             r_select
           when 'date_box', 'date'
             return parser_error("date_box without name") unless attribute
-            input_id = @context[:dom_prefix] ? ", :id=>\"#{dom_id}_#{attribute}\"" : ''
-            "<%= date_box #{node}, #{attribute.inspect}, :size=>15#{@context[:in_add] ? ", :value=>''" : ''}#{input_id} %>"
+            code = ::RubyLess.translate(self, "this.#{attribute}")
+            value = @context[:in_add] ? "''" : code
+            html_params = [':size => 15']
+            [:style, :class, :onclick, :size].each do |key|
+              html_params << ":#{key} => #{@params[key].inspect}" if @params[key]
+            end
+            html_params << ":id=>\"#{dom_id}_#{attribute}\"" if @context[:dom_prefix]
+            "<%= date_box(#{node}, #{attribute.inspect}, :value => #{value}, #{html_params.join(', ')}) %>"
           when 'id'
             return parser_error("select id without name") unless attribute
             name = "#{attribute}_id" unless attribute[-3..-1] == '_id'
@@ -395,6 +471,7 @@ module Zena
             wrap('')
           else
             # 'text', 'hidden', ...
+            return parser_error('Missing name.') unless attribute || html_attributes[:name]
             @markup.tag = 'input'
             @markup.set_param(:type, @params[:type] || 'text')
 
@@ -404,30 +481,57 @@ module Zena
             @markup.append_attribute checked if checked
             wrap('')
           end
+
+          extract_label(res, @params, attribute || html_attributes[:name])
         end
 
         # <r:checkbox role='collaborator_for' values='projects' in='site'/>"
         def r_checkbox
-          return parser_error("missing 'nodes'") unless values = @params[:values] || @params[:nodes]
-          return parser_error("missing 'role'")  unless   role = (@params[:role]  || @params[:name])
-          attribute = @params[:attr] || 'title'
-          if role =~ /(.*)_ids?\Z/
-            role = $1
-          end
-          meth = role.singularize
-
-          if values =~ /^\d+\s*($|,)/
-            # ids
-            # TODO generate the full query instead of using secure.
-            values = values.split(',').map{|v| v.to_i}
-            finder = "secure(Node) { Node.all(:conditions => 'zip IN (#{values.join(',')})') }"
+          nodes  = @params[:nodes]
+          values = @params[:values]
+          return parser_error("missing 'nodes' or 'values'") unless nodes || values
+
+          if values
+            return parser_error("missing attribute 'name'") unless name = @params[:name]
+            # parse literal values
+            opts = [":name => #{name.inspect}", ":list => #{values.split(',').map(&:strip).inspect}"]
+            if show_values = @params[:show]
+              opts << ":show => #{show_values.split(',').map(&:strip).inspect}"
+            elsif show_values = @params[:tshow]
+              opts << ":show => #{translate_list(show_values).inspect}"
+            end
+            meth = RubyLess.translate(self, "this.#{name}")
+            opts << ":selected => #{meth}"
+            attribute = name
+            res = "<%= make_checkbox(#{node}, #{opts.join(', ')}) %>"
           else
-            # relation
-            return unless finder = build_finder(:all, values, @params)
-            return parser_error("invalid class (#{finder[:class]})") unless finder[:class].first <= Node
-            finder = finder[:method]
+            if name = @params[:name]
+              if name =~ /(.*)_ids?\Z/
+                role = $1
+              else
+                role = name
+              end
+            else
+              role = @params[:role]
+            end
+            return parser_error("missing 'role'") unless role
+            # nodes
+            meth = role.singularize
+
+            if nodes =~ /^\d+\s*($|,)/
+              values = nodes.split(',').map{|v| v.to_i}
+              finder = "secure(Node) { Node.all(:conditions => 'zip IN (#{values.join(',')})') }"
+            else
+              return unless finder = build_finder(:all, nodes, @params)
+              return parser_error("invalid class (#{finder[:class]})") unless finder[:class].first <= Node
+              finder = finder[:method]
+            end
+
+            attribute = @params[:attr] || 'title'
+            res = "<%= make_checkbox(#{node}, :list => #{finder}, :role => #{meth.inspect}, :attr => #{attribute.inspect}) %>"
           end
-          out "<%= make_checkbox(#{node}, #{finder}, #{meth.inspect}, #{attribute.inspect}) %>"
+
+          extract_label(res, @params, attribute)
         end
 
         alias r_radio r_checkbox
@@ -449,23 +553,27 @@ module Zena
 
         # Parse params to extract everything that is relevant to building input fields.
         # TODO: refactor and pass the @markup so that attributes are added directly
+        # TODO: get attribute type in get_input_params (safe_method_type)
         def get_input_params(params = @params)
           res = Zafu::OrderedHash.new
-          if name = (params[:name] || params[:date])
+          if name = (params[:param] || params[:name] || params[:date])
             res[:name] = name
-            if res[:name] =~ /\A([\w_]+)\[(.*?)\]/
-              # Sub attributes are used with tags or might be used for other features. It
-              # enables things like 'tagged[foo]'
-              attribute, sub_attr = $1, $2
-            else
-              attribute = res[:name]
-            end
-
-            unless @context[:in_filter] || attribute == 's'
-              if sub_attr
-                res[:name] = "#{node.form_name}[#{attribute}][#{sub_attr}]"
+            unless params[:param]
+              # build name
+              if res[:name] =~ /\A([\w_]+)\[(.*?)\]/
+                # Sub attributes are used with tags or might be used for other features. It
+                # enables things like 'tagged[foo]'
+                attribute, sub_attr = $1, $2
               else
-               res[:name] = "#{node.form_name}[#{attribute}]"
+                attribute = res[:name]
+              end
+
+              unless @context[:in_filter] || attribute == 's'
+                if sub_attr
+                  res[:name] = "#{node.form_name}[#{attribute}][#{sub_attr}]"
+                else
+                 res[:name] = "#{node.form_name}[#{attribute}]"
+                end
               end
             end
 
@@ -480,11 +588,17 @@ module Zena
                 value = RubyLess.translate_string(self, value)
 
                 if value.literal
-                  res[:value] = value.literal.to_s.gsub("'",'&apos;')
+                  res[:value] = form_quote(value.literal.to_s)
                 else
                   res[:value] = "<%= fquote #{value} %>"
                 end
-              elsif type = node.klass.safe_method_type([attribute])
+              elsif params[:param]
+                if name =~ /^[a-z_]+$/
+                  res[:value] = "<%= fquote params[:#{name}] %>"
+                else
+                  res[:value] = "<%= fquote param_value(#{name.inspect}) %>"
+                end
+              elsif attribute && type = node.klass.safe_method_type([attribute])
                 res[:value] = "<%= fquote #{node}.#{type[:method]} %>"
               end
             end
@@ -605,9 +719,7 @@ module Zena
               if show = @params[:show]
                 show_values = show.split(',').map(&:strip)
               elsif show = @params[:tshow]
-                show_values = show.split(',').map do |s|
-                  _(s.strip)
-                end
+                show_values = translate_list(show)
               end
 
               if show_values
@@ -616,6 +728,18 @@ module Zena
                 end
               end
               options_list.inspect
+            elsif code = @params[:eval]
+              ruby = ::RubyLess.translate(self, code)
+              if !ruby.klass.kind_of?(Array)
+                return parser_error("invalid eval: should return an Array (found #{ruby.klass})")
+              end
+
+              if ruby.klass.first <= String
+                # ok
+                ruby
+              else
+                return parser_error("cannot extract values from eval (not a String list: [#{ruby.klass.first}])")
+              end
             end
           end