uwa 0.6 → 0.7

data/lib/uwa/config.rb

@@ -1,6 +1,6 @@
 module UWA
 	NAME = 'UWA'
-	VERSION = '0.6'
+	VERSION = '0.7'
 	DESC = 'Widget server for UWA specs by Netvibes (http://dev.netvibes.com/doc/universal_widget_api)'
 	AUTHOR = 'Florent Solt'
 	EMAIL = 'florent@solt.biz'

data/lib/uwa/handler.rb

@@ -20,53 +20,49 @@ class Handler < Mongrel::HttpHandler
 		@base = nil
 		@cache = {:css => nil, :script => nil}
 		@autoRefresh = nil
-
-		@query = nil
-		@out = nil
-		@response = nil
-		@request = nil
 	end
 
 	def process(req,res)
-		@request = req
-		@response = res
-		@tempfiles = []
 		begin
-			UWA::Server.log(@request.params['REQUEST_METHOD'], @request.params['REQUEST_URI'])
-			method = @request.params['PATH_INFO'].split('/')[1]
-			UWA::Server.log(:method, method.inspect)
+			Thread.current[:uwa] = {
+				:request => req,
+				:response => res,
+				:tempfiles => [],
+			}
 			parse_query
-			UWA::Server.log(:query, @query.inspect)
+			UWA::Server.log(req.params['REQUEST_METHOD'], req.params['REQUEST_URI'])
+			method = req.params['PATH_INFO'].split('/')[1]
+			UWA::Server.log(:method, method.inspect)
+			UWA::Server.log(:query, query.inspect)
 			if method.nil?
 				index
 			else
 				ajax(method.to_sym)
 			end
 		ensure
-			@tempfiles.each { |f| f.unlink }
+			tempfiles.each { |f| f.unlink }
 		end
+		GC.start # Force garbage collect
 	end
 
 	protected
 
-	def <<(buf)
-		@response.body.write(buf)
-	end
-
-	def send_file(file, content_type = 'application/octet-stream')
+	def send_file(file, content_type)
+		content_type ||= 'application/octet-stream'
 		if File.exists?(file)
 			file_status = File.stat(file)
-			@response.status = 200
-			@response.header[Mongrel::Const::LAST_MODIFIED] = file_status.mtime.httpdate
-			@response.header[Mongrel::Const::ETAG] = Mongrel::Const::ETAG_FORMAT %
-				[file_status.mtime.to_i, file_status.size, file_status.ino]
-			@response.header[Mongrel::Const::CONTENT_TYPE] = content_type unless content_type.nil?
-			@response.header['Content-disposition'] = "attachment; filename=\"#{File.basename(file)}\""
-			@response.send_status(file_status.size)
-			@response.send_header
-			@response.send_file(file)
+			response.status = 200
+			response.header['Last-Modified'] = file_status.mtime.httpdate
+			response.header['ETag'] = '%x-%x-%x' % [file_status.mtime.to_i, file_status.size, file_status.ino]
+			response.header['Content-Type'] = content_type unless content_type.nil?
+			response.header['Content-Disposition'] = "attachment; filename=\"#{File.basename(file)}\""
+			# response.header['Cache-Control'] = 'no-cache, must-revalidate';
+			# response.header['Expires'] = 'Mon, 26 Jul 1997 05:00:00 GMT';
+			response.send_status(file_status.size)
+			response.send_header
+			response.send_file(file)
 		else
-			@response.start(404) do |head, out|
+			response.start(404) do |head, out|
 				out.write("File #{file} not found")
 			end
 		end
@@ -90,6 +86,14 @@ class Handler < Mongrel::HttpHandler
 		xml << 'Loading...'
 	end
 
+	# Helper methods
+
+	def <<(buf); Thread.current[:uwa][:response].body.write(buf); end
+	def request; Thread.current[:uwa][:request]; end
+	def response; Thread.current[:uwa][:response]; end
+	def query; Thread.current[:uwa][:query]; end
+	def tempfiles; Thread.current[:uwa][:tempfiles]; end
+
 	private
 
 	MULTIPART_REGEXP = /\Amultipart\/form-data.*boundary=\"?([^\";,]+)/n.freeze
@@ -101,15 +105,15 @@ class Handler < Mongrel::HttpHandler
 
 	# Inspired bu controller_mixin.rb from the Merb project
 	def parse_query
-		@query = Mongrel::HttpRequest.query_parse(@request.params['QUERY_STRING'])
-		if @request.params['REQUEST_METHOD'] =~ /post/i and @request.params['CONTENT_TYPE'] =~ MULTIPART_REGEXP
+		Thread.current[:uwa][:query] = Mongrel::HttpRequest.query_parse(request.params['QUERY_STRING'])
+		if request.params['REQUEST_METHOD'] =~ /post/i and request.params['CONTENT_TYPE'] =~ MULTIPART_REGEXP
 			boundary = "--#{$1}"
 			buf = ""
-			content_length = @request.params['CONTENT_LENGTH'].to_i
+			content_length = request.params['CONTENT_LENGTH'].to_i
 			boundary_size = boundary.size + EOL.size
 			bufsize = 16384
 			content_length -= boundary_size
-			status = @request.body.read(boundary_size)
+			status = request.body.read(boundary_size)
 			raise EOFError, "bad content body"  unless status == boundary + EOL
 			rx = /(?:#{EOL})?#{Regexp.quote(boundary)}(#{EOL}|--)/
 
@@ -139,7 +143,7 @@ class Handler < Mongrel::HttpHandler
 						body << buf.slice!(0, buf.size - (boundary_size+4))
 					end
 
-					c = @request.body.read(bufsize < content_length ? bufsize : content_length)
+					c = request.body.read(bufsize < content_length ? bufsize : content_length)
 					raise EOFError, "bad content body"  if c.nil? || c.empty?
 					buf << c
 					content_length -= c.size
@@ -156,17 +160,17 @@ class Handler < Mongrel::HttpHandler
 				if filename
 					body.rewind
 					data = {'filename' => filename, 'type' => content_type, 'tempfile' => body}
-					@tempfiles << body
+					tempfiles << body
 				else
 					data = body
 				end
-				if @query[name].nil?
-					@query[name] = data
+				if query[name].nil?
+					query[name] = data
 				else
-					if not @query[name].is_a? Array
-						@query[name] = [@query[name]]
+					if not query[name].is_a? Array
+						query[name] = [query[name]]
 					end
-					@query[name] << data
+					query[name] << data
 				end
 				break if buf.empty? || content_length == -1
 			end
@@ -174,7 +178,7 @@ class Handler < Mongrel::HttpHandler
 	end
 
 	def index
-		@response.start(200) do |head, out|
+		response.start(200) do |head, out|
 			head["Content-Type"] = "text/html"
 			xml = Builder::XmlMarkup.new(:indent => 4, :target => out)
 			xml.instruct!
@@ -204,7 +208,7 @@ class Handler < Mongrel::HttpHandler
 					xml.link(:rel => :icon, :type => 'image/png', :href => @icon)
 					css.each { |c| xml.style("\n" + c, :type => 'text/css') }
 					xml.script(:type => 'text/javascript') do |xml|
-						url = 'http://' + @request.params['HTTP_HOST'] + @request.params['SCRIPT_NAME']
+						url = 'http://' + request.params['HTTP_HOST'] + request.params['SCRIPT_NAME']
 						xml << "widget.remoteUrl = '#{url}/'\n"
 						['Text', 'Json', 'Xml', 'Feed'].each do |m|
 							xml << "widget.remote#{m} = function(uri, cb) { 
@@ -230,21 +234,22 @@ class Handler < Mongrel::HttpHandler
 
 	def ajax(method)
 		if method == :resource or method == :resources
-			file = @request.params['PATH_INFO'].gsub(/\.\./, '').split('/')[2..-1].join($/)
+			file = request.params['PATH_INFO'].gsub(/\.\./, '').split('/')[2..-1].join($/)
 			file = File.join(@base, 'resources', file)
-			send_file(file)
+			send_file(file, nil)
 		elsif self.respond_to?(method)
 			begin
-				@response.header["Content-Type"] = "text/html"
-				@response.status = 200
+				response.header["Content-Type"] = "text/html"
+				response.status = 200
 				self.send(method)
-				@response.finished
+				response.finished
 			rescue Exception
 				UWA::Server.log(:error, "#{$!.message} <#{$!.class.name}>")
 				UWA::Server.log(:error, $!.backtrace)
 			end
 		else
-			@response.start(404) do |head, out|
+			UWA::Server.log(:warning, "Method #{method.inspect} does not exists")
+			response.start(404) do |head, out|
 				out.write("Method #{method.inspect} not found")
 			end
 		end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: uwa
 version: !ruby/object:Gem::Version 
-  version: "0.6"
-date: 2007-04-04 00:00:00 +02:00
+  version: "0.7"
+date: 2007-04-12 00:00:00 +02:00
 summary: Widget server for UWA specs by Netvibes (http://dev.netvibes.com/doc/universal_widget_api)
 require_paths: 
 - lib