uwa 0.2 → 0.3

data/bin/uwa

@@ -1,58 +1,24 @@
 #!/usr/bin/ruby
 require 'rubygems'
 require 'uwa'
-require 'getoptlong'
 
-CONFIG = {
-	:host => '0.0.0.0',
-	:port => '42080',
-	:dynamic => false,
-	:debug => false,
+SCRIPT =<<EOF
+#!/usr/bin/ruby
+require 'rubygems'
+require 'uwa'
+
+UWA::Server << {
+	:name => 'uwa_hello',
+	:path => '/hello'
 }
 
-OPTIONS = [
-	[ '--help', '-h', GetoptLong::NO_ARGUMENT, 'Display this help' ],
-	[ '--host', '-b', GetoptLong::REQUIRED_ARGUMENT, 'Set host/ip' ],
-	[ '--port', '-p', GetoptLong::REQUIRED_ARGUMENT, 'Set port' ],
-	[ '--dynamic', '-r', GetoptLong::NO_ARGUMENT, 'Enable dynamic mode (auto reload ressources only)' ],
-	[ '--debug', '-d', GetoptLong::NO_ARGUMENT, 'Enable debug mode' ],
-]
+UWA::Server.run
+EOF
 
-opts = GetoptLong.new(*OPTIONS.collect{|o| o[0..-2]})
-opts.each do |opt, arg|
-	case opt
-	when '--help'
-		puts "Usage #{File.basename(__FILE__)} [OPTION]"
-		OPTIONS.each do |opt|
-			default = CONFIG[opt.first[2..-1].to_sym]
-			default = default.nil? ? '' : "(default = #{default})"
-			puts "%2s, %-15s: %s %s" % [opt[1], opt[0], opt[3], default]
-		end
-		exit
-	when '--host'
-		CONFIG[:host] = arg
-	when '--port'
-		CONFIG[:port] = arg
-	when '--dynamic'
-		CONFIG[:dynamic] = true
-	when '--debug'
-		CONFIG[:debug] = true
-		$mongrel_debug_client = true
-	end
+name = ARGV.first || 'myuwa'
+File.open(name, 'w') do |fd|
+	fd.puts SCRIPT
 end
 
-begin
-	m = Mongrel::HttpServer.new(CONFIG[:host], CONFIG[:port])
-	UWA::Plugin.load.each do |name, config|
-		widget = config[:class].new
-		widget.script = config[:script]
-		widget.css = config[:css]
-		m.register('/' + name, widget)
-	end
-	m.register('/proxy', UWA::Proxy.new)
-	m.run.join
-rescue
-	STDERR.puts "Error: #{$!.message}"
-	STDERR.puts "Retrying..."
-	retry
-end
+puts "Your UWA server is ready\nJust edit and launch the file #{name.inspect}"
+

data/lib/uwa.rb

@@ -3,3 +3,4 @@ require 'builder'
 require 'uwa/proxy'
 require 'uwa/handler'
 require 'uwa/plugin'
+require 'uwa/server'

data/lib/uwa/config.rb

@@ -1,8 +1,10 @@
 module UWA
 	NAME = 'UWA'
-	VERSION = '0.2'
+	VERSION = '0.3'
 	DESC = 'Widget server for UWA specs by Netvibes (http://dev.netvibes.com/doc/universal_widget_api)'
 	AUTHOR = 'Florent Solt'
 	EMAIL = 'florent@solt.biz'
 	HOMEPAGE = 'http://gnetvibes.rubyforge.org'
+	LICENSE = 'BSD'
+	COPYRIGHT = 'Copyright (C) 2007 Florent Solt'
 end

data/lib/uwa/handler.rb

@@ -18,29 +18,29 @@ class Handler < Mongrel::HttpHandler
 		@css = []
 		@script = []
 		@cache = {:css => nil, :script => nil}
-	end
 
-	def log(title, msg)
-		return if not CONFIG[:debug]
-		if msg.is_a? Array
-			msg.each { |l| STDERR.puts "       " + l }
-		else
-			STDERR.puts "#{Time.now}: #{title.to_s.upcase}: #{msg}"
-		end
-		STDERR.flush
+		@query = nil
+		@out = nil
+		@response = nil
+		@request = nil
 	end
 
 	def process(req,res)
-		log(req.params['REQUEST_METHOD'], req.params['REQUEST_URI'])
-		query = query_string(req.params['QUERY_STRING'])
-		log(:QUERY, query.inspect)
-		if req.params['REQUEST_PATH'].split('/', 3)[2].nil? and query['url'].nil?
-			res.start(200) do |head, out|
+		@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)
+		if @request.params['REQUEST_PATH'].split('/', 3)[2].nil? and @query['url'].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.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)
@@ -48,8 +48,10 @@ 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.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.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)
@@ -62,12 +64,15 @@ class Handler < Mongrel::HttpHandler
 							url = 'http://' + req.params['HTTP_HOST'] + req.params['REQUEST_PATH'] + '/'
 							xml << "widget.remoteUrl = '#{url}'\n"
 							['Text', 'Json', 'Xml', 'Feed'].each do |m|
-								xml << "widget.remote#{m} = function(uri, cb) { UWA.Data.get#{m}('#{url}' + uri, cb); };\n"
+								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') { UWA.proxies.ajax = '/proxy'; }\n"
+							xml << "if (document.location && document.location.hostname == 'localhost') {
+										UWA.proxies.ajax = '/proxy';
+										UWA.Data.useJsonRequest = false; }\n"
 						end
 					end
 					xml.body do |xml|
@@ -77,14 +82,16 @@ class Handler < Mongrel::HttpHandler
 				xml.target!
 			end
 		else
-			method = req.params['REQUEST_PATH'].split('/', 3)[2].to_sym
+			method = @request.params['REQUEST_PATH'].split('/', 3)[2].to_sym
 			if self.respond_to?(method)
 				res.start(200) do |head, out|
 					begin
-						self.send(method, query, head, out)
+						@headers = head
+						@out = out
+						self.send(method)
 					rescue Exception
-						log(:error, "#{$!.message} <#{$!.class.name}>")
-						log(:error, $!.backtrace)
+						UWA::Server.log(:error, "#{$!.message} <#{$!.class.name}>")
+						UWA::Server.log(:error, $!.backtrace)
 					end
 				end
 			else
@@ -95,15 +102,21 @@ class Handler < Mongrel::HttpHandler
 		end
 	end
 
+	protected
+
+	def <<(buf)
+		@out.write(buf)
+	end
+
 	def script
-		if @cache[:script].to_a.empty? or CONFIG[:dynamic]
+		if @cache[:script].to_a.empty? or UWA::Server.reload
 			@cache[:script] = @script.collect { |s| File.read(s) }
 		end
 		@cache[:script].to_a
 	end
 
 	def css
-		if @cache[:css].to_a.empty? or CONFIG[:dynamic]
+		if @cache[:css].to_a.empty? or UWA::Server.reload
 			@cache[:css] = @css.collect { |s| File.read(s) }
 		end
 		@cache[:css].to_a

data/lib/uwa/proxy.rb

@@ -6,22 +6,28 @@ module UWA
 class Proxy < Mongrel::HttpHandler
 
 	def process(req,res)
-		query = CGI::parse(req.params['QUERY_STRING'])
-		url = URI.parse(query['url'].to_a.first)
-		if req.params['REMOTE_ADDR'] == '127.0.0.1'
-			res.start(200) do |head, out|
-				head["Content-Type"] = "text/html"
+		query = CGI::parse(req.params['QUERY_STRING'].to_s)
+		url = query['url'].to_a.first
+		if url.nil?
+			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'
+				res.start(200) do |head, out|
+				head["Content-Type"] = "text/xml"
 				unless url.nil?
-					STDERR.puts "#{Time.now}: PROXY: #{url}" if CONFIG[:debug]
+					UWA::Server.log :proxy, url
 					res = Net::HTTP.start(url.host, url.port) do |http|
-						http.get(url.path)
+						http.get(url.request_uri)
 					end
 					out.write(res.body)
 				end
+				end
+			else
+				UWA::Server.log :denied, "#{url} from #{req.params['REMOTE_ADDR']}"
 			end
-		else
-			STDERR.puts "#{Time.now}: DENIED: #{url} from #{req.params['REMOTE_ADDR']}" if CONFIG[:debug]
 		end
 	end
+
 end
 end

data/lib/uwa/server.rb

@@ -0,0 +1,68 @@
+require 'singleton'
+
+module UWA
+class Server
+	include Singleton
+
+	def self.method_missing(name, *args)
+		self.instance.send(name, *args)
+	end
+
+	attr_accessor :host, :port, :debug, :reload, :plugins
+
+	def initialize
+		@host = '0.0.0.0'
+		@port = 42080
+		@debug = true
+		@reload = true
+		@widgets = []
+		@plugins = UWA::Plugin.load
+	end
+
+	def <<(config)
+		begin
+			@widgets << @plugins[config[:name]].merge(config)
+		rescue
+			log(:warning, "Unable to register #{config[:name].inspect} at #{config[:path].inspect}")
+		else
+			log(:info, "Register #{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?
+			m.register('/', UWA::Proxy.new)
+			@widgets.each do |widget|
+				object = widget[:class].new
+				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
+				m.register(widget[:path], object)
+			end
+			m.run.join
+		rescue
+			m.graceful_shutdown unless m.nil?
+			log :error , $!.message
+			log :error, $!.backtrace
+			log :error, "Retrying in 5 seconds..."
+			sleep(5)
+			retry
+		end
+	end
+
+	def log(level, msg)
+		return unless @debug
+		if msg.is_a? Array
+			msg.each { |l| STDERR.puts "       " + l }
+		else
+			STDERR.puts "#{Time.now}: #{level.to_s.upcase}: #{msg}"
+		end
+		STDERR.flush
+	end
+end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: uwa
 version: !ruby/object:Gem::Version 
-  version: "0.2"
-date: 2007-03-28 00:00:00 +02:00
+  version: "0.3"
+date: 2007-03-29 00:00:00 +02:00
 summary: Widget server for UWA specs by Netvibes (http://dev.netvibes.com/doc/universal_widget_api)
 require_paths: 
 - lib
@@ -29,6 +29,7 @@ post_install_message:
 authors: 
 - Florent Solt
 files: 
+- lib/uwa/server.rb
 - lib/uwa/handler.rb
 - lib/uwa/config.rb
 - lib/uwa/plugin.rb