nitro 0.28.0 → 0.29.0

data/doc/MIGRATION

@@ -10,6 +10,19 @@ For more help, send your question to the mailing list:
 http://rubyforge.org/mailman/listinfo/nitro-general
 
 
+== 0.29.0 <- 0.28.0
+
+1. Please notice that Tag now resides in the Glue namespace, you 
+   will probably have to update your tables.
+   
+2. You have to be more careful with the hrefs you pass to
+   <render > and <?include ?>. Some times you have to pass
+   absolute paths (ie /this/is/my path) to get the correct
+   behaviour. Nitro is more strict in this version.
+   
+3. The routing rule format has changed slightly.
+
+
 == 0.27.0 <- 0.26.0
 
 1. If you use a custom compiler pipeline, notice that the interface

data/doc/RELEASES

@@ -1,3 +1,105 @@
+== Version 0.29.0
+
+A bold step towards maturity. Great care was taken to 
+fix reported bugs and fine tune many aspects of Nitro and Og.
+As always some great new features where added. Special thanks fly
+to Jonas Pfenniger, Bryan Sotto, Rob Pitt and Guillaume 
+Pierronnet for making this release possible.
+
+Most notable changes:
+
+* Greatly improved error detection and report. Nitro now provides
+  line exact error reports at compile or run time, in actions
+  or templates. Stay tuned for more improvements in error 
+  handling.
+  
+* Nitro now supports a very useful url endoding/decoding system 
+  along with a Camping inspired R operator. This new system allows
+  you to refer to controllers and actions in your code, without
+  bothering about the enforced nice urls and rewrite/routing
+  rules. This allows you to write more robust code.
+  
+  Here are some examples:
+  
+  redirect R(UsersController, :login, :name, 'gmosx')
+  <a href="#{R(ForaController, :delete, :id, 3)}">delete</a>
+  
+  some more helpers and better integration of this feature
+  will be available soon.
+
+* To better support the URL codec, a new router was implemented.
+  The new version is both more powerfull and faster. Here are
+  some examples:
+
+  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])  
+
+* Og now supports calculations and aggregations. Here are some
+  examples:
+
+  User.min(:age)
+  User.average(:age)
+  User.maximum(:age)
+  User.min(:age, :group => :profession) # => [..] (aggregation)
+  User.sum(:age, :group => :role) # => [..]
+  
+  and more!
+
+* Improved template_root handling. Now Nitro automatically generates
+  a template_root stack for each controller / publishable object.
+  Of course the developer can fully customize this stack.
+  This is great for reusable modules of functionality (parts). Lets
+  say you have implemented a forum part. When you 'mount' the 
+  forum controller a path relative to the mount point is pushed 
+  in the template_root stack. When the dispatcher searches for
+  a template, it traverses the stack. In the described scenario
+  it first looks in the application template root, next in a template
+  root the points inside the part template root and then in the 
+  proto dir template root. The proto dir template root is automatically
+  pushed as the last root in the stack. This system facilitates
+  'object oriented sites'.
+  
+  Use the following method to customize the template_root.
+  
+  def self.setup_template_root(path)
+    ...
+  end 
+
+* Added support for JSP like application scoped (global) 
+  variables.
+  
+  def login
+    ...
+    global[:users] << current_user
+    application[:users] << current_user
+    ...
+  end
+  
+  The global/application hash is backed by any of the available
+  cache stores.
+  
+* Improved Taggable mixin, now provides more helpers and supports
+  tag garbage collection through reference counting.
+  
+* Added a new store for the generalized caching system that is
+  backed by a MemCache server. Useful to extract the last ounch 
+  of performance in a production environment. 
+
+* Fixes in the SCGI adapter.
+
+* Many Og bug fixes and optimizations.
+
+* More flexible static include compiler.
+
+* Improved testing support.
+
+* Integrated latest versions of Scriptaculous and Facets.
+
+* Many, many bug fixes and small improvements throughout the
+  code.
+  
+
 == Version 0.28.0
 
 A snapshot of the latest developments. As always, cool new 

data/lib/glue/sweeper.rb

@@ -12,7 +12,7 @@ module Glue
 #++
 
 module Sweeper
-  include Aspects
+  include Glue::Aspects
   
   before "sweep_affected(:insert)", :on => :og_insert
   before "sweep_affected(:update)", :on => :og_update

data/lib/nitro.rb

@@ -16,7 +16,7 @@ module Nitro
   
   # The version.
 
-  Version = '0.28.0'
+  Version = '0.29.0'
 
   # Library path.
 
@@ -29,6 +29,10 @@ module Nitro
   # Add the src dir in the path.
   
   $LOAD_PATH.unshift File.join(LibPath, '..', 'src')
+  
+  # Include the Glue namespace in Nitro
+  
+  include Glue
 end
 
 #--
@@ -40,6 +44,7 @@ require 'nitro/controller'
 require 'nitro/dispatcher'
 require 'nitro/render'
 require 'nitro/server'
+require 'nitro/part'
 
 unless $NITRO_NO_ENVIRONMENT
   # Setup up the proposed environment. You are free
@@ -49,18 +54,17 @@ unless $NITRO_NO_ENVIRONMENT
   #
   # before requiring nitro.
   
-#  if $0 # mod_ruby set $0 to false
-    # Put the start file dir in the path. 
-    Dir.chdir(File.dirname($0))
+  # Put the start file dir in the path. 
 
-    # Application code come here.
+  Dir.chdir(File.dirname($0))
 
-    $LOAD_PATH.unshift 'src'
+  # Application code come here.
 
-    # Library code come here.
+  $LOAD_PATH.unshift 'src'
 
-    $LOAD_PATH.unshift 'lib'
-#  end
+  # Library code come here.
+
+  $LOAD_PATH.unshift 'lib'
 end
 
 module Nitro
@@ -73,6 +77,31 @@ module Nitro
       Server.run(controller)
     end
     alias_method :start, :run
+    
+    # A helper to get the current execution mode.
+    
+    def mode
+      Runner.mode
+    end
+    alias_method :execution_mode, :mode
+
+
+    # A helper method.
+    
+    def live?
+      Runner.mode == :live
+    end
+    alias_method :production?, :live?
+        
   end
+
+  # Cache for application scoped (global) variables. This is a 
+  # temporal store, will be moved to the actuall cache in 
+  # Server.start
+  
+  $global = $application = {}
   
 end
+
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/adapter/acgi.rb

@@ -8,15 +8,13 @@ require 'nitro/context'
 require 'nitro/dispatcher'
 require 'nitro/cgi'
 
-require 'glue/flexob'
-
 # Speeds things up, more comaptible with OSX.
 
 Socket.do_not_reverse_lookup = true
 
 # No multi-threading.
 
-Og.thread_safe = false
+Og.thread_safe = false if defined?(Og) and Og.respond_to?(:thread_safe)
 
 module Nitro
 

data/lib/nitro/adapter/cgi.rb

@@ -18,7 +18,7 @@ Socket.do_not_reverse_lookup = true
 
 # No multi-threading.
 
-Og.thread_safe = false
+Og.thread_safe = false if defined?(Og) and Og.respond_to?(:thread_safe)
 
 module Nitro
 

data/lib/nitro/adapter/fastcgi.rb

@@ -5,15 +5,13 @@ require 'nitro/context'
 require 'nitro/dispatcher'
 require 'nitro/cgi'
 
-require 'glue/flexob'
-
 # Speeds things up, more comaptible with OSX.
 
 Socket.do_not_reverse_lookup = true
 
 # No multi-threading.
 
-Og.thread_safe = false
+Og.thread_safe = false if defined?(Og) and Og.respond_to?(:thread_safe)
 
 module Nitro
 

data/lib/nitro/adapter/mongrel.rb

@@ -1,8 +1,8 @@
 require 'stringio'
 
 require 'mongrel'
+require 'mongrel/handlers'
 
-require 'glue/flexob'
 require 'nitro/cgi'
 require 'nitro/context'
 require 'nitro/dispatcher'
@@ -58,7 +58,8 @@ class Mongrel
       
       initialize_mongrel(server)
       
-      @mongrel_thread = @mongrel.run
+      @mongrel.run
+      @mongrel_thread = @mongrel.acceptor
       @mongrel_thread.join
     end
     
@@ -93,7 +94,7 @@ class MongrelAdapter < ::Mongrel::HttpHandler
   attr_accessor :server
 
   STATUS_CODES = {
-    200 => "OK", "304" => "Not Modified",
+    "200" => "OK", "304" => "Not Modified",
     "404" => "Not found", "500" => "Server Error"
   }
 
@@ -112,12 +113,13 @@ class MongrelAdapter < ::Mongrel::HttpHandler
       rewrite(req)
       # TODO handle If-Modified-Since and add Last-Modified headers
       filename = [@server.public_root, req.path_info].join("/")
-      File.open(filename, "r") { |f|
-        # TODO look up mime type
+      ext = File.extname(filename)
+      content_type = ::Mongrel::DirHandler::MIME_TYPES[ext] || "text/plain"
+      File.open(filename, "rb") { |f|
         # TODO check whether path circumvents public_root directory?
         size = File.size(filename)
         res.socket << "HTTP/1.1 200 OK\r\n"
-        res.socket << "Content-type: text/plain\r\n"
+        res.socket << "Content-type: #{content_type}\r\n"
         res.socket << "Content-length: #{size}\r\n"
         res.socket << "\r\n"
         res.socket << f.read # XXX inefficient for large files, may cause leaks

data/lib/nitro/adapter/webrick.rb

@@ -1,7 +1,6 @@
 require 'webrick'
 require 'stringio'
 
-require 'glue/flexob'
 require 'nitro/cgi'
 require 'nitro/context'
 require 'nitro/dispatcher'
@@ -141,8 +140,8 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
           context.headers.update(req.meta_vars)
 
           # gmosx: make compatible with fastcgi.
+          
           context.headers['REQUEST_URI'].slice!(/http:\/\/(.*?)\//)
-          # context.headers['REQUEST_URI'] << '/'
           context.headers['REQUEST_URI'] = '/' + context.headers['REQUEST_URI']
 
           Cgi.parse_params(context)

data/lib/nitro/cgi.rb

@@ -70,7 +70,7 @@ class Cgi
       params[$1] = structure_param(params[$1], $2, val)
     elsif key =~ /(.+)\[\]$/
       params[$1] ||= Array.new
-      params[$1] << val
+      params[$1] << val.to_s
     else
       params[key] = val.nil? ? nil : val
     end

data/lib/nitro/compiler.rb

@@ -1,7 +1,8 @@
 require 'glue/template'
 
-require 'nitro/compiler/elements'
 require 'nitro/compiler/errors'
+
+require 'nitro/compiler/elements'
 require 'nitro/compiler/markup'
 require 'nitro/compiler/morphing'
 require 'nitro/compiler/script'
@@ -44,31 +45,17 @@ class Compiler
     @shared = {}
   end
 
+  # Traverse the template_root stack to find a template for 
+  # this action.
+  #
   # Action names with double underscores (__) are converted
   # to subdirectories. Here are some example mappings:
   #
   # hello_world -> template_root/hello_world.xhtml
   # this__is__my__hello_world -> template_root/this/is/my/hello_world
   
-  def template_for_action(action, ext = Template.extension)
-    cklass = @controller
-    template_root = nil
-    checked_proto = nil
-    
-    # search for template in controller and its ancestors's template_root
-    # if there is not an action defined in controller then also check in
-    # PROTO_TEMPLATE_ROOT
-
-    loop do
-      if cklass.respond_to?(:template_root) && template_root = cklass.template_root
-        cklass = cklass.superclass
-      elsif !@controller.respond_to?(:action) && !checked_proto
-        template_root = PROTO_TEMPLATE_ROOT
-        checked_proto = true
-      else
-        return nil # no template found
-      end
-      
+  def template_for_action(action, ext = Glue::Template.extension)
+    for template_root in @controller.instance_variable_get(:@template_root)
       # attempt to find a template of the form
       # template_root/action.xhtml
 
@@ -78,9 +65,10 @@ class Compiler
       # attempt to find a template of the form
       # template_root/action/index.xhtml
 
-      path = "#{template_root}/#{action.gsub(/__/, '/')}/#{Template.default}.#{ext}".squeeze('/')
+      path = "#{template_root}/#{action.gsub(/__/, '/')}/#{Glue::Template.default}.#{ext}".squeeze('/')
       return path if File.exist?(path) 
     end
+    return nil      
   end
   alias_method :template?, :template_for_action
 
@@ -100,7 +88,7 @@ class Compiler
   # Morphing, Elements and Markup compiler modules.
   
   def transform_template(template)
-    template = StaticInclude.transform(template)
+    template = StaticInclude.transform(template, self)
     template = Morphing.transform(template, self)
 #   template = LayoutCompiler.transform(template, self)
     template = Elements.transform(template, self)
@@ -124,12 +112,8 @@ class Compiler
         #{transform_template(template)}
       end
     }
-
-    begin
-      @controller.class_eval(code, path)
-    rescue SyntaxError => e
-      raise TemplateCompileError.new(code, template, e)
-    end        
+    
+    @controller.class_eval(code, path)
   end
 
   # Compiles an action. The generated action combines the 
@@ -150,7 +134,7 @@ class Compiler
   #
   # This generated method is called by the dispatcher.
   #
-  # === Template root overloading
+  # === Glue::Template root overloading
   #
   # Nitro provides a nice method of template_root overloading
   # that allows you to use OOP principles with templates.
@@ -187,7 +171,7 @@ class Compiler
   
     # Inject the pre advices.
 
-    code << Aspects.gen_advice_code(action, @controller.advices, :pre) 
+    code << Glue::Aspects.gen_advice_code(action, @controller.advices, :pre) 
 
     # Call the action
     
@@ -204,7 +188,7 @@ class Compiler
       # Try to resolve action parameters. Returns negative
       # numbers for arbitrary parameters.
 
-      param_count = @controller.instance_method(action.intern).arity 
+      param_count = @controller.instance_method(action.to_sym).arity 
       
       if param_count != 0
         if param_count > 0 
@@ -224,7 +208,7 @@ class Compiler
         end
         code << %{
             break if qs.index('=') and not is_hash
-              params[i] = CGI.unescape(qs.split(/=/).last)
+              params[i] = CGI.unescape(qs.split(/=/).last || "")
             end            
           end          
           action_return_value = #{action}(*params)
@@ -283,7 +267,7 @@ class Compiler
 
     # Inject the post advices.
 
-    code << Aspects.gen_advice_code(action, @controller.advices, :post) 
+    code << Glue::Aspects.gen_advice_code(action, @controller.advices, :post) 
 
     code << %{
         @action_name = @parent_action_name
@@ -292,11 +276,7 @@ class Compiler
 
     # First compile the action method. 
     
-#    begin
-      @controller.class_eval(code)
-#    rescue SyntaxError => e
-#      raise ActionCompileError.new(code, action, e)
-#    end
+    @controller.class_eval(code)
 
     unless @controller.respond_to?("#{action}_template")
       if template_path 
@@ -329,12 +309,12 @@ class Compiler
     # Typically used to precompile css templates.
     
     def precompile(filename)
-      src = File.join(Template.root, "#{filename}t")
+      src = File.join(Glue::Template.root, "#{filename}t")
       dst = File.join(Server.public_root, filename)
       
       if (!File.exist?(dst)) or (File.mtime(src) > File.mtime(dst))
         Logger.info "Compiling template '#{src}' to '#{dst}'."
-        template = FileTemplate.new(src)
+        template = Glue::FileTemplate.new(src)
         File.open(dst, 'w') do |f|
           f << template.process
         end
@@ -349,3 +329,4 @@ end
 
 # * George Moschovitis <gm@navel.gr>
 # * Chris Farmiloe <chris.farmiloe@farmiloe.com>
+# * Rob Pitt <rob@motionpath.co.uk>