gnetvibes 0.3 → 0.4

data/bin/gnetvibes

@@ -12,8 +12,9 @@ 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
-gui.login_dialog.run
+api = GNetvibes::API.new
+icon = GNetvibes::GUI::Icon.new(api)
+login = GNetvibes::GUI::LoginDialog.new(api).run
+icon.refresh
 
 Gtk.main

data/lib/gnetvibes/api.rb

@@ -21,6 +21,8 @@ class API
 		@data = nil
 		@key = nil
 		@email = nil
+		@tabs = nil
+		@modules == nil
 	end
 
 	def login(email, password)
@@ -40,13 +42,13 @@ class API
 		end
 	end
 
-
 	def save(id, options)
-		mod = @modules[id]
+		mod = @modules[id.to_i]
 		case mod['name']
-		when 'PostIt'
+		when /PostIt/i
 			mod['title'] = options[:title]
 			mod['data']['text'] = options[:text]
+			mod['mode'] = 'module'
 		else
 			raise 'Not implemented'
 		end
@@ -59,6 +61,33 @@ class API
 		dump
 	end
 
+	def add(tab_id, type, options)
+		case type
+		when /PostIt/i
+			mod = { 'history' => nil, 'mode' => 'new', 'moduleRndld' => rand,
+				'name' => 'PostIt', 'share' => 0, 'status' => 1, 'tab' => tab_id.to_i,
+				'title' => options[:title], 'data' => { 'color' => 'yellow', '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
+	end
+
+	def delete(mod)
+		mod = mod.to_i
+		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({'id' => mod, 'mode' => 'close'})
+			http.request(post)
+		end
+	end
+
 	def refresh(force = false)
 		if force or not load
 			res = Net::HTTP.start(URL[:data].host, URL[:data].port) do |http|
@@ -75,14 +104,40 @@ class API
 		true
 	end
 
-	def each_modules_in_tab(tab)
+	def tab_has?(tab, kind)
+		raise "Unknown module : #{kind}" if not MODULES.keys.include?(kind)
+		@data['modules'].select{|m| m['tab'].to_i == tab.to_i}.each do |m|
+			return true if MODULES[kind] == m['name']
+		end
+		false
+	end
+
+	def each_modules_in_tab(tab, kind = nil)
+		raise "Unknown module : #{kind}" if not MODULES.keys.include?(kind)
 		@data['modules'].select{|m| m['tab'].to_i == tab.to_i}.each do |m|
-			yield m
+			yield m if kind.nil? or MODULES[kind] == m['name']
+		end
+	end
+
+	def each_webnote_in_tab(tab)
+		each_modules_in_tab(tab, :postit) { |m| yield m }
+	end
+
+	def each_todo_list_in_tab(tab)
+		each_modules_in_tab(tab, :todolist) { |m| yield m }
+	end
+
+	def each_feed_in_tab(tab)
+		each_modules_in_tab(tab, :feed) do |feed|
+			history = feed['data']['history']
+			feed['unread'] = history.split(':')[1..-1].select { |e| e == "0" }.size rescue feed['data']['nbTitles'].to_i
+			p feed
+			yield feed
 		end
 	end
 
 	def each_todo_list_item(mod)
-		raise "Module is not a TodoList" if @modules[mod.to_i]['name'] != 'TodoList'
+		raise "Module is not a TodoList" if @modules[mod.to_i]['name'] != MODULES[:todolist]
 		list = []
 		data = @modules[mod.to_i]['data']
 		data.select{|k,v| k =~ /^tdval/}.each do |k,v|
@@ -155,7 +210,6 @@ class API
 				post[k] = v
 			end
 		end
-		post['mode'] = 'module'
 		post
 	end
 

data/lib/gnetvibes/config.rb

@@ -1,6 +1,6 @@
 module GNetvibes
 	NAME = 'gNetvibes'
-	VERSION = '0.3'
+	VERSION = '0.4'
 	COPYRIGHT = 'Copyright (C) 2007 Florent Solt'
 	DESC = 'Netvibes integration with the Gnome Desktop'
 	AUTHOR = 'Florent Solt'
@@ -17,6 +17,12 @@ module GNetvibes
 	DATA = File.join(HOME, "data")
 
 	EXPIRE = 5 * 60
+
+	MODULES = {
+		:postit => 'PostIt',
+		:todolist => 'TodoList',
+		:feed => 'RssReader'
+	}
 end
 
 

data/lib/gnetvibes/gui.rb

@@ -1,136 +1,16 @@
-require 'gnetvibes/callback'
+require 'digest/sha1'
+require 'gnetvibes/api'
+require 'gnetvibes/gui/icon'
+require 'gnetvibes/gui/dlg_edit'
+require 'gnetvibes/gui/dlg_login'
 
 module GNetvibes
-class GUI
+module GUI
 
-	attr_reader :login_dialog, :edit_dialog
-
-	def initialize
-		# API
-		@api = GNetvibes::API.new
-
-		# Icons
-		@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],
-										[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_REJECT])
-		@login_dialog.icon = @icon
-		@login_dialog.resizable = false
-
-		@login = Gtk::Entry.new
-		@password = Gtk::Entry.new
-
-		table = Gtk::Table.new(2, 3)
-		table.border_width = 5
-		image = Gtk::Image.new(Gtk::Stock::DIALOG_AUTHENTICATION, Gtk::IconSize::DIALOG)
-		table.attach(image, 0, 1, 0, 2, nil, nil, 10, 10)
-
-		table.attach_defaults(Gtk::Label.new("Login:"), 1, 2, 0, 1)
-		table.attach_defaults(@login, 2, 3, 0, 1)
-
-		table.attach_defaults(Gtk::Label.new("Password:"), 1, 2, 1, 2)
-		@password.visibility = false
-		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.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_items << Gtk::SeparatorMenuItem.new
-		@menu.append(@menu_items.last)
-
-		@menu_items << Gtk::ImageMenuItem.new(Gtk::Stock::REFRESH)
-		@menu_items.last.signal_connect("activate", true, &method(:refresh))
-		@menu.append(@menu_items.last)
-
-		@menu_items << Gtk::ImageMenuItem.new(Gtk::Stock::QUIT)
-		@menu_items.last.signal_connect("activate") do
-			Gtk.main_quit
-		end
-		@menu.append(@menu_items.last)
-		@menu.show_all
-	end
-
-	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(600, 400)
-		@edit_dialog.signal_connect("delete-event") do
-			@edit_dialog.hide_on_delete
-		end
-
-		@edit_dialog.title = GNetvibes::NAME
-		@edit_dialog.modal = true
-		@edit_dialog.border_width = 10
-		@edit_dialog.icon = @icon
-		@edit_dialog.signal_connect('response', &method(:save))
-	end
+	# Icons
+	ICON = Gdk::Pixbuf.new(File.join(File.dirname(__FILE__), "gui", "netvibes.png"))
+	ICON_WEBNOTE = Gdk::Pixbuf.new(File.join(File.dirname(__FILE__), "gui", "webnote.gif"))
+	ICON_FEED = Gdk::Pixbuf.new(File.join(File.dirname(__FILE__), "gui", "feed.gif"))
 
 end
 end

metadata

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

data/lib/gnetvibes/callback.rb

@@ -1,93 +0,0 @@
-require 'gnetvibes/api'
-require 'digest/sha1'
-
-module GNetvibes
-class GUI
-
-	def edit(obj, mod)
-		@edit_current = mod.to_i
-		mod = @api.modules[mod.to_i]
-		@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
-			@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)
-		if (ev.is_a? Gdk::EventKey and (ev.keyval == Gdk::Keyval::GDK_KP_Enter or ev.keyval == Gdk::Keyval::GDK_Return)) or
-			(ev.is_a? Fixnum and ev == Gtk::Dialog::RESPONSE_ACCEPT)
-			if @api.login(@login.text, @password.text)
-				refresh
-				@login_dialog.destroy
-			else
-				raise "Login failed"
-			end
-		end
-
-		if (ev.is_a? Fixnum and ev == Gtk::Dialog::RESPONSE_REJECT)
-			exit!
-		end
-	end
-
-	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|
-			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
-
-			submenu = Gtk::Menu.new
-			@api.each_modules_in_tab(id) do |mod|
-				case mod['name']
-				when 'PostIt'
-					@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
-end