nitro 0.22.0 → 0.23.0

data/doc/RELEASES

@@ -1,3 +1,93 @@
+== Version 0.23.0
+
+The summer vacations are over and there is a brand new Nitro 
+release. There is a preview of the new Scaffolder (also handles
+Og relations), support for Tagging (folksonomy), lots of small 
+features and improvements and many bug fixes. Additionally, the 
+code has been restructured to utilize the excellent Nano and Mega
+support libraries.
+
+Most notable additions:
+
+* Scaffolding reloaded. The scaffolding infrastructure is 
+reimplemented to generate more flexible code. The automatically
+generated forms allow for visualization and editing of 
+Og relations such as HasMany and BelongsTo.
+
+For example when rendering a BelongsTo relation all possible 
+parents are presented with a select element. When rendering a 
+HasMany relation a list of all children is presented.
+
+Moreover, an experimental admin component is provided. Just add the
+line:
+
+require 'part/admin'
+
+and surf
+
+http://www.mysite.com/admin
+
+To enter a simple administration screen. 
+
+WARNING: This feature is considered a preview and will be 
+improved in a future version.
+
+* Major cleanup in the Glue subproject. Some files are moved
+to the nano/mega project. Nano/Mega is now used throughout 
+Nitro and really makes development so much easier.
+
+* Introduced Og Taggable mixin. It was never easier to add
+tagging to your application.
+
+  class Article
+    include Og::Taggable
+    ..
+  end
+
+  article.tag('navel', 'gmosx', 'nitro')
+  article.tags
+  article.tag_names
+  Article.find_with_tags('navel', 'gmosx')
+  Article.find_with_any_tag('name', 'gmosx')
+
+  t = Article::Tag.find_by_name('ruby')
+  t.articles
+  t.articles.count
+
+For an example usage of this Mixin, consult the Spark sources.
+
+* Added support for relative and absolute URLs in redirects
+and renders. This feature simplifies the creation of reusable
+components.
+
+* Support for assigning compound objects from the request. Here 
+is an example:
+
+  class Article
+    property :title, String
+    property :body, String
+  end
+
+  <form>
+    <input type="text" name="article.title" />
+    <input type="text" name="article.body" />
+  </form>
+
+  article = request.assign('article')
+
+Alternatively you can use the article[title] article[body]
+notation.
+
+* Added simple Benchmarking mixin.
+
+* Added support for 'evolving' a single Og managed class. Useful
+when you are in development mode and change your schema.
+
+* Added support for session garbage collection.
+
+* Many many small bug fixes in Og and Nitro.
+
+
 == Version 0.22.0
 
 A snapshot of the latest developments. Many requested features

data/lib/nitro.rb

@@ -1,21 +1,12 @@
 # = Nitro 
 #
-# Nitro is an efficient, yet simple engine for developing 
-# professional Web Applications using Ruby and Javascript. 
-# Nitro provides a robust infrastructure for scalable 
-# applications that can be distributed over a server 
-# cluster. However, Nitro can also power simple web 
-# applications for deployment on intranets or desktops.
-#
-# Nitro integrates the powerful Og Object-Relational mapping 
-# library.
-#
-# Copyright (c) 2004-2005, George Moschovitis (http://www.gmosx.com)
 # Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
+# Copyright (c) 2004-2005, George Moschovitis (http://www.gmosx.com)
 #
-# Nitro is copyrighted free software created and maintained by 
-# George Moschovitis (mailto:gm@navel.gr) and released under the 
-# standard BSD Licence. For details consult the file doc/LICENCE.
+# Nitro (http://www.nitrohq.com) is copyrighted free software 
+# created and maintained by George Moschovitis (mailto:gm@navel.gr) 
+# and released under the standard BSD Licence. For details 
+# consult the file doc/LICENCE.
 
 require 'glue'
 require 'glue/logger'
@@ -25,7 +16,7 @@ module Nitro
   
   # The version.
 
-  Version = '0.22.0'
+  Version = '0.23.0'
 
   # Library path.
 
@@ -75,5 +66,3 @@ module Nitro
   end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/adapter/cgi.rb

@@ -103,6 +103,9 @@ class CgiUtils
   #
   # Parameters in the form xxx[] are converted
   # to arrays.
+  # 
+  # Use the field.attr or field[attr] notation to pass
+  # compound objects.
 
   def self.parse_query_string(query_string)
     params = {}
@@ -117,12 +120,20 @@ class CgiUtils
       val = CGI.unescape(val) unless val.nil?
 
       if key =~ /(.*)\[\]$/
+        # Multiple values, for example a checkbox collection.
+        # Stored as an array.
         if params.has_key?($1)
           params[$1] << val
         else
           params[$1] = [val]
         end
+      elsif key =~ /(.*)\[(.*)\]$/ or key =~ /(.*)\.(.*)$/
+        # A compound object with attributes.
+        # Stored as a Hash. 
+        params[$1] ||= {}
+        params[$1][$2] = val
       else
+        # Standard single valued parameter.
         params[key] = val.nil? ? nil : val
       end
     end

data/lib/nitro/adapter/webrick.rb

@@ -26,7 +26,11 @@ class Webrick
       else
         wblog = STDERR
       end
-      @webrick = WEBrick::HTTPServer.new(
+
+     webrick_options = server.options.dup
+     require 'webrick/https' if webrick_options[:SSLEnable]
+
+     webrick_options.update(
         :BindAddress => server.address, 
         :Port => server.port, 
         :DocumentRoot => server.public_root,
@@ -35,6 +39,7 @@ class Webrick
           [wblog, WEBrick::AccessLog::REFERER_LOG_FORMAT]
         ]
       )
+      @webrick = WEBrick::HTTPServer.new(webrick_options)
       
       trap('INT') { @webrick.shutdown }
 
@@ -159,3 +164,4 @@ end
 end
 
 # * George Moschovitis <gm@navel.gr>
+# * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>

data/lib/nitro/caching/stores.rb

@@ -1,10 +1,6 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: stores.rb 182 2005-07-22 10:07:50Z gmosx $
-
 require 'fileutils'
 
-require 'glue/hash'
+require 'mega/synchash'
 
 module Nitro
 
@@ -14,7 +10,7 @@ module Caching
 
   # Cached fragments are stored in memory.
 
-  class MemoryStore < Glue::SafeHash
+  class MemoryStore < SyncHash
 
     def read(name, options = {})
       self[name]
@@ -82,3 +78,5 @@ module Caching
 end
 
 end
+
+# * George Moschovitis  <gm@navel.gr>

data/lib/nitro/compiler.rb

@@ -1,4 +1,4 @@
-require 'facet/object/singleton_class'
+require 'nano/object/singleton_class'
 
 require 'glue/template'
 require 'nitro/compiler/errors'

data/lib/nitro/compiler/errors.rb

@@ -1,4 +1,4 @@
-require 'facet/string/demodulize'
+require 'mega/orm_support'
 
 module Nitro
 

data/lib/nitro/context.rb

@@ -1,3 +1,5 @@
+require 'nano/object/assign_with'
+
 require 'nitro/request'
 require 'nitro/response'
 require 'nitro/render'
@@ -79,23 +81,28 @@ class Context
   EXCLUDED_PARAMETERS = %w{ oid name }
 
   def fill(obj, name = nil)
-    # if an object is passed create an instance.
+    # If an class is passed create an instance.
     obj = obj.new if obj.is_a?(Class)
   
     @params.each do |param, val|
       begin
         # gmosx: DO NOT escape by default !!!
         if not EXCLUDED_PARAMETERS.include?(param)
-          obj.send("__force_#{param}", val)
+          if val.is_a? Hash
+            obj.send("__force_hash_#{param}", val)
+          else
+            obj.send("__force_#{param}", val)
+          end
         end
-      rescue NameError
+      rescue NameError => ex
         next
       end
     end
-    
+
     return obj
   end    
   alias_method :populate, :fill
+  alias_method :assign, :fill  
 end
 
 end

data/lib/nitro/controller.rb

@@ -217,6 +217,3 @@ class SimpleController < Controller
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * James Britt <james_b@neurogami.com>

data/lib/nitro/cookie.rb

@@ -8,13 +8,14 @@ class Cookie
   attr_accessor :domain, :path, :secure
   attr_accessor :comment, :max_age
 
-  def initialize(name, value)
+ def initialize(name = nil, value = nil, expires = nil)
     @name = name
     @value = value
+    self.expires = expires
     @version = 0    # Netscape Cookie
     @path = '/'      # gmosx: KEEP this!
-    @domain = @secure = @comment = @max_age =
-    @expires = @comment_url = @discard = @port = nil
+    @domain = @secure = @comment = @max_age = nil
+    @comment_url = @discard = @port = nil
   end
 
   def expires=(t)

data/lib/nitro/dispatcher.rb

@@ -1,4 +1,4 @@
-require 'facet/object/special_class'
+require 'nano/object/singleton_class'
 
 require 'nitro/controller'
 require 'nitro/routing'
@@ -86,6 +86,12 @@ class Dispatcher
       end
 
       auto_mixin(c)      
+      
+      # Perform mount-time initialization of the controller.
+
+      if c.respond_to? :mounted
+        c.mounted
+      end
 
       # Try to setup a template_root if none is defined:
       

data/lib/nitro/dispatcher/nice.rb

@@ -8,6 +8,9 @@ class Dispatcher
   
   # An alternative dispatching algorithm that handles
   # implicit nice urls. Subdirectories are not supported.
+  # 
+  # Returns the dispatcher class, the action name and the
+  # base url. For the root path, the base url is nil.
   
   def dispatch(path, context)
     path = route(path, context)
@@ -18,7 +21,7 @@ class Dispatcher
     if klass = controller_class_for("/#{parts.first}")
       base = "/#{parts.shift}"
     else
-      base = ROOT
+      base = nil
       klass = controller_class_for(ROOT)
     end
 
@@ -30,6 +33,8 @@ class Dispatcher
       context.headers['QUERY_STRING'] = "#{parts.join(';')};#{context.headers['QUERY_STRING']}"
     end
 
+    base = nil if base == ROOT
+    
     return klass, "#{action}_action", base
   end
 end

data/lib/nitro/element.rb

@@ -1,8 +1,8 @@
 require 'rexml/document'
 require 'rexml/streamlistener'
 
-require 'facet/string/capitalized%3F'
-require 'facet/string/camelize'
+require 'nano/string/capitalized%3F'
+require 'nano/string/camelize'
 
 require 'glue/configuration'
 

data/lib/nitro/mixin/benchmark.rb

@@ -0,0 +1,16 @@
+require 'benchmark'
+
+module Nitro
+  
+module BenchmarkMixin
+
+  def benchmark(message = 'Benchmarking')
+    real = Benchmark.realtime { yield }
+    Logger.info "#{message}: time = #{'%.5f' % real} ms."
+  end
+
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/mixin/form.rb

@@ -1,88 +1,204 @@
-require 'glue/hash'
+require 'nano/inflect'
 
 module Nitro
 
 # A collection of useful helpers for creating and manipulating
 # Forms.
+#--
+# FIXME: cleanup this file, move stuff to scaffold, allow
+# overrides.
+#++
 
 module FormMixin
   
-  # Render a standard form for the given Entity (ie an
-  # object with attribute metadata).
+  def self.included(base)
+    base.send :include, XhtmlMixin
+  end
+
+private
+  
+  # Render a standard form for the given Object. The object 
+  # should include attribute metadata.
+  #--
+  # TODO: get info, for example localization mode from session,
+  # if this module is mixed in a Render.
+  #++
+  
+  def form_for(obj, options = {})
+    method = options.fetch(:method, 'post')
+    action = options.fetch(:action, "save_#{obj.class.name.underscore}")
+    submit = options.fetch(:submit, 'Save')
+  
+    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> 
+    }
+    return str
+  end
+      
+  # Render a standard form tags for the given Object. The object 
+  # should include attribute metadata.
+  #
   # If show_all is false then apply field filtering.
   #
+  # For extra flexibility and to keep semantics this helper
+  # emits a <dl> structure. You can use CSS to style the
+  # list to fit your overal design.
+  #
   # Example:
   #
   #  <p>
   #    <form name="test">
-  #      #{form_for entry}
+  #      #{tags_for entry}
   #    </form>
   #  </p>
-  #--
-  # TODO: get info, for example localization mode from session,
-  # if this module is mixed in a Render.
-  #++
   
-  def form_for(obj, lc = nil, show_all = false)
-    str = '<dl>'
+  def tags_for(obj, options = {})
+    str = prologue()
     
     for p in obj.class.properties
-      unless show_all
-        next if :oid == p.symbol
-      end
-      
-      if p.klass.ancestors.include?(Integer) or
-          p.klass.ancestors.include?(Float) 
-        str << %{
-  <dt><label for="#{p.symbol}">#{p.symbol}</label></dt>
-  <dd>
-    <input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{obj.send(p.symbol)}" />
-  </dd>
-        }
-      elsif p.klass.ancestors.include?(String)
-        str << %{
-  <dt><label for="#{p.symbol}">#{p.symbol}</label></dt>
-  <dd>
-        }
-        val = obj.send(p.symbol)
-        if :textarea == p.meta[:ui]
-          str << %{
-    <textarea id="#{p.symbol}" name="#{p.symbol}">#{val}</textarea>
-          }
+      next if :oid == p.symbol unless options[:all]
+      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)
         else
-          str << %{
-    <input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{val}" />
-          }        
+          str << field_tag(obj, p, options)
         end
-        str << %{
-  </dd>
-        }
-      elsif p.klass.ancestors.include?(TrueClass)
-        str << %{
-  <dt><label for="#{p.symbol}">#{p.symbol}</label></dt>
+      elsif ancestors.include?(TrueClass)
+        str << checkbox_tag(obj, p, options)
+      elsif ancestors.include?(Time)
+        str << datetime_tag(obj, p, options)
+      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)
+      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 />'
+    end
+    element(
+      label(rel.name) + '&nbsp;<a href="#">Add</a>',
+      %{
+      #{str}
+      }
+    )
+  end
+    
+  def field_tag(obj, p, options)
+    %{
+  <dt>#{label(p.symbol)}</dt>
   <dd>
-    <input type="checkbox" id="#{p.symbol}" name="#{p.symbol}" />
+    <input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{obj.send(p.symbol)}" style="width: 250px" />
   </dd>
-        }
-      elsif p.klass.ancestors.include?(Time)
-        str << %{
-  <dt><label for="#{p.symbol}">#{p.symbol}</label></dt>
+    }
+  end
+  
+  def textarea_tag(obj, p, options)
+    %{
+  <dt>#{label(p.symbol)}</dt>
   <dd>
-    <input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{obj.send(p.symbol)}" />
+    <textarea id="#{p.symbol}" name="#{p.symbol}">#{obj.send(p.symbol)}</textarea>
   </dd>
-        }
-      end
-    end
+    }
+  end
 
-    str << %{
-</dl>}
+  def checkbox_tag(obj, p, options)
+    %{
+  <dt>
+    <input type="checkbox" id="#{p.symbol}" name="#{p.symbol}" />&nbsp;
+    #{label(p.symbol)}
+  </dt>
+  <dd>#{}</dd>
+    }
+  end
     
-    self << str
+  def datetime_tag(obj, p, options)
+    element(
+      label(p.symbol), 
+      datetime_select(obj.send(p.symbol), :name => p.symbol.to_s)
+    )
+  end
+  
+  def label(sym)
+    %|<label for="#{sym}">#{sym.to_s.humanize}</label>|
+  end
+
+  # :section: Relations.
+  
+  
+  # :section: General formating methods. Override to customize.
+  
+  # Emit form prologue.
+  
+  def prologue
+    '<dl>'
+  end
+  
+  # Emit form epilogue.
+  
+  def epilogue
+    '</dl>'
   end
-  alias_method :build_form, :form_for
   
+  # Emit a form element.
+  
+  def element(label, element)
+    %{
+  <dt>#{label}</dt>
+  <dd>
+    #{element}
+  </dd>
+    }
+  end
 end
 
 end 
 
-# * George Moschovitis
+# * George Moschovitis <gm@navel.gr>