uwa 0.4 → 0.5

data/lib/uwa/config.rb

@@ -1,6 +1,6 @@
 module UWA
 	NAME = 'UWA'
-	VERSION = '0.4'
+	VERSION = '0.5'
 	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

@@ -30,85 +30,20 @@ class Handler < Mongrel::HttpHandler
 	def process(req,res)
 		@request = req
 		@response = res
-		UWA::Server.log(@request.params['REQUEST_METHOD'], @request.params['REQUEST_URI'])
-		@query = query_string(req.params['QUERY_STRING'])
-		UWA::Server.log(:QUERY, @query.inspect)
-
-		method = @request.params['PATH_INFO'].split('/')[1]
-		
-		if method.nil?
-			@response.start(200) do |head, out|
-				head["Content-Type"] = "text/html"
-				xml = Builder::XmlMarkup.new(:indent => 4, :target => out)
-				xml.instruct!
-				xml.declare! :DOCTYPE, :html, :PUBLIC, 
-					'-//W3C//DTD XHTML 1.0 Strict//EN',
-					'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
-				xml.html(:xmlns => 'http://www.w3.org/1999/xhtml', 
-						'xmlns:widget' => 'http://www.netvibes.com/ns/') do |xml|
-					xml.head do |xml|
-						xml.meta(:name => 'author', :content => @author)
-						xml.meta(:name => 'description', :content => @description)
-						xml.meta(:name => 'apiVersion', :content => @apiVersion)
-						xml.meta(:name => 'inline', :content => @inline.to_s)
-						xml.meta(:name => 'debugMode', :content => @debugMode.to_s)
-						xml.meta(:name => 'keywords', :content => @keywords)
-						xml.meta(:name => 'autoRefresh', :content => @autoRefresh) unless @autoRefresh.nil?
-						xml.link(:rel => :stylesheet, :type => 'text/css',
-								 :href => 'http://www.netvibes.com/themes/uwa/style.css')
-						xml.script("", :type => 'text/javascript',
-								   :src => 'http://www.netvibes.com/js/UWA/load.js.php?env=Standalone')
-						xml.tag!('widget:preferences') do |xml|
-							@preferences.each do |pref|
-								xml.preference(pref)
-							end
-						end
-						xml.title(@title)
-						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://' + req.params['HTTP_HOST'] + req.params['SCRIPT_NAME']
-							xml << "widget.remoteUrl = '#{url}/'\n"
-							['Text', 'Json', 'Xml', 'Feed'].each do |m|
-								xml << "widget.remote#{m} = function(uri, cb) { 
-											UWA.Data.get#{m}(widget.remoteUrl + uri, cb); };\n"
-							end
-							script.each do |s| 
-								xml << "\n#{s}\n"
-							end
-							xml << "if (document.location && (document.location.hostname == 'localhost'
-											|| document.location.href.match('^#{url}'))) {
-										UWA.proxies.ajax = '/proxy';
-										UWA.Data.useJsonRequest = false;
-									}\n"
-						end
-					end
-					xml.body do |xml|
-						body xml
-					end
-				end
-				xml.target!
-			end
-		else
-			if method == 'ressource'
-				file = @request.params['PATH_INFO'].gsub(/\.\./, '').split('/')[2..-1].join($/)
-				file = File.join(@base, 'ressources', file)
-				send_file(file)
-			elsif self.respond_to?(method.to_sym)
-				begin
-					@response.header["Content-Type"] = "text/html"
-					@response.status = 200
-					self.send(method.to_sym)
-					@response.finished
-				rescue Exception
-					UWA::Server.log(:error, "#{$!.message} <#{$!.class.name}>")
-					UWA::Server.log(:error, $!.backtrace)
-				end
+		@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)
+			parse_query
+			UWA::Server.log(:query, @query.inspect)
+			if method.nil?
+				index
 			else
-				@response.start(404) do |head, out|
-					out.write("Method #{method.inspect} not found")
-				end
+				ajax(method.to_sym)
 			end
+		ensure
+			@tempfiles.each { |f| f.unlink }
 		end
 	end
 
@@ -118,7 +53,7 @@ class Handler < Mongrel::HttpHandler
 		@response.body.write(buf)
 	end
 
-	def send_file(file, content_type = nil)
+	def send_file(file, content_type = 'application/octet-stream')
 		if File.exists?(file)
 			file_status = File.stat(file)
 			@response.status = 200
@@ -126,6 +61,7 @@ class Handler < Mongrel::HttpHandler
 			@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)
@@ -154,12 +90,165 @@ class Handler < Mongrel::HttpHandler
 		xml << 'Loading...'
 	end
 
-	def query_string(req)
-		query = {}
-		CGI::parse(req.to_s).each do |k,v| 
-			query[k] = v.first if v.size <= 1
+	private
+
+	MULTIPART_REGEXP = /\Amultipart\/form-data.*boundary=\"?([^\";,]+)/n.freeze
+	NAME_REGEX = /Content-Disposition:.* name="?([^\";]*)"?/ni.freeze
+	CONTENT_TYPE_REGEX = /Content-Type: (.*)\r\n/ni.freeze
+	FILENAME_REGEX = /Content-Disposition:.* filename="?([^\";]*)"?/ni.freeze
+	CRLF = "\r\n".freeze
+	EOL = CRLF
+
+	# 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
+			boundary = "--#{$1}"
+			buf = ""
+			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)
+			raise EOFError, "bad content body"  unless status == boundary + EOL
+			rx = /(?:#{EOL})?#{Regexp.quote(boundary)}(#{EOL}|--)/
+
+			loop do
+				head = nil
+				body = ''
+				filename = content_type = name = nil
+
+				until head && buf =~ rx
+					if !head && i = buf.index("\r\n\r\n")
+						head = buf.slice!(0, i+2) # First \r\n
+						buf.slice!(0, 2)          # Second \r\n
+
+						filename = head[FILENAME_REGEX, 1]
+						content_type = head[CONTENT_TYPE_REGEX, 1]
+						name = head[NAME_REGEX, 1]
+
+						if filename      
+							body = Tempfile.new(:uwa)
+							body.binmode if defined? body.binmode
+						end
+						next
+					end
+
+					# Save the read body part.
+					if head && (boundary_size+4 < buf.size)
+						body << buf.slice!(0, buf.size - (boundary_size+4))
+					end
+
+					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
+				end
+
+				# Save the rest.
+				if i = buf.index(rx)
+					body << buf.slice!(0, i)
+					buf.slice!(0, boundary_size+2)
+
+					content_length = -1  if $1 == "--"
+				end
+
+				if filename
+					body.rewind
+					data = {'filename' => filename, 'type' => content_type, 'tempfile' => body}
+					@tempfiles << body
+				else
+					data = body
+				end
+				if @query[name].nil?
+					@query[name] = data
+				else
+					if not @query[name].is_a? Array
+						@query[name] = [@query[name]]
+					end
+					@query[name] << data
+				end
+				break if buf.empty? || content_length == -1
+			end
+		end
+	end
+
+	def index
+		@response.start(200) do |head, out|
+			head["Content-Type"] = "text/html"
+			xml = Builder::XmlMarkup.new(:indent => 4, :target => out)
+			xml.instruct!
+			xml.declare! :DOCTYPE, :html, :PUBLIC, 
+					'-//W3C//DTD XHTML 1.0 Strict//EN',
+					'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
+					xml.html(:xmlns => 'http://www.w3.org/1999/xhtml', 
+						'xmlns:widget' => 'http://www.netvibes.com/ns/') do |xml|
+				xml.head do |xml|
+					xml.meta(:name => 'author', :content => @author)
+					xml.meta(:name => 'description', :content => @description)
+					xml.meta(:name => 'apiVersion', :content => @apiVersion)
+					xml.meta(:name => 'inline', :content => @inline.to_s)
+					xml.meta(:name => 'debugMode', :content => @debugMode.to_s)
+					xml.meta(:name => 'keywords', :content => @keywords)
+					xml.meta(:name => 'autoRefresh', :content => @autoRefresh) unless @autoRefresh.nil?
+					xml.link(:rel => :stylesheet, :type => 'text/css',
+							 :href => 'http://www.netvibes.com/themes/uwa/style.css')
+					xml.script("", :type => 'text/javascript',
+							   :src => 'http://www.netvibes.com/js/UWA/load.js.php?env=Standalone')
+					xml.tag!('widget:preferences') do |xml|
+						@preferences.each do |pref|
+							xml.preference(pref)
+						end
+					end
+					xml.title(@title)
+					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']
+						xml << "widget.remoteUrl = '#{url}/'\n"
+						['Text', 'Json', 'Xml', 'Feed'].each do |m|
+							xml << "widget.remote#{m} = function(uri, cb) { 
+											UWA.Data.get#{m}(widget.remoteUrl + uri, cb); };\n"
+						end
+						script.each do |s| 
+							xml << "\n#{s}\n"
+						end
+						xml << "if (document.location && (document.location.hostname == 'localhost'
+											|| document.location.href.match('^#{url}'))) {
+										UWA.proxies.ajax = '/proxy';
+										UWA.Data.useJsonRequest = false;
+									}\n"
+					end
+				end
+				xml.body do |xml|
+					body xml
+				end
+						end
+			xml.target!
+		end
+	end
+
+	def ajax(method)
+		if method == :resource
+			file = @request.params['PATH_INFO'].gsub(/\.\./, '').split('/')[2..-1].join($/)
+			file = File.join(@base, 'resources', file)
+			send_file(file)
+		elsif self.respond_to?(method)
+			begin
+				@response.header["Content-Type"] = "text/html"
+				@response.status = 200
+				self.send(method)
+				@response.finished
+			rescue Exception
+				UWA::Server.log(:error, "#{$!.message} <#{$!.class.name}>")
+				UWA::Server.log(:error, $!.backtrace)
+			end
+		else
+			@response.start(404) do |head, out|
+				out.write("Method #{method.inspect} not found")
+			end
 		end
-		query
 	end
+
 end
 end

data/lib/uwa/plugin.rb

@@ -15,6 +15,8 @@ class Plugin
 	end
 
 	def load
+		return @list unless @list.empty?
+
 		sdir = File.join(Gem.dir, "specifications")
 		gems = Gem::SourceIndex.from_installed_gems(sdir)
 		needs = {"uwa" => false}
@@ -31,12 +33,13 @@ class Plugin
 				file = File.join(gem_dir, "lib", gem.name, "widget.rb")
 				before = UWA::Widget.constants rescue []
 				require file
+				UWA::Server.log(:info, "Load plugin #{gem.name.inspect} v#{gem.version}")
 				after = UWA::Widget.constants
 				@list[gem.name] = { 
 					:base => gem_dir, 
 					:class => UWA::Widget.const_get((after - before).first.to_sym),
-					:script => Dir[File.join(gem_dir, 'ressources', '*.js')],
-					:css => Dir[File.join(gem_dir, 'ressources', '*.css')]
+					:script => Dir[File.join(gem_dir, 'resources', '*.js')],
+					:css => Dir[File.join(gem_dir, 'resources', '*.css')]
 				}
 			end
 		end

data/lib/uwa/server.rb

@@ -16,38 +16,50 @@ class Server
 		@debug = true
 		@reload = true
 		@widgets = []
-		@plugins = UWA::Plugin.load
+		@mongrel = nil
+		@plugins = []
 	end
 
 	def <<(config)
+		@plugins = UWA::Plugin.load if @plugins.empty?
+
 		begin
 			@widgets << @plugins[config[:name]].merge(config)
 		rescue
-			log(:warning, "Unable to register #{config[:name].inspect} at #{config[:path].inspect}")
+			log(:warning, "Unable to configure #{config[:name].inspect} at #{config[:path].inspect}")
 		else
-			log(:info, "Register #{config[:name].inspect} at #{config[:path].inspect}")
+			log(:info, "Configure #{config[:name].inspect} at #{config[:path].inspect}")
 		end
 	end
 
 	def run
-		m = nil
 		begin
 			$mongrel_debug_client = @debug
-			m = Mongrel::HttpServer.new(@host, @port) if m.nil?
+			@mongrel = Mongrel::HttpServer.new(@host, @port) if @mongrel.nil?
 			@widgets.each do |widget|
-				object = widget[:class].new
-				object.base = widget[:base]
-				object.script = widget[:script]
-				object.css = widget[:css]
-				widget[:params].to_a.each do |name, value|
-					object.instance_variable_set(('@' + name.to_s).to_sym, value)
+				unless @mongrel.classifier.uris.include?(widget[:path])
+					object = widget[:class].new
+					object.base = widget[:base]
+					object.script = widget[:script]
+					object.css = widget[:css]
+					widget[:params].to_a.each do |name, value|
+						object.instance_variable_set(('@' + name.to_s).to_sym, value)
+					end
+					@mongrel.register(widget[:path], object)
+					log(:info, "Register #{widget[:name].inspect} at #{widget[:path].inspect}")
 				end
-				m.register(widget[:path], object)
 			end
-			m.register('/proxy', UWA::Proxy.new)
-			m.run.join
-		rescue
-			m.graceful_shutdown unless m.nil?
+			unless @mongrel.classifier.uris.include?('/proxy')
+				@mongrel.register('/proxy', UWA::Proxy.new)
+				log(:info, "Proxy at \"/proxy\"")
+			end
+			log(:info, "Ready to serve")
+			@mongrel.run.join
+		rescue Interrupt
+			# Do nothing
+			log(:info, "Shutdown")
+		rescue Exception
+			@mongrel.graceful_shutdown unless @mongrel.nil?
 			log :error , $!.message
 			log :error, $!.backtrace
 			log :error, "Retrying in 5 seconds..."

metadata

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