nitro 0.28.0 → 0.29.0

data/lib/nitro/flash.rb

@@ -58,6 +58,50 @@ module Nitro
         
         (@dirty.keys - keys).each { |k| @dirty.delete k } 
       end
+
+      # :section: Helpers
+      
+      # Push a value in an array flash variable.
+      #
+      # === Example
+      #
+      # flash.push :errors, 'This is the first error'
+      # flash.push :errors, 'This is the second error'
+      #
+      # flash[:errors] # => []
+      
+      def push(key, value)
+        if value.is_a? Array
+          (self[key] ||= []).concat(value)
+        else
+          (self[key] ||= []) << value
+        end
+      end
+      
+      # Pop a value from an array flash variable.
+      
+      def pop(key)
+        if arr = self[key]
+          if arr.is_a? Array
+            return arr.pop
+          else
+            return arr
+          end
+        end
+        return nil
+      end
+
+      # Join helper
+      
+      def join(key, sep = ', ')
+        value = self[key]
+        
+        if value.is_a? Array
+          return value.join(sep)
+        else
+          return value
+        end
+      end
             
     private
       

data/lib/nitro/helper/buffer.rb

@@ -1,5 +1,3 @@
-require 'glue/attribute'
-
 module Nitro
 
 # The output buffering mixin. Provides php-style output

data/lib/nitro/helper/form.rb

@@ -118,7 +118,7 @@ module FormHelper
       unless options[:all]
         next if prop.symbol == obj.class.primary_key.symbol or prop[:control] == :none or prop[:relation]
       end
-      control = Control.fetch(obj, prop, options).render
+      control = Form::Control.fetch(obj, prop, options).render
       str << FormBuilder.element(prop, control)
     end
   end
@@ -130,7 +130,7 @@ module FormHelper
       unless options[:all]
         next if rel[:control] == :none
       end
-      control = Control.fetch(obj, rel, options).render
+      control = Form::Control.fetch(obj, rel, options).render
       str << FormBuilder.element(rel, control)      
     end  
   end

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

@@ -4,6 +4,8 @@ module Nitro
 
 # :section: Property controls.
 
+module Form
+
 # A Form control.
 
 class Control
@@ -174,7 +176,7 @@ class ArrayControl < Control
     else
       removable = values.size != 1 ? true : false
       values.each do |item|
-        str << emit_array_element(:selected => item.pk)
+        str << emit_array_element()
       end
     end
     str << emit_container_end
@@ -182,7 +184,6 @@ class ArrayControl < Control
   
   def emit_array_element(options={})
     removable = options.fetch(:removable, true)
-    selected = options.fetch(:selected, nil)
     %{
       <div>
         <input type="text" id="#{prop.symbol}_ctl" name="#{prop.symbol}[]" value="#{value}"#{emit_style}#{emit_disabled} />
@@ -192,6 +193,14 @@ class ArrayControl < Control
     }
   end
   
+  def emit_container_start
+    %{<div class="array_container">}
+  end
+  
+  def emit_container_end
+    %{</div>}
+  end
+  
   def emit_js
     %{
       <script type="text/javascript">
@@ -210,7 +219,7 @@ class ArrayControl < Control
           node.getElementsByTagName('input')[0].removeAttribute('disabled'); 
           if(container.lastChild==ctl) container.appendChild(node);
           else container.insertBefore(node, ctl.nextSibling);
-          if(container.childNodes.length>1) container.getElementsByTagName('input')[0].disabled='';
+          if(container.childNodes.length>1) container.getElementsByTagName('input')[1].disabled='';
         }
       </script>
     }
@@ -373,5 +382,7 @@ end
 
 end
 
+end
+
 # * George Moschovitis <gm@navel.gr>
 # * Chris Farmiloe <chris.farmiloe@farmiloe.com>

data/lib/nitro/helper/pager.rb

@@ -233,7 +233,7 @@ private
    
   def target_uri(page)
     params = { @key => page }
-    return UriUtils.update_query_string(@request.uri.to_s, params)
+    return Glue::UriUtils.update_query_string(@request.uri.to_s, params)
   end
 
 end

data/lib/nitro/helper/table.rb

@@ -53,6 +53,7 @@ module TableHelper
   #    A hash of options.
   # 
   # :id = id of the component.
+  # :class = class of the component
   # :headers = an array of the header values
   # :values = an array of arrays.
   # :order = options hash (:left, :right, :asc_pic, :desc_pic, :values)
@@ -62,6 +63,7 @@ module TableHelper
   def table(options)
     str = '<table'
     str << %| id="#{options[:id]}"| if options[:id]
+    str << %| class="#{options[:class]}"| if options[:class]
     str << '>'
     
     str << table_rows(options)
@@ -73,7 +75,6 @@ module TableHelper
   # [+options+]
   #    A hash of options.
   # 
-  # :id = id of the component.
   # :headers = an array of the header values
   # :values = an array of arrays.
   # :order = options hash (:left, :right, :asc_pic, :desc_pic, :values)
@@ -85,7 +86,7 @@ module TableHelper
     options[:values] = options[:values] || options[:items] || options[:rows]
     
     str = ''
-    str << table_header(options)
+    str << table_header(options) if options[:headers]
     str << table_footer(options) if options[:footers]
     
     items = options[:values]
@@ -228,7 +229,7 @@ module TableHelper
     params = { TableHelper.order_by_key => order_by, 
               TableHelper.order_direction_key => direction }
     
-    return UriUtils.update_query_string(request.uri.to_s, params)
+    return Glue::UriUtils.update_query_string(request.uri.to_s, params)
   end
   
   def create_tbody?(options)

data/lib/nitro/helper/xml.rb

@@ -98,7 +98,7 @@ end
 # functionality. Utilizes duck typing to redirect 
 # output to a target buffer.
 
-class XmlBuilder
+class Glue::XmlBuilder
   include XmlHelper
 
   # The target receives the generated xml,

data/lib/nitro/part.rb

@@ -0,0 +1,20 @@
+module Nitro
+
+# A part is a module of reusable functionality encapsulated as 
+# a mini site/app. You can require (include) multiple parts in 
+# your application. A part is in essence a high level component.
+
+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"
+  end
+
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/render.rb

@@ -7,7 +7,6 @@ require 'facet/string/blank'
 require 'glue/attribute'
 require 'glue/settings'
 require 'glue/template'
-require 'glue/builder'
 require 'glue/builder/xml'
 
 require 'nitro/helper/xhtml'
@@ -157,6 +156,8 @@ private
     @out.flush if @out.is_a?(IO)
   end
 
+  # :section: Redirection methods.
+
   # Send a redirect response.
   #
   # If the url starts with '/' it is considered absolute, else
@@ -184,6 +185,8 @@ private
     redirect("#{@context.referer}#{postfix}", status)
   end
   alias_method :redirect_to_referer, :redirect_referer
+  alias_method :redirect_referrer, :redirect_referer
+  alias_method :redirect_to_referrer, :redirect_referer
 
   # Redirect to home.
   
@@ -192,6 +195,42 @@ private
   end
   alias_method :redirect_to_home, :redirect_home
 
+  # :section: Seaside style call/answer methods.
+  
+  # Call redirects to the given url but push the original
+  # url in a callstack, so that the target can return by 
+  # executing answer.
+  #
+  # === Example
+  #
+  # caller:
+  # color, type = call('utils/select_color')
+  #
+  # target:
+  # answer(color, type)
+  #--
+  # FIXME: dont use yet, you have to encode the branch to 
+  # make this safe for use.
+  #++
+  
+  def call(url, status = 303)
+    (session[:CALL_STACK] ||= {}) << request.uri
+    redirect(url, status)
+  end
+  
+  # Returns from a call by poping the callstack.
+  #--
+  # FIXME: don't use yet.
+  #++
+    
+  def answer(index = 0, status = 303)
+    if stack = session[:CALL_STACK] and not stack.empty?
+      redirect(stack.pop, status)
+    else
+      raise 'Cannot answer, call stack is empty'
+    end
+  end
+
   # Log a rendering error.
 
   def log_error(error, path, full = true)
@@ -226,16 +265,16 @@ private
   def render_template(filename)
     filename = "#{filename}.xhtml" unless filename =~ /\.xhtml$/
     template = File.read("#{template_root}/#{filename}")
-    Template.process_template(template, '@out', binding)
+    Glue::Template.process_template(template, '@out', binding)
   end
 
   # Access the programmatic renderer (builder).
   
   def build(&block)
     if block.arity == 1
-      yield XmlBuilder.new(@out)
+      yield Glue::XmlBuilder.new(@out)
     else
-      XmlBuilder.new(@out).instance_eval(&block)
+      Glue::XmlBuilder.new(@out).instance_eval(&block)
     end
   end
 
@@ -243,7 +282,7 @@ private
   # output buffer.
   
   def builder
-    XmlBuilder.new(@out)
+    Glue::XmlBuilder.new(@out)
   end
   
   # A Helper class to access rendering mixins. Useful to avoid 

data/lib/nitro/router.rb

@@ -0,0 +1,81 @@
+module Nitro
+
+# Router mixin. Typically used to generate 'nice' urls.
+# Nice urls apart from looking more beautiful are considered (?) 
+# more Search Engine friendly.
+#
+# However, due to the power of Nitro's intelligent dispatching
+# mechanism, routing is almost never used! It is only needed
+# for really special urls.
+#
+# === 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])  
+
+module Router
+
+  # Strip the beginning of the path, used by cgi adapter.
+  
+  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
+  # can be handled by the Dispatcher.
+
+  attr_accessor :routes
+  
+  # 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)
+        params = nil
+        if param_names = options[:params] || options[: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
+      end
+    end
+    return false
+  end
+  alias_method :route, :decode_route
+  
+  # Encodes a [controller, action, params] tupple into a url.
+  # 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
+
+      (params.size / 2).times do |i|
+        val = params[i + i + 1]
+        url.sub!(/\(.*?\)/, val.to_s)
+      end       
+      
+      return url
+    end
+    return false
+  end
+
+  # Add a route to the routing table.
+  
+  def add_route(rule, options)
+    (@routes ||= []) << [rule, options]
+  end
+  alias_method :<<, :add_route
+  
+  def add_routes
+  end
+
+end
+
+end
+
+# * George Moschovitis  <gm@navel.gr>

data/lib/nitro/scaffolding.rb

@@ -33,12 +33,16 @@ module Scaffolding
     base.extend(ClassMethods)
   end
 
-  def self.class_to_name(klass)
-    klass.to_s.demodulize.underscore.downcase
+  def self.class_to_method(klass)
+    klass.name.underscore.gsub('::','__').downcase
   end
 
   def self.class_to_list(klass)
-    klass.to_s.demodulize.underscore.downcase.plural
+    class_to_method(klass).plural
+  end
+
+  def self.class_to_path(klass)
+    klass.name.underscore.gsub('::','/').downcase
   end
 
   #--
@@ -66,10 +70,6 @@ module Scaffolding
       @base__ = "#{@base}__" if @base
     end
   
-    def class_to_name(klass)
-      klass.to_s.demodulize.underscore.downcase
-    end
-
     #--
     # A helper that defines a class method.
     #++
@@ -160,28 +160,28 @@ module Scaffolding
     
     def scaffold_controller      
       define_controller_action 'index', %{
-        #{Aspects.gen_advice_code(:scaffold_index, @controller.advices, :pre)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_index, @controller.advices, :pre)}
         @list, @pager = paginate(@klass, :per_page => Scaffolding.per_page)
       }
 
       define_controller_action 'list', %{
-        #{Aspects.gen_advice_code(:scaffold_list, @controller.advices, :pre)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_list, @controller.advices, :pre)}
         @list, @pager = paginate(@klass, :per_page => Scaffolding.per_page)
       }
         
       define_controller_action 'view(oid)', %{
-        #{Aspects.gen_advice_code(:scaffold_view, @controller.advices, :pre)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_view, @controller.advices, :pre)}
         @obj = @klass[oid]
       }
 
       define_controller_action 'new(all = false)', %{
-        #{Aspects.gen_advice_code(:scaffold_new, @controller.advices, :pre)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_new, @controller.advices, :pre)}
         @obj = @klass.new
         @all = all
       }
 
       define_controller_action 'edit(oid = nil, all = false)', %{
-        #{Aspects.gen_advice_code(:scaffold_edit, @controller.advices, :pre)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_edit, @controller.advices, :pre)}
         @obj = @klass[oid]
         @all = all
       }
@@ -195,18 +195,19 @@ module Scaffolding
         else
           obj = request.fill(@klass.create, :assign_relations => true, :preprocess => true)
         end
-        #{Aspects.gen_advice_code(:scaffold_save, @controller.advices, :pre)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_save, @controller.advices, :pre)}
         unless obj.valid?
           flash[:ERRORS] = obj.errors
           redirect_to_referer
         end
         obj.save
-        #{Aspects.gen_advice_code(:scaffold_save, @controller.advices, :post)}
+        oid = obj.pk
+        #{Glue::Aspects.gen_advice_code(:scaffold_save, @controller.advices, :post)}
         redirect '#{action_path(:list)}'
       }
 
       define_controller_action 'search(query)', %{
-        #{Aspects.gen_advice_code(:scaffold_search, @controller.advices, :pre)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_search, @controller.advices, :pre)}
         @query = query
         if @klass.respond_to? :search
           @list = #@klass.search(query)
@@ -214,9 +215,9 @@ module Scaffolding
       }
     
       define_controller_action 'delete(oid)', %{
-        #{Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :pre)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :pre)}
         @klass.delete(oid)
-        #{Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :post)}
+        #{Glue::Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :post)}
         redirect_to_referer
       }            
       
@@ -225,18 +226,18 @@ module Scaffolding
       for rel in @klass.relations        
         define_controller_action "remove_#{rel.target_singular_name}(oid, rid)", %{
           obj = @klass[oid]
-          #{Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :pre)}
+          #{Glue::Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :pre)}
           rob = #{rel.target_class}[rid]
           obj.#{rel.name}.remove(rob)
-          #{Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :post)}
+          #{Glue::Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :post)}
           redirect_to_referer
         }
         define_controller_action "delete_#{rel.target_singular_name}(oid, rid)", %{
-          #{Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :pre)}
+          #{Glue::Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :pre)}
           obj = @klass[oid]
           rob = #{rel.target_class}[rid]
           obj.#{rel.name}.delete(rob)
-          #{Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :post)}
+          #{Glue::Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :post)}
           redirect_to_referer
         }
       end        
@@ -298,9 +299,9 @@ module Scaffolding
     #++
   
     def scaffold(klass, options = {})
-      o = {
+      o = scaffolding_classes[klass] || {
         :pk => 'oid',
-        :name => Scaffolding.class_to_name(klass),
+        :name => Scaffolding.class_to_method(klass),
         :plural_name => Scaffolding.class_to_list(klass),
         :mount => true
       }