nitro 0.23.0 → 0.24.0

data/lib/nitro/dispatcher.rb

@@ -1,4 +1,4 @@
-require 'nano/object/singleton_class'
+require 'nano/kernel/singleton'
 
 require 'nitro/controller'
 require 'nitro/routing'
@@ -51,7 +51,7 @@ class Dispatcher
     if controllers and controllers.is_a?(Class) and controllers.ancestors.include?(Controller)
       controllers = { '/' => controllers }
     else
-      controllers ||= { '/' => SimpleController }
+      controllers ||= { '/' => Controller }
     end
 
     mount(controllers)
@@ -90,13 +90,17 @@ class Dispatcher
       # Perform mount-time initialization of the controller.
 
       if c.respond_to? :mounted
-        c.mounted
+        c.mounted(path)
       end
 
       # Try to setup a template_root if none is defined:
       
       unless c.template_root
-        c.template_root = "#{Template.root}#{path}".gsub(/\/$/, '')
+        c.module_eval %{
+          def self.template_root
+            "#{Template.root}#{path}".gsub(/\\/$/, '')
+          end
+        }
       end
     end
 
@@ -130,11 +134,17 @@ class Dispatcher
 
   def update_routes
     @routes = []
+    
     @controllers.each do |base, c|
       base = '' if base == '/'
-      c.action_metadata.each do |action, meta|
-        if route = meta[:route]
-          @routes << [route, "#{base}/#{action}", *meta.params.keys]
+      for m in c.action_methods
+        if route = c.ann(:m).route and (!route.nil?)
+          unless c.ann(:m).params.nil?
+            keys = c.ann(:m).params.keys
+          else
+            keys = []
+          end
+          @routes << [route, "#{base}/#{action}", *keys]
         end
       end
     end
@@ -167,7 +177,7 @@ class Dispatcher
     klass = @controllers[key]
 
     if klass and Compiler.reload
-      klass.instance_methods.grep(/(action$)|(template$)/).each do |m|
+      klass.instance_methods.grep(/(_action$)|(_template$)/).each do |m|
         klass.send(:remove_method, m) rescue nil
       end
     end

data/lib/nitro/element.rb

@@ -1,7 +1,7 @@
 require 'rexml/document'
 require 'rexml/streamlistener'
 
-require 'nano/string/capitalized%3F'
+require 'nano/string/capitalized'
 require 'nano/string/camelize'
 
 require 'glue/configuration'
@@ -73,6 +73,8 @@ class Element
     child._parent = self  
     @_children << child
   end
+  
+  alias_method :children, :_children
 end
 
 # Processes a page containing elements.
@@ -161,7 +163,9 @@ class ElementProcessor # :nodoc: all
   def transform(source)
     listener = Listener.new
     REXML::Document.parse_stream(source, listener)
-    # gmosx, FIXME: optimize this, how?
+    # gmosx, FIXME: optimize this, how?
+    # gmosx, FIXME: this is a hack fix, improve.
+    listener.buffer.gsub! /<textarea ([^>]*)><\/textarea>/, '<textarea \1>#{}</textarea>'
     listener.buffer.gsub! /<(.*) ([^>]*)><\/\1>/, '<\1 \2 />'
     listener.buffer.gsub! /<(.*)><\/\1>/, '<\1 />'
     return listener.buffer

data/lib/nitro/flash.rb

@@ -6,8 +6,8 @@ module Nitro
   
     def self.append_features(base)
       super      
-      base.pre 'flash.discard'
-      base.post 'flash.clean'
+      base.before 'flash.discard'
+      base.after 'flash.clean'
     end
     
     # A Flash is a special hash object that lives in the session. 

data/lib/nitro/mixin/buffer.rb

@@ -22,8 +22,8 @@ private
 
   # Output buffers stack, used for php-style nested output 
   # buffering.
-
-  attr :out_buffers
+  
+  def out_buffers; @out_buffers; end
   
   # Start (push) a new output buffer.
 

data/lib/nitro/mixin/form.rb

@@ -1,5 +1,8 @@
 require 'nano/inflect'
 
+require 'nitro/mixin/xhtml'
+require 'og/relation/all'
+
 module Nitro
 
 # A collection of useful helpers for creating and manipulating
@@ -12,13 +15,22 @@ module Nitro
 module FormMixin
   
   def self.included(base)
+    super
     base.send :include, XhtmlMixin
   end
 
 private
   
+  # Propagate the given parameter by using a form hidden field. The
+  # parameter value is tus passed to the next request.
+  
+  def propagate_param(param)
+    %|<input type="hidden" name="#{param}" value="#{request[param.to_s]}" />|
+  end
+  alias_method :keep_param, :propagate_param
+  
   # Render a standard form for the given Object. The object 
-  # should include attribute metadata.
+  # should include attribute annotations.
   #--
   # TODO: get info, for example localization mode from session,
   # if this module is mixed in a Render.
@@ -28,25 +40,37 @@ private
     method = options.fetch(:method, 'post')
     action = options.fetch(:action, "save_#{obj.class.name.underscore}")
     submit = options.fetch(:submit, 'Save')
-  
+    cancel = options.fetch(:cancel, "#@base/#{Scaffolding.class_to_list(obj.class)}")  
+    
+    if enctype = options.fetch(:enctype, nil) 
+      enctype_attribute = " enctype=\"#{enctype}\""
+    else
+      enctype_attribute = ''
+      for pr in obj.class.properties.values
+        if pr.klass.ancestors.include? Og::Blob                
+          enctype_attribute = ' enctype="multipart/form-data"'
+        end
+      end
+    end
+
     action = "#{@base}/#{action}" unless action =~ /\//
     
     str = %{<form action="#{action}" method="post">}
-    if obj.oid
-      str << %{
-  <input type="hidden" name="oid" value="#{obj.oid}" />}
-    end
-    str << %{
-  #{tags_for(obj, options)}
-  <br />
-  <input type="submit" value="#{submit}" /> or <a href="#@base/#{Scaffolding.class_to_list(obj.class)}">Cancel</a>
-</form> 
-    }
+    
+    str = ''
+
+    str << %{<form action="#{action}" method="post"#{enctype_attribute}>}    
+    str << %{<input type="hidden" name="oid" value="#{obj.oid}" />} if obj.oid
+    str << tags_for(obj, options)
+    str << %{<input type="submit" value="#{submit}" />}
+    str << %{ or <a href="#{cancel}">Cancel</a>} if cancel
+    str << %{</form>}
+    
     return str
   end
       
   # Render a standard form tags for the given Object. The object 
-  # should include attribute metadata.
+  # should include attribute annotations.
   #
   # If show_all is false then apply field filtering.
   #
@@ -65,113 +89,200 @@ private
   def tags_for(obj, options = {})
     str = prologue()
     
-    for p in obj.class.properties
-      next if :oid == p.symbol unless options[:all]
+    for p in obj.class.properties.values
+      unless options[:all]
+        next if :oid == p.symbol or p.editor == :none #TODO check for real key
+      end
+      
       ancestors = p.klass.ancestors
-      if ancestors.include?(Numeric) 
-        unless p.meta[:relation]              
-          str << field_tag(obj, p, options)
-        end
-      elsif ancestors.include?(String)
-        if p.metadata[:editor] == :textarea 
-          str << textarea_tag(obj, p, options)
+      
+      tag = if p.editor and obj.respond_to?(p.editor.to_sym)
+        obj.send(p.editor.to_sym, p, options) #farms: send to custom _instance_ method
+      elsif ancestors.include? Numeric and !p.relation      
+        field_tag(obj, p, options)
+      elsif ancestors.include? String
+        if p.editor == :textarea 
+          textarea_tag(obj, p, options)
         else
-          str << field_tag(obj, p, options)
+          field_tag(obj, p, options)
         end
-      elsif ancestors.include?(TrueClass)
-        str << checkbox_tag(obj, p, options)
-      elsif ancestors.include?(Time)
-        str << datetime_tag(obj, p, options)
+      elsif ancestors.include? TrueClass
+        checkbox_tag(obj, p, options)
+      elsif ancestors.include? Date
+        date_tag(obj, p, options)
+      elsif ancestors.include? Time
+        datetime_tag(obj, p, options)
+      elsif ancestors.include? Og::Blob
+        file_tag(obj, p, options)
+      elsif ancestors.include? Hash
+        hash_tag(obj, p, options)
+      else
+        nil #no tag
+      end
+      
+      unless tag.nil?
+        #farms: TODO. way to override the general 'element' and disable per prop
+        str << element(p.symbol, tag)
       end
     end
 
-    for rel in obj.class.relations
-      case rel
-        when Og::BelongsTo
-          str << belongs_to_tag(obj, rel, options)
-        when Og::HasMany
-          str << has_many_tag(obj, rel, options)
+    if obj.class.relations and not options[:skip_relations]
+      for rel in obj.class.relations        
+        next if rel.options[:editor] == :none unless options[:all]
+        
+        tag = if rel.options[:editor] && obj.respond_to?(rel.options[:editor].to_sym)
+          obj.send(rel.options[:editor].to_sym, rel, options) #farms: allow custom relation editors
+        elsif rel.kind_of? Og::RefersTo
+          refers_to_control(obj, rel, options)
+        elsif rel.kind_of? Og::JoinsMany or rel.kind_of? Og::HasMany
+          if rel.options[:editor] == :twin_select or rel.options[:editor] == :twin
+            many_select_control(obj, rel, options)
+          else
+            many_list_control(obj, rel, options)
+          end
+        else
+          nil #no tag
+        end
+        
+        unless tag.nil?
+          #farms: TODO. way to override the general 'element' and disable per rel
+          str << element(rel.name, tag)
+        end
       end
     end
-
+        
     str << epilogue()
     
     return str    
   end
 
-  def belongs_to_tag(obj, rel, options)
-    entities = rel.target_class.all
-    labels = entities.map { |e| e.to_s }
-    values = entities.map { |e| e.oid }
-    element(
-      label(rel.name),
-      %{
-      <select id="#{rel.name}" name="#{rel.name}">
-        #{options(:labels => labels, :values => values, :selected => 1)}
-      </select>
-      }
-    )
-  end
-
-  def has_many_tag(obj, rel, options)
-    entities = obj.send(rel.target_plural_name) if obj.saved?
-    unless entities.empty?
-      str = entities.inject('') do |acc, e| 
-        acc << "<tr><td>#{e.to_edit_link(@base)}</td></tr>"
-      end
-      str = "<table>#{str}</table>"
-    else 
-      str = 'No entities found.<br /><br />'
+  def hash_tag(obj, p, options)
+    str = %{
+      <input type="text" id="#{p.symbol}_key" /> =&gt; <input type="text" id="#{p.symbol}_value" /> 
+      <input id="#{p.symbol}" class="naction_add_hash" type="button" value=" + " />
+      <ul id="#{p.symbol}_list">
+    }
+    obj.send(p.symbol).each do |k,v|
+      str << hash_tag_item(p.symbol, k, v)
     end
-    element(
-      label(rel.name) + '&nbsp;<a href="#">Add</a>',
-      %{
-      #{str}
-      }
-    )
+    str << %{</ul>}
   end
-    
-  def field_tag(obj, p, options)
+  
+  def hash_tag_item(name, key='', value='')
     %{
-  <dt>#{label(p.symbol)}</dt>
-  <dd>
-    <input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{obj.send(p.symbol)}" style="width: 250px" />
-  </dd>
+      <li>
+        <input type="text" value="#{key}" disabled="disabled" class="hash_item_key" /> =&gt; <input type="text" name="#{name}[#{key}]" id="#{name}_value" value="#{value}" class="hash_item_value" />
+        <span class="remove"><a href="#" class="naction_remove_hash" id="#{name}_remove">remove</a></span>
+      </li>
     }
   end
+  public :hash_tag_item # Allow ajax access
   
+  def file_tag(obj, p, options)
+     %{<input type="file" id="#{p.symbol}" name="#{p.symbol}" style="width: 250px" />}
+  end
+
+  def field_tag(obj, p, options) 
+    %{<input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{obj.send(p.symbol)}" style="width: 250px" /> }
+  end
+
   def textarea_tag(obj, p, options)
-    %{
-  <dt>#{label(p.symbol)}</dt>
-  <dd>
-    <textarea id="#{p.symbol}" name="#{p.symbol}">#{obj.send(p.symbol)}</textarea>
-  </dd>
-    }
+    %{<textarea id="#{p.symbol}" name="#{p.symbol}">#{obj.send(p.symbol)}</textarea> }    
   end
 
   def checkbox_tag(obj, p, options)
-    %{
-  <dt>
-    <input type="checkbox" id="#{p.symbol}" name="#{p.symbol}" />&nbsp;
-    #{label(p.symbol)}
-  </dt>
-  <dd>#{}</dd>
-    }
+    checked_flag = obj.send(p.symbol) ? 'checked="checked" ' : ''
+    %{<input type="checkbox" id="#{p.symbol}" name="#{p.symbol}"  #{checked_flag}/>&nbsp; }    
   end
-    
+
+  def date_tag(obj, p, options)
+    date_select(obj.send(p.symbol), :name => p.symbol.to_s)
+  end
+
   def datetime_tag(obj, p, options)
-    element(
-      label(p.symbol), 
-      datetime_select(obj.send(p.symbol), :name => p.symbol.to_s)
-    )
+    datetime_select(obj.send(p.symbol), :name => p.symbol.to_s)
   end
   
   def label(sym)
-    %|<label for="#{sym}">#{sym.to_s.humanize}</label>|
+    %{<label for="#{sym}">#{sym.to_s.humanize}</label>}
   end
 
   # :section: Relations.
   
+  def refers_to_control(obj, rel, options)
+    entities = rel.target_class.all
+    selected = obj.send(rel.name)
+    selected = selected.pk if selected
+    unless entities.empty?
+      str = %{<select id="#{rel.name}" name="#{rel.name}">}
+      str << %{<option value="null">None</option>} if rel.options[:allow_none]
+      str << %{#{options(:labels => entities.map{|e| e.to_s}, :values => entities.map{|e| e.oid}, :selected => selected)}</select>}
+    else
+      'No entities found.<br /><br />'
+    end
+  end
+
+  def many_list_control(obj, rel, options)
+    entities = rel.target_class.all
+
+    unless entities.empty? 
+      selected_entities = obj.send(rel.name)
+      selector_entities = entities.delete_if {|e| obj.saved? && selected_entities.include?(e)}
+      
+      str = %{
+        <select id="#{rel.name}_selector">
+          #{options(:labels => selector_entities.map{|e| e.to_s}, :values => selector_entities.map{|e| e.oid})}
+        </select>
+        <input id="#{rel.name}" type="button" value=" + " class="naction_add_rel" />
+        <ul class="relation_list" id="#{rel.name}_list">
+      }
+      selected_entities.each do |e|
+        str << relation_item(rel.name, e.to_s, e.oid)
+      end
+      str << %{</ul>}
+    else 
+      'No entities found.<br /><br />'
+    end
+  end
+
+  def relation_item(name, display, oid) 
+    %{
+      <li>
+        <input type="hidden" name="#{name}[]" value="#{oid}" />
+        <span class="display">#{display}</span>
+        <span class="remove"><a href="#" id="#{name}_remove" class="naction_remove_rel">remove</a></span>
+      </li>
+    }
+  end
+  public :relation_item # Allow ajax access.
+
+  def many_select_control(obj, rel, options)
+    entities = rel.target_class.all
+    
+    unless entities.empty?
+      selected_entities = obj.send(rel.name)
+      selector_entities = entities.delete_if {|e| obj.saved? && selected_entities.include?(e)}
+      str = %{
+        <div id="#{rel.name}" class="has_many_control">
+        <select id="#{rel.name}_selector" multiple="multiple">
+          #{options(:labels => selector_entities.map{|e| e.to_s}, :values => selector_entities.map{|e| e.oid})}
+        </select>
+
+        <a href="javascript:multiSelectorMove('#{rel.name}','add');">add &gt;&gt;</a>
+        <a href="javascript:multiSelectorMove('#{rel.name}','remove');">&lt;&lt; remove</a>
+
+        <select id="#{rel.name}_selected" multiple="multiple">
+          #{options(:labels => selected_entities.map{|e| e.to_s}, :values => selected_entities.map{|e| e.oid})}
+        </select>
+      }
+      selected_entities.each do |e|
+        str << %{<input type="hidden" name="#{rel.name}[]" id="#{rel.name}_#{e.oid}" value="#{e.oid}" />}
+      end
+      str << %{</div>}
+    else
+      'No entities found.<br /><br />'
+    end
+  end
   
   # :section: General formating methods. Override to customize.
   
@@ -189,12 +300,10 @@ private
   
   # Emit a form element.
   
-  def element(label, element)
+  def element(name, tag)    
     %{
-  <dt>#{label}</dt>
-  <dd>
-    #{element}
-  </dd>
+    <dt class="#{name}">#{label(name)}</dt>
+    <dd class="#{name}">#{tag}</dd>
     }
   end
 end
@@ -202,3 +311,5 @@ end
 end 
 
 # * George Moschovitis <gm@navel.gr>
+# * Chris Farmiloe <chris.farmiloe@farmiloe.com>
+# * Rob Pitt <rob@motionpath.co.uk>