gnetvibes 0.1 → 0.2

data/bin/gnetvibes

@@ -10,6 +10,7 @@ require 'gnetvibes/config'
 require 'gnetvibes/gui'
 
 FileUtils.mkdir_p(GNetvibes::CACHE) if not File.exists?(GNetvibes::CACHE)
+FileUtils.mkdir_p(GNetvibes::DATA) if not File.exists?(GNetvibes::DATA)
 
 gui = GNetvibes::GUI.new
 gui.login_dialog.show_all

data/lib/gnetvibes/api.rb

@@ -20,12 +20,16 @@ class API
 		@active_session_id = nil
 		@data = nil
 		@key = nil
+		@email = nil
 	end
 
 	def login(email, password)
-		res = Net::HTTP.post_form(URL[:login], {'email'=> email.strip, 'password' => password.strip})
+		email.strip!
+		password.strip!
+		res = Net::HTTP.post_form(URL[:login], {'email'=> email, 'password' => password})
 		if res.body.strip == 'success'
 			@key = Digest::SHA1.new(email + password).hexdigest
+			@email = email
 			cookies = CGI::Cookie::parse(res['set-cookie'])
 			@active_user_id = cookies['activeUserID'].value
 			@active_session_id = cookies['activeSessionID'].value
@@ -36,10 +40,27 @@ class API
 		end
 	end
 
-	def refresh(force = false)
-		if not force and File.exists?(DATA) and File.mtime(DATA) > Time.now - EXPIRE
-			@data = eval(crypt(File.read(DATA), @key))
+
+	def save(id, options)
+		mod = @modules[id]
+		case mod['name']
+		when 'PostIt'
+			mod['title'] = options[:title]
+			mod['data']['text'] = options[:text]
 		else
+			raise 'Not implemented'
+		end
+		Net::HTTP.start(URL[:data].host, URL[:data].port) do |http|
+			headers = {'Cookie' => "activeUserID=#{@active_user_id}; activeSessionID=#{@active_session_id}"}
+			post = Net::HTTP::Post.new(URL[:save].path, headers)
+			post.set_form_data(module2post(mod))
+			http.request(post)
+		end
+		dump
+	end
+
+	def refresh(force = false)
+		if force or not load
 			res = Net::HTTP.start(URL[:data].host, URL[:data].port) do |http|
 				headers = {'Cookie' => "activeUserID=#{@active_user_id}; activeSessionID=#{@active_session_id}"}
 				http.request(Net::HTTP::Get.new(URL[:data].path, headers))
@@ -74,11 +95,21 @@ class API
 	end
 
 	def dump
-		File.open(DATA, 'w') do |fd|
+		File.open(File.join(DATA, @email), 'w') do |fd|
 			fd.write crypt(@data.inspect, @key)
 		end
 	end
 
+	def load
+		file = File.join(DATA, @email)
+		if File.exists?(file) and File.mtime(file) > Time.now - EXPIRE
+			@data = eval(crypt(File.read(file), @key))
+			true
+		else
+			false
+		end
+	end
+
 	def download(uri)
 		if uri =~ /^\//
 			url = URL[:base] + uri
@@ -103,7 +134,7 @@ class API
 	end
 
 	def json2ruby(s)
-		eval(s.gsub(/":/, '"=>'))
+		eval(s.gsub(/:null/, ':nil').gsub(/":/, '"=>'))
 	end
 
 	def crypt(buf, key)
@@ -113,5 +144,20 @@ class API
 		buf.zip(key).collect{|c1,c2| c1^c2}.pack("c*")
 	end
 
+	def module2post(mod)
+		post = {}
+		mod.each do |k,v|
+			if v.is_a? Hash
+				v.each do |subk, subv|
+					post["arr#{k.capitalize}[#{subk}]"] = subv
+				end
+			else
+				post[k] = v
+			end
+		end
+		post['mode'] = 'module'
+		post
+	end
+
 end
 end

data/lib/gnetvibes/callback.rb

@@ -5,19 +5,29 @@ module GNetvibes
 class GUI
 
 	def edit(obj, mod)
+		@edit_current = mod.to_i
 		mod = @api.modules[mod.to_i]
-		@title.text = mod['title']
-		@buf.text = mod['data']['text'].strip
+		@buf.text = ''
+		iter = @buf.get_iter_at_offset(0)
+		@buf.insert(iter, mod['title'] + "\n", @tag_title)
+		@buf.insert(iter, mod['data']['text'].strip + "\n", @tag_normal)
 		@txt.grab_focus
 		@edit_dialog.show_all
 		@edit_dialog.run
 	end
 
+	def update_tag(*args)
+		@buf.apply_tag(@tag_title, @buf.get_iter_at_line(0), @buf.get_iter_at_line(1))
+		@buf.apply_tag(@tag_normal, @buf.get_iter_at_line(1), @buf.get_iter_at_line(2))
+	end
+
 	def save(obj, ev)
 		if ev == Gtk::Dialog::RESPONSE_ACCEPT
-			puts "save"
+			@api.save(@edit_current, :title => @buf.text[/^[^\n]*/], :text => @buf.text[/\n.*$/m].strip)
 		end
+		@edit_current = nil
 		@edit_dialog.hide_on_delete
+		refresh
 	end
 
 	def login(obj, ev)
@@ -36,36 +46,47 @@ class GUI
 		end
 	end
 
-	def refresh
+	def refresh(*args)
 		@tray.tooltip = "#{GNetvibes::NAME} refreshing...";
+		gui_menu
+		if args.empty?
+			@api.refresh
+		elsif args.last == true
+			@api.refresh(true)
+		end
 
 		@api.tabs.each do |id, tab|
-			icon = File.join(CACHE, Digest::SHA1.new(tab['icon']).hexdigest)
-			if not File.exists?(icon)
-				File.open(icon, 'w') do |fd|
-					fd.puts @api.download(tab['icon'])
+			submenutitle = Gtk::ImageMenuItem.new(tab['title'])
+
+			if not tab['icon'].strip.empty?
+				icon = File.join(CACHE, Digest::SHA1.new(tab['icon']).hexdigest)
+				if not File.exists?(icon)
+					File.open(icon, 'w') do |fd|
+						fd.puts @api.download(tab['icon'])
+					end
 				end
+				submenutitle.image = Gtk::Image.new(icon)
 			end
 
-			submenutitle = Gtk::ImageMenuItem.new(tab['title'])
-			submenutitle.image = Gtk::Image.new(icon)
-
 			submenu = Gtk::Menu.new
 			@api.each_modules_in_tab(id) do |mod|
 				case mod['name']
 				when 'PostIt'
-					item = Gtk::ImageMenuItem.new(mod['title'])
-					item.image = Gtk::Image.new(@icon_webnote)
-					item.signal_connect("activate", mod['id'], &method(:edit))
-					submenu.append(item)
+					@menu_items << Gtk::ImageMenuItem.new(mod['title'])
+					@menu_items.last.image = Gtk::Image.new(@icon_webnote)
+					@menu_items.last.signal_connect("activate", mod['id'], &method(:edit))
+					submenu.append(@menu_items.last)
 				end
 			end
 			submenutitle.submenu = submenu
+			@menu_items << submenu
+			@menu_items << submenutitle
 			@menu.prepend(submenutitle)
 		end
 
 		@menu.show_all
 		@tray.tooltip = GNetvibes::NAME;
+		GC.start
 	end
 
 end

data/lib/gnetvibes/config.rb

@@ -1,14 +1,21 @@
 module GNetvibes
 	NAME = 'gNetvibes'
-	VERSION = '0.1'
+	VERSION = '0.2'
 	COPYRIGHT = 'Copyright (C) 2007 Florent Solt'
 	DESC = 'Netvibes integration with the Gnome Desktop'
 	AUTHOR = 'Florent Solt'
 	EMAIL = 'florent@solt.biz'
 	HOMEPAGE = 'http://rubyforge.org/projects/gnetvibes/'
 
-	CACHE = File.join(ENV['HOME'], ".#{GNetvibes::NAME.downcase}", "cache")
-	DATA = File.join(ENV['HOME'], ".#{GNetvibes::NAME.downcase}", "data")
+	if RUBY_PLATFORM =~ /win32/
+		HOME = File.join(ENV['APPDATA'], GNetvibes::NAME)
+	else
+		HOME = File.join(ENV['HOME'], ".#{GNetvibes::NAME.downcase}")
+	end
+
+	CACHE = File.join(HOME, "cache")
+	DATA = File.join(HOME, "data")
+
 	EXPIRE = 5 * 60
 end
 

data/lib/gnetvibes/gui.rb

@@ -13,6 +13,14 @@ class GUI
 		@icon = Gdk::Pixbuf.new(File.join(File.dirname(__FILE__), "ico.png"))
 		@icon_webnote = Gdk::Pixbuf.new(File.join(File.dirname(__FILE__), "webnote.gif"))
 
+		gui_login
+		gui_edit
+		gui_tray
+	end
+
+	private
+
+	def gui_login
 		# Login Dialog 
 		@login_dialog = Gtk::Dialog.new("#{GNetvibes::NAME} Authentification", nil, Gtk::Dialog::MODAL,
 										[Gtk::Stock::OK, Gtk::Dialog::RESPONSE_ACCEPT],
@@ -33,65 +41,86 @@ class GUI
 
 		table.attach_defaults(Gtk::Label.new("Password:"), 1, 2, 1, 2)
 		@password.visibility = false
-		@password.invisible_char = 0
 		table.attach_defaults(@password, 2, 3, 1, 2)
 		@login_dialog.vbox.pack_start(table)
 		@password.signal_connect("key_release_event", &method(:login))
 
 		if not ARGV.empty?
 			@login.editable = false
-			@login.text = ARGV.first
+			@login.text = ARGV.shift
+			@password.text = ARGV.shift if not ARGV.empty?
 			@password.grab_focus
 		else
 			@login.grab_focus
 		end
 
 		@login_dialog.signal_connect('response', &method(:login))
+	end
 
+	def gui_tray
 		# Status Tray Icon
 		@tray = Gtk::StatusIcon.new
 		@tray.pixbuf = @icon
 
+		@tray.signal_connect('popup-menu') do |w, button, time|
+			unless @menu.nil?
+				@menu.popup(nil, nil, button, time) do
+					@tray.position_menu(@menu)
+				end
+			end
+		end
+	end
+
+	def gui_menu
+		if @menu
+			@menu_items.to_a.each {|i| i.destroy}
+			@menu.destroy
+		end
+		@menu_items = []
 		@menu = Gtk::Menu.new
-		@menu.append(Gtk::SeparatorMenuItem.new)
+		@menu_items << Gtk::SeparatorMenuItem.new
+		@menu.append(@menu_items.last)
 
-		item = Gtk::ImageMenuItem.new(Gtk::Stock::REFRESH)
-		item.signal_connect("activate", &method(:refresh))
-		@menu.append(item)
+		@menu_items << Gtk::ImageMenuItem.new(Gtk::Stock::REFRESH)
+		@menu_items.last.signal_connect("activate", true, &method(:refresh))
+		@menu.append(@menu_items.last)
 
-		item = Gtk::ImageMenuItem.new(Gtk::Stock::QUIT)
-		item.signal_connect("activate") do
+		@menu_items << Gtk::ImageMenuItem.new(Gtk::Stock::QUIT)
+		@menu_items.last.signal_connect("activate") do
 			Gtk.main_quit
 		end
-		@menu.append(item)
+		@menu.append(@menu_items.last)
 		@menu.show_all
+	end
 
-		@tray.signal_connect('popup-menu') do |w, button, time|
-			@menu.popup(nil, nil, button, time) do
-				@tray.position_menu(@menu)
-			end
-		end
-
-		# Text
-		@buf = Gtk::TextBuffer.new
-		@txt = Gtk::TextView.new(@buf)
-
-		@title = Gtk::Entry.new
-
+	def gui_edit
 		# Edit Dialog
 		@edit_dialog = Gtk::Dialog.new(GNetvibes::NAME, nil, Gtk::Dialog::MODAL,
 									   [Gtk::Stock::OK, Gtk::Dialog::RESPONSE_ACCEPT],
 									   [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_REJECT])
 
+		# Text
+		@buf = Gtk::TextBuffer.new
+		@buf.signal_connect("changed", &method(:update_tag))
+		@txt = Gtk::TextView.new(@buf)
+		@txt.wrap_mode = Gtk::TextTag::WRAP_WORD
+		@txt.accepts_tab = false
+		@tag_title = @buf.create_tag('title', :font => "Sans Bold 13", 
+									 :pixels_below_lines => 10, :pixels_above_lines => 10,
+									 :left_margin => 5)
+		@tag_normal = @buf.create_tag('normal', :font => "Sans 10", 
+									 :pixels_below_lines => 2, :pixels_above_lines => 0,
+									  :left_margin => 10)
+
 		scroll = Gtk::ScrolledWindow.new
 		scroll.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
 		scroll.add(@txt)
 		scroll.border_width = 1
-
 		frame = Gtk::Frame.new
 		frame.add(scroll)
+		@edit_dialog.vbox.pack_start(frame, true, true, 10)
 
-		@edit_dialog.set_default_size(300, 300)
+		@edit_dialog.set_default_size(600, 400)
 		@edit_dialog.signal_connect("delete-event") do
 			@edit_dialog.hide_on_delete
 		end
@@ -100,8 +129,6 @@ class GUI
 		@edit_dialog.modal = true
 		@edit_dialog.border_width = 10
 		@edit_dialog.icon = @icon
-		@edit_dialog.vbox.pack_start(@title, false, false)
-		@edit_dialog.vbox.pack_start(frame, true, true, 10)
 		@edit_dialog.signal_connect('response', &method(:save))
 	end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: gnetvibes
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2007-03-17 00:00:00 +01:00
+  version: "0.2"
+date: 2007-03-19 00:00:00 +01:00
 summary: Netvibes integration with the Gnome Desktop
 require_paths: 
 - lib
@@ -29,12 +29,12 @@ post_install_message:
 authors: 
 - Florent Solt
 files: 
-- lib/gnetvibes/callback.rb
-- lib/gnetvibes/api.rb
-- lib/gnetvibes/config.rb
 - lib/gnetvibes/gui.rb
-- lib/gnetvibes/ico.png
+- lib/gnetvibes/config.rb
 - lib/gnetvibes/webnote.gif
+- lib/gnetvibes/api.rb
+- lib/gnetvibes/ico.png
+- lib/gnetvibes/callback.rb
 test_files: []
 
 rdoc_options: []