parlement 0.9 → 0.10

data/CHANGES

@@ -1,9 +1,28 @@
 - parlement changelog
 
+== Version 0.10
+
+Democratically moderated mails.
+
+Elements are displayed on the web page or sent by mail when they reach a user
+chosen voting threshold.
+
+* one element threads are not automatically displayed anymore
+* better spam fighting
+* unsubscribe now also works when user is subscribed on a parent elt
+* correcting a badly managed reply_to in mails
+* setEmail and setPassword
+* small threads automatically displayed (SUB_THREAD_LENGTH = 5)
+* colored logs
+* persistent cookies for authentication
+* fighting the bacon spammer :-(
+* easier rss auto discovery (html/head/link)
+* moderated mails
+
 == Version 0.9
 
 Improved look, particularly the voting and writing part. Long posts and lists
-now truncated. Permanent login. Positioned elements. Search form (though
+now truncated. Permanent login. Positioned elements. Search form (through
 google).
 
 * now asking to choose a pseudo

data/MEMORY

@@ -0,0 +1,51 @@
+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:
+>> 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
+
+# To get and remove duplicate messages
+>> messages=Mail.find_by_sql "select message from mails group by message having count(message) > 1"; puts messages.length
+>> messages.each{ |m| mail=Mail.find_all_by_message m.message; mail.each{|m| print m.elt.id, ' ', m.elt.subject, ' ', m.elt.children.size; puts } }; puts messages.length
+>> messages.each{ |m| mail=Mail.find_all_by_message m.message; mail.each_index{|i| m=mail[i]; print i, ' ', m.elt.id, ' ', m.elt.subject, ' ', m.elt.children.size; m.elt.destroy if i>0 and m.elt.children.size==0; puts } }; puts messages.length
+
+# To get all existing votes
+elts=Elt.find(:all, :conditions => ["body LIKE '%%+1%%' OR body LIKE '%%0%%' OR body LIKE '%%-1%%'"]); puts elts.size
+elts.each { |e| print '(', Regexp.last_match(1), ')' if e.body =~ /^\s*(-1|0|\+1)(\s*|$)/ }; puts; puts elts.size
+elts.each { |e| e.vote(Regexp.last_match(1), e.person) if e.body =~ /^\s*(-1|0|\+1)(\s*|$)/ }; puts; puts elts.size
+
+
+UPDATE elts SET elts_count = (SELECT COUNT(*) FROM elts e2 WHERE e2.parent_id = elts.id);
+
+# To reconstruct the nested tree set
+def construction(e, counter)
+  e.lft = counter
+  counter += 1
+  e.children.each { |c|
+    counter = construction(c, counter)
+  }
+  e.rgt = counter
+  counter += 1
+  e.save
+  counter
+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);
+
+SELECT * FROM person_mails;
+INSERT INTO person_mails (person_id, mail_id, created_on) VALUES ('first', 'aGaGwUHxCr25c5aaVnmTrI', now());
+
+select id from mails;
+select count(*) from mails;
+select * from people;
+select * from subscriptions;
+select * from person_mails;
+\dt
+

data/README

@@ -5,10 +5,11 @@
                | .__/ \__,_|_|  |_|\___|_| |_| |_|\___|_| |_|\__|
                |_|                                               
 
-I use debian, here are the commands I use to setup my machine for parlement:
+On debian, here are the commands used to setup the parlement machine:
 # apt-get install postgresql
 # sudo su - postgres
-# createuser /your_login/
+~ createuser /your_login/
+~ exit
 # apt-get install ruby
 # apt-get install libpgsql-ruby
 # apt-get install irb
@@ -22,6 +23,7 @@ You need to install "ruby gems":http://docs.rubygems.org
 And then:
 # gem install rails
 # gem install redcloth
+# gem install term-ansicolor
 
 Only if you expect to develop and do any release:
 # gem install meta_project
@@ -40,54 +42,25 @@ filtering tool), define this kind of rule:
 	* ^TO parlement|leparlement.org
 	| /home/manu/parlement/trunk/script/runner 'Mailman.receive STDIN.read'
 
-
 Once you have everything set up (ruby, postgresql, redcloth, irb), you can
 initialise and launch parlement this way:
 
-Go into the right folder
-~ cd parlement/trunk
-
-Create the db
-~ psql -q template1 -f db/schema.sql
-
-Populate the db
-~ ruby lib/data_import.rb
-
-Migrate the db to its last version
-~ rake migrate
-
-Launch the developement web server
-~ ruby ./script/server
+~ svn checkout svn://rubyforge.org/var/svn/parlement # Get the code source
+~ cd parlement/trunk                                 # 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
+~ ruby ./script/server                               # Launch the server
 
 Now you can go to http://localhost:3000 with your browser.
 
 You can check that everything works all right on your machine with the testing suite:
 ~ rake
 
-
                    __        __   _                          
                    \ \      / /__| | ___ ___  _ __ ___   ___ 
                     \ \ /\ / / _ \ |/ __/ _ \| '_ ` _ \ / _ \
                      \ V  V /  __/ | (_| (_) | | | | | |  __/
                       \_/\_/ \___|_|\___\___/|_| |_| |_|\___|
-                                                             
-
-
-
-
-What is below is just for future personal reference...
-
-
-# Here is my 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
-
-# To get and remove duplicate messages
->> messages=Mail.find_by_sql "select message from mails group by message having count(message) > 1"; puts messages.length
->> messages.each{ |m| mail=Mail.find_all_by_message m.message; mail.each{|m| print m.elt.id, ' ', m.elt.subject, ' ', m.elt.children.size; puts } }; puts messages.length
->> messages.each{ |m| mail=Mail.find_all_by_message m.message; mail.each_index{|i| m=mail[i]; print i, ' ', m.elt.id, ' ', m.elt.subject, ' ', m.elt.children.size; m.elt.destroy if i>0 and m.elt.children.size==0; puts } }; puts messages.length
 
-# To get all existing votes
-elts=Elt.find(:all, :conditions => ["body LIKE '%%+1%%' OR body LIKE '%%0%%' OR body LIKE '%%-1%%'"]); puts elts.size
-elts.each { |e| print '(', Regexp.last_match(1), ')' if e.body =~ /^\s*(-1|0|\+1)(\s*|$)/ }; puts; puts elts.size
-elts.each { |e| e.vote(Regexp.last_match(1), e.person) if e.body =~ /^\s*(-1|0|\+1)(\s*|$)/ }; puts; puts elts.size

data/Rakefile

@@ -56,7 +56,7 @@ spec = Gem::Specification.new do |s|
 EOF
 	s.files = PKG_FILES
 	s.require_path = 'lib'
-	s.autorequire = 'rails redcloth'
+	s.autorequire = 'rails redcloth term-ansicolor'
 	s.has_rdoc = false
 	s.requirements << 'none'
 	s.test_files = Dir.glob('test/unit/*')
@@ -72,7 +72,7 @@ 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')
+	s.add_dependency('rails redcloth term-ansicolor')
 end
 
 desc "Build Gem"

data/app/controllers/account_controller.rb

@@ -1,4 +1,4 @@
-# 
+#
 # This class manages users inscription, login and logout
 #
 class AccountController < UserController
@@ -25,7 +25,7 @@ class AccountController < UserController
 				Person.transaction(@person) do
 					@person = Person.new :id => login.gsub(/\s/, '_'), :name => login
 					if @person.save
-						logger.info "person.id: #{@person.id}, name: #{@person.name}"
+						logger.info yellow { bold { "Person: #{@person.name}, id: #{@person.id}" } }
 						flash.now[:notice]  = "Pseudo created"
 						session[:person] = @person
 					else
@@ -34,12 +34,12 @@ class AccountController < UserController
 				end
 			rescue Exception => e 
 				flash.now[:error] = 'Error creating account'
-				logger.error e
+				logger.error red { e }
 			end
 		end
 
+		# We record the password or try to authenticate
 		if @person and @person.errors.empty?
-			# Second we record the password or try to authenticate
 			if password.empty?
 				if not @user or not @user.salted_password \
 					or @user.salted_password.empty?
@@ -48,42 +48,28 @@ class AccountController < UserController
 					flash.now[:error]  = "This pseudo is protected with a password"
 				end
 			elsif not @user
-				@user = User.new()
-				begin
-					User.transaction(@user) do
-						@user.login = login
-						@user.change_password(password)
-						# To make sure even a non email protected user can use a password
-						@user.email = login+'@nomailyet'
-						# This is a hack, to make sure this user can login even if he
-						# didn't verify his email
-						@user.verified = true
-						if @user.save
-							flash['notice 2'] = 'Password recorded'
-
-							session[:person] = @person
-							session[:user] = @user
-						end
-					end
-				rescue
-					flash.now[:error] = 'Error with password'
-				end
-
+				# Record password
+				session[:person] = @person
+				mngPassword
 			elsif User.authenticate(login, password)
-				# There is a password protecting this pseudo
+				logger.info yellow { bold { "#{@person.name} logged in" } }
+				# Authenticate
 				session[:person] = @person
 				session[:user] = @user
-
-			elsif not email.empty?
+			elsif email and not email.empty?
+				# There is a check key, used to change the password
 				begin
 					User.transaction(@user) do
 						if User.authenticate_by_token(@user.id, email)
 							@user.change_password(password)
 							@user.security_token = nil
 							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
+							else
+								@user.errors.each_full { |msg| logger.error msg }
 							end
 						end
 					end
@@ -94,45 +80,50 @@ class AccountController < UserController
 				flash.now[:error]  = "Wrong password"
 			end
 
-			# Third we record the email or send a check_key for a password reset
-			if not email.empty?
+			# Record the email or send a check_key for a password reset
+			if email and not email.empty?
 				if session[:person]
 					if email == @person.email
 						flash.now['notice 3']  = "Email already recorded and verified"
 					else
-						signup
+						mngEmail
 					end
-
 				elsif email == @person.email
 					# User protected by password and with the same email as entered
 					key = @user.generate_security_token
 					url =  url_for(:action => 'check_key')
 					url += "?user[id]=#{@user.id}&key=#{key}"
 					UserNotify::deliver_forgot_password(@user, url)
-					flash.now['notice 3']  = "Email with a check key sent to "+email
+					flash.now['notice 3']  = "Email with a check key sent to #{email}"
 				end
 			end
 		end
 
 		# Record cookies for re authentication
 		if session[:person]
-			cookies[:person_name] = session[:person].name
-			cookies[:salted_password] = @user.salted_password if @user
+			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
 		end
 
+		# To make sure the logout knows which elt's choices to update
+		@elt = Elt.find(params[:elt]) if params[:elt]
+
 		render :partial => 'show',
-			:locals => { :divId => params[:divId], :choices => getAllVotes },
+			:locals => { :choices => getAllVotes },
 			:status => (session[:person] ? 200 : 403)
 	end
 
 	def logout
+		logger.info yellow { bold { "Bye bye" } }
 		# Cleaning up
 		session[:person] = @person = session[:user] = @user = nil
 		cookies.delete :person_name
 		cookies.delete :salted_password
 
-		render :partial => 'show', :locals => {
-			:divId => params[:divId], :choices => getAllVotes }
+		# To make sure the logout knows which elt's choices to update
+		@elt = Elt.find(params[:elt]) if params[:elt]
+
+		render :partial => 'show', :locals => { :choices => getAllVotes }
 	end
 
 	def check_key
@@ -158,10 +149,26 @@ class AccountController < UserController
 		end
 	end
 
+	def setPassword
+		logger.info yellow { "Person #{session[:person].name} sets/changes his password" } if session[:person]
+		@person = session[:person]
+		@user = session[:user]
+		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]
+		mngEmail
+		render :partial => 'show'
+	end
+
 	def setAvatar
 		return render(:text => "Not logged in", :status => 403) \
 			unless session[:person]
-		logger.info "Setting up an avatar for person #{session[:person].name}"
+		logger.info yellow { "Setting up an avatar for person #{session[:person].name}" }
 
 		@elt = Elt.find_by_id 'people'
 		if !@elt
@@ -192,8 +199,34 @@ class AccountController < UserController
 
 	protected
 
+	def mngPassword
+		if @person and password = @params[:user][:password] and !password.empty?
+			@user = @person.user || User.new()
+			begin
+				User.transaction(@user) do
+					@user.login = @person.name
+					# To make sure even a non email protected user can use a password
+					@user.email ||= @person.name+'@nomailyet'
+					# This is a hack, to make sure this user can login even if he
+					# didn't verify his email
+					@user.verified = true
+					@user.change_password(password)
+					if @user.save
+						logger.info yellow { "Password changed" }
+						flash['notice 2'] = 'Password recorded'
+						session[:user] = @user
+					else
+						@user.errors.each_full { |msg| logger.error msg }
+					end
+				end
+			rescue
+				flash.now[:error] = 'Error with password'
+			end
+		end
+	end
+
 	# Mostly copied from the login engine
-	def signup
+	def mngEmail
 		if @person and not @user
 			@user = User.new
 			@user.login = @person.name
@@ -207,31 +240,31 @@ class AccountController < UserController
 				end
 				if @user.save
 					key = @user.generate_security_token
-					#url = url_for(:action => 'home', 'user[id]' => @user.id, :key => key)
-					url =  url_for(:action => 'check_key')
-					url += "?user[id]=#{@user.id}&key=#{key}"
+					url = url_for(:action => 'check_key', 'user[id]' => @user.id, :key => key)
+					#url = url_for(:action => 'check_key')
+					#url += "?user[id]=#{@user.id}&key=#{key}"
 					#flash[:notice] = 'Signup successful!'
-					flash.now['notice 3']  = 'Confirmation email sent to '+@user.email
 					if LoginEngine.config(:use_email_notification)
-						UserNotify.deliver_signup(@user, params[:user][:password], url)                               
-						flash['notice 4'] = ' Please check your registered email account to verify your account registration.'
+						PersonNotify.deliver_setEmail(@person, url)
+						flash.now['notice 3']  = "Confirmation email sent to #{@user.email}"
 					end
 					#redirect_to :action => 'login'
 				end
 			end
 		rescue Exception => e 
 			flash.now[:notice] = nil
+			flash.now['notice 2'] = nil
+			flash.now['notice 3'] = nil
 			flash.now[:warning] = 'Error creating account: confirmation email not sent'
-			logger.error e
+			e.backtrace.each { |m| logger.error m }
 		end
 	end
 
 	def getAllVotes
-		return if !params[:divId]
-		elt = Elt.find params[:divId].gsub(/author_/, '')
+		return unless @elt
 		Choice.find_all_by_person_id((session[:person] ? session[:person].id : nil),
 			:include => 'elt',
-			:conditions => "elts.lft >= '#{elt.lft}' AND elts.rgt <= '#{elt.rgt}'")
+			:conditions => "elts.lft >= '#{@elt.lft}' AND elts.rgt <= '#{@elt.rgt}'")
 	end
 end
 

data/app/controllers/application.rb

@@ -2,9 +2,11 @@
 # Likewese will all the methods added be available for all controllers.
 
 require 'login_engine'
+require 'term/ansicolor'
 
 class ApplicationController < ActionController::Base
 	include LoginEngine
+	include Term::ANSIColor
 	model :user
 
   before_filter :set_charset
@@ -32,6 +34,7 @@ class ApplicationController < ActionController::Base
 				((!person.user and !cookies[:salted_password]) \
 				 or (person.user \
 						 and person.user.salted_password == cookies[:salted_password]))
+				logger.info yellow { bold { "#{person.name} is back" } }
 				session[:person] = person 
 				session[:user] = person.user
 			end

data/app/controllers/elt_controller.rb

@@ -66,10 +66,13 @@ class EltController < ApplicationController
 		@elt = Elt.new(params[:elt])
 		@elt.person = @session[:person]
 
-		if @elt.subject.match(/([<>\/]|href)/) then
-			logger.error "SPAM! '#{@elt.subject}'"
+		if @elt.subject =~ /([<>\/]|href)/ \
+			 or @elt.body =~ /(.*([<>\/]|href).*){3}/ \
+			 or @elt.body =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i \
+			 or @elt.body =~ /([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}.*){3}/i
+			logger.error red { underline { "SPAM! '#{@elt.subject}'" } }
 			logger.error "SPAM! '#{@elt.body}'"
-			flash[:error] = 'Sorry, to fight spam "<" ">" or "href" are forbidden in the subject!'
+			flash[:error] = 'Sorry, to fight spam "<" ">" or "href" are forbidden in the subject, and there can not be more than 3 links in the body, you also can\'t input one simple email or more than 3 emails!'
 			headers["Status"] = "404 Post considered as spam"
 			render :controller => 'elt', :action => 'new', :status => 404
 		elsif params[:submit] == "preview" or (@elt.publish and @elt.parent.add_child(@elt)) then
@@ -89,6 +92,14 @@ class EltController < ApplicationController
 
 	def vote
 		@elt = Elt.find params[:id]
+		unless params[:choice][:value] =~ /^\s*(-1|0|\+1)(\s|$)/ then
+			logger.error red { underline { "SPAM! through the vote" } }
+			logger.error params[:choice][:value]
+			flash[:error] = 'Sorry, you can only vote here!'
+			render :partial => '/elt/choice', :locals => { :elt => @elt }
+			return
+		end
+
 		vote = @elt.children.build
 		vote.person = session[:person]
 		vote.subject = @elt.subject

data/app/controllers/subscriber_controller.rb

@@ -1,21 +1,37 @@
+#
+# Mailing list management
+#
+# This is to add or remove subscribers
+#
 class SubscriberController < ApplicationController
-
   def subscribe
-    @elt = Elt.find(params[:id])
+    @elt = Elt.find params[:id]
 
 		if @session[:person]
 			if @elt.subscribers.include?(@session[:person])
-				@elt.subscribers.delete(@session[:person])
-				logger.info "Unsubscribed #{@session[:person].name} from #{@elt.subject}..."
-				render :inline => "Unsubscribed..."
+				Subscription.find_by_person_id_and_elt_id(@session[:person].id, @elt.id).destroy
+				logger.info yellow { "User #{@session[:person].name} unsubscribed from #{@elt.subject}..." }
+			elsif @elt.all_recipients.include?(@session[:person])
+				elt2 = @elt
+				elt2 = elt2.parent until elt2.subscribers.include?(@session[:person])
+				Subscription.find_by_person_id_and_elt_id(@session[:person].id, elt2.id).destroy
+				logger.info yellow { "User #{@session[:person].name} unsubscribed from #{elt2.subject}..." }
 			else
-				@elt.subscribers << @session[:person]
-				logger.info "Subscribed #{@session[:person].name} to #{@elt.subject}..."
-				render :inline => "Subscribed..."
+				if cookies[:filter]
+					filter = cookies[:filter].to_i - 1
+					filter = nil unless filter >= 0
+				else
+					filter = 0
+				end
+				@elt.subscriptions.create :person => @session[:person], :filter => filter
+				logger.info yellow { "User #{@session[:person].name} subscribed to #{@elt.id} with filter #{filter}..." }
 			end
 		else
 			puts "Not logged in!"
-			render :inline => "First you need to login... it's easy, type a pseudo with at least 3 characters. Then ok. Then subscribe"
+			#render :inline => "First you need to login... it's easy, type a pseudo with at least 3 characters. Then OK"
+			flash.now[:error] = 'First you need to login!'
 		end
+		render :partial => 'list'
   end
 end
+

data/app/helpers/elt_helper.rb

@@ -66,7 +66,7 @@ module EltHelper
 			and elt.subject != elt.parent.subject \
 			and elt.parent.subject \
 			and elt.subject.downcase != elt.parent.subject.downcase \
-			and not elt.subject.sub(/(Re|r�f|re|sv|aw):\s*/, '') == elt.parent.subject
+			and not elt.subject.sub(/(Re|RE|r�f|re|sv|aw):\s*/, '') == elt.parent.subject
 	end
 end
 

data/app/models/elt.rb

@@ -16,12 +16,14 @@
 # normal characters are used)
 #
 class Elt < ActiveRecord::Base
-	has_one :mail, :dependent => true
 	belongs_to :person
+	has_one :mail, :dependent => :destroy
+
+	has_many :choices, :dependent => :destroy, :order => "choices.created_on"
 	has_many :voters, :through => :choices, :source => :person
-	has_many :choices, :dependent => true, :order => "choices.created_on"
-	has_many :attachments, :dependent => true
-	has_and_belongs_to_many :subscribers, :class_name => "Person", :join_table => "subscribers"
+	has_many :attachments, :dependent => :destroy
+	has_many :subscriptions, :dependent => :destroy
+	has_many :subscribers, :through => :subscriptions, :source => :person
 
 	acts_as_nested_set :order => "position is not null, position, created_on"
 	acts_as_tree :order => "position is not null, position, created_on", :counter_cache => true
@@ -35,11 +37,20 @@ class Elt < ActiveRecord::Base
 		end
 	end
 
+	def all_subscriptions
+		if parent
+			(subscriptions + parent.all_subscriptions).uniq
+		else
+			subscriptions
+		end
+	end
+
 	def vote(value = 1, person = self.person)
 		logger.info "#{person.name if person} vote #{value} on #{subject} #{self.choices}"
 		choices.each{ |c| c.destroy if c.person == person }
 		choice = choices.build :value => value, :person => person
 		choice.save!
+		mail.publish if mail
 	end
 
 	# Get the vote results
@@ -54,10 +65,10 @@ class Elt < ActiveRecord::Base
 	def publish
 		logger.info "Publish #{subject}"
 
+		self.position = Regexp.last_match(1) if body =~ /^\s*position:\s*(\d+(\.\d+)?)(\s|$)/
+
 		build_mail(:elt => self) unless mail
 		mail.publish
-
-		self.position = Regexp.last_match(1) if body =~ /^\s*position:\s*(\d+(\.\d+)?)(\s|$)/
 		save!
 
 		parent.vote Regexp.last_match(1), person if body =~ /^\s*(-1|0|\+1)(\s|$)/
@@ -73,15 +84,14 @@ class Elt < ActiveRecord::Base
 	def save
 		if new_record?
 			# Let's generate a nice looking id
-			self.id = new_id = subject.gsub(/\[[\w-]*\]/, '').strip \
-				.gsub(/\s/, '_').gsub(/[^\w]+/, '').gsub(/_+/, '_') \
-				.gsub(/(^_|_$)/, '') \
-				if subject
+			self.id = new_id =
+				subject.gsub(/\[[\w-]*\]/, '').strip \
+				.gsub(/\s/, '_').gsub(/[^\w]+/, '') \
+				.gsub(/_+/, '_').gsub(/(^_|_$)/, '') if subject
 			self.id ||= "elt"
 
-			discrim = 0
-			self.id = "#{new_id}_#{discrim}" \
-				while discrim += 1 and self.class.find_by_id self.id
+			i = 0
+			self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
 		end
 
 		super