nitro 0.30.0 → 0.31.0

data/ProjectInfo

@@ -2,7 +2,7 @@
 
 TITLE    : &title Nitro
 NAME     : &pkg nitro
-VERSION  : '0.30.0'
+VERSION  : '0.31.0'
 STATUS   : beta
 
 AUTHOR   : George Moschovitis
@@ -26,12 +26,12 @@ RUBYFORGE:
   USERNAME: 'gmosx'
 
 DEPENDENCIES:
-  - [ og, '= 0.30.0' ]
-  - [ gen, '= 0.30.0' ]
-  - [ glue, '= 0.30.0' ]
+  - [ og, '= 0.31.0' ]
+  - [ gen, '= 0.31.0' ]
+  - [ glue, '= 0.31.0' ]
   - [ RedCloth, '= 3.0.3' ]
-  - [ ruby-breakpoint, '= 0.5' ]
-  - [ daemons, '= 0.4.2' ]
+  - [ ruby-breakpoint, '~> 0.5' ]
+  - [ daemons, '~> 0.4' ]
 
 EXECUTABLES:
   - nitro

data/bin/nitro

@@ -1,12 +1,105 @@
 #!/usr/bin/env ruby
 
-$NITRO_NO_ENVIRONMENT = true
+require 'facets/more/consoleapp'
 
-require 'nitro'
+class NitroCommand < Console::Command
 
-if File.exist?('run.rb')
-  system('ruby -rubygems run.rb')
-else
-  puts 'No application found, starting default application.'
-  system 'ruby -rubygems ' + File.join(Nitro::LibPath, '..', 'proto', 'run.rb')
+  # :section: Commands
+  
+  # The default action, starts the application. You can 
+  # alternatively use the start/run aliases.
+  #
+  # === Examples
+  #
+  # $ nitro
+  # $ nitro start
+  # $ nitro run
+  
+  def default
+    if f = application_file
+      $NITRO_NO_ENVIRONMENT = true
+      load 'run.rb'
+    else
+      puts 'No application found!'
+      # FIXME: better error mesage and/or show default app!
+    end
+  end
+  alias run default
+  alias start default
+
+  # Starts an IRB console attached to the web application.
+    
+  def console
+    if RUBY_PLATFORM =~ /mswin32/
+      irb_name = 'irb.bat'
+    else
+      irb_name = 'irb'
+    end
+    
+    ENV['NITRO_INVOKE'] = 'irb'
+    
+    if f = application_file
+      ENV['NITRO_MODE'] = $DBG ? 'debug' : 'live'
+      exec "#{irb_name} -r #{f} -r irb/completion --noinspect"  
+    end
+    
+    exit
+  end  
+
+  # Dump the version of Nitro.
+  
+  def version
+    puts "Nitro 0.31.0"
+  end
+  
+  # :section: Options
+  
+  # Enable verbose mode.
+  
+  def _v
+    $DBG = true
+    ENV['NITRO_MODE'] = 'debug'
+  end
+  alias _verbose _v
+  
+  # Daemonize the server. Typically used with the Webrick 
+  # adapter.
+
+  def _daemon  
+    require 'daemons/daemonize'
+    
+    pwd = Dir.pwd
+    Daemonize.daemonize(File.join(pwd, 'log/app.log'))
+    
+    # Restore the original pwd (daemonize sets the 
+    # pwd to '/').
+    Dir.chdir(pwd)
+    
+    # Set the logger to a file (daemonize closes the
+    # std streams).
+    Logger.set(Logger.new('log/app.log'))
+  end
+  alias _daemonize _daemon
+  
+private
+  
+  # Typical application main file names.
+  
+  APPLICATION_FILES = %w{ run.rb start.rb conf.rb app.rb application.rb }
+  
+  # Find out the application main file.
+  
+  def application_file
+    for f in APPLICATION_FILES
+      if File.exist? f
+        return f
+      end
+    end
+    
+    return false
+  end
 end
+
+NitroCommand.new.execute
+
+# * George Moschovitis <gm@navel.gr>

data/doc/RELEASES

@@ -1,3 +1,21 @@
+== Version 0.31.0
+
+* Mongrel adapter updated to work with latest versions of Mongrel.
+
+* Fixed a long-standing bug where the template root wasn't determined correctly (would result in blank pages).
+
+* Added sendfile support.
+
+* Fixed strip_path support. When this setting is set to a path, it will be stripped from urls. Given, 
+
+  Router.strip_path = '/nitro-apps'
+
+when the dispatcher gets a url like /nitro-apps/blog it will strip out /nitro-apps and resolve to the controller for /blog.
+
+* Wee helper is removed.
+
+* Updated Nitro start page with links to the examples.
+
 == Version 0.30.0
 
 Another pragmatic release. The Nitro development team worked over

data/lib/glue/sweeper.rb

@@ -12,22 +12,26 @@ module Glue
 #++
 
 module Sweeper
-  include ::Aspects
+  include Aspects
   
   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.
   #--
   # FIXME: replace with 'extend Nitro::Caching::Output' ?
+  # this way we wont have to sync the same code in two different
+  # places.
   # If you change this method, don't forget the Caching::Output
   # expire method.  
   #++
   
-  def self.expire(name)
+  def self.expire(name, klass)
     begin
-      Logger.debug "Sweeper expired cache file '#{Server.public_root}/#{name}'" if $DBG
-      FileUtils.rm_rf("#{Server.public_root}/#{name}")
+      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?
     end
@@ -53,7 +57,7 @@ private
   #++
     
   def expire_affected_output(name)
-    Sweeper.expire(name)
+    Sweeper.expire(name, self.class)
   end
   alias_method :expire_output, :expire_affected_output
 

data/lib/nitro.rb

@@ -16,7 +16,7 @@ module Nitro
   
   # The version.
 
-  Version = '0.30.0'
+  Version = '0.31.0'
 
   # Library path.
 
@@ -35,18 +35,6 @@ module 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
@@ -68,6 +56,18 @@ unless $NITRO_NO_ENVIRONMENT
   $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

data/lib/nitro/adapter/console.rb

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

data/lib/nitro/adapter/mongrel.rb

@@ -28,8 +28,7 @@ module Mongrel # :nodoc: all
     end
   end
 end
-                
-   
+
 module Nitro
 
 class Mongrel
@@ -38,66 +37,53 @@ class Mongrel
     attr_accessor :mongrel
 
     # Start the Webrick adapter.
-    
+
     def start(server)
       # TODO add logging.
 
-     mongrel_options = server.options.dup
+      mongrel_options = server.options.dup
 
-     mongrel_options.update(
+      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') { stop } # will this work?
+                                           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.
-    
+      
     def stop
-        @mongrel_thread.kill
+      @mongrel_thread.kill
     end
-    
+      
     # Override this method to perform customized mongrel
     # initialization.
     
     def initialize_mongrel(server)
     end
-    
+      
   end
-
+  
 end
 
-# A special handler for Xhtml files.
-
-#class XhtmlFileHandler < WEBrick::HTTPServlet::DefaultFileHandler
-#  def do_GET(req, res)
-#    res['content-type'] = 'text/html'
-#    res.body = '<html><body>Permission denied</body></html>'
-#  end
-#end
-
 # A Mongrel Adapter for Nitro.
 
 class MongrelAdapter < ::Mongrel::HttpHandler
   attr_accessor :server
-
-  STATUS_CODES = {
-    "200" => "OK", "304" => "Not Modified",
-    "404" => "Not found", "500" => "Server Error"
-  }
-
+  
   def initialize(server)
     @server = server
   end
@@ -112,17 +98,11 @@ class MongrelAdapter < ::Mongrel::HttpHandler
     begin
       rewrite(req)
       # TODO handle If-Modified-Since and add Last-Modified headers
-      filename = [@server.public_root, req.path_info].join("/")
-      ext = File.extname(filename)
-      content_type = ::Mongrel::DirHandler::MIME_TYPES[ext] || "text/plain"
+      filename = [@server.public_root, req.path_info].join("/").gsub(%r[//], '/')
       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: #{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
+        res.status = 200
+        res.body << f.read # XXX inefficient for large files, may cause leaks
       }
       return true
     rescue Object => ex
@@ -141,47 +121,30 @@ class MongrelAdapter < ::Mongrel::HttpHandler
       begin
         context = Context.new(@server)
 
-        context.in = StringIO.new(req.body || "")
+        context.in = if req.body.is_a? String
+                       StringIO.new(req.body)
+                     else
+                       req.body
+                     end
 
         context.headers = {}
         req.params.each { |h, v|
           if h =~ /\AHTTP_(.*)\Z/
-                context.headers[$1.gsub("_", "-")] = v
-            end
-            context.headers[h] = v
+            context.headers[$1.gsub("_", "-")] = v
+          end
+          context.headers[h] = v
         }
-        # context.headers.update(req.meta_vars)
-
-        context.headers['REQUEST_URI'] = context.headers['SCRIPT_NAME']
-          
-        if context.headers['PATH_INFO'].blank?
-          context.headers['REQUEST_URI'] = '/'
-        else
-          context.headers['REQUEST_URI'] = '/' + context.headers['PATH_INFO']          
-        end
-
-        # gmosx: make compatible with fastcgi.
-
-        context.headers['REQUEST_URI'].slice!(/http:\/\/(.*?)\//)
-        context.headers['REQUEST_URI'] = '/' + context.headers['REQUEST_URI']
 
         Cgi.parse_params(context)
         Cgi.parse_cookies(context)
 
         context.render(path)
-  
-        res.socket << "HTTP/1.1 #{context.status.to_s} "
-  
-        if STATUS_CODES.has_key? context.status
-          res.socket << STATUS_CODES[context.status]
-        else
-          res.socket << "Unknown Status Code"
-        end
-        res.socket << "\r\n"
-
-        res.socket << Cgi.response_headers(context)
-        res.socket << context.out
- 
+        
+        res.status = context.status
+
+        res.header.out << Cgi.response_headers(context)
+        res.body << context.out
+        
         context.close
       ensure
         Og.manager.put_store if defined?(Og) and Og.respond_to?(:manager) and Og.manager

data/lib/nitro/adapter/script.rb

@@ -0,0 +1,71 @@
+require 'nitro/cgi'
+
+module Nitro
+
+# The script adapter. Useful when running in console mode, or
+# when creating scripts for cron jobs, testing and more. Allows
+# you to programmatically 'drive' the web application.
+
+class ScriptAdapter 
+
+  # The last generated response.
+  
+  attr_accessor :response
+  
+  def initialize server
+    @server = server
+  end
+  
+  # Perform a programmatic http request to the web app.
+  #
+  # === Examples
+  #
+  # app.get 'users/logout'
+  # app.post 'users/login', :params => { :name => 'gmosx', :password => 'pass' }
+  # app.post 'users/login?name=gmosx;password=pass
+  # app.post 'articles/view/1'
+  
+  def handle uri, options = {}
+    context = Context.new(@server)
+    
+    begin
+      context.params = options.fetch(:params, {})
+      context.headers = options.fetch(:headers, {})
+ 
+      context.headers['REQUEST_URI'] = uri
+      context.headers['REQUEST_METHOD'] = options.fetch(:method, :get)
+      context.headers['HTTP_COOKIE'] ||= options[:cookies]
+          
+      Cgi.parse_params context
+      Cgi.parse_cookies context
+
+      context.render uri 
+
+      context.close
+    ensure
+      $autoreload_dirty = false
+      Og.manager.put_store if defined?(Og) and Og.respond_to?(:manager) and Og.manager
+    end
+        
+    @response = context
+  end
+  
+  # Perform a programmatic http get request to the web app.
+   
+  def get uri, options = {}
+    options[:method] = :get
+    handle uri, options
+  end
+
+  # Perform a programmatic http post request to the web app.
+   
+  def post uri, options = {}
+    options[:method] = :post
+    handle uri, options
+  end
+    
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>