nitro 0.23.0 → 0.24.0

data/Rakefile

@@ -10,7 +10,7 @@ Name = Release[/\D+/].sub(/\-+$/, '') || 'unknown'
 Version = Release[/[\d.]+/] || 'unknown'
 
 AuthorName, AuthorMail = 'George Moschovitis', 'gm@navel.gr'
-RubyVersion = '1.8.2' 
+RubyVersion = '1.8.3' 
 
 # Description = (readme[/README\s+(.+?)\n\n/m, 1] || "unknown").gsub(/\s+/, " ")
 # Summary = Description[/^.+?>/] || "unknown"
@@ -62,10 +62,11 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency 'glue', "= #{s.version}"
   s.add_dependency 'og', "= #{s.version}"
-  s.add_dependency 'ruby-breakpoint', '>= 0.5'
-  s.add_dependency 'RedCloth', '>= 3.0.3'
+  s.add_dependency 'gen', "= #{s.version}"
+  s.add_dependency 'ruby-breakpoint', '= 0.5'
+  s.add_dependency 'RedCloth', '= 3.0.3'
 
-  s.required_ruby_version = '>= 1.8.2'
+  s.required_ruby_version = '= 1.8.3'
 
   s.files = FileList[
     '[A-Z]*', 'install.rb', '{bin,benchmark,examples,doc,proto,lib,test,vendor}/**/*' 

data/bin/nitrogen

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
+$NITRO_NO_ENVIRONMENT = true
+
 require 'nitro'
 require 'ftools'
 
-require 'nano/dir/recurse'
+require 'nano/dir/%3A%3Arecurse'
 
 PROTO_DIR = File.join(Nitro::LibPath, '..', 'proto')
 

data/doc/AUTHORS

@@ -3,7 +3,8 @@ MAIN DEVELOPER:
 * George Moschovitis <gm@navel.gr>
   Project leader, architecture and design, main coder, 
   documentation, maintainer.
-  
+
+
 IDEAS, ADDITIONAL CODING, SUPPORT:
 
 * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>
@@ -15,22 +16,45 @@ IDEAS, ADDITIONAL CODING, SUPPORT:
 * Dan Yoder <dan@zeraweb.com>
   Original 'Elements' implementation, bug reports.
   
-* Anastasios Koutoumanos <ak@navel.gr>
-  Design.
+* Aleksi Niemela <Aleksi.Niemela@cs.helsinki.fi>
+  Bug fixes, patches, documentation.
 
+* Chris Farmiloe <chris.farmiloe@farmiloe.com>
+  Bug fixes, Scaffolding improvements, patches.
+  
+* Rob Pitt <rob@motionpath.co.uk>
+  Bug fixes, Scaffolding improvements, patches.
+
+* Zed A. Shaw <zedshaw@zedshaw.com>
+  SCGI adapter.
+  
+* Anastasios Koutoumanos <ak@navel.gr>
+  Design, bug reports.
+  
+* TRANS <transfire@gmail.com>
+  Small bug fixes.
+  
 * Kostas Nasis <kostas@nasis.com>
   Ideas and bug reports.
 
+
 INTEGRATED LIBRARIES:
 
 Nitro integrates several open source libraries:
 
+* Facets (Nano/Mega): The best collection of
+  Ruby extensions/utilities.
+  Tomas Sawyer, http://nano.rubyforge.org, http://mega.rubyforge.org
+  
 * Prototype: Object Oriented Javascript library
   Sam Stepherson, http://www.conio.net
   
 * Script.aculo.us: Special FX Javascript library
   Thomas Fuchs, http://script.aculo.us
 
+* Breakpointer
+
+
 CODE FROM OTHER PROJECTS:
 
 Occasionaly, Nitro may include code from other open source

data/doc/RELEASES

@@ -1,3 +1,196 @@
+== Version 0.24.0
+
+A snapshot of the latest developments. This version features 
+tons of big and small features and bug fixes that were 
+implemented during the last month. Special thanks fly to
+Tom, Chris, Guill, Rob, Aleksi, and all others that sent
+patches and code.
+
+Most notable additions:
+
+
+* Totaly recoded annotation / property system. The property
+  system is now based on Facet annotations and inheritors.
+  You can now annotate every object, attribute or method
+  in Nitro. For example you can annotate your actions with
+  routing rules or sitemap strings etc, etc. One unified
+  system for annotations and metadata is used throughout
+  the whole Framework.
+  
+  Here is an example:
+  
+  class A
+    attr_accessor :val
+    ann :val, :klass => String
+    ann :self, :doc => 'Self annotation'
+  end
+  
+  A.ann.val.class => String
+  A.ann.self.doc =>
+  
+  if A.ann.val[:class] 
+  
+  etc, etc...
+
+* Implemented one of the most requested features. An Og
+  frontend for KirbyBase. The KirbyBase store does not yet
+  support all features, but is really useful. For example
+  it can power the Spark wiki example. Switching between
+  KirbyBase, Mysql, Postgres, Sqlite, etc by changing
+  one line of code is really cool ;-)
+  
+* Better Seperation of Concerns for Og managed classes. Og
+  can now annotate and handle classes from other libraries.
+  Lets say you have the following class:
+  
+  class User
+    attr_accessor :name
+    attr_accessor :body
+  end
+  
+  Using Ruby's open classes and Nitro's advanced annotation
+  system you can easily prepare this class for Og management
+  
+  class User
+    ann :user, :klass => String
+    ann :body, :klass => String
+  end
+  
+  or even better:
+  
+  class User
+    property :user, String
+    property :body, String
+  end
+  
+  This style promotes SOC: You define your classes in one
+  place and annotate them for Og in another place.
+  
+* Introduced a simple code generation framework. Two example
+  generators are included:
+  
+  * app: generates the directory structure for a new
+    nitro application.
+    
+  * form: generates an xhtml form for a Ruby class.
+    This generator leverages the annotations of the
+    object class.
+
+* Improved scaffolding code and django style auto 
+  administration system. The new scaffolder supports all
+  Og relation types and provides an intuitive DHTML 
+  interface for editing.
+  
+* SCGI (http://python.ca/nas/scgi/protocol.txt) support. 
+  Thanks to a refactoring of Nitro's cgi code this 
+  version integrates with Zed Shaw's SCGI adapter. This 
+  provides FastCGI's performance with an easy 
+  installation.
+
+* Experimental HTTP streaming support. Here is a 
+  simple example:
+
+  def index
+    response.content_type = "text/plain"
+    stream do
+      5.times do |i|
+        print "#{i}"*10000 + "\n"
+        sleep 1
+      end
+    end
+  end
+
+* Simple Og automatic evolution system. Lets say you have a class Article
+
+  class Article
+    property :title, String
+    property :nbody, String
+    property :dumy, Fixnum
+  end
+  
+  lets you want to change your 
+  class to this one:
+
+  class NewArticle
+    property :ntitle, String
+    property :nbody, String
+    property :new, Float
+  end
+
+  First you export the database:
+  
+  og.export
+
+  Then you import the database. Some rules
+  are needed when renaming classes or properties. 
+  New properties or deleted properties are handled
+  automatically.
+
+  rules = {
+    :Article => {
+      :self => :NewArticle, # rename the class
+      :title => :ntitle,
+      :body => :nbody
+    }
+  }
+  og.import :evolution => rules
+
+  Thats all. In a future version this will be integrated into
+  the default runner scripts.
+
+* Og helpers to create simple rdbms management scripts. Here 
+  is an example:
+
+  mysql "-u root -p", <<-END
+    drop database if exists weblog_development;
+    create database weblog_development;
+    grant all on weblog_development.* to #{`id -un`.strip}@localhost;
+  END
+  
+  At the moment this is only available for Mysql.
+
+* Added support for dynamic CSS using Nitro's advanced templating
+  system. Create the dynamic CSS file with an .csst extension in
+  your template root.
+  
+  <?r
+  green = '#79b500'
+  background = '#fff'
+  ?>
+  
+  .page {
+    background: #{green}
+    
+    <?r 10.times do ?>
+      padding: 5px;
+    <?r end ?>
+    
+    // or even
+    
+    <% 3.times do %>
+      margin: 5px;
+    <% end %>
+  }
+  ..
+  
+  then, add this line in run.rb:
+  
+  Compiler.precompile 'style.css'
+  
+  The CSS file will be regenerated automatically whenever the
+  template changes...
+
+* Updated to support latest Prototype, Scriptaculous etc.
+
+* Cleaned up Og implementation.
+
+* Fixed minor Ruby 1.8.3 compatibility issues.
+
+* Even better integration with Ruby Facets.
+
+* Tons of bug fixes and small but useful features.
+
+
 == Version 0.23.0
 
 The summer vacations are over and there is a brand new Nitro 

data/doc/lhttpd.txt

@@ -0,0 +1,4 @@
+
+= Installation
+
+./configure --enable-rewrite

data/lib/nitro.rb

@@ -16,7 +16,7 @@ module Nitro
   
   # The version.
 
-  Version = '0.23.0'
+  Version = '0.24.0'
 
   # Library path.
 

data/lib/nitro/adapter/cgi.rb

@@ -2,30 +2,21 @@ require 'cgi'
 require 'stringio'
 require 'tempfile'
 
-require 'glue/attribute'
-
 # Speeds things up, more comaptible with OSX.
 
 Socket.do_not_reverse_lookup = true
 
 module Nitro
 
-class Cgi
-  # Maximum content length allowed in requests.
-
-  cattr_accessor :max_content_length, (2 * 1024 * 1024)
-
-  # Multipart parsing buffer size.
-
-  cattr_accessor :buffer_size, (10 * 1024)
-
+class CgiAdapter
   #--
   # No need for connection pooling, CGI uses process.
   #++
   
   def self.start(server)
     cgi = CGI.new
-    
+    CgiUtils.process(server, cgi, cgi, cgi)
+=begin    
     context = Context.new(server)
     context.headers = ENV
     
@@ -36,319 +27,13 @@ class Cgi
 
     cgi.print(CgiUtils.response_headers(context))
     cgi.print(context.out)
+=end
   end
-end
-
-# CGI utility methods.
-
-class CgiUtils
-
-  # HTTP protocol EOL constants
-
-  CR = "\x0d"
-  LF = "\x0a"
-  CRLF = "\x0d\x0a"
-  EOL = CRLF
-
-  # Constants for readable code
-
-  STATUS_OK = 200
-  STATUS_PARTIAL_CONTENT = 206
-  STATUS_MOVED = 301
-  STATUS_REDIRECT = 302
-  STATUS_SEE_OTHER = 303        # gmosx: VERIFY THIS
-  STATUS_SEE_OTHER_307 = 307    # gmosx: VERIFY THIS
-  STATUS_NOT_MODIFIED = 304
-  STATUS_BAD_REQUEST = 400
-  STATUS_AUTH_REQUIRED = 401       
-  STATUS_FORBIDDEN = 403           
-  STATUS_NOT_FOUND = 404           
-  STATUS_METHOD_NOT_ALLOWED = 405  
-  STATUS_NOT_ACCEPTABLE = 406      
-  STATUS_LENGTH_REQUIRED = 411     
-  STATUS_PRECONDITION_FAILED = 412 
-  STATUS_SERVER_ERROR = 500        
-  STATUS_NOT_IMPLEMENTED = 501    
-  STATUS_BAD_GATEWAY = 502         
-  STATUS_VARIANT_ALSO_VARIES = 506 
-
-  # Hash to allow id to description maping.
-
-  STATUS_STRINGS = {
-    200 => "OK",
-    206 => "Partial Content",
-    300 => "Multiple Choices",
-    301 => "Moved Permanently",
-    302 => "Found",
-    303 => "See other", # gmosx: VERIFY THIS
-    304 => "Not Modified",
-    307 => "See other 07", # gmosx: VERIFY THIS
-    400 => "Bad Request",
-    401 => "Authorization Required",
-    403 => "Forbidden",
-    404 => "Not Found",
-    405 => "Method Not Allowed",
-    406 => "Not Acceptable",
-    411 => "Length Required",
-    412 => "Precondition Failed",
-    500 => "Internal Server Error",
-    501 => "Method Not Implemented",
-    502 => "Bad Gateway",
-    506 => "Variant Also Negotiates"
-  }
-
-  # Returns a hash with the pairs from the query 
-  # string. The implicit hash construction that is done 
-  # in parse_request_params is not done here.
-  #
-  # 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 = {}
-    
-    # gmosx, THINK: better return nil here?
-    return params if (query_string.nil? or query_string.empty?)
-
-    query_string.split(/[&;]/).each do |p| 
-      key, val = p.split('=')
-      
-      key = CGI.unescape(key) unless key.nil?
-      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
-    
-    return params
-  end
-
-  # Parse the HTTP_COOKIE header and returns the
-  # cookies as a key->value hash. For efficiency no 
-  # cookie objects are created.
-  #
-  # [+context+]
-  #    The context 
-
-  def self.parse_cookies(context) 
-    env = context.env
-
-    # FIXME: dont precreate?
-    context.cookies = {}
-
-    if env.has_key?('HTTP_COOKIE') or env.has_key?('COOKIE')    
-      (env['HTTP_COOKIE'] or env['COOKIE']).split(/; /).each do |c|
-        key, val = c.split(/=/, 2)
-        
-        key = CGI.unescape(key)
-        val = val.split(/&/).collect{|v| CGI::unescape(v)}.join("\0")
-
-        if context.cookies.include?(key)
-          context.cookies[key] += "\0" + val
-        else
-          context.cookies[key] = val
-        end
-      end
-    end
-  end
-
-  # Build the response headers for the context. 
-  #
-  # [+context+]
-  #    The context of the response.
-  #
-  # [+proto+]
-  #    If true emmit the protocol line. Useful for MOD_RUBY.
-  #--
-  # FIXME: return the correct protocol from env.
-  # TODO: Perhaps I can optimize status calc.
-  #++
-                                                                                      
-  def self.response_headers(context, proto = false)
-    reason = STATUS_STRINGS[context.status] 
-
-    if proto
-      buf = "HTTP/1.1 #{context.status} #{reason}#{EOL}Date: #{CGI::rfc1123_date(Time.now)}#{EOL}"
-    else
-      buf = "Status: #{context.status} #{reason}#{EOL}"
-    end
-
-    context.response_headers.each do |key, value|
-      tmp = key.gsub(/\bwww|^te$|\b\w/) { |s| s.upcase }
-      buf << "#{tmp}: #{value}" << EOL
-    end
   
-    context.response_cookies.each do |cookie|
-      buf << "Set-Cookie: " << cookie.to_s << EOL
-    end if context.response_cookies
-      
-    buf << EOL
-
-    return buf
-  end
-  
-  # Initialize the request params.
-  # Handles multipart forms (in particular, forms that involve 
-  # file uploads). Reads query parameters in the @params field, 
-  # and cookies into @cookies.
-  
-  def self.parse_params(context)
-    method = context.method
-    if (:post == method) and
-        %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n.match(context.headers['CONTENT_TYPE'])
-      boundary = $1.dup
-      context.params = parse_multipart(context, boundary)
-
-      # Also include the URL parameters.
-      context.params.update(CgiUtils.parse_query_string(context.query_string))      
-    else 
-      case method
-      when :get, :head
-        context.params = CgiUtils.parse_query_string(context.query_string)  
-      when :post
-        context.in.binmode #  if defined?(context.in.binmode)
-        context.params = CgiUtils.parse_query_string(context.in.read(context.content_length) || '')  
-      end
-    end
-  end
-
-  # Parse a multipart request.
-  # Adapted from Ruby's cgi.rb
-  #--
-  # TODO: optimize and rationalize this.
-  #++
-
-  def self.parse_multipart(context, boundary)
-    input = context.in
-    content_length = context.content_length
-    env_table = context.env
-    
-    params = Hash.new([])
-    boundary = "--" + boundary
-    buf = ""
-
-    input.binmode if defined? input.binmode
-    boundary_size = boundary.size + EOL.size
-    content_length -= boundary_size
-    status = input.read(boundary_size)
-
-    if nil == status
-      raise EOFError, "no content body"
-    elsif boundary + EOL != status
-      raise EOFError, "bad content body"
-    end
-
-    loop do
-      head = nil
-
-      if 10240 < content_length
-        body = Tempfile.new("CGI")
-      else
-        begin
-          body = StringIO.new
-        rescue LoadError
-          body = Tempfile.new("CGI")
-        end
-      end
-      body.binmode if defined? body.binmode
-
-      until head and /#{boundary}(?:#{EOL}|--)/n.match(buf)
-
-        if (not head) and /#{EOL}#{EOL}/n.match(buf)
-          buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
-            head = $1.dup
-            ""
-          end
-          next
-        end
-
-        if head and ( (EOL + boundary + EOL).size < buf.size )
-          body.print buf[0 ... (buf.size - (EOL + boundary + EOL).size)]
-          buf[0 ... (buf.size - (EOL + boundary + EOL).size)] = ""
-        end
-
-        c = if Cgi.buffer_size < content_length
-              input.read(Cgi.buffer_size)
-            else
-              input.read(content_length)
-            end
-        if c.nil?
-          raise EOFError, "bad content body"
-        end
-        buf.concat(c)
-        content_length -= c.size
-      end
-
-      buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{boundary}([\r\n]{1,2}|--)/n) do
-        body.print $1
-        if "--" == $2
-          content_length = -1
-        end
-        ""
-      end
-
-      body.rewind
-
-      /Content-Disposition:.* filename="?([^\";]*)"?/ni.match(head)
-      
-      filename = ($1 or "")
-
-      if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
-          /Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and
-          (not /MSIE/ni.match(env_table['HTTP_USER_AGENT']))
-        filename = CGI::unescape(filename)
-      end
-      
-      /Content-Type: (.*)/ni.match(head)
-      content_type = ($1 or "")
-
-      (class << body; self; end).class_eval do
-        alias local_path path
-        define_method(:original_filename) { filename.dup.taint }
-        define_method(:content_type) { content_type.dup.taint }
-
-        # gmosx: this hides the performance hit!!
-        define_method(:to_s) { read }
-      end
-
-      /Content-Disposition:.* name="?([^\";]*)"?/ni.match(head)
-      name = $1.dup
-
-      if params.has_key?(name)
-        params[name] = [params[name]] << body
-      else
-        params[name] = body
-      end
-
-      break if buf.size == 0
-      break if content_length === -1
-    end
-
-    return params
-  end
-
 end
 
 end
 
-# * George Moschovitis <gm@navel.gr>
 # * James Britt <james_b@neurogami.com>
-# * Michael Neumann <mneumann@ntecs.de>
+# * George Moschovitis <gm@navel.gr>
+