nitro 0.31.0 → 0.40.0

data/lib/glue/magick.rb

@@ -33,6 +33,3 @@ module Thumbnails
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * Michael Fellinger <m.fellinger@gmail.com>

data/lib/glue/sweeper.rb

@@ -13,12 +13,22 @@ module Glue
 
 module Sweeper
   include Aspects
-  
+
+  #--
+  # Inject the sweepers *after* the event to have a valid
+  # oid.
+  #++
+    
   before "sweep_affected(:insert)", :on => :og_insert
   before "sweep_affected(:update)", :on => :og_update
   before "sweep_affected(:delete)", :on => :og_delete
 
   # Expires (deletes) a cached page from the file system.
+  #
+  # == Input
+  #
+  # * relative = if set to true, prepends the controller 
+  #   mount path.
   #--
   # FIXME: replace with 'extend Nitro::Caching::Output' ?
   # this way we wont have to sync the same code in two different
@@ -27,14 +37,16 @@ module Sweeper
   # expire method.  
   #++
   
-  def self.expire(name, klass)
-    begin
-      filename = "#{Server.public_root}/#{klass.ann.self.controller.mount_path}/#{name}".squeeze('/')
-      Logger.debug "Sweeper expired cache file '#{filename}'" if $DBG
-      FileUtils.rm_rf(filename)
-    rescue Object
-      # gmosx: is this the right thing to do?
+  def self.expire(name, klass, relative = false)
+    if relative and controller = klass.ann.self[:controller]
+      filename = "#{Server.public_root}/#{controller.mount_path}/#{name}.html".squeeze('/')
+    else
+      filename = "#{Server.public_root}/#{name}.html".squeeze('/')
     end
+    Logger.debug "Sweeper expired cache file '#{filename}'" if $DBG
+    FileUtils.rm_rf(filename)
+  rescue Object => ex
+    # ignore any error.
   end
 
 private
@@ -52,12 +64,17 @@ private
   end
   alias_method :expire_affected, :sweep_affected
   
-  #--
-  # Generally you don't override this.
-  #++
+  # Called from an action that modifies the model to expire 
+  # affected (dependend) cached pages. Generally you don't 
+  # override this method.
+  #
+  # == Input
+  #
+  # * relative = if set to true, prepends the controller 
+  #   mount path.
     
-  def expire_affected_output(name)
-    Sweeper.expire(name, self.class)
+  def expire_affected_output(name, relative = true)
+    Sweeper.expire(name, self.class, relative)
   end
   alias_method :expire_output, :expire_affected_output
 
@@ -71,5 +88,3 @@ private
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/thumbnails.rb

@@ -1,3 +1 @@
 require 'glue/magick'
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/webfile.rb

@@ -27,33 +27,45 @@ class WebFile
   # webapp dir for easier updates.
   
   setting :upload_root, :default => 'upload', :doc => 'The directory where upload files are stored'
+  
+  # Override files by default?
+  
+  setting :override_files, :default => true, :doc => 'Override files by default?'
 
   # Modify the base class when this class is included as 
   # property
   
-  def self.included_as_property(base, names, options)
+  def self.included_as_property base, args
+    if args.last.is_a?(Hash)
+      options = args.pop
+    else
+      options = Hash.new
+    end
+    
+    args.pop if args.last.is_a?(Class)
+    
     if thumbnails = (options[:thumbnail] || options[:thumbnails] || options[:magick]) or self.name == 'WebImage'
       require 'glue/thumbnails'
       base.send :include, Thumbnails
       thumbnails = { :small => :thumbnails } if thumbnails.is_a?(String) 
     end
     
-    for name in names
+    for name in args
       base.module_eval do
         # The 'web' path to the file (relative to the public
         # root directory. Uses the original property name
         # or the #{name}_path alias.
                  
-        property name.to_sym, String
+        attr_accessor name.to_sym, String
         alias_method "#{name}_path".to_sym, name.to_sym
         
         # The file size.
         
-        property "#{name}_size".to_sym, Fixnum
+        attr_accessor "#{name}_size".to_sym, Fixnum
         
-        # The mime type
+        # The mime type.
 
-        property "#{name}_mime_type".to_sym, String        
+        attr_accessor "#{name}_mime_type".to_sym, String        
      
         # Assignment callbacks.        
         #--
@@ -66,7 +78,7 @@ class WebFile
       if thumbnails
         for tname in thumbnails.keys
           base.module_eval do
-            property "#{name}_#{tname}_thumbnail".to_sym, String
+            attr_accessor "#{name}_#{tname}_thumbnail".to_sym, String
           end        
         end
       end
@@ -78,6 +90,8 @@ class WebFile
 
         def #{name}_from_request(request)
           param = request['#{name}']
+          
+          return if param.nil? or param.original_filename.blank?
       }
       if base.respond_to? :webfile_path
         code << %{
@@ -94,6 +108,7 @@ class WebFile
           @#{name}_size = param.size
           
           real_path = #{name}_real_path
+          raise 'file exists' if !WebFile.override_files and File.exists?(real_path)
           FileUtils.mkdir_p(File.dirname(real_path))
           if param.path
             FileUtils.cp(param.path, real_path)
@@ -102,7 +117,7 @@ class WebFile
             param.rewind
             File.open(real_path, 'wb') { |f| f << param.read }
           end
-          FileUtils.chmod(0777, real_path)
+          FileUtils.chmod(0664, real_path)
       }
 
       if thumbnails
@@ -145,6 +160,3 @@ end
 WebImage = WebFile
 
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * Michael Fellinger <m.fellinger@gmail.com>

data/lib/nitro.rb

@@ -1,23 +1,19 @@
 # = Nitro 
 #
 # Copyright (c) 2004-2006, George Moschovitis (http://www.gmosx.com)
-# Copyright (c) 2004-2006, Navel Ltd (http://www.navel.gr)
 #
 # Nitro (http://www.nitroproject.org) 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.
+# created and maintained by George Moschovitis 
+# (mailto:george.moschovitis@gmail.com) and released under the 
+# standard BSD Licence. For details consult the file doc/LICENCE.
 
 require 'glue'
 require 'glue/logger'
 require 'glue/configuration'
 
-module Nitro
-  
-  # The version.
-
-  Version = '0.31.0'
+require 'nitro/version'
 
+module Nitro
   # Library path.
 
   LibPath = File.dirname(__FILE__)
@@ -26,15 +22,32 @@ module Nitro
   
   setting :proto_path, :default => File.join(LibPath, '..', 'proto'), :doc => 'The path to the prototype application'
 
-  # Add the src dir in the path.
-  
-  $LOAD_PATH.unshift File.join(LibPath, '..', 'src')
+  # The adapter used to serve nitro applications.
   
-  # Include the Glue namespace in Nitro
+  setting :adapter, :default => :webrick, :doc => 'The web adapter'
+
+  # Add standard dirs in the path.
+
+  $LOAD_PATH.unshift Dir.pwd
+  $LOAD_PATH.unshift File.join(Dir.pwd, 'lib')
+
+  # Include the Glue namespace in Nitro.
   
   include Glue
 end
 
+#--
+# gmosx: leave them here.
+#++
+
+require 'nitro/global'
+require 'nitro/context'
+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
   # to skip this if you dont like it. Just set
@@ -47,58 +60,38 @@ unless $NITRO_NO_ENVIRONMENT
 
   Dir.chdir(File.dirname($0))
 
-  # Application code come here.
-
-  $LOAD_PATH.unshift 'src'
-
   # Library code come here.
 
   $LOAD_PATH.unshift 'lib'
 end
 
-#--
-# gmosx: leave them here.
-#++
-
-require 'nitro/global'
-require 'nitro/context'
-require 'nitro/controller'
-require 'nitro/dispatcher'
-require 'nitro/render'
-require 'nitro/server'
-require 'nitro/part'
-
 module Nitro
 
   class << self
   
+    attr_accessor :server
+    
     # A helper method to start a Nitro application.
     
     def run(controller = nil)
-      Server.run(controller)
+      @server = Server.run(controller)
     end
     alias_method :start, :run
     
-    # A helper to get the current execution mode.
+    # A helper method. Will be deprecated, use 
+    # Configuration.mode instead.
     
-    def mode
-      Runner.mode
+    def live?
+      Configuration.mode == :live
     end
-    alias_method :execution_mode, :mode
-
+    alias_method :production?, :live?
 
-    # A helper method.
+    # Deprecated, use Configuration.mode instead.
     
-    def live?
-      Runner.mode == :live
+    def mode
+      Configuration.mode
     end
-    alias_method :production?, :live?
         
   end
 
-  $global = $application = Global
-  
 end
-
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/adapter/cgi.rb

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

data/lib/nitro/adapter/console.rb

@@ -3,5 +3,3 @@ require 'nitro/adapter/script'
 module Nitro
   ConsoleAdapter = ScriptAdapter
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/adapter/fastcgi.rb

@@ -22,10 +22,15 @@ module Nitro
 #
 # === Sessions
 #
-# As FCGI is process based, you have cant use the default
+# As FCGI is process based, you have can't use the default
 # in-memory session store. For production web sites you should
 # use the drb session store. Moreover, there is no need for 
 # DB connection pooling in Og.
+#
+#--
+# gmosx: I always thought that the concept of FastCGI is stupid!
+# Why don't you use a proxy setup? (For example Apache + Mongrel)
+#++
 
 class FastCGI
 
@@ -41,5 +46,3 @@ class FastCGI
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/adapter/mongrel.rb

@@ -16,6 +16,7 @@ Socket.do_not_reverse_lookup = true
 #++ 
 
 module Mongrel # :nodoc: all
+
   class HttpRequest
     def method_missing(name, *args)
       if @params.has_key?(name.to_s.upcase)
@@ -27,6 +28,13 @@ module Mongrel # :nodoc: all
       end
     end
   end
+
+  class Configurator
+    def log(msg)
+      Logger.info msg
+    end
+  end
+
 end
 
 module Nitro
@@ -35,57 +43,53 @@ class Mongrel
 
   class << self
     attr_accessor :mongrel
+    attr_accessor :mongrel_config
 
-    # Start the Webrick adapter.
+    # Start the Mongrel adapter.
 
     def start(server)
       # TODO add logging.
-
-      mongrel_options = server.options.dup
-
-      mongrel_options.update(
-        :BindAddress => server.address, 
-        :Port => server.port, 
-        :DocumentRoot => server.public_root
-      )
-
-      @mongrel = ::Mongrel::HttpServer.new(mongrel_options[:BindAddress],
-                                           mongrel_options[:Port])
-        
-      trap('INT') { exit } # works until you use breakpoint... why?
-
-      @mongrel.register('/', MongrelAdapter.new(server))
-        
-      initialize_mongrel(server)
-        
-      @mongrel.run
-      @mongrel_thread = @mongrel.acceptor
-      @mongrel_thread.join
-    end
       
-    # Stop the Mongrel adapter.
+      @mongrel_config = ::Mongrel::Configurator.new :host => server.address do
+          listener :port => server.port do
+            uri "/", :handler => MongrelAdapter.new(server)
+            trap('INT') { Nitro::Mongrel.stop(server) }
+            run
+          end
+      end
       
-    def stop
-      @mongrel_thread.kill
+      @mongrel_config.log("Started Mongrel on " + server.address + ":" + server.port.to_s)
+      @mongrel_config.join
     end
-      
+
+    # Stop the Mongrel adapter.
+
+    def stop(server = nil)
+      @mongrel_config.log("Stopped Mongrel on " + server.address + ":" + server.port.to_s)
+      @mongrel_config.stop
+    end
+
     # Override this method to perform customized mongrel
     # initialization.
-    
+
     def initialize_mongrel(server)
     end
-      
+
   end
-  
+
 end
 
-# A Mongrel Adapter for Nitro.
+# A Mongrel Adapter for Nitro. This is the prefered adapter to
+# use in production mode. Typically you will have a front-end
+# web server (for example apache) handle static content and 
+# proxy dynamic content request to a cluster of mongrel servers.
 
 class MongrelAdapter < ::Mongrel::HttpHandler
   attr_accessor :server
-  
+
   def initialize(server)
     @server = server
+    @handle_static_files = Server.handle_static_files
   end
 
   def process(req, res)
@@ -95,30 +99,45 @@ class MongrelAdapter < ::Mongrel::HttpHandler
   # Handle a static file. Also handles cached pages.
 
   def handle_file(req, res)
-    begin
-      rewrite(req)
-      # TODO handle If-Modified-Since and add Last-Modified headers
-      filename = [@server.public_root, req.path_info].join("/").gsub(%r[//], '/')
-      File.open(filename, "rb") { |f|
-        # TODO check whether path circumvents public_root directory?
-        res.status = 200
-        res.body << f.read # XXX inefficient for large files, may cause leaks
-      }
-      return true
-    rescue Object => ex
+    rewrite(req)
+    
+    # gmosx, FIXME: this is a nasty hack that fixes a really
+    # *nasty* caching bug. Find a better solution. When hitting
+    # the backend server, if the index method takes parameters
+    # the dispatcher considers all static files as parameters.
+    # If you have output caching enabled for the index page, 
+    # all your static files get corrupted.
+    
+    if (@handle_static_files == false) and (req.path_info =~ /\.html$/)
       return false
-    ensure
-      unrewrite(req)
     end
+    
+    # TODO: handle If-Modified-Since and add Last-Modified headers
+
+    filename = File.join(@server.public_root, req.path_info).squeeze('/')
+
+    File.open(filename, "rb") do |f|
+      # TODO: check whether path circumvents public_root directory?
+      res.status = 200
+      res.body << f.read # XXX inefficient for large files, may cause leaks
+    end
+    return true
+  rescue Errno::ENOENT => ex # TODO: Lookup Win32 error for 'file missing'
+    return false
+  ensure
+    unrewrite(req)
   end
 
   # Handle the request.
-
+  #--
+  # TODO: recode this like the camping mongrel handler.
+  #++
+  
   def handle(req, res)
     unless handle_file(req, res)
-      path = req.path_info
-
       begin
+        path = req.path_info
+      
         context = Context.new(@server)
 
         context.in = if req.body.is_a? String
@@ -134,29 +153,52 @@ class MongrelAdapter < ::Mongrel::HttpHandler
           end
           context.headers[h] = v
         }
+        
+        # hackfix: make it behave like webrick and fcgi
+        context.headers['REQUEST_URI'] << "?#{context.headers['QUERY_STRING']}" if context.headers['QUERY_STRING']
+        context.headers['QUERY_STRING'] ||= ''
 
         Cgi.parse_params(context)
         Cgi.parse_cookies(context)
 
         context.render(path)
+=begin
+        res.start(context.status,true) do |head,out|
+          out.write(Cgi.response_headers(context))    
+          out.write(context.out)
+        end 
+=end
+
+        # what is the error code if a request without a handler 
+        # is comming?! al 2006-Aug-05
         
-        res.status = context.status
-
-        res.header.out << Cgi.response_headers(context)
-        res.body << context.out
-        
+        res.start(context.status, true) do |head,out|
+          context.response_headers.each do |key, value|
+            head[key] = value
+          end
+          
+          context.response_cookies.each do |cookie|
+            head['Set-Cookie'] = cookie
+          end if context.response_cookies
+          
+          out.write(context.out)
+        end
+      
         context.close
       ensure
+        $autoreload_dirty = false
         Og.manager.put_store if defined?(Og) and Og.respond_to?(:manager) and Og.manager
       end
     end
   end
 
+  # Try to rewrite the path to a filename.
+
   def rewrite(req)
     if req.path_info == '/' || req.path_info == ''
       req.path_info = '/index.html'
     elsif req.path_info =~ /^([^.]+)$/
-      req.path_info = "#{$1}/index.html"
+      req.path_info = "#{$1}.html"
     end
   end
 
@@ -165,13 +207,10 @@ class MongrelAdapter < ::Mongrel::HttpHandler
   def unrewrite(req)
     if req.path_info == '/index.html'
       req.path_info = '/'
-    elsif req.path_info =~ /^([^.]+)\/index.html$/    
+    elsif req.path_info =~ /^([^.]+)\.html$/    
       req.path_info = $1
     end
   end
 end
 
 end
-
-# * Joshua Hoke
-# * George Moschovitis <gm@navel.gr>