zena 1.1.3 → 1.2.0

data/lib/zena/use/display.rb

@@ -232,7 +232,7 @@ module Zena
         def admin_links(opts = {})
           list = opts[:list] || 'all'
           if list == 'all'
-            list = %w{home preferences comments users groups relations virtual_classes properties iformats sites acls dev}
+            list = %w{home preferences comments jobs users groups relations virtual_classes properties iformats sites acls dev}
           else
             list = list.split(',').map(&:strip)
           end
@@ -280,6 +280,9 @@ module Zena
           when 'acls'
             return nil unless visitor.is_admin?
             link_to_with_state(_('acls'), acls_path)
+          when 'jobs'
+            return nil unless visitor.is_admin? && Bricks::CONFIG['worker']
+            link_to_with_state(_('jobs'), jobs_site_path(current_site[:id]))
           when 'dev'
             return nil unless visitor.is_admin?
             if visitor.dev_skin_id
@@ -520,7 +523,7 @@ module Zena
         # Insert javascript asset tags
         def r_javascripts
           if @params[:list] == 'all' || @params[:list].nil?
-            list = %w{ prototype effects dragdrop tablekit window zena }
+            list = %w{ prototype effects dragdrop window zena grid }
           else
             list = @params[:list].split(',').map{|e| e.strip}
           end
@@ -567,7 +570,7 @@ module Zena
         # Insert stylesheet asset tags
         def r_stylesheets
           if @params[:list] == 'all' || @params[:list].nil?
-            list = %w{ reset window zena code }
+            list = %w{ reset window zena code grid }
           else
             list = @params[:list].split(',').map{|e| e.strip}
           end
@@ -596,8 +599,33 @@ module Zena
           return parser_error("only works with nodes (not with #{node.klass})") unless node.will_be?(Node)
           @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 %>"
+
+          params = {}
+          @params.each do |k,v|
+            next if [:attr, :eval, :text, :t, :update].include?(k)
+            v = RubyLess.translate_string(self, v)
+            if v.literal
+              params[k] = CGI.escape(v.literal)
+            else
+              params[k] = "<%= CGI.escape(#{v}) %>"
+            end
+          end
+          
+          if upd = @params[:update]
+            js = ""
+            with_context(:node => node(Node)) do
+              href = make_href(upd)
+              name = get_var_name('add_document', 'update')
+
+              txt = "%Q{#{name}\#{#{node}.zip} = function() {new Ajax.Request(\"\#{#{href}}\", {asynchronous:true, evalScripts:true, method:\"get\"})}}"
+              js = "<% js_data << #{txt} %>"
+              # Evaluated before the add_document page is opened.
+              params[:js] = "<%= CGI.escape(\"Zena.t().#{name}\#{#{node}.zip}();\") %>"
+            end
+          end
+          
+          res = node_action_link('add_doc', "<%= #{node}.zip %>", :text => text_for_link(''), :params => params)
+          "<% if #{node}.can_write? %>#{js}#{wrap(res)}<% end %>"
         end
 
         # Find icon through a relation named 'icon' or use first image child
@@ -669,11 +697,11 @@ module Zena
           end
         end
 
-        def r_grid
+        def r_prop_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}"
-          add_block %Q{<table class='grid'>
+          add_block %Q{<table class='prop_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>
@@ -681,6 +709,15 @@ module Zena
           expand_with
         end
 
+        # Also used by rubyless_expand
+        def show_string(method)
+          if param(:h) == 'false'
+            "<%= #{method} %>"
+          else
+            "<%= h #{method} %>"
+          end
+        end
+
         private
           def show_number(method)
             if fmt = param(:format)
@@ -709,16 +746,9 @@ module Zena
             end
           end
 
-          def show_string(method)
-            if param(:h) == 'false'
-              "<%= #{method} %>"
-            else
-              "<%= h #{method} %>"
-            end
-          end
 
           # show_time is in Dates
       end
     end # Display
   end # Use
-end # Zena
+end # Zena

data/lib/zena/use/forms.rb

@@ -200,10 +200,11 @@ module Zena
 
             if @context[:in_add]
               # Inline form used to create new elements: set values to '' and 'parent_id' from context
-              opts[:id]          = "#{node.dom_prefix}_form"
+              opts[:id]          = "#{node.dom_prefix}_0"
               opts[:form_tag]    = "<% remote_form_for(:#{node.form_name}, #{node}, :url => #{node.form_name.pluralize}_path, :html => {:id => \"#{dom_name}_form_t\"}) do |f| %>"
-              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"
+              opts[:form_cancel] = "#{cancel_pre}<a href='javascript:void(0)' onclick='[\"#{dom_name}_add\", \"#{dom_name}_0\"].each(Element.toggle);return false;'>#{cancel_text}</a>#{cancel_post}\n"
             else
+
               # Saved form
               if @markup.tag == 'table'
                 # the normal id goes to the form wrapping the table
@@ -215,19 +216,18 @@ module Zena
               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 => \"#{str_form_id}\"}) 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{
-<% if #{node}.new_record? %>
-  #{cancel_pre}<a href='#' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>_form\"].each(Element.toggle);return false;'>#{cancel_text}</a>#{cancel_post}
-<% else %>
+  <% if #{node}.new_record? %>
+  #{cancel_pre}<a href='javascript:void(0)' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>\"].each(Element.toggle);return false;'>#{cancel_text}</a>#{cancel_post}
+  <% else %>
   #{cancel_pre}<%= link_to_remote(#{cancel_text_ruby}, :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) %>#{cancel_post}
-<% end %>
-}
+  <% end %>
+  }
             end
           else
             # no ajax
@@ -283,7 +283,11 @@ module Zena
                                                                                  # This is a hack to fix wrong dom_prefix in drop+add.
             #erb_dom_id = @context[:saved_template] ? "<%= ndom_id(#{node}, false) %>" : (@context[:dom_prefix] || node.dom_prefix)
 
-            hidden_fields['dom_id'] = erb_dom_id = node.dom_prefix
+            if @context[:saved_template]
+              hidden_fields['dom_id'] = erb_dom_id = "<%= ndom_id(#{node}, false) %>"
+            else
+              hidden_fields['dom_id'] = erb_dom_id = node.dom_prefix
+            end
 
             if node.will_be?(Comment)
               # FIXME: the "... || '@node'" is a hack and I don't understand why it's needed...
@@ -303,7 +307,7 @@ module Zena
                     if sym == :before
                       hidden_fields['reference'] = "#{erb_dom_id}_add"
                     else
-                      hidden_fields['reference'] = "#{erb_dom_id}_form"
+                      hidden_fields['reference'] = "#{erb_dom_id}_0"
                     end
                   else
                     hidden_fields['reference'] = value
@@ -318,11 +322,19 @@ module Zena
                   hidden_fields['done'] = "'$(\"#{erb_dom_id}_form_t\").focusFirstElement();'"
                 end
               elsif params[:done]
-                hidden_fields['done'] = CGI.escape(params[:done])
+                done = RubyLess.translate_string(self, params[:done])
               end
             else
               # ajax form, not in 'add'
-              hidden_fields['done'] = CGI.escape(@params[:done]) if @params[:done]
+              done = RubyLess.translate_string(self, @params[:done])
+            end
+            if done
+              if done.literal
+                done = done.literal
+              else
+                done = "<%= fquote #{done} %>"
+              end
+              hidden_fields['done'] = done
             end
           else
             # no ajax
@@ -368,7 +380,7 @@ module Zena
             # r_form params
                      :klass, :done, :on, :update,
             # r_each params (make_form)
-                     :join].include?(key)
+                     :join, :alt_class].include?(key)
             code = ::RubyLess.translate(self, value)
             if code.literal.kind_of?(String) || code.literal.kind_of?(Number)
               hidden_fields[key.to_s] = "#{code.literal}"
@@ -418,7 +430,7 @@ module Zena
           # 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"
+            selected  = "param_value(#{param.inspect}).to_s"
             attribute = param
           else
             return parser_error("missing name") unless attribute
@@ -426,7 +438,7 @@ module Zena
             if value = @params[:selected]
               selected = ::RubyLess.translate_string(self, value)
             elsif @context[:in_filter]
-              selected = "params[#{attribute.to_sym.inspect}].to_s"
+              selected = "param_value(#{attribute.inspect}).to_s"
             elsif %w{parent_id}.include?(attribute)
               selected = "#{node}.parent_zip.to_s"
             elsif attribute == 'copy_id'
@@ -517,6 +529,7 @@ module Zena
             @markup.set_param(:type, @params[:type])
             @markup.set_param(:text, @params[:text]) if @params[:text]
             @markup.set_params(html_attributes)
+            @markup.done = false
             wrap('')
           else
             # 'text', 'hidden', ...
@@ -527,6 +540,7 @@ module Zena
             checked = html_attributes.delete(:checked)
             @markup.set_dyn_params(html_attributes)
             @markup.append_attribute checked if checked
+            @markup.done = false
             wrap('')
           end
 
@@ -609,7 +623,13 @@ module Zena
           res = Zafu::OrderedHash.new
           if name = (params[:param] || params[:name] || params[:date])
             res[:name] = name
-            unless params[:param]
+            if params[:param]
+              if name =~ /^[a-z_]+$/
+                sub_attr_ruby = "params[:#{name}]"
+              else
+                sub_attr_ruby = "param_value(#{name.inspect})"
+              end
+            else
               # build name
               if res[:name] =~ /\A([\w_]+)\[(.*?)\]/
                 # Sub attributes are used with tags or might be used for other features. It
@@ -625,7 +645,7 @@ module Zena
                 res[:name] = "#{node.form_name}[#{attribute}]"
               end
             end
-
+            
             if sub_attr
               type = node.klass.safe_method_type([attribute])
               if sub_attr_ruby = RubyLess.translate(self, %Q{this.#{attribute}[#{sub_attr.inspect}]})
@@ -642,11 +662,7 @@ module Zena
                   res[:value] = "<%= fquote #{value} %>"
                 end
               elsif params[:param]
-                if name =~ /^[a-z_]+$/
-                  res[:value] = "<%= fquote params[:#{name}] %>"
-                else
-                  res[:value] = "<%= fquote param_value(#{name.inspect}) %>"
-                end
+                res[:value] = "<%= fquote #{sub_attr_ruby} %>"
               elsif attribute && type = node.klass.safe_method_type([attribute])
                 res[:value] = "<%= fquote #{node}.#{type[:method]} %>"
               end
@@ -677,11 +693,11 @@ module Zena
           end
 
           if node.dom_prefix && !params[:param]
-            res[:id]   = "#{node.dom_prefix}_#{attribute}"
+            res[:id] = params[:id] || "#{@context[:form_prefix]}_#{attribute}"
           else
-            res[:id]   = params[:id] if params[:id]
+            res[:id] = params[:id] if params[:id]
           end
-
+          
           if params[:type] == 'checkbox' && sub_attr_ruby
             if value = params[:value]
               res[:checked] = "<%= #{sub_attr_ruby} == #{value.inspect} ? \" checked='checked'\" : '' %>"
@@ -770,10 +786,13 @@ module Zena
                 nodes = finder[:method]
               end
 
-              set_attr  = ::RubyLess.translate(klass, @params[:attr] || 'id')
-              show_attr = ::RubyLess.translate(klass, @params[:show] || 'title')
+              set_attr, show_attr = nil
+              with_context(:node => node.move_to('r', klass)) do
+                set_attr  = ::RubyLess.translate(self, @params[:attr] || 'id')
+                show_attr = ::RubyLess.translate(self, @params[:show] || 'title')
+              end
 
-              options_list = "[['','']] + (#{nodes} || []).map{|r| [r.#{show_attr}, r.#{set_attr}.to_s]}"
+              options_list = "[['','']] + (#{nodes} || []).map{|r| [#{show_attr}, #{set_attr}.to_s]}"
             elsif values = @params[:values]
               options_list = values.split(',').map(&:strip)
 
@@ -781,6 +800,16 @@ module Zena
                 show_values = show.split(',').map(&:strip)
               elsif show = @params[:tshow]
                 show_values = translate_list(show)
+              else
+                tprefix = @params[:tprefix] || @params[:name]
+                show_values = options_list.map do |v|
+                  t = trans("#{tprefix}_#{v}")
+                  if t == "#{tprefix}_"
+                    ''
+                  else
+                    t
+                  end
+                end
               end
 
               if show_values

data/lib/zena/use/query_builder.rb

@@ -29,9 +29,9 @@ module Zena
                 :rubyless_helper => zafu_helper.helpers
               )
               if type == :count
-                return klass.do_find(:count, eval(query.to_s(:count)))
+                return klass.do_find(:count, eval(query.to_s(:count), opts[:binding] || binding))
               else
-                return klass.do_find(:all, eval(query.to_s))
+                return klass.do_find(opts[:find] || :all, eval(query.to_s, opts[:binding] || binding))
               end
             rescue ::QueryBuilder::Error => err
               @query_errors = "<span class='query'>#{pseudo_sql}</span> <span class='error'>#{err}</span>"
@@ -151,12 +151,12 @@ module Zena
 
         # Dynamic query mocks the QueryBuilder::Query
         class DynamicQuery
-          def initialize(default, node, sql)
-            @default, @node, @sql = default, node, sql
+          def initialize(default, node, sql, count)
+            @default, @node, @sql, @count = default, node, sql, count
           end
 
           def to_s(type = :find)
-            base = "'#{@node.klass}', #{@node.to_s.inspect}, #{@sql}"
+            base = "'#{@node.klass}', #{@node.to_s.inspect}, #{@sql}, :find => #{@count.inspect}, :binding => binding"
             case type
             when :find
               return "query(#{base})"
@@ -177,14 +177,15 @@ module Zena
           return parser_error("Cannot be used in list context (#{node.class_name})") if node.list_context?
           return parser_error("Missing 'default' query") unless default_psql = @params[:default]
 
+          count = get_count(default_psql, {:find => @params[:find]})
           begin
-            default = build_finder(:all, default_psql, {})
+            default = build_finder(count, default_psql, {})
             default_query = default[:query]
           rescue ::QueryBuilder::Error => err
             return parser_error(err.message)
           end
 
-          klass = [default_query.main_class]
+          klass = count == :all ? [default_query.main_class] : default_query.main_class
 
           can_be_nil = true
           if sql = @params[:eval]
@@ -204,8 +205,8 @@ module Zena
             sql = "#{sql} || #{default_psql.inspect}"
           end
 
-          query = DynamicQuery.new(default_query, node, sql)
-          expand_with_finder(:method => query.to_s, :class => [query.main_class], :nil => true, :query => query)
+          query = DynamicQuery.new(default_query, node, sql, count)
+          expand_with_finder(:method => query.to_s, :class => klass, :nil => true, :query => query)
         end
 
         # Pre-processing of the 'find("...")' method.
@@ -225,8 +226,6 @@ module Zena
 
         # Resolve unknown methods by trying to build a pseudo-sql query with QueryBuilder.
         def querybuilder_eval(method = @method)
-          node = single_node
-
           if method =~ /^\d+$/
             finder = {:method => "find_node_by_zip(#{method})", :class => VirtualClass['Node'], :nil => true}
           else
@@ -307,7 +306,8 @@ module Zena
             node = single_node
 
             if !node.klass.respond_to?(:build_query)
-              raise ::QueryBuilder::Error.new("No query builder for class #{node.klass}")
+              # Fallback to Node
+              node = node.up(Node)
             end
 
             query_opts = {

data/lib/zena/use/recursion.rb

@@ -12,7 +12,7 @@ module Zena
           return '' if @context[:saved_template]
           return super if @params[:template] || !@params[:part]
           recursion = get_context_var('recursion', @params[:part])
-          return parser_error("no parent named '#{part}'") unless recursion
+          return parser_error("no parent named '#{@params[:part]}'") unless recursion
           klass = recursion[:klass]
           if klass.kind_of?(Array)
             return parser_error("node context '#{node.klass}' incompatible with '[#{klass}]'")   unless node.list_context?

data/lib/zena/use/rendering.rb

@@ -74,7 +74,8 @@ module Zena
             zafu_node('@node', Project)
 
             respond_to do |format|
-              format.html do
+              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'
@@ -82,7 +83,6 @@ module Zena
                   render_and_cache :mode => '+notFound', :format => 'html', :cache_url => "/#{prefix}/404.html", :status => '404 Not Found'
                 end
               end
-              format.all  { render :nothing => true, :status => "404 Not Found" }
             end
           else
             # site not found
@@ -128,14 +128,11 @@ module Zena
 
             method = "render_to_#{opts[:format]}"
             if params.keys.include?('debug')
-              template_path = template_url(opts)
-              result = {
-                :data         => render_to_string(:file => template_path, :layout=>false),
-                :disposition  => params['disposition'] || 'inline',
-                :type         => 'text/html',
-              }
               opts[:cache] = false
-            elsif respond_to?(method)
+              opts[:debug] = true
+            end
+
+            if respond_to?(method)
               # Call custom rendering engine 'render_to_pdf' for example.
               result = send(method, opts)
             else
@@ -199,6 +196,8 @@ module Zena
         #   else
         #     raise err
         #   end
+        rescue ActiveRecord::RecordNotFound => err
+          return render_404(err)
         end
 
         # Cache page content into a static file in the current sites directory : SITES_ROOT/test.host/public
@@ -221,6 +220,8 @@ module Zena
         # Return true if we can cache the current page
         def caching_allowed(opts = {})
           return false if current_site.authentication? || query_params != {}
+          # Cache even if authenticated (public content).
+          #                       Content viewed by anonymous user should be cached anyway.
           opts[:authenticated] || visitor.is_anon?
         end
 
@@ -231,12 +232,11 @@ module Zena
           ext = params[:format].blank? ? 'html' : params[:format]
           path << ".#{ext}" unless path =~ /\.#{ext}(\?\d+|)$/
           #
-          # QUERY_STRING in cached page ?
-          #
-          # Do not cache filename with query or apache will not see it !
-          # if cachestamp_format?(params['format'])
-          #   path << "?" << make_cachestamp(@node, params['mode'])
-          # end
+          # FULL QUERY_STRING in cached page ?
+          if cachestamp_format?(params['format'])
+            # We have to use a '.' because apache cannot serve static files with '?'.
+            path << "." << make_cachestamp(@node, params['mode'])
+          end
           path
         end
 
@@ -274,7 +274,7 @@ module Zena
               if Zena::ASSET_PORT == request.port
                 raise Exception.new("Custom rendering not allowed on this process (port == asset_port).")
               else
-                "http://localhost:#{Zena::ASSET_PORT}"
+                "http://127.0.0.1:#{Zena::ASSET_PORT}"
               end
             else
               raise Exception.new("Using custom rendering without an asset host ('asset_port' setting in bricks.yml).")
@@ -305,6 +305,7 @@ module Zena
 
         def r_style
           @markup.tag = 'style'
+          @markup.set_param(:type, 'text/css')
           expand_with
         end
 
@@ -321,4 +322,4 @@ module Zena
       end # ZafuMethods
     end # Rendering
   end # Use
-end # Zena
+end # Zena

data/lib/zena/use/urls.rb

@@ -14,6 +14,7 @@ module Zena
         'propose'  => {:url => '/nodes/#{node_zip}/versions/0/propose', :method => 'put'},
         'refuse'   => {:url => '/nodes/#{node_zip}/versions/0/refuse',  :method => 'put'},
         'edit'     => {:url => '/nodes/#{node_zip}/versions/0/edit'},
+        'create'   => {:url => '/nodes', :method => 'post', :query => {:parent_id => 'node_zip'}},
       }
 
 
@@ -842,4 +843,4 @@ module Zena
       end # ZafuMethods
     end # Urls
   end # Use
-end # Zena
+end # Zena

data/lib/zena/use/zafu_safe_definitions.rb

@@ -108,15 +108,6 @@ module Zena
 
         safe_method_for Object, :blank?    => Boolean
 
-        safe_method_for Time, [:advance, {
-          :years   => Number,
-          :months  => Number,
-          :weeks   => Number,
-          :days    => Number,
-          :hours   => Number,
-          :minutes => Number,
-          :seconds => Number}] => Time
-        safe_method_for Time, :to_i  => {:class => Number, :pre_processor => true}
 
         safe_method_for Node,  [:kind_of?, VirtualClass] =>
           {:method => 'nil', :nil => true, :pre_processor => kind_of_proc}

data/lib/zena/use/zafu_templates.rb

@@ -475,7 +475,7 @@ module Zena
                 end
               end
               next if nodes.empty?
-              res << "  <li><a class='group' onclick='$(\"dev_#{name}\").toggle();' href='#'>#{name}</a>\n"
+              res << "  <li><a class='group' onclick='$(\"dev_#{name}\").toggle();' href='javascript:void(0)'>#{name}</a>\n"
               res << "  <table class='dev_pop' id='dev_#{name}'#{name == 'images' ? " style='display:none;'" : ''}>\n"
               if template && name == 'zafu'
                 # Create specialized template on the fly for current page
@@ -502,7 +502,7 @@ module Zena
               res << "  </li>\n"
             end
 
-            res << "  <li><a class='group' onclick='$(\"dev_tools\").toggle();' href='#'>tools</a>\n"
+            res << "  <li><a class='group' onclick='$(\"dev_tools\").toggle();' href='javascript:void(0)'>tools</a>\n"
             res << "    <ul class='dev_pop' id='dev_tools'><li>\n"
             res << %Q{    <div style='float:right'><% form_for(:user, visitor, :url => user_path(visitor), :html => { :method => :put }) do |f| %>
               <p><%= f.select(:dev_skin_id, dev_skin_options, {}, {:onchange => 'this.form.submit()'}) %> <input style='display:none;' type='submit' value='<%= _('validate') %>'/></p>

data/lib/zena/use/zazen.rb

@@ -5,8 +5,6 @@ module Zena
       ZAZEN_TIMEOUT = 5
       module ViewMethods
 
-        include Zena::Use::Grid::ViewMethods
-
         @@_asset_methods = {}
 
         # define an asset method ('key' => method_name).
@@ -272,4 +270,4 @@ module Zena
       end
     end # ViewMethods
   end # Use
-end # Zena
+end # Zena

data/lib/zena/use.rb

@@ -2,12 +2,12 @@ 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 Site Skin}
+    MODULE_NAMES = %w{Controller View Zafu User Site Skin Routes}
     # "Controller" => "ControllerMethods"
     MODULE_NAME  = Hash[*MODULE_NAMES.map {|n| [n, "#{n}#{SUFFIX_NAME}"]}.flatten]
 
     class << self
-      attr_accessor :modules
+      attr_accessor :modules, :extra_routes
 
       # Declare a module (or list of modules) that should be used in Zena. The module should implement
       # sub-modules named ControllerMethods, ViewMethods or ZafuMethods in order to add features to
@@ -38,6 +38,17 @@ module Zena
         self.modules[name] || []
       end
 
+      def routes(rez)
+        if self.extra_routes.nil?
+          hash = {}
+          each_module_for('Routes') do |mod|
+            hash.merge!(mod)
+          end
+          self.extra_routes = hash
+        end
+        (self.extra_routes[rez] || {})[rez] || {}
+      end
+
       private
         def create_module_hash
           if self.modules.nil?

data/lib/zena.rb

@@ -138,7 +138,9 @@ module Zena
       gem_configuration.each do |gem_name, gem_config|
         if gem_config
           conf = gem_config.symbolize_keys
-          conf[:version].gsub!(/\A=\s*/,'')
+          if conf[:version]
+            conf[:version].gsub!(/\A=\s*/,'')
+          end
           if conf[:optional]
             if brick = conf[:brick]
               if Bricks::CONFIG[brick]
@@ -263,6 +265,7 @@ end
   end
 end
 
+# FIXME: use another mime types library...
 # this list is taken from http://www.duke.edu/websrv/file-extensions.html
 EXT_TYPE = [
   [ "ai"        , "application/postscript"         ],
@@ -284,6 +287,7 @@ EXT_TYPE = [
   [ "dir"       , "application/x-director"         ],
   [ "dms"       , "application/octet-stream"       ],
   [ "doc"       , "application/msword"             ],
+  [ "docx"      , "application/vnd.openxmlformats-officedocument.wordprocessingml.document"             ],
   [ "drw"       , "application/drafting"           ],
   [ "dvi"       , "application/x-dvi"              ],
   [ "dwg"       , "application/acad"               ],
@@ -346,6 +350,7 @@ EXT_TYPE = [
   [ "ppm"       , "image/x-portable-pixmap"        ],
   [ "pps"       , "application/mspowerpoint"       ],
   [ "ppt"       , "application/mspowerpoint"       ],
+  [ "pptx"      , "application/vnd.openxmlformats-officedocument.presentationml.presentation"       ],
   [ "ppz"       , "application/mspowerpoint"       ],
   [ "pre"       , "application/x-freelance"        ],
   [ "prt"       , "application/pro_eng"            ],
@@ -425,6 +430,7 @@ EXT_TYPE = [
   [ "xll"       , "application/vnd.ms-excel"       ],
   [ "xlm"       , "application/vnd.ms-excel"       ],
   [ "xls"       , "application/vnd.ms-excel"       ],
+  [ "xlsx"      , "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"       ],
   [ "xlw"       , "application/vnd.ms-excel"       ],
   [ "xml"       , "text/xml"                       ],
   [ "xsl"       , "text/xml"                       ],
@@ -462,4 +468,4 @@ Zena::EXT_TO_TYPE, Zena::TYPE_TO_EXT = make_hashes(EXT_TYPE)
 Zena.add_load_paths
 Zena.gems_setup
 Zena.load_custom_extensions
-require 'rubyless'
+require 'rubyless'