parlement 0.2 → 0.3

data/CHANGES

@@ -1,13 +1,23 @@
 - parlement changelog
 
+== Version 0.3
+
+Major version, adding the possibility to use not only the web forums, but mails
+
+* mailing list functionality!!!
+* new look
+* tests all pass
+* rails 1.0
+* plugin guid
+* W3C xhtml 1.0 compliant
+
+
 == Version 0.2
 
 Evolutions
 
-* Anonymous users doing a quick post (where the subject is not modified) will
-	be marked as "anon"
-* Each person has a public page listing its posts (this page can also be used
-	to post...)
+* Anonymous users doing a quick post (where the subject is not modified) will be marked as "anon"
+* Each person has a public page listing its posts (this page can also be used to post...)
 * Display the creation time for the most important posts
 
 

data/README

@@ -1,9 +1,31 @@
 I am using debian, so here are a few commands I use:
-# apt-get install ruby
 # apt-get install postgresql
-# apt-get install libpgsql-ruby1.6
-# apt-get install libredcloth-ruby
+# sudo su - postgres
+# createuser /your_login/
+# apt-get install ruby
+# apt-get install libpgsql-ruby
 # apt-get install irb
+# apt-get install libredcloth-ruby
+# apt-get install rdoc
+
+-> why???
+# ln -s /sbin/ifconfig /bin/
+
+# gem install -r rails
+Only if you expect to develop and release:
+# gem install -r meta_project
+
+
+The database is setup for user "manu", you may need to change the file
+config/database.yml for your own settings.
+
+Change config/environment.rb to set the domain, default is something like
+'leparlement.org', define it as your web site or email domain.
+
+In procmail, define a rule to redirect the relevant mail to parlement, I use:
+:0 c
+* ^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
@@ -13,8 +35,6 @@ launch parlement thus:
 ~ ruby lib/data_import.rb
 ~ ruby ./script/server
 
-The database is setup for user "manu", you may need to change the file
-config/database.yml for your own settings.
 
 Now you can go to localhost:3000
 

data/Rakefile

@@ -35,7 +35,7 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
 	'[A-Z]*', 'app/**/*', 'components/**/*', 'config/**/*', 'db/**/*',
 	'lib/**/*', 'public/**/*', 'script/**/*', 'test/**/*', 'vendor/**/*'
-].exclude(/\bCVS\b|~$/)
+].exclude(/\bsvn\b|~$/)
 
 spec = Gem::Specification.new do |s|
 	## Basic information.
@@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
 EOF
 	s.files = PKG_FILES
 	s.require_path = 'lib'
-	s.autorequire = 'rails, meta_project'
+	s.autorequire = 'rails'
 	s.has_rdoc = false
 	s.requirements << 'none'
 	s.test_files = Dir.glob('test/unit/*')
@@ -73,11 +73,10 @@ EOF
 	s.add_dependency('rails')
 end
 
+desc "Build Gem"
 Rake::GemPackageTask.new(spec) do |pkg|
-  #pkg.gem_spec = spec
 	pkg.need_zip = true
 	pkg.need_tar = true
-	#pkg.package_files.include("*")
 end
 
 
@@ -90,8 +89,8 @@ task :todo do
   end
 end
 
-#task :release => [:verify_env_vars, :release_files, :publish_doc, :publish_news, :tag]
-task :release => [:verify_env_vars, :release_files, :publish_news]
+#task :release => [:verify_env_vars, :release_files, :publish_doc, :publish_news]
+task :release => [:release_files, :publish_news]
 
 task :verify_env_vars do
 	if not ENV["RUBYFORGE_USER"]
@@ -122,7 +121,6 @@ task :verify_env_vars do
 		print "freshmeat's password: "
 		ENV["FRESHMEAT_PASSWORD"] = STDIN.gets.chomp
 	end
-
 end
 
 task :publish_doc do
@@ -131,7 +129,7 @@ task :publish_doc do
 end
 
 desc "Release files on RubyForge"
-task :release_files => [:gem] do
+task :release_files => [:verify_env_vars, :package] do
 	release_files = FileList[ "pkg/#{PKG_FILE_NAME}.gem",
 		"pkg/#{PKG_FILE_NAME}.tgz",
 		"pkg/#{PKG_FILE_NAME}.zip" ]
@@ -140,6 +138,8 @@ task :release_files => [:gem] do
     # Never hardcode user name and password in the Rakefile!
     release.user_name = ENV['RUBYFORGE_USER']
     release.password = ENV['RUBYFORGE_PASSWORD']
+		#puts "login: ", ENV['RUBYFORGE_USER']
+		#puts "password: ", ENV['RUBYFORGE_PASSWORD']
     release.files = release_files.to_a
     release.release_name = "#{PKG_NAME} #{PKG_VERSION}"
     # The rest of the options are defaults (among others, release_notes and release_changes, parsed from CHANGES)
@@ -148,24 +148,31 @@ end
 
 
 desc "Publish news"
-task :publish_news => [:gem] do
-  Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news|
+task :publish_news => [:verify_env_vars] do
+	#release_files = FileList[ "pkg/#{PKG_FILE_NAME}.gem",
+	#	"pkg/#{PKG_FILE_NAME}.tgz",
+	#	"pkg/#{PKG_FILE_NAME}.zip" ]
+
+	Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news|
     # Never hardcode user name and password in the Rakefile!
     news.user_name = ENV['RUBYFORGE_USER']
     news.password = ENV['RUBYFORGE_PASSWORD']
   end
 
+	"""
 	fm = DevTools::Freshmeat::FreshmeatService.new(ENV['FRESHMEAT_USER'], ENV['FRESHMEAT_PASSWORD'])
 	fm.get_project_list.each do |p|
-		puts p
 		branches = fm.get_branch_list( p.shortName )
-		puts branches.inspect
 		release = fm.get_release( p.shortName, branches[0], p.version )
-		puts release
+		if PKG_NAME == p.shortName
+			puts p
+			release.version = PKG_VERSION
+			release.changes = PKG_VERSION
+		end
 	end
 	puts fm.logout
 
-	"""
+ 
   Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::Fresh.new(PKG_NAME)) do |news|
     # Never hardcode user name and password in the Rakefile!
     news.user_name = ENV['RUBYFORGE_USER']
@@ -174,10 +181,3 @@ task :publish_news => [:gem] do
 	"""
 end
 
-desc "Tag all the CVS files with the latest release number (REL=x.y.z)"
-task :tag do
-  reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
-  puts "Tagging CVS with [#{reltag}]"
-  sh %{cvs tag #{reltag}}
-end
-

data/app/controllers/account_controller.rb

@@ -1,3 +1,6 @@
+# 
+# This class manages users inscription, login and logout
+#
 class AccountController < UserController
 	model :person
   model :user
@@ -116,6 +119,7 @@ class AccountController < UserController
 
   def logout
     @session[:person] = @person = nil
+    @session[:user] = @user = nil
 		render :partial => 'login', :locals => { :divId => params[:divId] }
   end
 
@@ -143,8 +147,8 @@ class AccountController < UserController
 	end
 
 
-	protected
 	# Mostly copied from the login engine
+	protected
   def signup
 		if @person and not @user
 			@user = User.new

data/app/controllers/elt_controller.rb

@@ -1,7 +1,8 @@
-"""
-This is the central component to parlement
-An element is just the name for a poll/message/issue
-"""
+#
+# This is the central component to parlement
+#
+# An element is just the name for a poll/message/issue
+#
 class EltController < ApplicationController
   def index
 		params[:id] = params[:id].gsub(/.html/, '')
@@ -31,10 +32,12 @@ class EltController < ApplicationController
   end
 
   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
 
+	# Used to initialise the elt, its subject mainly
   def new
     @elt = Elt.new
 		@elt.parent = Elt.find(params[:id])
@@ -61,12 +64,6 @@ class EltController < ApplicationController
 		@elt.person = @session[:person]
 
     if params[:submit] == 'preview' or @elt.save
-			#cookies[:person] = { :value => @elt.person.name,
-			#	:expires => Time.now + 360000 }
-      #flash[:notice] = 'Elt was successfully created.'
-      #redirect_to :action => 'top', :id => @elt.parent_id
-			#render_component(:action => 'show', :id => @elt.id )
-
 			render :partial => '/elt/elt', :locals => { :elt => @elt, :eltTop => false }
     else
       flash[:notice] = 'Error'

data/app/controllers/person_controller.rb

@@ -1,4 +1,7 @@
 class PersonController < ApplicationController
+	# To make sure we can also display properly this person's elements
+	helper :elt
+
 	layout 'top'
 	model :person
 
@@ -10,4 +13,10 @@ class PersonController < ApplicationController
 			flash[:error] = "Person '#{params[:id]}' does not exist"
 			redirect_to '/'
   end
+
+  def list
+    @person = Person.find(params[:id]) if @person == nil
+		render :partial => '/person/listElts', :locals => { :person => @person }
+  end
 end
+

data/app/controllers/subscriber_controller.rb

@@ -0,0 +1,21 @@
+class SubscriberController < ApplicationController
+
+  def subscribe
+    @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..."
+			else
+				@elt.subscribers << @session[:person]
+				logger.info "Subscribed #{@session[:person].name} to #{@elt.subject}..."
+				render :inline => "Subscribed..."
+			end
+		else
+			puts "Not logged in!"
+			render :inline => "First you need to login... it's easy, juste type a pseudo, any pseudo ;-) "
+		end
+  end
+end

data/app/helpers/elt_helper.rb

@@ -16,22 +16,34 @@ module EltHelper
 				.gsub(/^\d+[\.-]\s+/, '# ') \
 			if data != nil
 
+		# Remove any leading and finishing <p> </p>
 		textiled = text.blank? ? "" : RedCloth.new(text).to_html
 		if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
 		if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
-		return textiled
 
-		"""
-		hard_breaks = false
-    auto_link textilize_without_paragraph(data \
-        .gsub(/\&\#8211\;/, '* ') \
-        .gsub(/^-\s/, '* ') \
-        .gsub(/(\s+)\/([\w\s�������]*)\//, '\\1_\\2_') \
-        .gsub(/[^\n]\n^>/, '') \
-        .gsub(/^\d+[ \.-]+/, '# ') \
-    # ).gsub(/(.{65,182})<br\s\/>/, \
-		# ).gsub(/([\r\n\<\>=\w\d\s.\:;,$*?!\-����������\"\&#;()\/]{65,182})<br\s\/>([^>])/,
-		  ) if data != nil
-		"""
+		textiled
+
+#		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
+
+	#
+	# Should we display an element's title
+	#
+	# The algo used is simple, display a title if it is not a simple reply to its
+	# parent
+	#
+	def displayTitle? elt
+		#elt.id and elt.subject.reverse.index(elt.parent.subject.reverse) != 0
+		elt.id and elt.parent and elt.subject != elt.parent.subject \
+			and not elt.subject =~ /^((\[[\w]*\] )*(r�f|re|sv|aw)*(.)*:[ \t]*)+#{elt.parent.subject}/
 	end
 end
+

data/app/helpers/mailman.rb

@@ -1,96 +1,13 @@
-"""
-Receive an email from which an elt is created. An associated mail is kept to
-make sure we don't lose any data. Attachments are also created in an associated
-table
-"""
+#
+# Receive an email from which an elt is created.
+#
+# An associated mail is kept to make sure we don't lose any data. Attachments
+# are also created in an associated table
+#
 class Mailman < ActionMailer::Base
-	""" This is to make sure we only have utf-8, no iso-8859 """
-	def unquote(text)
-		text.gsub(/\=\?.*?\?\=/) do |m|
-			TMail::Unquoter.unquote_and_convert_to(m, 'utf-8')
-		end
-	end
-
 	def receive(email)
-		@elt = Elt.new
-		@elt.created_on = email.date
-		@elt.subject = unquote(email.subject)
-
-		@elt.body = ''
-
-		@elt.person = Person.find_by_name(unquote(email.friendly_from))
-		@elt.person = Person.new if @elt.person == nil
-		@elt.person.name = unquote(email.friendly_from)
-		@elt.person.email = email.from.first
-
-		if email.references != nil
-			# Try to fin its email parent in the db
-			for parent in email.references
-				m = Mail.find_by_message(parent.to_s)
-				@elt.parent = m.elt if m != nil
-			end
-		end
-
-		if @elt.parent == nil
-			parentId = @elt.subject.match(/\[\w*\]/)
-			logger.info parentId
-			if parentId != nil
-				parentId = parentId[0].gsub(/[\[\]]/, '')
-				parentElt = Elt.find(parentId)
-				logger.info parentElt
-				if parentElt != nil
-					@elt.subject = @elt.subject
-					@elt.parent_id = parentId
-				end
-				logger.info @elt.subject
-			end
-		end
-
-		@elt.parent_id = 'mails' if @elt.parent == nil
-
-
-		mngAttachment(email) if email != nil
-
-
-		logger.info email.from.first
-		@mail = Mail.new
-		logger.info email.friendly_from
-		@mail.message = email.message_id
-		logger.info email.references
-		@mail.mail_parents = email.references
-
-		@mail.file = email.encoded
-
-		@elt.save
-		@mail.elt = @elt
-		@mail.save
-	end
-
-	def mngAttachment(attachment)
-		if attachment.content_type == 'text/plain'
-			@elt.body += attachment.body
-		elsif attachment.multipart?
-			attachment.parts.each do |part|
-				mngAttachment(part)
-			end
-		elsif attachment.content_type != 'text/html'
-			@attach = @elt.attachments.build
-			body = attachment.body
-
-			@attach.content_type = attachment.content_type
-
-			def body.original_filename=(orig)
-				@original_filename = orig
-			end
-			body.original_filename = attachment.type_param('name')
-			def body.original_filename
-				@original_filename
-			end
-			def body.read
-				self.to_s
-			end
-
-			@attach.file = body
-		end
+		elt = Elt.new
+		elt.receive(email)
 	end
 end
+

data/app/helpers/subscriber_helper.rb

@@ -0,0 +1,2 @@
+module SubscriberHelper
+end

data/app/models/attachment.rb

@@ -1,4 +1,6 @@
 class Attachment < ActiveRecord::Base
+	usesguid
+
 	belongs_to :elt
 	file_column :file
 end

data/app/models/elt.rb

@@ -1,17 +1,79 @@
+#
+# This is, in fact, the main parlement class!
+#
 class Elt < ActiveRecord::Base
+	usesguid
+
 	acts_as_tree :order => "position is not null, position, created_on"
-	belongs_to :person
+
 	has_one :mail, :dependent => true
 	has_many :attachments, :dependent => true
 
+	belongs_to :person
+
+	has_and_belongs_to_many :subscribers,
+		:class_name => "Person",
+		:join_table => "subscribers"
+
 	# for live_tree
 	def name
 		subject
 	end
 
+	# Just a quick method to get all subscribers as a simple list
+	def all_recipients
+		result = Array.new
+		eltRecipient = self
+		while eltRecipient
+			result.concat eltRecipient.subscribers
+			eltRecipient = eltRecipient.parent
+		end
+		logger.debug "all_recipients result: #{result.to_s}"
+		return result
+	end
+
+	#
+	# Receive this new elt as an email, sent through app/helpers/mailman.rb
+	#
+	def receive(mail)
+		logger.info "Receive \"#{mail.subject}\""
+
+		# TODO
+		# Loop detection, will need more work
+		mail1 = Mail.find_by_message(mail.message_id)
+		# The to_s seems necessary
+		mail2 = Mail.find_by_message(mail['X-Message-Id'].to_s) if mail['X-Message-Id']
+
+		if not mail1 and not mail2
+			self.mail = Mail.new if not self.mail
+			self.mail.elt = self
+			self.mail.receive(mail)
+			save
+		else
+			logger.info "Already received (id: #{mail.message_id})...\n"
+		end
+	end
+
+	#
+	# Save and publish this elt
+	#
 	def save
 		super
-		logger.info 'hello world!!!'
+		publish
+		logger.info "\n"
+	end
+
+	private
+
+	#
+	# Mail the elt to all subscribers
+	#
+	def publish
+		logger.info "Publish #{subject}"
+		self.mail = Mail.new if not self.mail
+		self.mail.elt = self
+		self.mail.publish
+		self.mail.save
 	end
 end