nitro 0.29.0 → 0.30.0

data/lib/nitro/helper/form/builder.rb

@@ -0,0 +1,140 @@
+require 'glue/builder/xml'
+
+module Nitro
+module FormHelper
+
+  # A specialized Builder for dynamically building of forms.
+  # Provides extra support for forms backed by managed objects
+  # (entities).
+  #--
+  # TODO: allow multiple objects per form.
+  # TODO: use more generalized controls.
+  #++
+  
+  class FormXmlBuilder < ::Glue::XmlBuilder
+  
+    def initialize buffer = '', options = {}
+      super
+      @obj = options[:object]
+    end
+    
+    # Render a control+label for the given property of the form
+    # object.
+    
+    def property sym, options = {}
+      if prop = @obj.class.properties[sym]
+        control = Form::Control.fetch(@obj, prop, options).render
+        print element(prop, control)
+      else
+        raise "Undefined property '#{sym}' for class '#{@obj.class}'."
+      end
+    end
+
+    # Render controls+labels for all relations of the form object.
+    
+    def all_properties options = {}
+      for prop in @obj.class.properties.values
+        property prop.symbol, options
+      end
+    end
+    alias_method :properties, :all_properties
+
+    #--
+    # IMPLEMENT ME
+    #++
+    
+    def relation sym, options = {}
+    end
+
+    #--
+    # IMPLEMENT ME
+    #++
+        
+    def all_relations options = {}
+    end    
+
+    # Renders a control to select a file for upload.
+    
+    def select_file name, options = {}
+      print %|<input type="file" name="#{name}" />|
+    end
+
+  private
+  
+    # Emit a label. Override this method to customize the
+    # rendering for your application needs.
+          
+    def label prop
+      %{<label for="#{prop.name}">#{prop[:title] || prop.name.to_s.humanize}</label>}
+    end
+    
+    # Emit a form element. Override this method to customize the
+    # rendering for your application needs.
+    
+    def element prop, html
+      %{
+        <p class="form_#{prop.symbol}">
+          <div>#{label(prop)}</div>
+          #{html}
+        </p>
+      }        
+    end
+  
+  end
+
+  # A sophisticated form generation helper method.
+  #
+  # === Options
+  #
+  # * :object, :entity, :class = The object that acts as model
+  #   for this form. If you pass a class an empty object is 
+  #   instantiated.
+  #
+  # === Example
+  #   
+  # #{form(:object => @owner, :action => :save_profile) do |f|
+  #   f.property :name, :editable => false
+  #   f.property :password
+  #   f.br
+  #   f.submit 'Update'
+  # end}
+  
+  def form options = {}, &block
+    obj = (options[:object] ||= options[:entity] || options[:class])
+    
+    # If the passed obj is a Class instantiate an empty object
+    # of this class.
+    
+    if obj.is_a? Class
+      obj = options[:object] = obj.allocate
+    end
+
+    # Convert virtual :multipart method to method="post",
+    # enctype="multipart/form-data"
+    
+    if options[:method] == :multipart
+      options[:method] = :post
+      options[:enctype] = 'multipart/form-data'
+    end    
+        
+    b = FormXmlBuilder.new('', options)
+
+    b << '<form'
+    b << %| action="#{options[:action]}"| if options[:action]
+    b << %| method="#{options[:method]}"| if options[:method]
+    b << %| enctype="#{options[:enctype]}"| if options[:enctype]
+    b << '>'
+    
+    b.hidden(:name => 'oid', :value => obj.oid) if obj and obj.saved?
+     
+    yield b
+    
+    b << '</form>'
+    
+    return b
+  end
+  
+end
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/helper/form/controls.rb

@@ -1,3 +1,5 @@
+require 'glue/configuration'
+
 require 'nitro/helper/xhtml'
 
 module Nitro
@@ -365,7 +367,6 @@ class Control
   # or :symbol defaults to Control if not found
   
   def self.fetch(obj, key, options={})
-
     if key.kind_of? Og::Relation
       control_sym = key[:control] || key.class.to_s.demodulize.underscore.to_sym
     elsif key.kind_of? Property

data/lib/nitro/helper/javascript.rb

@@ -2,6 +2,12 @@ require 'facet/inflect'
 
 module Nitro
 
+module Javascript
+  # The javascript files to auto include.
+  
+  setting :required_files, :default => [], :doc => 'The javascript files to auto include'
+end
+
 # Javascript utilities.
 
 module JavascriptUtils

data/lib/nitro/helper/javascript/morphing.rb

@@ -89,20 +89,27 @@ end
 #
 # <a client="action">..</a>
 # becomes
-# <a href="#" onclick="__nc_action(); return false">...</a>
+# <a href="#" onclick="__nc_action(); return false">..</a>
+#
+# <a client="action" params="this.id">..</a>
+# becomes
+# <a href="#" onclick="__nc_action(this.id); return false">..</a>
 
 class ClientMorpher < SharedMorpher
   def before_start(buffer)
     require_script_file :prototype, :effects
     
+    params = @attributes['params']
+
     case @name
-      when 'form'
-        @attributes['onsubmit'] = "__nc_#@value(); return false"
-      else
-        @attributes['href'] = '#'
-        @attributes['onclick'] = "__nc_#@value(); return false"
+    when 'form'
+      @attributes['onsubmit'] = "__nc_#@value(#{params}); return false"
+    else
+      @attributes['href'] = '#'
+      @attributes['onclick'] = "__nc_#@value(#{params}); return false"
     end
     @attributes.delete(@key)
+    @attributes.delete('params')
   end
 end
 

data/lib/nitro/helper/xhtml.rb

@@ -5,7 +5,31 @@ module Nitro
 
 module XhtmlHelper
 
-private
+  # Creates the href of an Object.
+    
+  def href_of(obj, base = nil)
+    if obj.is_a?(Symbol) or obj.is_a?(String)
+      href = obj.to_s
+    elsif obj.respond_to? :to_href
+      href = obj.to_href
+    else
+      href = "#{obj.class.name.pluralize.undescore}/#{obj.oid}"
+    end
+    
+    if base
+      base += '/'
+    else
+      base = "#{self.class.mount_path}/".squeeze
+    end
+    
+    return "#{base}#{href}"
+  end
+
+  # Creates a link to an Object.
+  
+  def link_to(obj, base = nil)
+    %|<a href="#{href_of(obj, base)}">#{obj}</a>|
+  end
 
   # Render select options. The parameter is a hash of options.
   #
@@ -64,17 +88,29 @@ private
     end
   end
 
+  # Render a hidden form input.
+  
+  def hidden(options)
+    opts = options.collect { |k, v| %[#{k}="#{v}"] }.join(' ')
+    %[<input type="hidden" #{opts} />]
+  end
+  
   # Render a submit input.
   
-  def submit(options = nil)
+  def submit(label, options = nil)
     str = ''
     
-    if options
+    label = options.delete(:value) unless label 
+    
+    str << '<input type="submit"'
+    str << %[ value="#{label}"] if label
+
+    unless options.empty?
       opts = options.collect { |k, v| %[#{k}="#{v}"] }.join(' ')
-      str << %[<input type="submit" #{opts} />]
-    else
-      str << %|<input type="submit" />|
+      str << %[ #{opts} ]
     end
+    
+    str << ' />'
 
     return str
   end

data/lib/nitro/helper/xml.rb

@@ -2,6 +2,9 @@ module Nitro
 
 # A helper mixin for programmatically building XML
 # blocks. 
+#--
+# gmosx, INVESTIGATE: is this used or deprecated?
+#++
 
 module XmlHelper
 

data/lib/nitro/part.rb

@@ -9,8 +9,8 @@ class Part
   # Require (include) a part in the current application.
 
   def self.require(name)
-    Logger.debug "Requiring part '#{name}'."
-    Kernel.require "part/#{name}/run.rb"
+    Logger.debug "Requiring part '#{name}'." if $DBG
+    Kernel.require 'part/' + name + '/run.rb'
   end
 
 end

data/lib/nitro/render.rb

@@ -94,6 +94,7 @@ module Render
   #    A parent render/controller acts as the context.
 
   def initialize(context, base = nil)
+    @rendering_context = 0
     @request = @response = @context = context
     @controller_name = @base = base
     @out = context.out
@@ -119,13 +120,17 @@ module Render
     @context.content_type = klass.instance_variable_get('@content_type') || 'text/html'
 
     raise 'No controller for action' unless klass
-    
+
+    @context.level += 1
+        
     if self.class == klass 
       self.send(action)
     else
       klass.new(@context, base).send(action)
     end
 
+    @context.level -= 1
+    
   rescue NoActionError => e1
     log_error(e1, path, false)
     print '(error)'
@@ -308,7 +313,7 @@ private
   def emit(meth, *options)
     Emitter.instance.send(meth, *options)
   end
-
+  
 end
 
 end

data/lib/nitro/router.rb

@@ -10,9 +10,30 @@ module Nitro
 #
 # === Example
 #
-# r.add_route(%r{rewritten/url/(.*)}, :controller => IdController, :action => :register, :param => :name)
-# r.add_route(%r{another/zelo/(.*)/(.*)}, :controller => AdminController, :action => :kick, :params => [:name, :age])
-# r.add_route(%r{cool/(.*)_(.*).html}, :controller => AdminController, :action => :long, :params => [:name, :age])  
+# can also be initialized by a YAML file through Configuration.
+#
+# Router.rules = [
+#   {:match => /rewritten\/url\/(.*)/, :controller => IdController, :action => :register, :param => :name},
+#   {:match => %r{another/zelo/(.*)/(.*)}, :controller => AdminController, :action => :kick, :params => [:name, :age]}
+# ]
+#
+# or 
+#
+# Router.add_rule :match => /rewritten\/url\/(.*)/, :controller => IdController, :action => :register, :param => :name
+# Router.add_rule :match => %r{another/zelo/(.*)/(.*)}, :controller => AdminController, :action => :kick, :params => [:name, :age]
+#
+# this is the global table that initializes each Router 
+# instance.
+# 
+# or (specialized per Router instance)
+# 
+# r.add_rule(:match => %r{rewritten/url/(.*)}, :controller => IdController, :action => :register, :param => :name)
+# r.add_rule(:match => %r{another/zelo/(.*)/(.*)}, :controller => AdminController, :action => :kick, :params => [:name, :age])
+# r.add_rule(:match => %r{cool/(.*)_(.*).html}, :controller => AdminController, :action => :long, :params => [:name, :age])  
+#
+#--
+# gmosx, TODO: use a hash only instead of [rule, options]
+#++
 
 module Router
 
@@ -20,26 +41,39 @@ module Router
   
   setting :strip_path, :default => nil, :doc => 'Strip the beginning of the path, used by cgi adapter'
 
-  # The route table maps 'nice URLs' to real URLs that
+  # The routing rules. The rules in this table are used to initialize
+  # the routing table of each instantiated router.
+  
+  setting :rules, :default => [], :doc => 'The routing rules' 
+
+  # The rules map 'nice URLs' to real URLs that
   # can be handled by the Dispatcher.
 
-  attr_accessor :routes
+  attr_accessor :rules
+  
+  # Initialize the routing table by importing from the global
+  # Router rules.
+  
+  def init_routes
+    @rules = Router.rules.dup
+  end
   
   # Decodes a url to a [controller, action, params] tupple.
   # Returns false if no decoding is possible. 
   
   def decode_route(url)
-    for rule, options in @routes
-      if md = url.match(rule)
+    for rule in @rules
+      if md = url.match(rule[:match])
         params = nil
-        if param_names = options[:params] || options[:param]
+        if param_names = rule[:params] || rule[:param]
           param_names = [ param_names ] unless param_names.is_a?(Array)
           params = {}
           md.captures.each_with_index do |val, idx|
             params[param_names[idx].to_s] = val
           end
         end
-        return options[:controller], options[:action], params
+        Logger.debug "Rewriting '#{url}' to '#{rule[:controller]}##{rule[:action]}(#{params.values.join(', ')})." if $DBG
+        return rule[:controller], rule[:action], params
       end
     end
     return false
@@ -50,9 +84,8 @@ module Router
   # Returns false if no encoding is possible.
   
   def encode_route(controller, action, *params)
-    if route = @routes.find { |r| (r.last[:controller] == controller) and (r.last[:action] == action) }
-      rule, options = *route
-      url = rule.source
+    if rule = @rules.find { |r| (r[:controller] == controller) and (r[:action] == action) }
+      url = rule[:match].source
 
       (params.size / 2).times do |i|
         val = params[i + i + 1]
@@ -66,12 +99,20 @@ module Router
 
   # Add a route to the routing table.
   
-  def add_route(rule, options)
-    (@routes ||= []) << [rule, options]
+  def add_rule(rule)
+    @rules << rule
   end
-  alias_method :<<, :add_route
+  alias_method :<<, :add_rule
   
-  def add_routes
+  def add_rules(new_rules)
+    @rules.concat(new_rules)
+  end
+
+  class << self
+    def add_rule(rule)
+      self.rules << rule
+    end
+    alias_method :<<, :add_rule
   end
 
 end

data/lib/nitro/scaffolding.rb

@@ -1,7 +1,6 @@
 require 'nitro/helper/form'
 require 'nitro/helper/pager'
 
-
 module Nitro
 
 # Scaffolding is a feature of Nitro that automatically generates
@@ -118,11 +117,12 @@ module Scaffolding
         if File.exist?(path) and source = File.read(path)
           # Interpolate the source.
           source.gsub!(/%base%/, @base.to_s)
+          source.gsub!(/%klass%/, @klass.to_s)
           source.gsub!(/%name%/, @name)
           source.gsub!(/%plural%/, @plural)
           
           # Transform the source.
-          source = @compiler.transform_template(source)
+          source = @compiler.transform_template(action, source)
 
           @controller.module_eval %{
             def #{action}_template
@@ -144,15 +144,15 @@ module Scaffolding
     
     def scaffold_class      
       define_class_method :scaffold_base, %{
-        "#{@controller.ann.self.mount_point}/#@base"
+        "#{@controller.mount_path}/#@base"
       }          
       
       define_class_method :to_href, %{
-        "#{@controller.ann.self.mount_point}/#@base/view/\#@#{@oid}"
+        "#{@controller.mount_path}/#@base/view/\#@#{@oid}"
       }    
 
       define_class_method :to_edit_href, %{
-        "#{@controller.ann.self.mount_point}/#@base/edit/\#@#{@oid}"
+        "#{@controller.mount_path}/#@base/edit/\#@#{@oid}"
       }    
     end
     
@@ -160,28 +160,28 @@ module Scaffolding
     
     def scaffold_controller      
       define_controller_action 'index', %{
-        #{Glue::Aspects.gen_advice_code(:scaffold_index, @controller.advices, :pre)}
+        #{::Aspects.gen_advice_code(:scaffold_index, @controller.advices, :pre)}
         @list, @pager = paginate(@klass, :per_page => Scaffolding.per_page)
       }
 
       define_controller_action 'list', %{
-        #{Glue::Aspects.gen_advice_code(:scaffold_list, @controller.advices, :pre)}
+        #{::Aspects.gen_advice_code(:scaffold_list, @controller.advices, :pre)}
         @list, @pager = paginate(@klass, :per_page => Scaffolding.per_page)
       }
         
       define_controller_action 'view(oid)', %{
-        #{Glue::Aspects.gen_advice_code(:scaffold_view, @controller.advices, :pre)}
+        #{::Aspects.gen_advice_code(:scaffold_view, @controller.advices, :pre)}
         @obj = @klass[oid]
       }
 
       define_controller_action 'new(all = false)', %{
-        #{Glue::Aspects.gen_advice_code(:scaffold_new, @controller.advices, :pre)}
+        #{::Aspects.gen_advice_code(:scaffold_new, @controller.advices, :pre)}
         @obj = @klass.new
         @all = all
       }
 
       define_controller_action 'edit(oid = nil, all = false)', %{
-        #{Glue::Aspects.gen_advice_code(:scaffold_edit, @controller.advices, :pre)}
+        #{::Aspects.gen_advice_code(:scaffold_edit, @controller.advices, :pre)}
         @obj = @klass[oid]
         @all = all
       }
@@ -195,29 +195,38 @@ module Scaffolding
         else
           obj = request.fill(@klass.create, :assign_relations => true, :preprocess => true)
         end
-        #{Glue::Aspects.gen_advice_code(:scaffold_save, @controller.advices, :pre)}
+        #{::Aspects.gen_advice_code(:scaffold_save, @controller.advices, :pre)}
         unless obj.valid?
           flash[:ERRORS] = obj.errors
           redirect_to_referer
         end
         obj.save
         oid = obj.pk
-        #{Glue::Aspects.gen_advice_code(:scaffold_save, @controller.advices, :post)}
+        #{::Aspects.gen_advice_code(:scaffold_save, @controller.advices, :post)}
         redirect '#{action_path(:list)}'
       }
 
       define_controller_action 'search(query)', %{
-        #{Glue::Aspects.gen_advice_code(:scaffold_search, @controller.advices, :pre)}
+        #{::Aspects.gen_advice_code(:scaffold_search, @controller.advices, :pre)}
         @query = query
         if @klass.respond_to? :search
           @list = #@klass.search(query)
         end
+        #{::Aspects.gen_advice_code(:scaffold_search, @controller.advices, :post)}
+      }
+
+      define_controller_action 'advanced_search', %{
+        #{::Aspects.gen_advice_code(:scaffold_search, @controller.advices, :pre)}
+        if request.post?
+          @list = #@klass.query_by_example(request.params)
+        end
+        #{::Aspects.gen_advice_code(:scaffold_advanced_search, @controller.advices, :post)}
       }
     
       define_controller_action 'delete(oid)', %{
-        #{Glue::Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :pre)}
+        #{::Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :pre)}
         @klass.delete(oid)
-        #{Glue::Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :post)}
+        #{::Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :post)}
         redirect_to_referer
       }            
       
@@ -226,18 +235,18 @@ module Scaffolding
       for rel in @klass.relations        
         define_controller_action "remove_#{rel.target_singular_name}(oid, rid)", %{
           obj = @klass[oid]
-          #{Glue::Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :pre)}
+          #{::Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :pre)}
           rob = #{rel.target_class}[rid]
           obj.#{rel.name}.remove(rob)
-          #{Glue::Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :post)}
+          #{::Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :post)}
           redirect_to_referer
         }
         define_controller_action "delete_#{rel.target_singular_name}(oid, rid)", %{
-          #{Glue::Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :pre)}
+          #{::Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :pre)}
           obj = @klass[oid]
           rob = #{rel.target_class}[rid]
           obj.#{rel.name}.delete(rob)
-          #{Glue::Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :post)}
+          #{::Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :post)}
           redirect_to_referer
         }
       end        
@@ -323,7 +332,7 @@ module Scaffolding
       if scaffold_all?
         options = scaffold_all_options
         Og.manager.manageable_classes.each do |klass|
-          unless klass.ancestors.include?(Og::Unmanageable) or options[:except] && options[:except].include?(klass)
+          unless options[:except] && options[:except].include?(klass)
             scaffold(klass, options)
           end
         end