parlement 0.5 → 0.6

data/CHANGES

@@ -1,5 +1,31 @@
 - parlement changelog
 
+== Version 0.6
+
+Voting using V and Λ buttons (picturing -1 and +1 values, down and up).
+Clicking on an existing vote resets it (equivalent to a 0 vote).
+
+Votes recorded and replicated as mails. Elements also listed by their approval
+(rss feed available).
+
+* elements are now acts_as_nested_set AND acts_as_tree
+* list by date, dynamic and managing all sub elements
+* rss now manages _all_ sub elements
+* compress_output
+* google analytics plugin
+* visual_effect queues
+* close or open elements and their sub elements
+* optimisations
+* voting on the web page
+* logging in and out changes appropriately +1 and -1 votes
+* element id now generated from element subject
+* element body now cached
+* some spam tests when creating a new element
+* list by vote
+* possibility to see individual votes when clicking on a vote result
+* Correcting a painful "null character" mishandling when mail is quoted printable
+
+
 == Version 0.5
 
 Voting. Mails containing -1, 0 or +1 trigger a vote

data/README

@@ -69,9 +69,10 @@ Parameters
 >> 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 duplicate messages
+# 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

data/app/controllers/account_controller.rb

@@ -7,7 +7,7 @@ class AccountController < UserController
 
   def login
 		# Cleaning up
-		@session[:person] = @session[:user] = nil
+		session[:person] = session[:user] = nil
 
 		login = @params[:person][:name]
 		email = @params[:person][:email]
@@ -27,7 +27,7 @@ class AccountController < UserController
 						logger.info "person: "+@person.to_s
 						logger.info "person.id: "+@person.id.to_s
 						flash.now[:notice]  = "Pseudo created"
-						@session[:person] = @person
+						session[:person] = @person
 					else
 						flash.now[:error] = 'Error creating account'
 					end
@@ -38,12 +38,12 @@ class AccountController < UserController
 			end
 		end
 
-		# Second 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?
-					@session[:person] = @person
+					session[:person] = @person
 				else
 					flash.now[:error]  = "This pseudo is protected with a password"
 				end
@@ -61,8 +61,8 @@ class AccountController < UserController
 						if @user.save
 							flash['notice 2'] = 'Password recorded'
 
-							@session[:person] = @person
-							@session[:user] = @user
+							session[:person] = @person
+							session[:user] = @user
 						end
 					end
 				rescue
@@ -71,8 +71,8 @@ class AccountController < UserController
 
 			elsif User.authenticate(login, password)
 				# There is a password protecting this pseudo
-				@session[:person] = @person
-				@session[:user] = @user
+				session[:person] = @person
+				session[:user] = @user
 
 			elsif not email.empty?
 				begin
@@ -82,8 +82,8 @@ class AccountController < UserController
 							@user.security_token = nil
 							if @user.save
 								flash.now['notice 2']  = 'Password successfully modified!'
-								@session[:person] = @person
-								@session[:user] = @user
+								session[:person] = @person
+								session[:user] = @user
 							end
 						end
 					end
@@ -96,7 +96,7 @@ class AccountController < UserController
 
 			# Third we record the email or send a check_key for a password reset
 			if not email.empty?
-				if @session[:person]
+				if session[:person]
 					if email == @person.email
 						flash.now['notice 3']  = "Email already recorded and verified"
 					else
@@ -114,15 +114,16 @@ class AccountController < UserController
 			end
 		end
 
-		render :partial => 'show', :locals => { :divId => params[:divId] }
-		#render :partial => 'show', :locals => { :divId => 'test' }
+		render :partial => 'show', :locals => {
+			:divId => params[:divId], :choices => getAllVotes }
   end
 
 
   def logout
-    @session[:person] = @person = nil
-    @session[:user] = @user = nil
-		render :partial => 'login', :locals => { :divId => params[:divId] }
+    session[:person] = @person = nil
+    session[:user] = @user = nil
+		render :partial => 'show', :locals => {
+			:divId => params[:divId], :choices => getAllVotes }
   end
 
   def check_key
@@ -132,8 +133,8 @@ class AccountController < UserController
 			@person.email = @user.email
 			@person.save
 			flash.now[:notice] = "Email #{@person.email} verified."
-			@session[:person] = @person
-			@session[:user] = @user
+			session[:person] = @person
+			session[:user] = @user
 			render :text => "<h1>Email verified!</h1> \
 				<br/> \
 				<a href='#{url_for :controller => 'elt', :action => 'show', :id => nil }'>\
@@ -183,5 +184,13 @@ class AccountController < UserController
       logger.error e
     end
   end
+
+	def getAllVotes
+		return if !params[:divId]
+		elt = Elt.find params[:divId].gsub(/author_/, '')
+		Choice.find_all_by_person_id((session[:person] ? session[:person].id : nil),
+			:include => 'elt',
+			:conditions => "elts.lft >= '#{elt.lft}' AND elts.rgt <= '#{elt.rgt}'")
+	end
 end
 

data/app/controllers/application.rb

@@ -9,9 +9,7 @@ class ApplicationController < ActionController::Base
 
   before_filter :set_charset
 	after_filter :fix_unicode_for_safari
-
-	include LiveTree
-	helper LiveTreeHelper
+	after_filter :compress_output
 
 	# automatically and transparently fixes utf-8 bug 
 	# with Safari when using xmlhttp

data/app/controllers/elt_controller.rb

@@ -4,73 +4,123 @@
 # An element is just the name for a poll/message/issue
 #
 class EltController < ApplicationController
-  def index
+
+	def index
 		params[:id] = params[:id].gsub(/.html/, '')
-    show
-  end
+		show
+	end
 
-  def show
+	def show
 		params[:id] = params[:id].gsub(/.html/, '')
-    @elt = Elt.find(params[:id])
-		@title = @elt.subject+' (parlement)'
+		@elt = Elt.find(params[:id])
+		@title = @elt.subject
+		@title += " (parlement)" if !@title.downcase.include? "parlement"
+		if request.env['REQUEST_URI'].match '.dyndns'
+			headers["Status"] = "301 Moved Permanently"
+			redirect_to request.env['REQUEST_URI'].gsub(/.dyndns/, '')
+		end
 		render :layout => 'top'
 
 		# TODO
-		rescue ActiveRecord::RecordNotFound => e
-			flash[:error] = "Element '#{params[:id]}' does not exist"
-			headers["Status"] = "301 Moved Permanently"
-			redirect_to '/'
-  end
+	rescue ActiveRecord::RecordNotFound => e
+		flash[:error] = "Element '#{params[:id]}' does not exist"
+		headers["Status"] = "301 Moved Permanently"
+		redirect_to '/'
+	end
 
-  def list
-    @elt = Elt.find(params[:id]) if @elt == nil
+	def list
+		@elt = Elt.find(params[:id]) if @elt == nil
 		render :partial => '/elt/list', :locals => { :elt => @elt }
-  end
+	end
+
+	def listByDate
+		@elt = Elt.find params[:id] unless @elt
+		render :partial => 'listByDate'
+	end
+
+	def listByVote
+		@elt = Elt.find params[:id] unless @elt
+		render :partial => 'listByVote'
+	end
 
-  def rss
+	def rss
 		params[:id] = params[:id].gsub(/.rss/, '')
 		@headers["Content-Type"] = "text/xml; charset=utf-8" 
-    @elt = Elt.find(params[:id]) if @elt == nil
-  end
+		@elt = Elt.find(params[:id]) if @elt == nil
+	end
+
+	def vote_rss
+		params[:id] = params[:id].gsub(/.rss/, '')
+		@headers["Content-Type"] = "text/xml; charset=utf-8" 
+		@elt = Elt.find(params[:id]) if @elt == nil
+	end
 
 	# Used to initialise the elt, its subject mainly
-  def new
-    @elt = Elt.new
+	def new
+		@elt = Elt.new
 		@elt.parent = Elt.find(params[:id])
-		@elt.position = 0
-		@elt.person = Person.find_by_name(cookies[:person])
-		@elt.build_person if @elt.person == nil
-
-		@person = @elt.person
 
 		if @elt.parent.subject.include? 'Re: '
 			@elt.subject = @elt.parent.subject 
 		else
 			@elt.subject = 'Re: '+@elt.parent.subject 
 		end
-  end
+	end
 
-  def preview
+	def preview
 		render :inline => h(format(params[:elt][:body]))
-  end
-
-  def create
-    @elt = Elt.new(params[:elt])
+	end
 
+	def create
+		@elt = Elt.new(params[:elt])
 		@elt.person = @session[:person]
 
-    if params[:submit] == 'preview' or @elt.save
-			render :partial => '/elt/elt', :locals => { :elt => @elt, :eltTop => false }
-    else
-      flash[:notice] = 'Error'
-      render :controller => 'elt', :action => 'new'
-    end
-  end
-
-  def raw_elt
-    @mail = Elt.find(params[:id]).mail
-    #@elt = TMail::Mail.parse(Elt.find(params[:id]).mail.id)
+		if @elt.subject.match(/([<>\/]|href)/) then
+			logger.error "SPAM! '#{@elt.subject}'"
+			logger.error "SPAM! '#{@elt.body}'"
+			flash[:error] = 'Sorry, to fight spam "<" ">" or "href" are forbidden in the subject!'
+			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
+			headers["Status"] = "201 Created"
+			render :partial => '/elt/elt', :status => 201, :locals => { :elt => @elt, :eltTop => false }
+		else
+			flash[:notice] = 'Error'
+			render :controller => 'elt', :action => 'new'
+		end
+	end
+
+	def raw_elt
+		@mail = Elt.find(params[:id]).mail
+		#@elt = TMail::Mail.parse(Elt.find(params[:id]).mail.id)
 		render :inline => "<pre><%= @mail.file %></pre>", :layout => 'top'
-  end
+	end
+
+	def vote
+		@elt = Elt.find params[:id]
+		vote = @elt.children.build
+		vote.person = session[:person]
+		vote.subject = @elt.subject
+		vote.subject = 'Re: '+vote.subject if vote.subject and !vote.subject.include? 'Re: '
+		vote.body = params[:choice][:value]
+
+		choice = Choice.find_by_elt_id_and_person_id @elt.id, (session[:person] ? session[:person].id : nil)
+
+		if choice and choice.value == vote.body.to_i then
+			logger.info "#{(session[:person] ? session[:person].name : 'null')} voting 0"
+			vote.body = "0"
+		else
+			logger.info "#{(session[:person] ? session[:person].name : 'null')} voting #{params[:choice][:value]}"
+		end
+
+		vote.publish
+		@elt.add_child vote
+
+		render :partial => '/elt/choice', :locals => { :elt => @elt }
+	end
+
+	def choices
+		@elt = Elt.find params[:id]
+	end
 end
 

data/app/helpers/elt_helper.rb

@@ -9,6 +9,7 @@ module EltHelper
 		# /italic/
 		# - listElement
 		# 1. numbered list
+		# chat log lines become list elements
 		# short lines to which are added a break
 		text = auto_link data \
 				.gsub(/^\b(.*:)$(\n)^>\s/, '\\1<br/>\\2\\2> ') \
@@ -17,9 +18,11 @@ module EltHelper
 				.gsub(/(\s+)\/([\w\s]*)\//, '\\1_\\2_') \
 				.gsub(/^-\s/, '* ') \
 				.gsub(/^\d+[\.-]\s+/, '# ') \
+				.gsub(/^(\d\d:\d\d\s)/, '* \\1') \
 				.gsub(/^\b(.{2,50})$(\n)\b/, '\\1<br/>\\2') \
 			if data != nil
 
+		#hard_breaks = true
 		textiled = text.blank? ? "" : RedCloth.new(text)
 		begin
 			textiled = textiled.to_html if !textiled.blank?
@@ -28,28 +31,13 @@ module EltHelper
 			textiled = textiled.gsub(/[->\[]/, ' ')
 			textiled = textiled.to_html
 		end
-		if ! textiled.match(/[.\s]<p>/) then
+		if ! textiled.match(/[.\s]<p>/) and textiled.size < 200 then
 			# Remove any leading and finishing <p> </p> as they are not required
 			if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
 			if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
 		end
 
 		textiled
-
-		# in reply to:\n>
-		#		.gsub(/(:)(\n)(^>\s)/, '\\1\\2\\2\\3') \
-		# ^here: data
-		#		.gsub(/^(\w*):\s/, ' \\1: ') \
-
-#		hard_breaks = false
-#    auto_link textilize_without_paragraph(data \
-#        .gsub(/\&\#8211\;/, '* ') \
-#        .gsub(/^-\s/, '* ') \
-#        .gsub(/[^\n]\n^>/, '') \
-#        .gsub(/^\d+[ \.-]+/, '# ') \
-#    # ).gsub(/(.{65,182})<br\s\/>/, \
-#		# ).gsub(/([\r\n\<\>=\w\d\s.\:;,$*?!\-����������\"\&#;()\/]{65,182})<br\s\/>([^>])/,
-#		  ) if data != nil
 	end
 
 	#
@@ -60,10 +48,11 @@ module EltHelper
 	#
 	def displayTitle? elt
 		#elt.id and elt.subject.reverse.index(elt.parent.subject.reverse) != 0
-		elt.id and elt.parent and !elt.subject.empty? \
+		elt.id and elt.parent and elt.subject and !elt.subject.empty? \
 			and elt.subject != elt.parent.subject \
+			and elt.parent.subject \
 			and elt.subject.downcase != elt.parent.subject.downcase \
-			and not elt.subject =~ /^((\[[\w]*\] )*(r�f|re|sv|aw)*(.)*:[ \t]*)+(#{Regexp.escape(elt.parent.subject)})/
+			and not elt.subject.sub(/(Re|r�f|re|sv|aw):\s*/, '') == elt.parent.subject
 	end
 end
 

data/app/models/elt.rb

@@ -7,7 +7,8 @@
 class Elt < ActiveRecord::Base
 	usesguid
 
-	acts_as_tree :order => "position is not null, position, created_on"
+	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
 
 	has_one :mail, :dependent => true
 	has_many :attachments, :dependent => true
@@ -16,14 +17,9 @@ class Elt < ActiveRecord::Base
 
 	has_and_belongs_to_many :subscribers, :class_name => "Person", :join_table => "subscribers"
 
-	has_many :choices
+	has_many :choices, :dependent => true, :order => "choices.created_on"
 	has_many :voters, :through => :choices, :source => :person
 
-	# for live_tree
-	def name
-		subject
-	end
-
 	# Just a quick method to get all subscribers as a simple list
 	def all_recipients
 		if parent
@@ -33,36 +29,94 @@ class Elt < ActiveRecord::Base
 		end
 	end
 
-	alias_method :simple_save, :save
-
-	# Save, publish and vote this elt
-	def save
-		publish
-		simple_save
-		vote
-	end
-
 	def vote(value = 1, person = self.person)
 		logger.info "#{person.name if person} vote #{value} on #{subject} #{self.choices}"
-		choices.each{ |c| logger.info c if c.person == person; c.destroy if c.person == person }
+		choices.each{ |c| c.destroy if c.person == person }
 		choice = choices.build :value => value, :person => person
 		choice.save!
 	end
 
 	# Get the vote results
 	def result(electoralList = nil)
-		(Choice.count("elt_id = '#{self.id}' AND value = 1") \
-			- \
-			Choice.count("elt_id = '#{self.id}' AND value = -1"))
+		#(Choice.count("elt_id = '#{self.id}' AND value = 1") \
+		#	- \
+		#	Choice.count("elt_id = '#{self.id}' AND value = -1"))
+		Choice.sum(:value, :conditions => "elt_id = '#{self.id}'")
 	end
 
-	private
-
 	# Mail this elt to all subscribers
 	def publish
 		logger.info "Publish #{subject}"
+
 		build_mail(:elt => self) unless mail
 		mail.publish
+		save!
+
+		parent.vote Regexp.last_match(1), person if body =~ /^\s*(-1|0|\+1)(\s|$)/
+		if self.body.gsub(/(-1|0|\+1)/, '').strip.empty?
+			# Hide simple votes
+			vote -1
+		else
+			vote if person
+		end
+		true
+	end
+
+	def save
+		if new_record? and subject and not subject.empty?
+			# Let's generate a nice looking id
+			self.id = new_id = subject.gsub(/\[[\w-]*\]/, '').strip.gsub(/[\s\?\&\#\\\/:]+/, '_')
+
+			discrim = 0
+			self.id = "#{new_id}_#{discrim}" while discrim += 1 and self.class.find_by_id self.id
+		end
+
+		super
+	end
+
+	#
+	#     ___________________________________________________________________
+	#    |  Root                                                             |
+	#    |    ____________________________    ____________________________   |
+	#    |   |  Child 1                  |   |  Child 2                  |   |
+	#    |   |   __________   _________  |   |   __________   _________  |   |
+	#    |   |  |  C 1.1  |  |  C 1.2 |  |   |  |  C 2.1  |  |  C 2.2 |  |   |
+	#    1   2  3_________4  5________6  7   8  9_________10 11_______12 13  14
+	#    |   |___________________________|   |___________________________|   |
+	#    |___________________________________________________________________| 
+	#
+	def move(destination)
+		return if self[right_col_name].nil? || self[left_col_name].nil? \
+			|| destination[right_col_name].nil? || destination[left_col_name].nil? \
+			|| (self[left_col_name] < destination[left_col_name] && destination[right_col_name] < self[right_col_name])
+
+		dif = self[right_col_name] - self[left_col_name] + 1
+		moveBy = destination[right_col_name] - self[left_col_name]
+
+		self.class.transaction {
+			# Take out of range this very node
+			self.class.update_all( "#{left_col_name} = -#{left_col_name}, #{right_col_name} = -#{right_col_name}",
+				"#{scope_condition} AND #{self[left_col_name]} <= #{left_col_name} AND #{right_col_name} <= #{self[right_col_name]}" )
+
+			# Shift intermediary elements to the left
+			self.class.update_all( "#{left_col_name} = (#{left_col_name} - #{dif})",
+				"#{scope_condition} AND #{self[right_col_name]} < #{left_col_name} AND #{left_col_name} < #{destination[right_col_name]}" )
+			self.class.update_all( "#{right_col_name} = (#{right_col_name} - #{dif})",
+				"#{scope_condition} AND #{self[right_col_name]} < #{right_col_name} AND #{right_col_name} < #{destination[right_col_name]}" )
+
+			# Shift intermediary elements to the right
+			self.class.update_all( "#{left_col_name} = (#{left_col_name} + #{dif})",
+				"#{scope_condition} AND #{destination[right_col_name]} < #{left_col_name} AND #{left_col_name} < #{self[left_col_name]}" )
+			self.class.update_all( "#{right_col_name} = (#{right_col_name} + #{dif})",
+				"#{scope_condition} AND #{destination[right_col_name]} <= #{right_col_name} AND #{right_col_name} < #{self[left_col_name]}" )
+
+			# Puts back this element where it should be
+			self.class.update_all( "#{left_col_name} = -#{left_col_name} + #{moveBy}, #{right_col_name} = -#{right_col_name} + #{moveBy}",
+				"#{scope_condition} AND #{self[left_col_name]} <= -#{left_col_name} AND #{right_col_name} <= -#{self[right_col_name]}" )
+
+			self.parent = destination
+			self.save!
+		}
 	end
 end
 

data/app/models/mail.rb

@@ -103,7 +103,9 @@ class Mail < ActiveRecord::Base
 		rescue ActiveRecord::RecordNotFound
 			elt.build_parent :parent_id => 'mail', :subject => parentId, :body => ''
 			elt.parent.id = parentId
-			elt.parent.save!
+			elt.parent.publish
+			elt.save
+			elt.parent.parent.add_child elt.parent
 		end
 
 		mngAttachment(mail) if mail
@@ -111,16 +113,10 @@ class Mail < ActiveRecord::Base
 		self.message = mail.message_id
 		self.mail_parents = mail.references
 		self.file = mail.encoded
-		elt.save!
-
-		if elt.body =~ /^\s*(-1|0|\+1)(\s*|$)/ then
-			#print '(', $`, ': ', Regexp.last_match(1), ')'
-			#puts
-			elt.parent.vote Regexp.last_match(1)
-		end
+		elt.publish
+		elt.parent.add_child elt
 	end
 
-
 	"""            _     _ _     _     
 		 _ __  _   _| |__ | (_)___| |__  
 		| '_ \| | | | '_ \| | / __| '_ \ 
@@ -201,7 +197,14 @@ class Mail < ActiveRecord::Base
 		if attachment.content_type == 'text/plain'
 			charset = attachment.type_param 'charset'
 			if charset and !charset.empty?
-				elt.body += Iconv.new(charset, 'utf-8').iconv(attachment.body)
+				if attachment.transfer_encoding == 'quoted-printable'
+					# Here to correct a null character which can occur in some mails
+					# It looks like ==0 or ^@ !!!
+					# Otherwise the elt can not be saved in the db :(
+					elt.body += Iconv.new(charset, 'utf-8').iconv(attachment.body).gsub(/\0/, '')
+				else
+					elt.body += Iconv.new(charset, 'utf-8').iconv(attachment.body)
+				end
 			else
 				elt.body += attachment.body
 			end

data/app/models/mail_notify.rb

@@ -9,40 +9,24 @@ class MailNotify < ActionMailer::Base
 		logger.info "Create a mail for publication"
 		subject elt.subject
 
-		recipients (mailing_list(elt.parent).subject.blank? ? '' : mailing_list(elt.parent).subject ) \
-			+ ' <' \
-			+ mailing_list(elt.parent).id + '@' + ActionMailer::Base.server_settings[:domain] \
-			+ '>'
+		ml = mailing_list(elt.parent)
+
+		recipients (ml.subject.blank? ? '' : ml.subject ) \
+			+ " <#{ml.id}@#{ActionMailer::Base.server_settings[:domain]}>"
 
 		from ((elt.person and elt.person.name) ? elt.person.name : ANONYMOUS_POSTER) \
-			+ ' <' \
+			+ " <" \
 			+ ((elt.person and elt.person.email) \
-				? elt.person.email : ANONYMOUS_POSTER + '@' + ActionMailer::Base.server_settings[:domain]) \
-			+ '> '
+				? elt.person.email : "#{ANONYMOUS_POSTER}@#{ActionMailer::Base.server_settings[:domain]}") \
+			+ ">"
 
 		# Try to render the element as html
-		body(:elt => elt)
-
-		#content_type 'multipart/alternative'
-		#part "text/html" do |a|
-		#	a.body = render(:template => "/home/manu/develop/parlement/trunk/app/views/mail_notify/publish.text.html.rhtml",
-		#									:locals => { :elt => elt })
-		#end
-		#part "text/plain" do |a|
-		#	a.body = render(:template => "mail_notify/publish.text.plain",
-		#									:locals => { :elt => elt })
-		#end
-		#	:body => email_builder.render(:file => "mail_notify/publish.text.html.rhtml")
-		#attachment :content_type => "text/html",
-		#	:body => email_builder.render(:file => "mail_notify/publish.text.html.rhtml")
-		#attachment :content_type => "text/plain",
-		#	:body => email_builder.render(:file => "mail_notify/publish.text.plain.rhtml")
-
+		body :elt => elt
 
 		# This is the essential of a mailing list, you reply to the mailing list,
 		# where every body sends their mail.
 		# This very mail can be a mailing list all by itself...
-		@headers['Reply-to'] = mailing_list(elt).id + '@' + ActionMailer::Base.server_settings[:domain]
+		@headers['Reply-to'] = "#{ml.id}@#{ActionMailer::Base.server_settings[:domain]}"
 
 		@headers['In-Reply-To'] = elt.parent.mail.message \
 			if elt.parent and elt.parent.mail and elt.parent.mail.message
@@ -56,7 +40,7 @@ class MailNotify < ActionMailer::Base
 			@headers['references'] << parentMsg.message if parentMsg.message
 		end
 
-		@headers['X-Mailer'] = ActionMailer::Base.server_settings[:domain] + " v" + PARLEMENT_VERSION
+		@headers['X-Mailer'] = "#{ActionMailer::Base.server_settings[:domain]} v#{PARLEMENT_VERSION}"
 
 		logger.info "Mail created"
 	end
@@ -70,7 +54,7 @@ class MailNotify < ActionMailer::Base
 	# generated ids
 	#
 	def mailing_list(elt)
-		if (elt.id.size > 21 and elt.parent_id != 'ROOT') then
+		if (elt.id.size > 21 and elt.parent_id != 'ROOT' and !elt.subject.match 'Re: ') then
 			mailing_list elt.parent
 		else
 			elt

data/app/models/person.rb

@@ -6,7 +6,7 @@ class Person < ActiveRecord::Base
 	has_many :issues, :through => :choices, :source => :elt
 
 	validates_presence_of :name, :on => :create
-	validates_length_of :name, :within => 3..40, :on => :create
+	validates_length_of :name, :within => 3..80, :on => :create
   validates_uniqueness_of :name, :on => :create
   validates_uniqueness_of :email, :on => :create,
 		:if => Proc.new { |p| p.email and p.email.length > 0 }