uwa 0.1 → 0.2

data/bin/uwa

@@ -8,15 +8,13 @@ CONFIG = {
 	:port => '42080',
 	:dynamic => false,
 	:debug => false,
-	:path => '.'
 }
 
 OPTIONS = [
 	[ '--help', '-h', GetoptLong::NO_ARGUMENT, 'Display this help' ],
 	[ '--host', '-b', GetoptLong::REQUIRED_ARGUMENT, 'Set host/ip' ],
 	[ '--port', '-p', GetoptLong::REQUIRED_ARGUMENT, 'Set port' ],
-	[ '--path', '-i', GetoptLong::REQUIRED_ARGUMENT, 'Set path to scan for widget' ],
-	[ '--dynamic', '-r', GetoptLong::NO_ARGUMENT, 'Enable dynamic mode (auto reload)' ],
+	[ '--dynamic', '-r', GetoptLong::NO_ARGUMENT, 'Enable dynamic mode (auto reload ressources only)' ],
 	[ '--debug', '-d', GetoptLong::NO_ARGUMENT, 'Enable debug mode' ],
 ]
 
@@ -35,29 +33,26 @@ opts.each do |opt, arg|
 		CONFIG[:host] = arg
 	when '--port'
 		CONFIG[:port] = arg
-	when '--path'
-		CONFIG[:path] = arg
 	when '--dynamic'
 		CONFIG[:dynamic] = true
 	when '--debug'
 		CONFIG[:debug] = true
+		$mongrel_debug_client = true
 	end
 end
 
 begin
 	m = Mongrel::HttpServer.new(CONFIG[:host], CONFIG[:port])
-	Dir[File.join(CONFIG[:path], '*')].each do |d|
-		if File.directory?(d)
-			name = File.basename(d)
-			require File.join(d, 'widget.rb')
-			klass = self.class.const_get(name.capitalize + 'Widget')
-			widget = klass.new
-			widget.script = File.join(d, 'script.js')
-			widget.css = File.join(d, 'style.css')
-			m.register('/' + name.downcase, widget)
-		end
+	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
-	puts "Error: #{$!.message}"
+	STDERR.puts "Error: #{$!.message}"
+	STDERR.puts "Retrying..."
+	retry
 end

data/lib/uwa/config.rb

@@ -1,7 +1,7 @@
 module UWA
 	NAME = 'UWA'
-	VERSION = '0.1'
-	DESC = 'Widget server that implements UWA specs (http://dev.netvibes.com/doc/universal_widget_api)'
+	VERSION = '0.2'
+	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'

data/lib/uwa/handler.rb

@@ -0,0 +1,124 @@
+require 'rubygems'
+
+module UWA
+class Handler < Mongrel::HttpHandler
+	attr_accessor :css, :script
+
+	def initialize
+		super
+		@author = 'No author'
+		@description = 'No description'
+		@title = 'Widget'
+		@icon = 'http://www.netvibes.com/favicon.ico'
+		@apiVersion = '1.0'
+		@inline = true
+		@debugMode = false
+		@preferences = []
+		@keywords = self.class.name.downcase
+		@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
+	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|
+				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.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['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"
+							end
+							script.each do |s| 
+								xml << "\n#{s}\n"
+							end
+							xml << "if (document.location && document.location.hostname == 'localhost') { UWA.proxies.ajax = '/proxy'; }\n"
+						end
+					end
+					xml.body do |xml|
+						body xml
+					end
+				end
+				xml.target!
+			end
+		else
+			method = req.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)
+					rescue Exception
+						log(:error, "#{$!.message} <#{$!.class.name}>")
+						log(:error, $!.backtrace)
+					end
+				end
+			else
+				res.start(404) do |head, out|
+					out.write("Method \"#{method}\" not found")
+				end
+			end
+		end
+	end
+
+	def script
+		if @cache[:script].to_a.empty? or CONFIG[:dynamic]
+			@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]
+			@cache[:css] = @css.collect { |s| File.read(s) }
+		end
+		@cache[:css].to_a
+	end
+
+	def body(xml)
+		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
+		end
+		query
+	end
+end
+end

data/lib/uwa/plugin.rb

@@ -0,0 +1,46 @@
+require 'singleton'
+
+# Plugin Manager inspired by GemPlugin
+module UWA
+class Plugin
+	include Singleton
+	def self.method_missing(name, *args)
+		self.instance.send(name, *args)
+	end
+
+	attr_reader :list
+
+	def initialize
+		@list = {}
+	end
+
+	def load
+		sdir = File.join(Gem.dir, "specifications")
+		gems = Gem::SourceIndex.from_installed_gems(sdir)
+		needs = {"uwa" => false}
+		gems.each do |path, gem|
+			next if @list.has_key? gem.name
+			check = needs.dup
+			gem.dependencies.each do |dep|
+				if check.has_key? dep.name
+					check[dep.name] = !check[dep.name]
+				end
+			end
+			if (check.select {|name,test| !test}).length == 0
+				gem_dir = File.join(Gem.dir, "gems", path)
+				file = File.join(gem_dir, "lib", gem.name, "widget.rb")
+				before = UWA::Widget.constants rescue []
+				require file
+				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')]
+				}
+			end
+		end
+		@list
+	end
+end
+end

data/lib/uwa/proxy.rb

@@ -0,0 +1,27 @@
+require 'net/http'
+require 'uri'
+
+# http://dev.netvibes.com/doc/uwa_faq
+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"
+				unless url.nil?
+					STDERR.puts "#{Time.now}: PROXY: #{url}" if CONFIG[:debug]
+					res = Net::HTTP.start(url.host, url.port) do |http|
+						http.get(url.path)
+					end
+					out.write(res.body)
+				end
+			end
+		else
+			STDERR.puts "#{Time.now}: DENIED: #{url} from #{req.params['REMOTE_ADDR']}" if CONFIG[:debug]
+		end
+	end
+end
+end

data/lib/uwa.rb

@@ -1,3 +1,5 @@
 require 'mongrel'
 require 'builder'
-require 'uwa/widget'
+require 'uwa/proxy'
+require 'uwa/handler'
+require 'uwa/plugin'

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: uwa
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2007-03-25 00:00:00 +01:00
-summary: Widget server that implements UWA specs (http://dev.netvibes.com/doc/universal_widget_api)
+  version: "0.2"
+date: 2007-03-28 00:00:00 +02:00
+summary: Widget server for UWA specs by Netvibes (http://dev.netvibes.com/doc/universal_widget_api)
 require_paths: 
 - lib
 email: florent@solt.biz
@@ -29,8 +29,10 @@ post_install_message:
 authors: 
 - Florent Solt
 files: 
+- lib/uwa/handler.rb
 - lib/uwa/config.rb
-- lib/uwa/widget.rb
+- lib/uwa/plugin.rb
+- lib/uwa/proxy.rb
 - lib/uwa.rb
 test_files: []
 

data/lib/uwa/widget.rb

@@ -1,84 +0,0 @@
-require 'rubygems'
-
-module UWA
-class Widget < Mongrel::HttpHandler
-	attr_accessor :title, :icon, :apiVersion, :inline, :debugMode,
-		:preferences, :css, :script
-
-	def initialize
-		super
-		@author = 'No author'
-		@description = 'No description'
-		@title = 'Widget'
-		@icon = 'http://www.netvibes.com/favicon.ico'
-		@apiVersion = '1.0'
-		@inline = 'true'
-		@debugMode = 'false'
-		@preferences = []
-		@css = nil
-		@script = nil
-		@cache = {:config => nil, :css => nil, :script => nil}
-	end
-
-	def process(req,res)
-		res.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)
-					xml.meta(:name => 'debugMode', :content => @debugMode)
-					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)
-					xml.style(css, :type => 'text/css')
-					xml.script(script, :type => 'text/javascript')
-				end
-				xml.body do |xml|
-					body xml
-				end
-			end
-			xml.target!
-		end
-	end
-
-	def script
-		begin
-			if CONFIG[:dynamic]
-				File.read(@script)
-			else
-				@cache[:script] ||= File.read(@script)
-			end
-		rescue Errno::ENOENT
-			nil
-		end
-	end
-
-	def css
-		begin
-			if CONFIG[:dynamic]
-				File.read(@css)
-			else
-				@cache[:css] ||= File.read(@css)
-			end
-		rescue Errno::ENOENT
-			nil
-		end
-	end
-
-	def body(xml)
-		xml.em('Loading...')
-	end
-end
-end