parlement 0.14 → 0.17

data/CHANGES

@@ -1,10 +1,50 @@
 - parlement changelog
 
+== Version 0.17 ==
+
+Migration to latest rails 2.3 and better navigation
+
+* better routes, particularly for rss
+* no more fancy minus sign to decrease the filter, a straight -
+* modified links
+* iconv better managed to transform into utf8
+* better 404 mgmt
+* rss dates corresponding to ISO standard
+* ie now also has rounded corners
+* no more "show" action for elts, instead, an "index" one
+* passage to rails 2.3
+* session stored in cookies
+* better next/back navigation
+
+== Version 0.16 ==
+
+Sub domains to directly access elements
+
+* upgraded ie7 javascript hack
+* updraded ruzze border script
+* passage to full utf8
+* default element is the oldest one
+* subdomains redirect to the relevant element
+* antispam: only authenticated users can vote
+* better google sitesearch integration
+* links now partly work with subdomain
+
+== Version 0.15 ==
+
+Automatic widening text area. Rails 2
+
+* sidebar updates now defined as an environment constant
+* edition text area is widened, its height now follows its content
+* passage to rails 2.0.2
+* easier db installation
+
 == Version 0.14 ==
 
 Heavily modified skin where anonymous users can no longer vote. Simplified and
 faster HTML. Shaded border.
 
+Anonymous users can write and login at the same time.
+
 * protection against some browsers who update too frequently their views
 * no more deprecations and errors
 * moved all elt lists to app/views/elt/list directory
@@ -13,7 +53,7 @@ faster HTML. Shaded border.
 * anonymous users are not able to vote anymore
 * results displayed only to those who have voted
 * faster view update
-* anonymous users can write and create their login at the same time, blog like
+* anonymous users can write and login at the same time
 
 == Version 0.13 ==
 

data/MEMORY

@@ -1,13 +1,22 @@
-TODO
-* factorise paginations
-* new and preview using tabs
+# To delete spam
+e = Elt.find_by_sql("SELECT * FROM elts ORDER BY created_on DESC LIMIT 1").first; puts e.id; e.person.id; puts e.children.size; puts e.person.elts.size if e.person
+
+puts e.destroy; e.person.destroy
+e.person.elts.each { |c| puts c.destroy }.size if e.person; e.person.destroy
+
+
+
+
+create/delete el
+add/see/remove user(s)
+mail, name
 
 What is below is just for future personal reference...
 
 http://www.ajaxchat.org/chat/
 
 
-# Here is my console code to reset threads from their original mails:
+# Console code to reset threads from their original mails:
 >> elts=Mail.find_all.select{|m|m.file and mail=TMail::Mail.parse(m.file) and reply=mail.in_reply_to and mailObject=Mail.find_by_message(reply) and mailObject.elt.id!=m.elt.parent_id}.collect{|m| {:elt=>m.elt.id, :parent=>Mail.find_by_message(TMail::Mail.parse(m.file).in_reply_to).elt.id}}; puts elts.size
 >> elts.each{|e|print e[:elt], ' ', e[:parent], ' '; puts Elt.update_all("parent_id='#{e[:parent]}'", "id='#{e[:elt]}'")}; puts elts.size
 
@@ -23,6 +32,7 @@ elts.each { |e| e.vote(Regexp.last_match(1), e.person) if e.body =~ /^\s*(-1|0|\
 
 
 UPDATE elts SET elts_count = (SELECT COUNT(*) FROM elts e2 WHERE e2.parent_id = elts.id);
+UPDATE elts SET lft = NULL, rgt = NULL;
 
 # To reconstruct the nested tree set
 def construction(e, counter)
@@ -39,7 +49,6 @@ end
 e=Elt.find('ROOT')
 construction(e, 0)
 
-UPDATE elts SET lft = NULL, rgt = NULL;
 ALTER TABLE elts ADD CONSTRAINT elts_unique_lft UNIQUE (lft);
 ALTER TABLE elts ADD CONSTRAINT elts_unique_rgt UNIQUE (rgt);
 
@@ -49,6 +58,7 @@ INSERT INTO person_mails (person_id, mail_id, created_on) VALUES ('first', 'aGaG
 select id from mails;
 select count(*) from mails;
 select * from people;
+select * from users;
 select * from subscriptions;
 select * from person_mails;
 select distinct last_activity from elts;
@@ -61,3 +71,54 @@ Processing EltController#create (for 192.168.0.254 at 2007-02-11 00:07:05) [POST
 Response body was encoded with gzip 
 Completed in 0.05879 (17 reqs/sec) | Rendering: 0.05682 (96%) | DB: 0.00072 (1%) | 200 OK [http://leparlement.org/elt/create/Testez?submit=preview] 
 
+# To get anonymous votes
+Elt.find_all_by_person_id(nil).select { |e| e.body == "+1" or e.body == "0" or e.body == "-1" }.select { |e| e.children_count == 0 }.each { |e| e.reload; puts e.id }.size
+Choice.find_all_by_person_id(nil).each { |c| c.reload; puts c.destroy }.size
+
+Elt.find_all_by_person_id(nil).select { |e| e.body == "+1" or e.body == "0" or e.body == "-1" }.select { |e| e.children_count == 0 }.each { |e| e.reload; e.parent.choices.select { |c| not c.person }.each { |c| print c.elt_id }; puts e.id }.size
+
+
+# UTF 8 goodness!
+def u(tStrin)
+	tStrin.gsub(/\xC3 /, "à").gsub(/\xC3 /, "à").gsub(/\x9E/, "Ẑ").gsub(/\xA0/, " ").gsub(/\xA4/, "€").gsub(/\xA7/, "§").gsub(/\xAB/, "«").gsub(/\xAD/, " ").gsub(/\xB0/, "°").gsub(/\xB4/, "'").gsub(/\xB7/, "·").gsub(/\xBB/, "»").gsub(/\xC4/, "Ä").gsub(/\xC5/, "Å").gsub(/\xC8/, "È").gsub(/\xC9/, "É").gsub(/\xD0/, "Ð").gsub(/\xD6/, "Ö").gsub(/\xE0/, "à").gsub(/\xE2/, "â").gsub(/\xE4/, "ä").gsub(/\xE5/, "å").gsub(/\xE7/, "ç").gsub(/\xE8/, "è").gsub(/\xE9/, "é").gsub(/\xEA/, "ê").gsub(/\xEA/, "ê").gsub(/\xEB/, "ë").gsub(/\xEE/, "î").gsub(/\xEF/, "ï").gsub(/\xF4/, "ô").gsub(/\xF6/, "ö").gsub(/\xF8/, "ø").gsub(/\xF9/, "ù").gsub(/\xFB/, "û").gsub(/\x85/, "…").gsub(/\x91/, "‘").gsub(/\x92/, "’").gsub(/\x93/, "“").gsub(/\x94/, "”").gsub(/\x96/, "–")
+end
+mails2.each { |m| m.file.each { |l| puts "\n#{l} --- #{u(l)} #{l.to_yaml}" unless (l.isutf8 or u(l).isutf8) } }.size
+
+elts = Elt.find(:all).select { |e| !e.body.isutf8 if e.body }; puts elts.size
+elts2 = elts.reject { |e| u(e.body).isutf8 }; puts elts2.size
+elts2.each { |e| e.body.each { |l| puts "#{l} #{l.to_yaml}" unless l.isutf8 or u(l).isutf8 } }.size
+elts2.each { |e| e.body = u(e.body); e.save }.size
+
+mails = Mail.find(:all).select { |m| !m.file.isutf8 if m.file }; puts mails.size
+mails2 = mails.reject { |m| u(m.file).isutf8 }; puts mails2.size
+mails2.reject { |m| u(m.file).each { |l| puts l.to_yaml unless l.isutf8 } }.size
+mails2.reject { |m| m.file.each { |l| puts "#{l} #{u(l)}" unless (l.isutf8 or u(l).isutf8) } }.size
+mails.each { |m| m.file = u(m.file); m.save }.size
+
+
+---------------
+Electoral lists
+
+How to be sure that our voice counts? That it counts equally to all others.
+
+In politics, a mere one can subvert the whole, and use his power to tilt the balance all the way toward him. To that end
+
+______________________________________________________________________________________________________________________________
+------------------------------------------------------------------------------------------------------------------------------
+Listes électorale
+
+Comment être sûr que notre voix compte? Qu'elle compte à égalité de toutes les autres.
+
+Les arrangements sont multiples, on ne fait voter que les riches, on écarte les femmes ou les étrangers, on s'arrange pour que la population votant pour son opposant soit disqualifiée, on fait voter les morts, un grand classique!
+
+- intro
+- les problèmes potentiels
+  * manipulation
+- les délais
+- l'identité
+- conclusion
+
+=======
+What it is
+Why it is so important
+Who should be concerned with it

data/README

@@ -11,10 +11,12 @@ On debian, here are the commands used to setup a parlement server:
 ~ createuser /your_login/
 ~ exit
 # apt-get install ruby
+# apt-get install ruby-dev
 # apt-get install libpgsql-ruby
 # apt-get install irb
 # apt-get install rdoc
 # apt-get install rake
+# apt-get install make
 
 Basically this install postgresql, ruby and the ruby driver to psql. Ruby on
 Rails is database agnostic, parlement will be sometimes in the future.
@@ -23,7 +25,8 @@ You need to install "ruby gems":http://docs.rubygems.org
 
 And then:
 # gem install rails
-# gem install redcloth
+# gem install RedCloth
+# gem install ruby-debug
 # gem install term-ansicolor
 
 Only if you expect to develop and do any release:
@@ -52,14 +55,16 @@ initialise and launch parlement this way:
 # Get the source code
 ~ svn checkout svn://rubyforge.org/var/svn/parlement/trunk parlement
 ~ cd parlement                                       # Go into the right folder
-~ createdb parlement_development                     # Create database
-~ psql -q template1 -f db/schema.sql                 # Initiate the db schema
-~ rake migrate                                       # Get the db to its last version
-~ ruby lib/data_import.rb                            # Populate the db
+~ rake db:create                                     # Create the db
 ~ ruby ./script/server                               # Launch the server
 
 Now you can go to http://localhost:3000 with your browser.
 
+To setup an apache configuration:
+# apt-get install libapache2-mod-fcgid
+# a2enmod fcgid
+
+
 You can check that everything works all right on your machine with the testing suite:
 ~ rake
 

data/Rakefile

@@ -17,17 +17,6 @@ require 'rake/contrib/rubyforgepublisher'
 require 'meta_project/release/freshmeat'
 require 'meta_project/release/raa'
 
-desc "Deploy basic application directories" 
-task :deploy => :environment do
-	# public is missing
-  dirs = %w{ app lib test config}
-  onserver = "manu@vvv:/home/manu/develop/parlement/" 
-  dirs.each do | dir|
-    `rsync -a --delete "#{RAILS_ROOT}/#{dir}" "#{onserver}" --exclude ".svn"`
-  end
-end
-
-
 PKG_NAME = "parlement"
 PKG_VERSION = PARLEMENT_VERSION
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
@@ -45,18 +34,18 @@ spec = Gem::Specification.new do |s|
 	s.version = PKG_VERSION
 	s.summary = "Trusted Direct Democracy on a forum"
 	s.description = <<EOF
-		This is a forum and mailing list project, which aims to be a complete Direct
-		Democracy implementation where everybody can propose polls, vote on them, or
-		delegate their voice to someone else.
+    Forum and mailing list project aiming to be a complete Direct Democracy
+    implementation where everybody can propose polls, vote on them, or delegate
+    their voice to someone else.
 
 		Trust through:
-		- cluster
+		- P2P cluster
 		- PGP signatures
 		- electoral lists
 EOF
 	s.files = PKG_FILES
 	s.require_path = 'lib'
-	s.autorequire = 'rails redcloth term-ansicolor'
+	#s.autorequire = 'rails RedCloth ruby-debug term-ansicolor gettext'
 	s.has_rdoc = false
 	s.requirements << 'none'
 	s.test_files = Dir.glob('test/unit/*')
@@ -72,7 +61,11 @@ EOF
 	#s.signing_key = File.join(ENV['CERT_DIR'], 'gem-private_key.pem')
 	#s.cert_chain  = [File.join(ENV['CERT_DIR'], 'gem-public_cert.pem')] 
 	#end 
-	s.add_dependency('rails redcloth term-ansicolor')
+	s.add_dependency('rails')
+	s.add_dependency('gettext')
+	s.add_dependency('RedCloth')
+	s.add_dependency('ruby-debug')
+	s.add_dependency('term-ansicolor')
 end
 
 desc "Build Gem"
@@ -179,14 +172,13 @@ end
 
 desc "Update pot/po files."
 task :updatepo do
-  require 'gettext/utils'
-  GetText.update_pofiles(PKG_NAME, Dir.glob("{app}/{views,controllers}/**/*.{rb,rhtml}"), "#{PKG_NAME} #{PKG_VERSION}")
+	require 'gettext_rails/tools'
+	GetText.update_pofiles(PKG_NAME, Dir.glob("{app}/{views,controllers}/**/*.{rb,rhtml}"), "#{PKG_NAME} #{PKG_VERSION}")
 end
 
 desc "Create mo-files"
 task :makemo do
-  require 'gettext/utils'
-  #GetText.create_mofiles(true)
-  GetText.create_mofiles(true, "po", "locale")  # This is for "Ruby on Rails".
+	require 'gettext_rails/tools'
+	GetText.create_mofiles(true)
+	#GetText.create_mofiles(true, "po", "locale")  # This is for "Ruby on Rails".
 end
-

data/app/controllers/account_controller.rb

@@ -1,10 +1,10 @@
 #
 # This class manages users inscription, login and logout
 #
-class AccountController < UserController
+class AccountController < ApplicationController
 	def login
 		# Cleaning up
-		session[:person] = @person = session[:user] = @user = nil
+		session[:person_id] = session[:person_name] = @person = session[:user_id] = @user = nil
 		cookies.delete :person_name
 		cookies.delete :salted_password
 
@@ -24,7 +24,8 @@ class AccountController < UserController
 					if @person.save
 						logger.info yellow { bold { "Person: #{@person.name}, id: #{@person.id}" } }
 						flash.now[:notice]  = _("Pseudo recorded")
-						session[:person] = @person
+						session[:person_id] = @person.id
+						session[:person_name] = @person.name
 					else
 						flash.now[:error] = _('Error creating account')
 					end
@@ -40,19 +41,22 @@ class AccountController < UserController
 			if password and password.empty?
 				if not @user or not @user.salted_password \
 					or @user.salted_password.empty?
-					session[:person] = @person
+					session[:person_id] = @person.id
+					session[:person_name] = @person.name
 				else
 					flash.now[:error]  = _("This pseudo is protected with a password")
 				end
 			elsif not @user
 				# Record password
-				session[:person] = @person
+				session[:person_id] = @person.id
+				session[:person_name] = @person.name
 				mngPassword
 			elsif User.authenticate(login, password)
 				logger.info yellow { bold { "#{@person.name} logged in" } }
 				# Authenticate
-				session[:person] = @person
-				session[:user] = @user
+				session[:person_id] = @person.id
+				session[:person_name] = @person.name
+				session[:user_id] = @user.id if @user
 			elsif email and not email.empty?
 				# There is a check key, used to change the password
 				begin
@@ -63,8 +67,9 @@ class AccountController < UserController
 							if @user.save
 								logger.info yellow { "Person: #{@person.name} changed its password" }
 								flash.now['notice 2']  = _('Password successfully modified!')
-								session[:person] = @person
-								session[:user] = @user
+								session[:person_id] = @person.id
+								session[:person_name] = @person.name
+								session[:user_id] = @user.id if @user
 							else
 								@user.errors.each_full { |msg| logger.error msg }
 							end
@@ -79,7 +84,7 @@ class AccountController < UserController
 
 			# Record the email or send a check_key for a password reset
 			if email and not email.empty?
-				if session[:person]
+				if session[:person_id]
 					if email == @person.email
 						flash.now['notice 3']  = _("Email already recorded and verified")
 					else
@@ -97,9 +102,9 @@ class AccountController < UserController
 		end
 
 		# Record cookies for re authentication
-		if session[:person]
-			cookies[:person_name] = { :value => session[:person].name, :expires => 3.years.from_now }
-			cookies[:salted_password] = { :value => @user.salted_password, :expires => 3.years.from_now } if @user
+		if session[:person_id]
+			cookies[:person_name] = { :value => @person.name }
+			cookies[:salted_password] = { :value => @user.salted_password } if @user
 
       @person.last_login = Time.now
       @person.save
@@ -110,13 +115,13 @@ class AccountController < UserController
 
 		render :partial => 'show',
 			:locals => { :choices => getAllVotes },
-			:status => (session[:person] ? 200 : 403)
+			:status => (session[:person_id] ? 200 : 403)
 	end
 
 	def logout
 		logger.info yellow { bold { "Bye bye" } }
 		# Cleaning up
-		session[:person] = @person = session[:user] = @user = nil
+		session[:person_id] = session[:person_name] = @person = session[:user_id] = @user = nil
 		cookies.delete :person_name
 		cookies.delete :salted_password
 
@@ -133,58 +138,57 @@ class AccountController < UserController
 			@person.email = @user.email
 			@person.save
 			flash.now[:notice] = "Email #{@person.email} verified."
-			session[:person] = @person
-			session[:user] = @user
+			session[:person_id] = @person.id
+			session[:person_name] = @person.name
+			session[:user_id] = @user.id
 			render :text => "<h1>Email verified!</h1> \
 				<br/> \
-				<a href='#{url_for :controller => 'elt', :action => 'show', :id => nil }'>\
-					Back</a>",
+				<a href='#{url_for :controller => 'elt', :id => nil }'>Back</a>",
 					:layout => 'top'
 		else
 			render :text => "<h3>Sorry, no corresponding check key :-(</h3> \
 					<br/> \
-					<a href='#{url_for :controller => 'elt', :action => 'show', :id => nil }'>\
-						Back</a>",
+					<a href='#{url_for :controller => 'elt', :id => nil }'>Back</a>",
 						:layout => 'top'
 		end
 	end
 
 	def setPassword
-		logger.info yellow { "Person #{session[:person].name} sets/changes his password" } if session[:person]
-		@person = session[:person]
-		@user = session[:user]
+		@person = Person.find_by_id(session[:person_id])
+		@user = User.find_by_id(session[:user_id])
+		logger.info yellow { "Person #{@person.name} sets/changes his password" }
 		mngPassword
 		render :partial => 'show'
 	end
 
 	def setEmail
-		logger.info yellow { "Person #{session[:person].name} set his email to #{params[:person][:email]}" } if session[:person]
-		@person = session[:person]
-		@user = session[:user]
+		@person = Person.find_by_id(session[:person_id])
+		@user = User.find_by_id(session[:user_id])
+		logger.info yellow { "Person #{@person.name} set his email to #{params[:person][:email]}" }
 		mngEmail
 		render :partial => 'show'
 	end
 
 	def setAvatar
-		return render(:text => _("Not logged in"), :status => 403) unless session[:person]
-		logger.info yellow { "Setting up an avatar for person #{session[:person].name}" }
+		return render(:text => _("Not logged in"), :status => 403) unless session[:person_id]
 
 		@elt = Elt.find_by_id 'people'
-		if !@elt
+		unless @elt
 			@elt = Elt.new :parent_id => 'ROOT', :subject => 'people', :body => ''
 			@elt.save!
 			@elt.publish
-			@elt.parent.add_child @elt
 		end
-		avatar = @elt.children.build :person => session[:person], :body => ""
-		att = avatar.attachments.build :file => params[:person][:image],
-			:content_type => params[:person][:image].content_type
+		@person = Person.find_by_id(session[:person_id])
+		logger.info yellow { "Setting up an avatar for person #{@person.name}" }
+		avatar = @elt.children.build :person => @person,
+		 	:subject => params[:person][:image].original_filename,
+		 	:body => ""
+		avatar.save!
+		att = avatar.attachments.build :file => params[:person][:image]
+		att.save!
 
-		avatar.subject = att.file.gsub /^.*public.*\//, ''
 		avatar.publish
-		@elt.add_child avatar
 
-		@person = session[:person]
 		@person.image = "/attachment/file/#{att.file_relative_path}"
 		@person.save!
 
@@ -213,7 +217,7 @@ class AccountController < UserController
 					if @user.save
 						logger.info yellow { "Password changed" }
 						flash['notice 2'] = 'Password recorded'
-						session[:user] = @user
+						session[:user_id] = @user.id
 					else
 						@user.errors.each_full { |msg| logger.error msg }
 					end
@@ -234,7 +238,7 @@ class AccountController < UserController
 		@user.email = params[:person][:email]
 		begin
 			User.transaction do
-				unless LoginEngine.config(:use_email_notification)
+				unless LOGIN_ENGINE[:use_email_notification]
 					@user.verified = 1
 				end
 				if @user.save
@@ -243,7 +247,7 @@ class AccountController < UserController
 					#url = url_for(:action => 'check_key')
 					#url += "?user[id]=#{@user.id}&key=#{key}"
 					#flash[:notice] = 'Signup successful!'
-					if LoginEngine.config(:use_email_notification)
+					if LOGIN_ENGINE[:use_email_notification]
 						PersonNotify.deliver_setEmail(@person, url)
 						flash.now['notice 3']  = "Confirmation email sent to #{@user.email}"
 					end
@@ -259,12 +263,13 @@ class AccountController < UserController
 
 	def getAllVotes
 		if @elt then
-			Choice.find_all_by_person_id((session[:person] ? session[:person].id : nil),
+			Choice.find(:all,
 				:include => 'elt',
-				:conditions => "elts.lft >= '#{@elt.lft}' AND elts.rgt <= '#{@elt.rgt}'")
+				:conditions => "choices.person_id = '#{session[:person_id]}' \
+					AND elts.lft >= '#{@elt.lft}' AND elts.rgt <= '#{@elt.rgt}'")
 		else
 			# This should only happen for very new people
-			Choice.find_all_by_person_id((session[:person] ? session[:person].id : nil))
+			Choice.find(:all, :conditions => "person_id = '#{session[:person_id]}'")
 		end
 	end
 end