nitro 0.25.0 → 0.26.0

data/ProjectInfo

@@ -2,14 +2,14 @@
 
 TITLE    : &title Nitro
 NAME     : &pkg nitro
-VERSION  : '0.25.0'
+VERSION  : '0.26.0'
 STATUS   : beta
 
 AUTHOR   : George Moschovitis
 EMAIL    : &email gm@navel.gr
 HOMEPAGE : "http://www.nitrohq.com"
 
-SUMMARY: Everyhting you need to create Web 2.0 applications with Ruby and Javascript
+SUMMARY: Everything you need to create Web 2.0 applications with Ruby and Javascript
 
 DESCRIPTION: >
   Nitro provides everything you need to develop professional Web
@@ -22,19 +22,43 @@ DESCRIPTION: >
   staying standards compliant.
 
 DEPENDENCIES:
- - [ og, '= 0.25.0' ]
- - [ gen, '= 0.25.0' ]
- - [ glue, '= 0.25.0' ]
+ - [ og, '= 0.26.0' ]
+ - [ gen, '= 0.26.0' ]
+ - [ glue, '= 0.26.0' ]
  - [ RedCloth, '= 3.0.3' ]
  - [ ruby-breakpoint, '= 0.5' ]
  - [ daemons, '= 0.4.2' ]
 
+PACKAGE:
+  exclude: 
+    - dev
+    
+EXECUTABLES:
+  - nitro
+  - nitrogen  
+  
 DISTRIBUTE: [ gem, tgz, zip ]
 
 RUBYFORGE:
   PROJECT: 'nitro'
   USERNAME: 'gmosx'
 
+RDOC:
+  - dir: web/rdoc
+    template: jamis
+    options: ['--all', '--inline-source']
+    include:
+      - 'lib/nitro/**/*'
+      - '[A-Z]*'
+
+PUBLISH:
+  -
+    host: rubyforge
+    type: web
+    username: gmosx
+    project: nitro
+    dir: 'web'
+    
 # Anything to require upfront?
 #TEST:
 #  fixture: ''

data/README

@@ -1,4 +1,4 @@
-= Nitro 0.24.0 README
+= Nitro 0.26.0 README
 
 Nitro provides everything you need to develop professional Web
 applications using Ruby and Javascript. 

data/doc/AUTHORS

@@ -10,6 +10,9 @@ IDEAS, ADDITIONAL CODING, SUPPORT:
 * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>
   Patches, bug reports.
 
+* Chris Farmiloe <chris.farmiloe@farmiloe.com>
+  Bug fixes, Scaffolding improvements, patches.
+  
 * James Britt <james_b@neurogami.com>
   Additional code, documentation, design, bug reports.
 
@@ -19,24 +22,27 @@ IDEAS, ADDITIONAL CODING, SUPPORT:
 * 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.
 
+* Bryan Soto <bryan.a.soto@gmail.com>
+  Small bug fixes, patches.
+
+* Brian Bugh <brian@xsi-design.com>
+  Fixes, Patches.
+  
 * Zed A. Shaw <zedshaw@zedshaw.com>
   SCGI adapter.
   
+* Peter Abrahamsen <rainhead@gmail.com>  
+  Documentation, small patches.
+  
 * Anastasios Koutoumanos <ak@navel.gr>
   Design, bug reports.
   
 * TRANS <transfire@gmail.com>
   Small bug fixes, patches.
 
-* Bryan Soto <bryan.a.soto@gmail.com>
-  Small bug fixes, patches.
-  
 * Kostas Nasis <kostas@nasis.com>
   Ideas and bug reports.
 

data/doc/RELEASES

@@ -1,3 +1,117 @@
+== Version 0.26.0
+
+Another step closer to web programming nirvana. This release
+features completely recoded scaffolding, an auto admin system,
+a recoded template-morphing system, a new intelligent dispatcher
+that handles both nice urls and general structure, and so much 
+more. Moreover, this is the release with the most community
+contributions. Download now!
+
+Most notable changes:
+
+* New, intelligent dispatcher handles nice urls automatically,
+  without explicit rewrite rules. At the same time, it handles
+  sub directories, so you are free to design your app's
+  structure as you like.
+  
+* New template morphing implementation. The morphing compiler
+  is fully customizable. You can implement your own morphers and
+  add them to the morphing system, here for example is the
+  new selected_if morpher:
+  
+  <option value="1" selected_if="@cond">opt1</option>
+  
+  becomes
+  <?r if @cond ?>
+    <option value="1" selected="selected">opt1</option>
+  <?r else ?>
+    <option value="1">opt1</option>
+  <?r end ?>
+  
+* New Sweeper mixin. Using this mixin allows you to keep
+  the cleanup logic in one place. This logic is called
+  automagically by many default Nitro/Og methods (for example
+  Og insert/update, scaffolding, etc). You can fully customize
+  the behaviour.
+  
+  class Article
+    include Sweeper
+    
+    def sweep_affected(action = :all)
+      expire_affected_output('articles/view')
+      ...
+    end
+  end
+  
+  a = Article[1]
+  a.title = 'New'
+  a.save # => calls expire_affected.
+  
+  This mixin is typically used to automatically clean up output 
+  caching files from the filesystem, but you can use it to remove
+  temp rows from the database, or temp objects from a drb server
+  or anything you like.
+  
+* Searchable mixin. Include this mixin to your classes to make
+  them searchable by the auto administration system.
+  
+* Added two new session managers (OgSession, FileSession), 
+  cleaned up the session code.
+  
+* Better validations implementation. Cleaner code, less evals,
+  more flexible and easier to extend.
+   
+* New scaffolding / auto administration system. The implementation
+  is much cleaner and easier to customize. It leverages the latest
+  advancements (dispatcher, sweeper, etc) and adds search support,
+  pager, breadcrumps and more. You can define your own controls 
+  to handle properties and relations. Stay tuned for more stuff 
+  in the near future.
+
+* New Og revisable mixin. Just include this mixin in your classes
+  and get db backed revision support for free. Here comes an
+  example:
+  
+  class Article
+   is Revisable
+   property :body, String, :revisable => true
+   property :title, String
+  end
+
+  Automatically generates the Revision class (and the 
+  backend schema):
+ 
+  class Article::Revision
+ 
+  article.revisions
+ 
+  article.revise do |a|
+    a.title = 'hello'
+    a.body = 'world'
+  end
+ 
+  article.rollback(4)
+
+* Bug fixed KirbyBase Og adapter. This works great with the
+  new 2.5 gem.
+
+* Added more rational defaults, and many predefined options to
+  minimize the amount of setup needed to get your app running. Of
+  course you can still customize just about everything in Nitro.
+
+* Improvements to PostgreSQL automatic generation of foreign key 
+  constraints.
+
+* Added evolution support to the MySql store.
+
+* Upgrated to Prototype 1.4 and Scriptaculous 1.5
+
+* Updated the examples, check out the improved blog and why_wiki 
+  examples.
+
+* Many, many, many bug fixes and smaller improvements.
+
+   
 == Version 0.25.0
 
 This is the first in a series of releases focused on stability 

data/lib/glue/sweeper.rb

@@ -0,0 +1,71 @@
+require 'glue/aspects'
+
+module Glue
+
+# This module adds cleanup functionality to managed 
+# classes. Override and implement sweep_affected.
+# Typically used to cleanup output caching files from
+# the filesystem. But you can also use it to clean up
+# temp objects in the database or other temp files.
+#--
+# FIXME: find a better name.
+#++
+
+module Sweeper
+  include Aspects
+  
+  before "sweep_affected(:insert)", :on => :og_insert
+  before "sweep_affected(:update)", :on => :og_update
+  before "sweep_affected(:delete)", :on => :og_delete
+
+  #--
+  # FIXME: replace with 'extend Nitro::Caching::Output' ?
+  # If you change this method, don't forget the Caching::Output
+  # expire method.  
+  #++
+  
+  def self.expire(name)
+    begin
+      Logger.debug "Sweeper expired cache file '#{Server.public_root}/#{name}'" if $DBG
+      FileUtils.rm_rf("#{Server.public_root}/#{name}")
+    rescue Object
+      # gmosx: is this the right thing to do?
+    end
+  end
+
+private
+
+  # If needed pass the calling action symbol to allow
+  # for conditional expiration.
+  # Action takes values from { :insert, :delete, :update }
+  # or your own custom enumeration.
+  #
+  # Generally add lines like the following:
+  #
+  # expire_affected_output('file_to_expire')
+    
+  def sweep_affected(action = :all)
+  end
+  alias_method :expire_affected, :sweep_affected
+  
+  #--
+  # Generally you don't override this.
+  #++
+    
+  def expire_affected_output(name)
+    Sweeper.expire(name)
+  end
+  alias_method :expire_output, :expire_affected_output
+
+  # Expire affected cached fragments.
+  
+  def expire_affected_fragment(name, options = {})
+    Nitro::Caching::Fragments.store.delete(name, options)
+  end
+  alias_method :expire_fragment, :expire_affected_fragment
+  
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro.rb

@@ -16,7 +16,7 @@ module Nitro
   
   # The version.
 
-  Version = '0.25.0'
+  Version = '0.26.0'
 
   # Library path.
 
@@ -37,7 +37,7 @@ end
 
 require 'nitro/context'
 require 'nitro/controller'
-require 'nitro/dispatcher/nice'
+require 'nitro/dispatcher'
 require 'nitro/render'
 require 'nitro/server'
 
@@ -48,24 +48,31 @@ unless $NITRO_NO_ENVIRONMENT
   # $NITRO_NO_ENVIRONMENT = true 
   #
   # before requiring nitro.
+  
+#  if $0 # mod_ruby set $0 to false
+    # Put the start file dir in the path. 
+    Dir.chdir(File.dirname($0))
 
-  Dir.chdir(File.dirname($0))
-
-  # Application code come here.
+    # Application code come here.
 
-  $LOAD_PATH.unshift 'src'
+    $LOAD_PATH.unshift 'src'
 
-  # Library code come here.
+    # Library code come here.
 
-  $LOAD_PATH.unshift 'lib'
+    $LOAD_PATH.unshift 'lib'
+#  end
 end
 
 module Nitro
 
-  # A helper method to start a Nitro application.
+  class << self
   
-  def self.run(controller = nil)
-    Server.run(controller)
+    # A helper method to start a Nitro application.
+    
+    def run(controller = nil)
+      Server.run(controller)
+    end
+    alias_method :start, :run
   end
-
+  
 end

data/lib/nitro/adapter/cgi.rb

@@ -15,6 +15,10 @@ class CgiAdapter
   
   def self.start(server)
     cgi = CGI.new
+    def cgi.env
+      env_table
+    end
+    Router.strip_path = cgi.env["SCRIPT_NAME"]
     Cgi.process(server, cgi, cgi, cgi)
 =begin    
     context = Context.new(server)

data/lib/nitro/adapter/webrick.rb

@@ -25,7 +25,9 @@ class Webrick
       if RUBY_PLATFORM !~ /mswin32/
         wblog = WEBrick::BasicLog::new('/dev/null')
       elsif server.access_log
-        wblog = WEBrick::BasicLog::new(server.access_log || 'log/access.log')
+        wblog = WEBrick::BasicLog::new(server.access_log)
+      elsif File.exist? 'log'
+        wblog = WEBrick::BasicLog::new('log/access.log')
       else
         wblog = STDERR
       end
@@ -146,7 +148,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
           res.instance_variable_set(:@header, context.response_headers || {})
           res.instance_variable_set(:@cookies, context.response_cookies || {})
           res.body = context.out
-          res.chunked = true if context.out.is_a?(IO)
+          res.chunked = true if context.out.is_a?(IO) and context["SERVER_PROTOCOL"] == "HTTP/1.1"
           
           context.close
         ensure

data/lib/nitro/caching.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 
 require 'glue/attribute'
 require 'glue/configuration'
+require 'glue/sweeper'
 
 require 'nitro/caching/output'
 require 'nitro/caching/actions'

data/lib/nitro/caching/fragments.rb

@@ -9,7 +9,8 @@ module Nitro
 
 module Caching
 
-  # Action caching.
+  # Action caching. Caches a fragment, ie a page part.
+  # Use output cachingfor full page caching.
 
   module Fragments
 
@@ -58,6 +59,11 @@ module Caching
       end
     end
 
+    #--
+    # gmosx: If you modify the code here, don't forget to modify
+    # the same method on the sweeper.
+    #++
+    
     def expire_fragment(name, options = {})
       Fragments.store.delete(name, options)
     end

data/lib/nitro/caching/output.rb

@@ -10,7 +10,7 @@ module Caching
 
   module Output
 
-    def self.append_features(base) # :nodoc: 
+    def self.included(base) # :nodoc: 
       super
       base.extend(ClassMethods)
       base.module_eval do
@@ -57,6 +57,11 @@ module Caching
         self.class.do_cache_output(@request.uri, @out)
       end
     end
+    
+    #--
+    # If you change this method, don't forget the CacheSweeper
+    # expire method.
+    #++
 
     def expire_output(name)
       begin