parlement 0.4 → 0.5

data/app/views/elt/new.rhtml

@@ -4,10 +4,12 @@
 
 <%= error_messages_for 'elt' %>
 
-<div id="author_<%= @elt.parent_id %>">
+<!--
+<span id="author_<%= @elt.parent_id %>">
 	<%= render :partial => 'account/show',
 		:locals => { :divId => 'author_'+@elt.parent_id } %>
-</div>
+</span>
+-->
 
 <%= form_remote_tag(
 	:update => 'eltSubs_'+@elt.parent_id,
@@ -38,14 +40,14 @@
 		<%= text_field 'elt', 'position', 'size' => 1, 'align' => 'right' %>
 	</div>
 
-	<p style="margin-top:0px;text-align:right">
-		<%= text_area 'elt', 'body' %>
+	<%= text_area 'elt', 'body' %>
 
+	<div class="eltNewButtons">
 		<%= submit_to_remote('Preview', 'Preview',
 				:update => 'eltNewPreview_'+@elt.parent_id,
 				:url => { :action => 'create', :submit => :preview },
 				:loaded => visual_effect(:BlindDown, 'eltNewPreview_'+@elt.parent_id)) %>
-		<%= submit_tag 'Propose' %>
+		<%= submit_tag 'Propose!' %>
 
 		<%= render :partial => '/help',
 			:locals => { :divId => 'body'+@elt.parent_id, :content => '
@@ -91,11 +93,9 @@
 				</div>
 				<a href="http://hobix.com/textile/quick.html">Textile Reference</a>
 			' } %>
+	</div>
 
-		<div style="display:none" class="eltNew" id="eltNewPreview_<%= @elt.parent_id %>">
-			&nbsp;
-		</div>
-	</p>
+	<span class="eltNew" id="eltNewPreview_<%= @elt.parent_id %>"/>
 
 	<!--[eoform:elt]-->
 <%= end_form_tag %>

data/app/views/elt/show.rhtml

@@ -1,4 +1,20 @@
 <div class="sidebar">
+	<h3 class="boxTitle">Electoral list</h3>
+	<div class="box">
+		All voters:
+		<span class="result" style="float: none">
+			<%= Choice.count :select => 'person_id', :distinct => true %>
+		</span>
+	</div>
+
+	<h3 class="boxTitle">Identity</h3>
+	<div class="box">
+		<div id="author_<%= @elt.id %>">
+			<%= render :partial => 'account/show',
+					:locals => { :divId => 'author_'+@elt.id } %>
+		</div>
+	</div>
+
 	<% if @elt.children.count > 0 %>
 		<h3 class="boxTitle">Titres</h3>
 	<% end %>
@@ -7,6 +23,7 @@
 		<ul>
 			<% for elt in @elt.children.reverse[0...PAGE_ELT_LENGTH] %>
 				<li class="boxLine" title="<%= elt.created_on.strftime('%d/%m') %>">
+					<span class="result"><%= sprintf("%+d", elt.result) %></span>
 					<%= link_to elt.subject, :id => elt %>
 				</li>
 			<% end %>
@@ -18,11 +35,6 @@
 
 	<h3 class="boxTitle">Subscribe</h3>
 	<div class="box">
-		<div id="author_<%= @elt.id %>">
-			<%= render :partial => 'account/show',
-					:locals => { :divId => 'author_'+@elt.id } %>
-		</div>
-
 		<div id="subscription">
 			<%= link_to_remote(((@session[:person] and @elt.subscribers.include?(@session[:person])) ? 'Unsubscribe!' : 'Subscribe!'),
 					:update => 'subscription',
@@ -30,12 +42,12 @@
 					:loaded => visual_effect(:BlindDown, 'subscription')) %>
 		</div>
 
-		<div class="boxLine"><%= @elt.subscribers.size %> subscriber(s)</div>
 		<div class="boxLine">
 			<% @elt.subscribers.each do |i| %>
 				<%= link_to(i.name, :controller => 'person', :action => 'show', :id => i) %>
 			<% end %>
 		</div>
+		<div class="boxLineR"><%= @elt.subscribers.size %> subscriber(s)</div>
 	</div>
 </div>
 

data/app/views/layouts/top.rhtml

@@ -45,13 +45,20 @@
 		<p class="version">
 			<a href="<%= url_for :controller => 'elt', :action => 'show', :id => '' %>">
 				v<%= PARLEMENT_VERSION %></a>
-			<a href="http://www.pagerank.net/" title="Search Engine Optimization" target="_blank">
-				<img src="http://www.pagerank.net/pagerank.gif" alt="Search Engine Optimization">
+			<a href="http://www.pagerank.net/" title="Search Engine Optimization">
+				<img src="http://www.pagerank.net/pagerank.gif" alt="Search Engine Optimization"/>
 			</a>
 			<a href="http://validator.w3.org/check?uri=referer">
 				<img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Strict"/>
 			</a>
 		</p>
+
+		<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</script>
+		<script type="text/javascript">
+			_uacct = "UA-317241-1";
+			urchinTracker();
+		</script>
 	</body>
 </html>
 

data/app/views/mail_notify/publish.text.html.rhtml

@@ -26,6 +26,7 @@
 	</head>
 
 	<body>
+		<!--
 		<div class="links">
 			<a class="title" href="http://leparlement.org">Parlement</a>
 			<div class="signets">
@@ -33,7 +34,7 @@
 				<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>
 			</div>
 		</div>
-
+		-->
 		<div class="elt">
 			<h1><%= textilize_without_paragraph @elt.subject %></h1>
 
@@ -41,6 +42,8 @@
 				<%= RedCloth.new(@elt.body).to_html%>
 			</div>
 		</div>
+
+		<a class="title" href="http://leparlement.org">Parlement</a>
 	</body>
 </html>
 

data/app/views/person/_listElts.rhtml

@@ -24,7 +24,8 @@ e = Elt.find_all("person_id = '#{person.id}'",
 		:complete => visual_effect(:BlindDown, 'personElts_'+person.id.to_s)) if e_pages.current.previous %>
 
 <% for elt in e.reverse[0...PAGE_ELT_LENGTH] %>
-	<div class="boxLine">
+	<div class="elt">
+		<span class="result"><%= sprintf("%+d", elt.result) %></span>
 		<%= elt.created_on.strftime('%d/%m %H:%M') %>
 		<%= link_to(elt.subject, :controller => 'elt', :action => 'show', :id => elt) %>
 		(<%= elt.children.size %> sub)

data/app/views/person/show.rhtml

@@ -6,9 +6,7 @@
 	<div class="box">
 		<% for elt in @person.subscribed_elts.reverse[0...PAGE_ELT_LENGTH] %>
 			<div class="boxLine">
-				<span style="float:right;margin-right:0.5em;font-size:smaller;">
-					<%= elt.created_on.strftime('%d/%m') %>
-				</span>
+				<span class="result"><%= sprintf("%+d", elt.result) %></span>
 				<%= link_to(elt.subject, :controller => 'elt', :action => 'show', :id => elt) %>
 			</div>
 		<% end %>

data/config/environment.rb

@@ -64,7 +64,7 @@ require 'rails_file_column'
 require 'jcode'
 $KCODE = 'u'
 
-PARLEMENT_VERSION='0.4'
+PARLEMENT_VERSION='0.5'
 
 # How many elements are displayed at once
 PAGE_ELT_LENGTH = 10

data/db/ROOT/parlement/ddRing.txt

@@ -1,4 +1,4 @@
-DIRECT DEMOCRACY
+Direct Democracy
 
 <img style="float: left; padding-bottom: 1em" src="http://www.acthum.net/directdemocracy/images/dd-sml.gif"/>
 

data/db/ROOT/parlement/news/release0.4.txt

@@ -0,0 +1,15 @@
+Version 0.4
+
+Evolutions and corrections
+
+* bug correction in the regexp managing title display
+* bug managing incoming mails into the "lost+found" folder
+* received mails are resent with the same id
+* no more strange backgrounds in IE
+* short lines (formatted lines in email for exemple), are now wrapped correctly
+* permanent redirect header if an inexistant element is requested
+* rails 1.1
+* plugins now linked to their respective svn
+* elements now in a list (ul/li)
+* simplifications for w3m display
+* yahoo and google footers now hidden

data/db/ROOT/parlement/news/release0.5.txt

@@ -0,0 +1,3 @@
+Version 0.5
+
+Voting. Mails containing -1,0 or +1 trigger a vote

data/db/ROOT/parlement/our-constitution.txt

@@ -0,0 +1,11 @@
+Our constitution
+
+<span style="float:right">
+!http://our-constitution.org/img/choose_europe.jpg!:http://our-constitution.org
+</span>
+
+Writing the European Constitution and involving the people in the process of
+Europe's integration.
+
+A wiki is kept "here":http://our-constitution.org
+

data/db/ROOT/parlement/top-politics.txt

@@ -1,12 +1,10 @@
 top-politics
 
-This group was started with the goal of creating a network of different
-initiatives which reside on the TOP (Transparent Open Public) principles of
-political activities. We hope that we will soon be able to share concepts,
-ideas and suggestions about the Internet as a media, OpenSource as a paradigm
-and Democracy as the ultimate goal.
-
-http://groups.google.com/group/top-politics
-
-(historically here: http://groups.yahoo.com/group/top-politics)
-
+This "group":http://groups.google.com/group/top-politics was
+"started":http://groups.yahoo.com/group/top-politics with the goal of creating
+a network of different initiatives which reside on the *TOP* (Transparent Open
+Public) principles of political activities.
+
+We hope that we will soon be able to share concepts, ideas and suggestions
+about the Internet as a media, OpenSource as a paradigm and Democracy as the
+ultimate goal.

data/db/development_structure.sql

@@ -37,9 +37,11 @@ CREATE TABLE attachments (
 --
 
 CREATE TABLE choices (
-    elt_id text NOT NULL,
-    person_id text NOT NULL,
-    created_on timestamp with time zone DEFAULT now() NOT NULL
+    id serial NOT NULL,
+    elt_id character varying(255) NOT NULL,
+    person_id character varying(255),
+    created_on timestamp without time zone NOT NULL,
+    value integer DEFAULT 1 NOT NULL
 );
 
 
@@ -48,6 +50,7 @@ CREATE TABLE choices (
 --
 
 CREATE TABLE delegations (
+    id serial NOT NULL,
     elt_id text NOT NULL,
     person_id text NOT NULL,
     created_on timestamp with time zone DEFAULT now() NOT NULL,
@@ -179,7 +182,7 @@ ALTER TABLE ONLY attachments
 --
 
 ALTER TABLE ONLY choices
-    ADD CONSTRAINT choices_pkey PRIMARY KEY (elt_id, person_id);
+    ADD CONSTRAINT choices_pkey PRIMARY KEY (id);
 
 
 --
@@ -187,7 +190,15 @@ ALTER TABLE ONLY choices
 --
 
 ALTER TABLE ONLY delegations
-    ADD CONSTRAINT delegations_pkey PRIMARY KEY (elt_id, person_id);
+    ADD CONSTRAINT delegations_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: elt_person_key; Type: CONSTRAINT; Schema: public; Owner: manu; Tablespace: 
+--
+
+ALTER TABLE ONLY choices
+    ADD CONSTRAINT elt_person_key UNIQUE (elt_id, person_id);
 
 
 --
@@ -254,22 +265,6 @@ ALTER TABLE ONLY attachments
     ADD CONSTRAINT attachments_elt_id_fkey FOREIGN KEY (elt_id) REFERENCES elts(id);
 
 
---
--- Name: choices_elt_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
---
-
-ALTER TABLE ONLY choices
-    ADD CONSTRAINT choices_elt_id_fkey FOREIGN KEY (elt_id) REFERENCES elts(id);
-
-
---
--- Name: choices_person_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
---
-
-ALTER TABLE ONLY choices
-    ADD CONSTRAINT choices_person_id_fkey FOREIGN KEY (person_id) REFERENCES people(id);
-
-
 --
 -- Name: delegations_delegate_to_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
@@ -310,6 +305,22 @@ ALTER TABLE ONLY elts
     ADD CONSTRAINT elts_person_id_fkey FOREIGN KEY (person_id) REFERENCES people(id);
 
 
+--
+-- Name: fk_elt_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
+--
+
+ALTER TABLE ONLY choices
+    ADD CONSTRAINT fk_elt_id FOREIGN KEY (elt_id) REFERENCES elts(id);
+
+
+--
+-- Name: fk_person_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
+--
+
+ALTER TABLE ONLY choices
+    ADD CONSTRAINT fk_person_id FOREIGN KEY (person_id) REFERENCES people(id);
+
+
 --
 -- Name: mails_elt_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
@@ -346,3 +357,4 @@ ALTER TABLE ONLY usersold
 -- PostgreSQL database dump complete
 --
 
+INSERT INTO schema_info (version) VALUES (1)

data/db/migrate/001_create_choices.rb

@@ -0,0 +1,27 @@
+class CreateChoices < ActiveRecord::Migration
+  def self.up
+    create_table :choices, :force => true do |t|
+      # t.column :name, :string
+			t.column :elt_id, :string, :null => false
+			t.column :person_id, :string
+			t.column :created_on, :datetime, :null => false
+			t.column :value, :integer, :default => 1, :null => false
+    end
+
+		execute 'ALTER TABLE choices ADD CONSTRAINT fk_elt_id FOREIGN KEY ( elt_id ) REFERENCES elts( id ) '
+		execute 'ALTER TABLE choices ADD CONSTRAINT fk_person_id FOREIGN KEY ( person_id ) REFERENCES people( id ) '
+		execute 'ALTER TABLE choices ADD CONSTRAINT elt_person_key UNIQUE ( elt_id, person_id ) '
+
+		execute 'INSERT INTO choices (elt_id, person_id, created_on, value) SELECT id AS elt_id, person_id, created_on, 1 AS value FROM elts '
+		puts "#{Choice.count} choices"
+
+		elts = Elt.find(:all, :conditions => ["body LIKE '%%+1%%' OR body LIKE '%%0%%' OR body LIKE '%%-1%%'"])
+		puts "#{elts.size} potential choices"
+		elts.each { |e| e.parent.vote(Regexp.last_match(1), e.person) if e.body =~ /^\s*(-1|0|\+1)(\s*|$)/ }
+		puts "#{Choice.count} choices"
+  end
+
+  def self.down
+    drop_table :choices
+  end
+end

data/db/schema.sql

@@ -106,18 +106,19 @@ INSERT INTO subscribers(elt_id, person_id)
 VALUES ('ROOT', 'echarp');
 
 CREATE TABLE choices (
+	id SERIAL PRIMARY KEY,
 	elt_id text NOT NULL REFERENCES elts,
 	person_id text NOT NULL REFERENCES people,
 	created_on timestamp with time zone NOT NULL DEFAULT now(),
-	PRIMARY KEY (elt_id, person_id)
+	value integer NOT NULL DEFAULT 1
 );
 
 CREATE TABLE delegations (
+	id SERIAL PRIMARY KEY,
 	elt_id text NOT NULL REFERENCES elts,
 	person_id text NOT NULL REFERENCES people,
 	created_on timestamp with time zone NOT NULL DEFAULT now(),
 	temporary boolean NOT NULL DEFAULT false,
-	delegate_to text NOT NULL REFERENCES people,
-	PRIMARY KEY (elt_id, person_id)
+	delegate_to text NOT NULL REFERENCES people
 );
 

data/test/fixtures/choices.yml

@@ -0,0 +1,13 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+first:
+  id: 1
+  elt_id: ROOT
+  person_id: echarp
+  created_on: 2006-03-02
+  value: 1
+another:
+  id: 2
+  elt_id: ROOT
+  person_id: echarp
+  created_on: 2006-03-02
+  value: 1

data/test/fixtures/mail/mail_ruby

@@ -26,3 +26,10 @@ Lines: 18
 
 Test d'envoi de mail!
 je teste en même temps les accents unicode!
+
+Et ici de faux votes qui ne devraient pas être pris en compte:
+
+. -1
+1
++ 1
+

data/test/fixtures/mail/mail_rubyChild

@@ -25,4 +25,6 @@ Status: RO
 Content-Length: 1007
 Lines: 18
 
-Test d'envoi de mail!
+-1
+
+Test d'envoi de mail! Et en même temps test de vote!

data/test/fixtures/mail/mail_rubyChild2

@@ -0,0 +1,30 @@
+From manu@leparlement.org Fri Jan 20 20:58:33 2006
+Return-path: <manu@leparlement.org>
+Envelope-to: manu@localhost
+Delivery-date: Fri, 20 Jan 2006 20:58:33 +0100
+Received: from localhost ([127.0.0.1])
+	by localhost.localdomain with esmtp (Exim 4.60)
+	(envelope-from <manu@leparlement.org>)
+	id 1F02P3-0005yR-JN
+	for manu@localhost; Fri, 20 Jan 2006 20:58:33 +0100
+Received: from echarp.org [81.66.133.96]
+	by localhost with IMAP (fetchmail-6.2.5.4)
+	for manu@localhost (single-drop); Fri, 20 Jan 2006 20:58:33 +0100 (CET)
+Received: from manu by vvv with local (Exim 4.60)
+	(envelope-from <manu@leparlement.org>)
+	id 1F02OK-0002EG-DN
+	for manu@localhost; Fri, 20 Jan 2006 20:57:48 +0100
+From: echarp <manu@leparlement.org>
+To: mailingList@leparlement.org
+Subject: test threaded parlement reply
+Date: Fri, 20 Jan 2006 18:11:00 -0000
+Content-Type: text/plain; charset="utf-8"
+Message-Id: <E1F02OK-0002EG-DQ2@vvv>
+references: <E1F02OK-0002EG-DN@vvv>
+Status: RO
+Content-Length: 1007
+Lines: 18
+
++1
+
+Test d'envoi de mail! Et en même temps test de revote!

data/test/fixtures/subscribers.yml

@@ -8,4 +8,7 @@ another:
 mail:
   elt_id: 'mail'
   person_id: 'echarp'
+first_mail:
+  elt_id: 'mail'
+  person_id: 'first'
 

data/test/unit/choice_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ChoiceTest < Test::Unit::TestCase
+  #fixtures :people, :users, :elts, :mails, :attachments, :subscribers, :choices
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/mail_notify_test.rb

@@ -19,7 +19,7 @@ class MailNotifyTest < Test::Unit::TestCase
 		assert_equal 0, ActionMailer::Base.deliveries.size
 
 		elt = Elt.find('mail')
-		assert elt.save
+		elt.save
 
 		assert_equal 1, ActionMailer::Base.deliveries.size
 	end
@@ -30,7 +30,7 @@ class MailNotifyTest < Test::Unit::TestCase
 		assert_equal 0, ActionMailer::Base.deliveries.size
 
 		elt = Elt.find('mail')
-		assert elt.save
+		elt.save
 
 		assert_equal 1, ActionMailer::Base.deliveries.size
 		#puts ActionMailer::Base.deliveries[0]