nitro 0.13.0 → 0.14.0

data/lib/nitro/adapters/webrick.rb

@@ -3,44 +3,24 @@
 # $Id$
 
 require 'webrick'
+require 'stringio'
 
 require 'glue/flexob'
-
 require 'nitro/context'
 require 'nitro/dispatcher'
 
-module WEBrick
-
-	class HTTPRequest
-		attr :socket
-	end
-	
-	class HTTPResponse
-		def header=(header)
-			@header = header
-		end
-		
-		def cookies=(cookies)
-			@cookies = cookies
-		end
-	end
-
-end
-
 module N
 	
 # Helper methods for the WebrickAdapter.
 
 class Webrick
-	
+
 	class << self
 		attr_accessor :server
 
 		def start(conf)
 			conf = Conf.new(conf) unless conf.is_a?(Conf)
 			
-			# patch for OSX
-			
 			Socket.do_not_reverse_lookup = true
 	 
 			if :none == conf.log and RUBY_PLATFORM !~ /mswin32/
@@ -80,6 +60,7 @@ end
 #++
 
 class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
+	include WEBrick
 
 	# REQUEST_MUTEX = Mutex.new
 		
@@ -89,60 +70,93 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 		# Handles static resources. Useful when running 
 		# a stand-alone webrick server.
 		
-    @file_handler = WEBrick::HTTPServlet::FileHandler.new(
-				server, 
-				conf.dispatcher.public_root, conf.webrick_options || {})
+    @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, conf.dispatcher.public_root, conf.webrick_options || {})
   end
-	
-	def handle(req, res)
-		path = req.request_uri.path
 
-    if path =~ /\./
+	# Handle a static file. Also handles cached pages.
+
+  def handle_file(req, res)
+		begin
+			rewrite(req)
 			@file_handler.do_GET(req, res)
-		else
-			# gmosx, TODO: move this into a filter.
-			Og.db.get_connection if defined?(Og) and Og.db
+			return true
+		rescue WEBrick::HTTPStatus::PartialContent, WEBrick::HTTPStatus::NotModified => err
+			res.set_error(err)
+			return true
+		rescue 
+			return false
+		ensure
+			unrewrite(req)
+		end
+	end
 
-			# REQUEST_MUTEX.lock
+	# Handle the request.
 
-			context = Context.new(@conf)
-			
-			context.headers = {}
-			req.header.each { |h, v| context.headers[h.upcase] = v.first }
-			context.headers.update(req.meta_vars)
-		
-			context.params = {}
-			req.query.each do |k, v| 
-				if k =~ /(.*)\[\]$/
-					context.params[k] = v
-				else
-					context.params[k] = v.to_s
-				end
-			end
-			#	context.in = req.socket
-			# CgiUtils.parse_params(context)
+	def handle(req, res)
+		unless handle_file(req, res)
+			path = req.request_uri.path
 
-			#context.cookies = {}
-			#req.cookies.each { |c| context.cookies[c.name] = c.value }
-			CgiUtils.parse_cookies(context)
+			unless path =~ /\./
+				begin
+					path = req.request_uri.path
 
-			context.render(path)
-			
-			res.status = context.status
-			res.header = context.response_headers || {}
-			res.cookies = context.response_cookies || {}
-			res.body = context.out
+					# gmosx, TODO: move this into a filter.
+					Og.db.get_connection if defined?(Og) and Og.db
+
+					# REQUEST_MUTEX.lock
+
+					context = Context.new(@conf)
+
+					context.in = StringIO.new(req.body || "")
+
+					context.headers = {}
+					req.header.each { |h, v| context.headers[h.upcase] = v.first }
+					context.headers.update(req.meta_vars)
+					# gmosx: make compatible with fastcgi.
+					context.headers['REQUEST_URI'].slice!(/http:\/\/(.*)\//)
+					context.headers['REQUEST_URI'] << '/'
+
+					CgiUtils.parse_params(context)
+					CgiUtils.parse_cookies(context)
 
-			context.close
+					context.render(path)
+					
+					res.status = context.status
+					res.instance_variable_set(:@header, context.response_headers || {})
+					res.instance_variable_set(:@cookies, context.response_cookies || {})
+					res.body = context.out
+
+					context.close
+				ensure
+					# REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
+					Og.db.put_connection if defined?(Og) and Og.db
+				end
+			end
 		end
-	ensure
-		# REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
-		Og.db.put_connection if defined?(Og) and Og.db
 	end
 
 	alias do_GET handle 
 	alias do_POST handle
 
+	# Try to rewrite the path to a filename.
+
+	def rewrite(req)
+		if req.path == '/'
+			req.instance_variable_set(:@path_info, '/index.html') 
+		elsif req.path =~ /^([^.]+)$/
+			req.instance_variable_set(:@path_info, "#{$1}.html") 
+		end
+	end
+
+	# Rewrite back to the original path.
+
+	def unrewrite(req)
+		if req.path == '/'
+			req.instance_variable_set(:@path_info, '/') 
+		elsif req.path =~ /^([^.]+).html$/
+			req.instance_variable_set(:@path_info, $1) 
+		end
+	end
 end
 
 end

data/lib/nitro/caching.rb

@@ -0,0 +1,29 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: caching.rb 326 2005-03-28 11:07:17Z gmosx $
+
+require 'fileutils'
+
+require 'glue/attribute'
+
+require 'nitro/caching/output'
+require 'nitro/caching/actions'
+require 'nitro/caching/fragments'
+
+module N
+
+# Adds support for caching.
+
+module Caching
+	
+	def self.append_features(base) #:nodoc:
+		super
+		base.send :include, Output, Actions, Fragments
+		base.class_eval do
+			cattr_accessor :caching_enabled, true
+		end
+	end
+
+end
+
+end

data/lib/nitro/caching/actions.rb

@@ -0,0 +1,67 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: actions.rb 326 2005-03-28 11:07:17Z gmosx $
+
+require 'fileutils'
+
+module N
+
+# Adds support for caching.
+
+module Caching
+
+	# Action caching.
+
+	module Actions 
+
+		def self.append_features(base) # :nodoc: 
+			super
+			base.extend(ClassMethods)
+		end
+
+		module ClassMethods
+
+			def cache_action(*actions)
+				return unless caching_enabled
+				
+				before_filter(
+					%{
+						fragment_name = "\#\{@action_name\}\#{@request.query_string}"
+						if fragment = Fragment.get(fragment_name)
+							@out = fragment
+							return
+						end
+					},
+					:only => actions
+				)
+				
+				after_filter(
+					%{ 
+						fragment_name = "\#\{@action_name\}\#{@request.query_string}"
+						Fragment.put(fragment_name, @out) 
+					},
+					:only => actions
+				)
+			end
+			
+		end
+
+		private 
+
+		#--
+		# FIXME: not implemented.
+		#++
+		
+		def expire_action(*actions)
+			return unless caching_enabled
+
+			for action in [actions].flatten
+				expire_fragment(action)
+			end
+		end
+
+	end
+
+end
+
+end

data/lib/nitro/caching/fragments.rb

@@ -0,0 +1,72 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: fragments.rb 326 2005-03-28 11:07:17Z gmosx $
+
+require 'fileutils'
+
+require 'glue/attribute'
+require 'nitro/caching/stores'
+
+module N
+
+# Adds support for caching.
+
+module Caching
+
+	# Action caching.
+
+	module Fragments
+
+		@@store = FileStore.new # MemoryStore.new
+
+		def self.store 
+			@@store 
+		end
+		
+		def self.store=(store) 
+			@@store = store
+		end
+		
+		def self.get(name, options = {})
+			return @@store.read(name, options)
+		end
+		
+		def self.put(name, content = nil, options = {})
+			@@store.write(name, content, options)
+			return content
+		end
+		
+		def self.append_features(base) # :nodoc: 
+			super
+		end
+
+		private
+
+		def cache(name = nil, options = {}, &block)
+			name = @action_name unless name	
+			cache_fragment(block, "#{name}#{options}", options)
+		end
+
+		def cache_fragment(block, name, options = {})
+			unless caching_enabled
+				block.call
+				return
+			end
+
+			if fragment = Fragments.get(name, options)
+				@out << fragment
+			else
+				pos = @out.length				
+				block.call
+				Fragments.put(name, @out[pos..-1], options)
+			end
+		end
+
+		def expire_fragment(name, options = {})
+			Fragments.store.delete(name, options)
+		end
+	end
+	
+end
+
+end

data/lib/nitro/caching/invalidation.rb

@@ -0,0 +1,51 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: invalidation.rb 327 2005-03-28 11:09:58Z gmosx $
+
+module N
+
+module Caching
+
+	# Support for invalidating output/fragment caches.
+	
+	module Invalidation
+
+  	def self.append_features(base) #:nodoc:
+			super
+			base.extend(ClassMethods)
+		end
+
+		module ClassMethods
+		end
+
+	end
+
+end
+
+end
+
+
+__END__
+
+class MyController < Controller
+
+	cache_output :list
+
+	cache_monitor :on => [ :add, :delete ]
+	
+	def list
+	end
+
+	def add
+	end
+
+	def delete
+	end
+
+end
+
+class Invalidator
+	def filter(controller)
+
+	end
+end

data/lib/nitro/caching/output.rb

@@ -0,0 +1,72 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: output.rb 322 2005-03-21 18:15:52Z gmosx $
+
+require 'fileutils'
+
+module N
+
+# Adds support for caching.
+
+module Caching
+
+	# Output caching.
+
+	module Output
+
+		def self.append_features(base) # :nodoc: 
+			super
+			base.extend(ClassMethods)
+			base.module_eval do
+				cattr_accessor :output_cache_root, 'public'
+			end
+		end
+
+		module ClassMethods
+
+			def do_cache_output(path, content)
+				filepath = output_cache_path(path)
+				FileUtils.makedirs(File.dirname(filepath))
+				File.open(filepath, 'w+') { |f| f.write(content) }
+				Logger.debug "Cached page: #{filepath}" if $DBG
+			end
+
+			# Enable output caching for the given actions.
+
+			def cache_output(*actions)
+				return unless caching_enabled
+
+				str = actions.collect { |a| ":#{a}" }.join(', ')
+
+				module_eval %{
+					after_filter "do_cache_output", :only => [ #{str} ]
+				}
+			end
+
+			private
+
+			def output_cache_path(path)
+      	filename = ((path.empty? || path == '/') ? '/index' : path)
+				filename << '.html' unless (name.split('/').last || name).include? '.'
+				return output_cache_root + filename 										
+			end
+			
+		end
+
+		private
+
+		def do_cache_output
+			if caching_enabled and caching_allowed?
+				self.class.do_cache_output(@request.path, @out)
+			end
+		end
+
+		def caching_allowed?
+			!@request.post?
+		end
+
+	end
+
+end
+
+end