nitro 0.24.0 → 0.25.0

data/lib/nitro/dispatcher.rb

@@ -2,7 +2,7 @@ require 'nano/kernel/singleton'
 
 require 'nitro/controller'
 require 'nitro/routing'
-require 'nitro/mixin/helper'
+require 'nitro/helper/default'
 
 module Nitro
 
@@ -114,14 +114,14 @@ class Dispatcher
 
   # Call this method to automatically include helpers in the
   # Controllers. For each Controller 'XxxController' the
-  # default helper 'Helper' and the auto mixin
-  # 'XxxControllerMixin' (if it exists) are included.
+  # default helper 'Helper' and the auto helper
+  # 'XxxControllerHelper' (if it exists) are included.
   
   def auto_mixin(c)
-      c.helper(Helper)      
+      c.helper(Nitro::DefaultHelper)      
       
       begin
-        if helper = Module.by_name("#{c}Mixin")
+        if helper = Module.by_name("#{c}Helper")
           c.helper(helper)
         end
       rescue NameError

data/lib/nitro/dispatcher/nice.rb

@@ -6,8 +6,11 @@ module Nitro
 
 class Dispatcher
   
-  # An alternative dispatching algorithm that handles
-  # implicit nice urls. Subdirectories are not supported.
+  # The default dispatching algorithm that handles
+  # implicit nice urls. Subdirectories are supported.
+  # Action containing '/' separators look for templates 
+  # in subdirectories. The '/' char is converted to '__' 
+  # to find the actual action.
   # 
   # Returns the dispatcher class, the action name and the
   # base url. For the root path, the base url is nil.
@@ -17,18 +20,26 @@ class Dispatcher
     
     parts = path.split('/')
     parts.shift # get rid of the leading '/'.
-    
+
     if klass = controller_class_for("/#{parts.first}")
       base = "/#{parts.shift}"
     else
       base = nil
       klass = controller_class_for(ROOT)
     end
-
+=begin
+    if klass.action_methods.include?(parts.first)
+      action = parts.shift
+    else
+      action = 'index'
+    end
+    p '---', action
+    getc
+=end
     unless action = parts.shift
       action = 'index'
     end        
-
+    
     unless parts.empty?
       context.headers['QUERY_STRING'] = "#{parts.join(';')};#{context.headers['QUERY_STRING']}"
     end

data/lib/nitro/element.rb

@@ -3,7 +3,9 @@ require 'rexml/streamlistener'
 
 require 'nano/string/capitalized'
 require 'nano/string/camelize'
+require 'mega/annotation'
 
+require 'glue/flexob'
 require 'glue/configuration'
 
 module Nitro
@@ -28,10 +30,14 @@ class Element
   
   attr_accessor :_parent
   
-  # The childrens of this element.
+  # The children of this element.
   
   attr_accessor :_children
   
+  # The named children of this element.
+  
+  attr_accessor :_named
+  
   # The text of this element.
   
   attr_accessor :_text
@@ -42,15 +48,22 @@ class Element
 
   def initialize(*args)
     @_children = []
+    @_named = Flexob.new
     @_text = ''
   end
     
   def open
   end
   
-  def content
-#    "#{@_text}#{render_children}"
-    @_text
+  # If an optional name parameter is passed renders
+  # the content of the named child element.
+  
+  def content(cname = nil)
+    if cname
+      @_named[cname].content
+    else
+      @_text
+    end
   end
   
   def close
@@ -72,9 +85,18 @@ class Element
   def add_child(child)
     child._parent = self  
     @_children << child
+    if cname = child.class.ann.self[:name]
+      @_named[cname] = child
+    end
   end
   
   alias_method :children, :_children
+  
+  class << self
+    def name(sym)
+      ann self, :name => sym.to_sym
+    end
+  end
 end
 
 # Processes a page containing elements.
@@ -100,7 +122,7 @@ class ElementProcessor # :nodoc: all
       # check if the name starts with the element prefix, or
       # is capitalized.
       if name =~ PREFIX_RE or name =~ CAPITALIZED_RE    
-         name = name.split(':')[1].camelize if name =~ PREFIX_RE
+        name = name.split(':')[1].camelize if name =~ PREFIX_RE
         
         obj = Object.const_get(name).new
         
@@ -108,10 +130,11 @@ class ElementProcessor # :nodoc: all
           obj.instance_variable_set("@#{k}", v)
         end        
         
-        @stack.push [obj, @buffer]
+        @stack.push [obj, @buffer, @parent]
         
         @buffer = obj._text
         @parent.add_child(obj) if @parent
+        
         @parent = obj
       else # This is a static element.
         attrs = []
@@ -131,7 +154,7 @@ class ElementProcessor # :nodoc: all
       # is capitalized.
       if name =~ PREFIX_RE or name =~ CAPITALIZED_RE    
          name = name.split(':')[1].camelize if name =~ PREFIX_RE
-        obj, @buffer = @stack.pop
+        obj, @buffer, @parent = @stack.pop
         @buffer << obj.render
       else
         @buffer << "</#{name}>"
@@ -155,7 +178,6 @@ class ElementProcessor # :nodoc: all
     def transform(source)
       self.new.transform(source)
     end
-
   end
 
   # Expand the elemens found in source.

data/lib/nitro/helper.rb

@@ -0,0 +1,56 @@
+require 'nano/kernel/constant'
+require 'nano/string/camelize'
+
+require 'glue/attribute'
+
+module Nitro
+
+# Helpers are standard Ruby modules that contain utility 
+# methods. By using the special 'helper'
+# macro provided by Helpers, the utility methods are
+# included as private methods.
+#
+# === Examples
+#
+# class MyController < Nitro::Controller
+#   helper :xhtml # == include Nitro::XhtmlHelper
+# end
+
+module Helpers
+
+  module Utils
+  
+    #--
+    # gmosx: dont name constant to avoid loop.
+    #++
+    
+    def self.const(mod)
+      return constant(mod)
+    rescue NameError => ex
+      return nil
+    end
+  end
+  
+  def self.append_features(base)
+    super
+    base.module_eval do
+      def self.helper(*modules)
+        for mod in modules
+          unless mod.is_a? Module
+            mod = mod.to_s.camelize
+            # gmosx: check xxxHelper before xxx.
+            mod = Utils.const("#{mod}Helper") || Utils.const("Nitro::#{mod}Helper") || Utils.const(mod) 
+          end
+          symbols = mod.instance_methods.collect { |m| m.to_sym }
+          self.send(:include, mod)
+          self.send(:private, *symbols)
+        end
+      end
+    end
+  end
+  
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/{mixin → helper}/benchmark.rb

@@ -2,7 +2,7 @@ require 'benchmark'
 
 module Nitro
   
-module BenchmarkMixin
+module BenchmarkHelper
 
   def benchmark(message = 'Benchmarking')
     real = Benchmark.realtime { yield }

data/lib/nitro/{mixin → helper}/buffer.rb

@@ -10,13 +10,12 @@ module Nitro
 # <?r buf = capture do ?>
 # ...
 # <?r end ?>
-#
 #--
 # TODO: use better names but keep the ob_xxx php style methods
 # as aliases.
 #++
 
-module BufferMixin
+module BufferHelper
 
 private
 

data/lib/nitro/{mixin → helper}/debug.rb

@@ -2,7 +2,7 @@ module Nitro
 
 # A collection of useful debuging methods.
 
-module DebugMixin
+module DebugHelper
 
 private
 

data/lib/nitro/{mixin/helper.rb → helper/default.rb}

@@ -1,13 +1,13 @@
-require 'nitro/mixin/debug'
+require 'nitro/helper/debug'
 
 module Nitro
 
-# This mixin is included by default in all Controllers.
+# This helper is included by default in all Controllers.
 # This is the place to add general purpose utility methods to
 # be shared accross all Controllers.
 
-module Helper
-  include DebugMixin
+module DefaultHelper
+  include DebugHelper
   # This is an open module, extend in your application.
 end
 

data/lib/nitro/{mixin → helper}/form.rb

@@ -1,6 +1,6 @@
 require 'nano/inflect'
 
-require 'nitro/mixin/xhtml'
+require 'nitro/helper/xhtml'
 require 'og/relation/all'
 
 module Nitro
@@ -12,11 +12,11 @@ module Nitro
 # overrides.
 #++
 
-module FormMixin
+module FormHelper
   
   def self.included(base)
     super
-    base.send :include, XhtmlMixin
+    base.send :include, XhtmlHelper
   end
 
 private

data/lib/nitro/{mixin → helper}/javascript.rb

@@ -9,7 +9,7 @@ module Nitro
 # * dragdrop.js
 # * controls.js
 
-module JavascriptMixin
+module JavascriptHelper
 
 private
 
@@ -57,6 +57,21 @@ private
   alias_method :live, :live_request
   alias_method :async, :live_request
   
+  # Denotes an element as toggleable.
+  
+  def toggleable(id, options = {})
+    __append_script_file__ 'js/prototype.js'
+    
+    behaviour "##{id}", %{
+      el.onclick = function() {
+        Element.toggle('#{id}');
+        return false;
+      }
+    }
+    
+    return nil
+  end
+  
   # :section: script.aculo.us dragdrop.js
   
   # Make the element dragable.
@@ -197,6 +212,7 @@ private
     return nil
   end
   
+  # -----------------------------------------------------------
   # :section: general javascript helpers.
   
   # Include external javascript file.

data/lib/nitro/{mixin → helper}/pager.rb

@@ -231,7 +231,7 @@ end
 
 # Pager related helper methods.
 
-module PagerMixin
+module PagerHelper
 
 private
   

data/lib/nitro/{mixin → helper}/rss.rb

@@ -3,7 +3,7 @@ require 'rss/0.9'
 
 require 'nano/string/first_char'
 
-require 'nitro/mixin/markup'
+require 'glue/markup'
 
 module Nitro
 
@@ -18,8 +18,8 @@ module Nitro
 # <?xml-stylesheet href="rss.css" type="text/css"?>
 #++
 
-module RssMixin
-  include Nitro::Markup
+module RssHelper
+  include Glue::Markup
   
   # === Options
   #

data/lib/nitro/{mixin → helper}/table.rb

@@ -18,7 +18,7 @@ module Nitro
 # TODO: sorting, thead/tbody/legend etc, verbose...
 #++
 
-module TableMixin
+module TableHelper
 
   # [+options+]
   #    A hash of options.

data/lib/nitro/{mixin → helper}/xhtml.rb

@@ -3,7 +3,7 @@ module Nitro
 # A helper mixin for programmatically building XHTML 
 # blocks. 
 
-module XhtmlMixin
+module XhtmlHelper
 
 private
 
@@ -90,7 +90,7 @@ private
         #{options(:labels_values => (1..31).to_a, :selected => date.day)}        
       </select>&nbsp;
       <select id="#{name}.month" name="#{name}.month">
-        #{options(:labels => Date::MONTHNAMES, :values => (1..12).to_a, :selected => (date.month))}
+        #{options(:labels => Date::MONTHNAMES[1..12], :values => (1..12).to_a, :selected => (date.month))}
       </select>&nbsp;
       <select id="#{name}.year" name="#{name}.year">
         #{options(:labels_values => ((Time.now.year-10)..(Time.now.year+10)).to_a, :selected => date.year)}        

data/lib/nitro/{mixin → helper}/xml.rb

@@ -3,7 +3,7 @@ module Nitro
 # A helper mixin for programmatically building XML
 # blocks. 
 
-module XmlMixin
+module XmlHelper
 
   def method_missing(tag, *args, &block)
     self.class.module_eval <<-"end_eval", __FILE__, __LINE__

data/lib/nitro/render.rb

@@ -10,10 +10,10 @@ require 'glue/template'
 require 'glue/builder'
 require 'glue/builder/xml'
 
-require 'nitro/mixin/xhtml'
-require 'nitro/mixin/form'
-require 'nitro/mixin/table'
-require 'nitro/mixin/buffer'
+require 'nitro/helper/xhtml'
+require 'nitro/helper/form'
+require 'nitro/helper/table'
+require 'nitro/helper/buffer'
 
 module Nitro
 
@@ -44,7 +44,7 @@ end
 #++
 
 module Render
-  include BufferMixin
+  include BufferHelper
 
   # If true, auto redirect to referer on empty buffer.
   
@@ -173,6 +173,7 @@ private
 
     raise RenderExit
   end
+  alias_method :redirect_to, :redirect
   
   # Redirect to the referer.
   
@@ -181,6 +182,13 @@ private
   end
   alias_method :redirect_to_referer, :redirect_referer
 
+  # Redirect to home.
+  
+  def redirect_home(status = 303)
+    redirect('/', status)
+  end
+  alias_method :redirect_to_home, :redirect_home
+
   # Log a rendering error.
 
   def log_error(error, path)
@@ -240,9 +248,9 @@ private
   
   class Emitter
     include Singleton
-     include XhtmlMixin
-     include FormMixin
-     include TableMixin
+    include XhtmlHelper
+    include FormHelper
+    include TableHelper
   end
 
   # A helper to access the utilities emitter: