nitro 0.30.0 → 0.31.0

data/lib/nitro/adapter/webrick.rb

@@ -199,8 +199,6 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 
   def handle(req, res)
     unless handle_file(req, res)
-      path = req.request_uri.path
-
       begin
         path = req.request_uri.path
 

data/lib/nitro/caching.rb

@@ -1,4 +1,3 @@
-require 'glue/attribute'
 require 'glue/configuration'
 require 'glue/sweeper'
 

data/lib/nitro/caching/fragments.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 
 require 'glue/configuration'
-require 'glue/attribute'
 require 'glue/cache/memory'
 
 module Nitro
@@ -20,11 +19,11 @@ module Caching
     setting :cache, :default => Glue::MemoryCache.new, :doc => 'The cache used to store the fragments'
     
     def self.get(name, options = {})
-      return @@cache.get(name, options)
+      return self.cache.get(name, options)
     end
     
     def self.put(name, content = nil, options = {})
-      @@cache.put(name, content, options)
+      self.cache.put(name, content, options)
       return content
     end
     

data/lib/nitro/caching/output.rb

@@ -6,6 +6,8 @@ module Nitro
 
 module Caching
 
+  setting :output_cache_root, :default => 'public', :doc => 'The directory where cached pages are generated'
+
   # The Output caching subsystem stores whole pages in the 
   # filesystem to be served directly be the front web server
   # (Lighttpd, Apache, etc) for optimal performance.
@@ -22,9 +24,6 @@ module Caching
 
     def self.included(base) # :nodoc: 
       base.extend(ClassMethods)
-      base.module_eval do
-        cattr_accessor :output_cache_root, 'public'
-      end
     end
 
     module ClassMethods
@@ -54,7 +53,7 @@ module Caching
         filename = ((path.empty? || path == '/') ? 'index.html' : path.dup)
 #        filename.gsub!(/\/$/, '')
         filename << '/index.html' unless (filename.split('/').last || filename).include? '.'
-        return output_cache_root + '/' + filename                     
+        return Caching.output_cache_root + '/' + filename
       end
       
     end

data/lib/nitro/cgi.rb

@@ -1,5 +1,7 @@
 require 'cgi'
 
+require 'stringio'
+
 require 'glue/configuration'
 require 'nitro/cgi/http'
 
@@ -21,10 +23,22 @@ class Cgi
 
   # Process a CGI request. This is a general method reused by
   # many adapters.
+  #--
+  # A CGI request is process-based so there is no need for Og
+  # connection cleanup.
+  #++
   
   def self.process(server, cgi, inp, out)
     context = Context.new(server)
 
+    unless inp.respond_to?(:rewind)
+      # The module Request#raw_body requires a rewind method,
+      # so if the input stream doesn't have one, *cough* FCgi,
+      # we convert it to a StringIO.
+
+      inp = StringIO.new(inp.read.to_s) # if read returns nil, to_s makes it ""
+    end
+
     context.in = inp
     context.headers = cgi.env
 

data/lib/nitro/cgi/request.rb

@@ -64,7 +64,7 @@ module Request
    # www.nitroproject.org: request.domain # => 'nitroproject.org'
    # www.nitroproject.co.uk: request.domain(2) # => 'nitroproject.co.uk'
   
-  def domain(tld_length = 1)
+  def domain tld_length = 1
     host.split('.').last(1 + tld_length).join('.')
   end
 
@@ -74,7 +74,7 @@ module Request
   # 
   # my.name.nitroproject.org: request.subdomains # => ['my', 'name']
   
-  def subdomains(tld_length = 1)
+  def subdomains tld_length = 1 
     parts = host.split('.')
     parts[0..-(tld_length+2)]
   end
@@ -104,7 +104,7 @@ module Request
   # if request.get?
 
   def method
-    @headers['REQUEST_METHOD'].downcase.intern
+    @headers['REQUEST_METHOD'].downcase.to_sym
   end
 
   #--
@@ -176,6 +176,7 @@ module Request
   def referer
     return @headers['HTTP_REFERER'] || '/'
   end
+  alias referrer referer
 
   # The content_length
   
@@ -242,19 +243,19 @@ module Request
   
   # Lookup a query parameter.
 
-  def [](param)
+  def [] param
     @params[param]
   end
 
   # Set a query parameter.
 
-  def []=(param, value)
+  def []= param, value
     @params[param] = value
   end
   
   # Check if a boolean param (checkbox) is true.
   
-  def true?(param)
+  def true? param
     @params[param] == 'on'
   end
   alias_method :enabled?, :true?
@@ -262,19 +263,19 @@ module Request
   
   # Check if a boolean param (checkbox) is false.
    
-  def false?(param)
+  def false? param
     !true?(param)
   end
   
   # Fetch a parameter with default value.
   
-  def fetch(param, default = nil)
+  def fetch param, default = nil
     @params.fetch(param, default)
   end
   
   # Check if a param is available.
   
-  def has_key?(key)
+  def has_key? key
     @params.has_key?(key)
   end
   alias_method :has_param?, :has_key?

data/lib/nitro/cgi/sendfile.rb

@@ -0,0 +1,45 @@
+require 'nitro/render'
+
+module Nitro
+
+module Render
+
+  # Send a file download to the client.
+  #
+  # Like render and redirect, the action is exited upon calling
+  #
+  # [+fname+]  That name of the file
+  # [+path+]   Specifying true mean fname contains the full path.
+  #     The default, false, uses Server.public_root as the path.
+  #
+  # [+return+] true on success, false on failure
+  #
+  # === Examples
+  #
+  # require 'nitro/cgi/sendfile'
+  # class MyController < Nitro:Controller
+  #   def download(fname)
+  #     sendfile(fname)
+  #   end
+  # end
+  #
+  # class MyController < Nitro:Controller
+  #   def download()
+  #     sendfile('/etc/password', true)
+  #   end
+  # end
+
+  def sendfile(fname=nil, fullpath=false)
+    fname = fullpath ? fname : "#{Server.public_root}/#{fname}"
+    f = File.open(fname, "rb")
+    @context.response_headers["Cache-control"] = 'private'
+    @context.response_headers["Content-Length"] = "#{File.size?(f) || 0}"
+    @context.response_headers["Content-Type"] = 'application/force-download'
+    @context.out = f
+    raise RenderExit
+  end
+
+end
+
+end
+

data/lib/nitro/compiler.rb

@@ -258,7 +258,7 @@ class Compiler
           end          
           
           # Concatenate some extracted parameters.
-          params.concat(context.params.values)
+#          params.concat(context.params.values)
           
           # Fill the array with nils for the missing params.
           (#{param_count} - params.size).times { params << nil }

data/lib/nitro/compiler/errors.rb

@@ -10,7 +10,7 @@ require 'facet/ormsupport'
 # or something.
 #++
 
-class Exception
+class Exception # :nodoc: all
 
   # Radius of the source code to display arround the error line.
   
@@ -45,7 +45,7 @@ class Exception
         source = File.read(file)
 
         if file =~ /\.xhtml$/
-          source = Compiler.new.transform_template(source)
+          source = Compiler.new(Nitro::Controller).transform_template(:action, source)
           no -= 2
         end
 
@@ -105,7 +105,7 @@ class Exception
   
   def source_for_backtrace(indent = 0)
     backtrace.inject([]) do |sources, step| 
-      sources << source_extract(indent,step)
+      sources << source_extract(step, indent)
     end
   end
   

data/lib/nitro/context.rb

@@ -63,6 +63,11 @@ class Context
     # initialize the output buffer.
 
     @out ||= OutputBuffer.new
+    
+    # Store this instance in a thread local variable for easy
+    # access.
+    
+    Thread.current[:CURRENT_CONTEXT] = self
   end
 
 
@@ -162,7 +167,17 @@ class Context
   alias_method :is_top?, :is_top_level?
   alias_method :in_top_level?, :is_top_level?
   alias_method :top_level?, :is_top_level?
-  
+
+  class << self
+
+    # Returns the context for the current thread.
+    
+    def current
+      Thread.current[:CURRENT_CONTEXT]
+    end
+    
+  end
+    
 end
 
 end

data/lib/nitro/controller.rb

@@ -46,6 +46,22 @@ module Publishable
       include ::Aspects
       include Flashing
       include Helpers
+
+      # The collection of 'models' ie classes that are linked
+      # to this Publishable/Controller.
+      
+      ann :self, :models => []
+
+      # This is a helper that 'links' one or more classes to this
+      # controller. In practice it annotates each class with the 
+      # controller and stores the controller's list of 'models'.
+      
+      def self.model *classes
+        for c in classes
+          c.ann :self, :controller => self
+          self.ann.self.models! << c
+        end
+      end
     end
 
     # Aliases an action
@@ -171,7 +187,7 @@ private
 
   # Cookie helpers.
   #--
-  # TODO: move elsewhere.
+  # TODO: move elsewhere, probably to a default helper.
   #++
   
   def cookies
@@ -207,13 +223,34 @@ private
   # encode_url ForaController, :post, :title, 'Hello', :body, 'World'
   # encode_url :post, :title, 'Hello', :body, 'World' # => implies controller == self
   # encode_url :kick, :oid, 4
+  # encode_url article # => article.to_href
+  # 
+  # Alternatively you can pass options with a hash:
+  #
+  # encode_url :controller => ForaController, :action => :delete, :params => { :title => 'Hello' }
+  # encode_url :action => :delete
   #--
   # FIXME: better implementation? optimize this?
   # TODO: move elsewhere.
   #++
   
-  def encode_url(*args)
-    if args.first.is_a?(Symbol) or args.first.is_a?(String)
+  def encode_url *args
+    f = args.first
+    
+    # A standard url as string, return as is.
+    
+    if f.is_a? String
+      return f
+    end
+  
+    # If the passed param is an object that responds to :to_href
+    # returns the url to this object.
+    
+    if f.respond_to? :to_href
+      return args.first.to_href
+    end
+    
+    if f.is_a? Symbol
       # no controller passed, imply controller == self!
       args.unshift(self.class)
     end
@@ -278,10 +315,10 @@ class Controller
 
   # This callback is called after the Controller is mounted.
   
-  def self.mounted(path)
+  def self.mounted path
     # Resolve aspects.
     
-    ::Aspects.include_advice_modules(self)
+    Aspects.include_advice_modules(self)
       
     # The scaffolding code is compiled after the mount, so 
     # that template roots are finalized.
@@ -289,6 +326,24 @@ class Controller
     compile_scaffolding_code()
   end
   
+  # Returns the current controller from the context thread local
+  # variable.
+    
+  def self.current
+    Thread.current[:CURRENT_CONTROLLER] 
+  end    
+  
+  #--
+  # Replaces the current controller (helper for render).
+  # This is an internal method.
+  #++
+  
+  def self.replace_current controller # :nodoc:
+    old = Thread.current[:CURRENT_CONTROLLER]
+    Thread.current[:CURRENT_CONTROLLER] = controller
+    return old
+  end
+
 end
 
 end

data/lib/nitro/dispatcher.rb

@@ -128,7 +128,7 @@ class Dispatcher
       for m in c.action_methods
         m = m.to_sym
         if route = c.ann(m).route and (!route.nil?)
-          add_route(route.first, :controller => c, :action => m, :params => route.last)
+          add_rule(route.first, :controller => c, :action => m, :params => route.last)
         end
       end
     end
@@ -168,6 +168,7 @@ class Dispatcher
       return klass, "#{action}_action", klass.mount_path
     end
     
+    path = path.sub(/#{Router.strip_path}/, '') if Router.strip_path
     parts = path.split('/')
     parts.shift # get rid of the leading '/'.
 

data/lib/nitro/helper.rb

@@ -1,8 +1,6 @@
 require 'facet/kernel/constant'
 require 'facet/string/camelize'
 
-require 'glue/attribute'
-
 module Nitro
 
 # Helpers are standard Ruby modules that contain utility 

data/lib/nitro/helper/form/builder.rb

@@ -90,6 +90,10 @@ module FormHelper
   #   for this form. If you pass a class an empty object is 
   #   instantiated.
   #
+  # * :action = The action of this form. The parameter is 
+  #   passed through the R operator (encode_url) to support
+  #   advanced url encoding.
+  #
   # === Example
   #   
   # #{form(:object => @owner, :action => :save_profile) do |f|
@@ -120,7 +124,7 @@ module FormHelper
     b = FormXmlBuilder.new('', options)
 
     b << '<form'
-    b << %| action="#{options[:action]}"| if options[:action]
+    b << %| action="#{R options[:action]}"| if options[:action]
     b << %| method="#{options[:method]}"| if options[:method]
     b << %| enctype="#{options[:enctype]}"| if options[:enctype]
     b << '>'

data/lib/nitro/helper/javascript.rb

@@ -28,7 +28,7 @@ private
   # filename. Override if you don't like the defaults.
   
   def name_to_jsfile(name)  
-    "js/#{name}.js"
+    "/js/#{name}.js"
   end  
 end