uwa 0.3 → 0.4

data/lib/uwa/config.rb

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

@@ -2,7 +2,7 @@ require 'rubygems'
 
 module UWA
 class Handler < Mongrel::HttpHandler
-	attr_accessor :css, :script
+	attr_accessor :css, :script, :base
 
 	def initialize
 		super
@@ -17,7 +17,9 @@ class Handler < Mongrel::HttpHandler
 		@keywords = self.class.name.downcase
 		@css = []
 		@script = []
+		@base = nil
 		@cache = {:css => nil, :script => nil}
+		@autoRefresh = nil
 
 		@query = nil
 		@out = nil
@@ -31,7 +33,10 @@ class Handler < Mongrel::HttpHandler
 		UWA::Server.log(@request.params['REQUEST_METHOD'], @request.params['REQUEST_URI'])
 		@query = query_string(req.params['QUERY_STRING'])
 		UWA::Server.log(:QUERY, @query.inspect)
-		if @request.params['REQUEST_PATH'].split('/', 3)[2].nil? and @query['url'].nil?
+
+		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)
@@ -48,6 +53,7 @@ class Handler < Mongrel::HttpHandler
 						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',
@@ -61,8 +67,8 @@ 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://' + req.params['HTTP_HOST'] + req.params['REQUEST_PATH'] + '/'
-							xml << "widget.remoteUrl = '#{url}'\n"
+							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"
@@ -70,9 +76,11 @@ class Handler < Mongrel::HttpHandler
 							script.each do |s| 
 								xml << "\n#{s}\n"
 							end
-							xml << "if (document.location && document.location.hostname == 'localhost') {
+							xml << "if (document.location && (document.location.hostname == 'localhost'
+											|| document.location.href.match('^#{url}'))) {
 										UWA.proxies.ajax = '/proxy';
-										UWA.Data.useJsonRequest = false; }\n"
+										UWA.Data.useJsonRequest = false;
+									}\n"
 						end
 					end
 					xml.body do |xml|
@@ -82,21 +90,23 @@ class Handler < Mongrel::HttpHandler
 				xml.target!
 			end
 		else
-			method = @request.params['REQUEST_PATH'].split('/', 3)[2].to_sym
-			if self.respond_to?(method)
-				res.start(200) do |head, out|
-					begin
-						@headers = head
-						@out = out
-						self.send(method)
-					rescue Exception
-						UWA::Server.log(:error, "#{$!.message} <#{$!.class.name}>")
-						UWA::Server.log(:error, $!.backtrace)
-					end
+			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
 			else
-				res.start(404) do |head, out|
-					out.write("Method \"#{method}\" not found")
+				@response.start(404) do |head, out|
+					out.write("Method #{method.inspect} not found")
 				end
 			end
 		end
@@ -105,7 +115,25 @@ class Handler < Mongrel::HttpHandler
 	protected
 
 	def <<(buf)
-		@out.write(buf)
+		@response.body.write(buf)
+	end
+
+	def send_file(file, content_type = nil)
+		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.send_status(file_status.size)
+			@response.send_header
+			@response.send_file(file)
+		else
+			@response.start(404) do |head, out|
+				out.write("File #{file} not found")
+			end
+		end
 	end
 
 	def script

data/lib/uwa/proxy.rb

@@ -5,6 +5,11 @@ require 'uri'
 module UWA
 class Proxy < Mongrel::HttpHandler
 
+	@@ALLOWED_IP = [ '127.0.0.1' ]
+	def self.allow(ip)
+		@@ALLOWED_IP << ip
+	end
+
 	def process(req,res)
 		query = CGI::parse(req.params['QUERY_STRING'].to_s)
 		url = query['url'].to_a.first
@@ -12,7 +17,7 @@ class Proxy < Mongrel::HttpHandler
 			UWA::Server.log :ignore, req.params['REQUEST_URI']
 		else
 			url = URI.parse(query['url'].to_a.first.to_s.strip)
-			if req.params['REMOTE_ADDR'] == '127.0.0.1'
+			if @@ALLOWED_IP.include? req.params['REMOTE_ADDR']
 				res.start(200) do |head, out|
 				head["Content-Type"] = "text/xml"
 				unless url.nil?

data/lib/uwa/server.rb

@@ -34,9 +34,9 @@ class Server
 		begin
 			$mongrel_debug_client = @debug
 			m = Mongrel::HttpServer.new(@host, @port) if m.nil?
-			m.register('/', UWA::Proxy.new)
 			@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|
@@ -44,6 +44,7 @@ class Server
 				end
 				m.register(widget[:path], object)
 			end
+			m.register('/proxy', UWA::Proxy.new)
 			m.run.join
 		rescue
 			m.graceful_shutdown unless m.nil?

metadata

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