parlement 0.3 → 0.4

data/vendor/plugins/login_engine/lib/login_engine.rb

@@ -11,10 +11,10 @@ module LoginEngine
   #++
 
   # Source address for user emails
-  config :email_from, 'lazyatom@lazyatom.com'
+  config :email_from, 'webmaster@your.company'
 
   # Destination email for system errors
-  config :admin_email, 'lazyatom@lazyatom.com'
+  config :admin_email, 'webmaster@your.company'
 
   # Sent in emails to users
   config :app_url, 'http://localhost:3000/'
@@ -29,7 +29,7 @@ module LoginEngine
   config :security_token_life_hours, 24
 
   # Two column form input
-  config :TwoColumnInput, true
+  config :two_column_input, true
 
   # Add all changeable user fields to this array.
   # They will then be able to be edited from the edit action. You
@@ -55,4 +55,8 @@ module LoginEngine
   # controls whether or not email is used
   config :use_email_notification, true
 
+  # Controls whether accounts must be confirmed after signing up
+  # ONLY if this and use_email_notification are both true
+  config :confirm_account, true
+
 end

data/vendor/plugins/login_engine/test/functional/user_controller_test.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require_dependency 'user_controller'
-require 'breakpoint'
 
 
 # Raise errors beyond the default web-based presentation
@@ -8,7 +7,9 @@ class UserController; def rescue_action(e) raise e end; end
 
 class UserControllerTest < Test::Unit::TestCase
   
-  fixtures LoginEngine.config(:user_table).to_sym
+  # load the fixture into the developer-specified table using the custom
+  # 'fixture' method.
+  fixture :users, :table_name => LoginEngine.config(:user_table), :class_name => "User"
   
   def setup
     
@@ -47,7 +48,7 @@ class UserControllerTest < Test::Unit::TestCase
     
     assert_response 302  # redirect
     assert_session_has :user
-    assert_equal fixture_object(LoginEngine.config(:user_table).to_sym, :bob), session[:user]
+    assert_equal users(:bob), session[:user]
     
     assert_redirect_url "http://#{@request.host}/bogus/location"
   end
@@ -86,8 +87,12 @@ class UserControllerTest < Test::Unit::TestCase
     assert_equal "newbob@test.com", mail.to_addrs[0].to_s
     assert_match /login:\s+\w+\n/, mail.encoded
     assert_match /password:\s+\w+\n/, mail.encoded
-    mail.encoded =~ /key=(.*?)"/
-    key = $1
+    #mail.encoded =~ /user_id=(.*?)&key=(.*?)"/
+    user_id = /user_id=(\d+)/.match(mail.encoded)[1]
+    key = /key=([a-z0-9]+)/.match(mail.encoded)[1]
+
+    assert_not_nil user_id
+    assert_not_nil key
 
     user = User.find_by_email("newbob@test.com")
     assert_not_nil user
@@ -95,18 +100,18 @@ class UserControllerTest < Test::Unit::TestCase
 
     # First past the expiration.
     Time.advance_by_days = 1
-    get :home, :user=> { "id" => "#{user.id}" }, "key" => "#{key}"
+    get :home, :user_id => "#{user_id}", :key => "#{key}"
     Time.advance_by_days = 0
     user = User.find_by_email("newbob@test.com")
     assert_equal 0, user.verified
 
     # Then a bogus key.
-    get :home, :user=> { "id" => "#{user.id}" }, "key" => "boguskey"
+    get :home, :user_id => "#{user_id}", :key => "boguskey"
     user = User.find_by_email("newbob@test.com")
     assert_equal 0, user.verified
 
     # Now the real one.
-    get :home, :user=> { "id" => "#{user.id}" }, "key" => "#{key}"
+    get :home, :user_id => "#{user_id}", :key => "#{key}"
     user = User.find_by_email("newbob@test.com")
     assert_equal 1, user.verified
 
@@ -246,20 +251,19 @@ class UserControllerTest < Test::Unit::TestCase
     post :delete
     assert_equal 1, ActionMailer::Base.deliveries.size
     mail = ActionMailer::Base.deliveries[0]
-    mail.encoded =~ /user\[id\]=(.*?)&key=(.*?)"/
-    id = $1
-    key = $2
+    user_id = /user_id=(\d+)/.match(mail.encoded)[1]
+    key = /key=([a-z0-9]+)/.match(mail.encoded)[1]
     
-    post :restore_deleted, :user => { "id" => "#{id}" }, "key" => "badkey"
+    post :restore_deleted, :user_id => "#{user_id}", "key" => "badkey"
     assert_session_has_no :user
 
     # Advance the time past the delete date
     Time.advance_by_days = LoginEngine.config :delayed_delete_days
-    post :restore_deleted, :user => { "id" => "#{id}" }, "key" => "#{key}"
+    post :restore_deleted, :user_id => "#{user_id}", "key" => "#{key}"
     assert_session_has_no :user
     Time.advance_by_days = 0
 
-    post :restore_deleted, :user => { "id" => "#{id}" }, "key" => "#{key}"
+    post :restore_deleted, :user_id => "#{user_id}", "key" => "#{key}"
     assert_session_has :user      
   end
   
@@ -341,7 +345,7 @@ class UserControllerTest < Test::Unit::TestCase
 
     post :change_password, :user => { :password => "changed_password", :password_confirmation => "changed_password" }
     
-    assert_success
+    assert_redirected_to :action => "change_password"
 
     post :login, :user => { :login => "bob", :password => "changed_password" }
     assert_session_has :user
@@ -452,10 +456,9 @@ class UserControllerTest < Test::Unit::TestCase
         assert_equal 1, ActionMailer::Base.deliveries.size
         mail = ActionMailer::Base.deliveries[0]
         assert_equal "bob@test.com", mail.to_addrs[0].to_s
-        mail.encoded =~ /user\[id\]=(.*?)&key=(.*?)"/
-        id = $1
-        key = $2
-        post :change_password, :user => { :password => "#{password}", :password_confirmation => "#{password}", :id => "#{id}" }, :key => "#{key}"
+        user_id = /user_id=(\d+)/.match(mail.encoded)[1]
+        key = /key=([a-z0-9]+)/.match(mail.encoded)[1]
+        post :change_password, :user => { :password => "#{password}", :password_confirmation => "#{password}"}, :user_id => "#{user_id}", :key => "#{key}"
         assert_session_has :user
         get :logout
       end

data/vendor/plugins/login_engine/test/test_helper.rb

@@ -1,15 +1,11 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper' # the default rails helper
+require File.expand_path(File.dirname(__FILE__) + '/../../../../test/test_helper') # the default rails helper
+
+# ensure that the Engines testing enhancements are loaded.
+require File.join(Engines.config(:root), "engines", "lib", "engines", "testing_extensions")
 
 require File.dirname(__FILE__) + '/mocks/time'
 require File.dirname(__FILE__) + '/mocks/mail'
 
-# TODO: Add check for database-specific sql files instead
-load(File.dirname(__FILE__) + "/../db/schema.rb")
-
 # set up the fixtures location
 Test::Unit::TestCase.fixture_path = File.dirname(__FILE__)  + "/fixtures/"
 $LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
-
-
-# declare mappings between your fixtures templates and the actual table names used.
-Test::Unit::TestCase.set_fixtures_table(:users, LoginEngine.config(:user_table))

data/vendor/plugins/login_engine/test/unit/user_test.rb

@@ -1,28 +1,29 @@
 require File.dirname(__FILE__) + '/../test_helper'
-
 class UserTest < Test::Unit::TestCase
-  
-  fixtures LoginEngine.config(:user_table).to_sym
+
+  # load the fixture into the developer-specified table using the custom
+  # 'fixture' method.
+  fixture :users, :table_name => LoginEngine.config(:user_table), :class_name => "User"
  
   def setup
     LoginEngine::CONFIG[:salt] = "test-salt"
   end 
     
   def test_auth   
-    assert_equal fixture_object(LoginEngine.config(:user_table), :bob), User.authenticate("bob", "atest")    
+    assert_equal users(:bob), User.authenticate("bob", "atest")    
     assert_nil User.authenticate("nonbob", "atest")
   end
 
 
   def test_passwordchange
         
-    fixture_object(LoginEngine.config(:user_table), :longbob).change_password("nonbobpasswd")
-    fixture_object(LoginEngine.config(:user_table), :longbob).save
-    assert_equal fixture_object(LoginEngine.config(:user_table), :longbob), User.authenticate("longbob", "nonbobpasswd")
+    users(:longbob).change_password("nonbobpasswd")
+    users(:longbob).save
+    assert_equal users(:longbob), User.authenticate("longbob", "nonbobpasswd")
     assert_nil User.authenticate("longbob", "alongtest")
-    fixture_object(LoginEngine.config(:user_table), :longbob).change_password("alongtest")
-    fixture_object(LoginEngine.config(:user_table), :longbob).save
-    assert_equal fixture_object(LoginEngine.config(:user_table), :longbob), User.authenticate("longbob", "alongtest")
+    users(:longbob).change_password("alongtest")
+    users(:longbob).save
+    assert_equal users(:longbob), User.authenticate("longbob", "alongtest")
     assert_nil User.authenticate("longbob", "nonbobpasswd")
         
   end
@@ -31,6 +32,7 @@ class UserTest < Test::Unit::TestCase
     
     u = User.new    
     u.login = "nonbob"
+    u.email = "bobs@email.com"
 
     u.change_password("tiny")
     assert !u.save     
@@ -54,6 +56,7 @@ class UserTest < Test::Unit::TestCase
 
     u = User.new  
     u.change_password("bobs_secure_password")
+    u.email = "bobs@email.com"
 
     u.login = "x"
     assert !u.save     
@@ -86,9 +89,26 @@ class UserTest < Test::Unit::TestCase
     u = User.new
     u.login = "nonexistingbob"
     u.change_password("bobs_secure_password")
+    u.email = "bobs@email.com"
       
     assert u.save  
     
   end
-  
+
+  def test_email_should_be_nominally_valid
+    u = User.new
+    u.login = "email_test"
+    u.change_password("email_test_password")
+
+    assert !u.save
+    assert u.errors.invalid?('email')
+
+    u.email = "invalid_email"
+    assert !u.save
+    assert u.errors.invalid?('email')
+
+    u.email = "valid@email.com"
+    assert u.save
+  end
+
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: parlement
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2006-02-23 00:00:00 +01:00
+  version: "0.4"
+date: 2006-04-17 00:00:00 +02:00
 summary: Trusted Direct Democracy on a forum
 require_paths: 
 - lib
@@ -12,7 +12,7 @@ email: emmanuel.charpentier@free.fr
 homepage: http://leparlement.org
 rubyforge_project: parlement
 description: "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.  Trust through: - cluster - PGP signatures - electoral lists"
-autorequire: rails
+autorequire: rails redcloth
 default_executable: 
 bindir: bin
 has_rdoc: false
@@ -56,7 +56,6 @@ files:
 - app/models/elt.rb
 - app/models/mail_notify.rb
 - app/models/user_notify.rb
-- app/models/attachment.rb
 - app/views/layouts
 - app/views/elt
 - app/views/account
@@ -94,9 +93,9 @@ files:
 - config/environments/test.rb
 - config/environments/user_environment.rb
 - db/schema.sql
-- db/development_structure.sql
-- db/ROOT
 - db/schema.rb
+- db/ROOT
+- db/development_structure.sql
 - db/ROOT/perso
 - db/ROOT/parlement.txt
 - db/ROOT/perso.txt
@@ -108,6 +107,8 @@ files:
 - db/ROOT/parlement/security
 - db/ROOT/parlement/news
 - db/ROOT/parlement/news.txt
+- db/ROOT/parlement/top-politics.txt
+- db/ROOT/parlement/ddRing.txt
 - db/ROOT/parlement/security/anonymity.txt
 - db/ROOT/parlement/news/release0.1.txt
 - db/ROOT/parlement/news/release0.2.txt
@@ -118,22 +119,15 @@ files:
 - lib/login_system.rb
 - lib/user_system.rb
 - lib/localizer.rb
-- public/images
-- public/javascripts
-- public/stylesheets
 - public/dispatch.rb
 - public/dispatch.cgi
 - public/dispatch.fcgi
 - public/404.html
 - public/500.html
-- public/attachment
 - public/favicon.ico
 - public/favicon.png
-- public/dynamic
 - public/oldindex.html
-- public/oldREADME
 - public/robots.txt
-- public/engine_files
 - public/images/live_tree_branch_collapsed_icon.gif
 - public/images/live_tree_branch_expanded_icon.gif
 - public/images/live_tree_leaf_icon.gif
@@ -143,12 +137,14 @@ files:
 - public/images/rails.png
 - public/images/orange_by_darren_Hester_350o.jpg
 - public/images/Sleep-Deprivation-5.JPG
-- public/images/eltBackground.png
 - public/images/smile.png
 - public/images/smile.svg
 - public/images/eltBackground.svg
 - public/images/world.png
 - public/images/world.svg
+- public/images/eltBackground.jng
+- public/engine_files/README
+- public/engine_files/login_engine
 - public/javascripts/prototype.js
 - public/javascripts/effects.js
 - public/javascripts/dragdrop.js
@@ -156,37 +152,11 @@ files:
 - public/javascripts/live_tree.js
 - public/javascripts/scriptaculous.js
 - public/javascripts/slider.js
+- public/javascripts/blank.gif
 - public/javascripts/ie7.js
-- public/stylesheets/scaffold.css
-- public/stylesheets/default.css
-- public/stylesheets/live_tree.css
-- public/attachment/file
-- public/attachment/file/tmp
-- public/attachment/file/architecture.png
-- public/attachment/file/architecture.svg
-- public/attachment/file/security.svg
-- public/engine_files/README
-- public/engine_files/login_engine
-- public/engine_files/login_engine/stylesheets
-- public/engine_files/login_engine/stylesheets/login_engine.css
-- script/console
-- script/destroy
-- script/generate
-- script/server
-- script/runner
-- script/benchmarker
-- script/profiler
-- script/breakpointer
-- script/performance
-- script/process
-- script/create_db
-- script/about
-- script/plugin
-- script/performance/benchmarker
-- script/performance/profiler
-- script/process/reaper
-- script/process/spawner
-- script/process/spinner
+- public/javascripts/borders.js
+- public/javascripts/ie7-load.htc
+- public/javascripts/application.js
 - test/fixtures
 - test/functional
 - test/mocks
@@ -218,7 +188,6 @@ files:
 - test/unit/notifier_test.rb
 - test/unit/person_test.rb
 - test/unit/attachment_test.rb
-- test/unit/user_test.rb
 - test/unit/mail_notify_test.rb
 - test/unit/subscriber_test.rb
 - vendor/plugins
@@ -234,16 +203,16 @@ files:
 - vendor/plugins/login_engine/public
 - vendor/plugins/login_engine/init_engine.rb
 - vendor/plugins/login_engine/README
+- vendor/plugins/login_engine/CHANGELOG
+- vendor/plugins/login_engine/install.rb
 - vendor/plugins/login_engine/test/unit
 - vendor/plugins/login_engine/test/functional
-- vendor/plugins/login_engine/test/test_helper.rb
 - vendor/plugins/login_engine/test/fixtures
 - vendor/plugins/login_engine/test/mocks
+- vendor/plugins/login_engine/test/test_helper.rb
 - vendor/plugins/login_engine/test/unit/user_test.rb
 - vendor/plugins/login_engine/test/functional/user_controller_test.rb
-- vendor/plugins/login_engine/test/fixtures/templates
 - vendor/plugins/login_engine/test/fixtures/users.yml
-- vendor/plugins/login_engine/test/fixtures/templates/users.yml
 - vendor/plugins/login_engine/test/mocks/time.rb
 - vendor/plugins/login_engine/test/mocks/mail.rb
 - vendor/plugins/login_engine/app/helpers
@@ -270,7 +239,8 @@ files:
 - vendor/plugins/login_engine/app/views/user/change_password.rhtml
 - vendor/plugins/login_engine/app/views/user/login.rhtml
 - vendor/plugins/login_engine/app/views/user/logout.rhtml
-- vendor/plugins/login_engine/db/schema.rb
+- vendor/plugins/login_engine/db/migrate
+- vendor/plugins/login_engine/db/migrate/001_initial_schema.rb
 - vendor/plugins/login_engine/tasks/tasks.rake
 - vendor/plugins/login_engine/lib/login_engine
 - vendor/plugins/login_engine/lib/login_engine.rb
@@ -279,23 +249,57 @@ files:
 - vendor/plugins/login_engine/public/stylesheets
 - vendor/plugins/login_engine/public/stylesheets/login_engine.css
 - vendor/plugins/engines/test
+- vendor/plugins/engines/tasks
 - vendor/plugins/engines/lib
-- vendor/plugins/engines/init.rb
+- vendor/plugins/engines/generators
 - vendor/plugins/engines/CHANGELOG
+- vendor/plugins/engines/init.rb
+- vendor/plugins/engines/MIT-LICENSE
 - vendor/plugins/engines/README
 - vendor/plugins/engines/test/ruby_extensions_test.rb
-- vendor/plugins/engines/lib/testing_extensions.rb
-- vendor/plugins/engines/lib/ruby_extensions.rb
+- vendor/plugins/engines/test/action_view_extensions_test.rb
+- vendor/plugins/engines/tasks/engines.rake
+- vendor/plugins/engines/lib/engines
+- vendor/plugins/engines/lib/bundles
 - vendor/plugins/engines/lib/engines.rb
-- vendor/plugins/engines/lib/action_mailer_extensions.rb
-- vendor/plugins/engines/lib/dependencies_extensions.rb
-- vendor/plugins/engines/lib/action_view_extensions.rb
+- vendor/plugins/engines/lib/bundles.rb
+- vendor/plugins/engines/lib/engines/migration_extensions.rb
+- vendor/plugins/engines/lib/engines/ruby_extensions.rb
+- vendor/plugins/engines/lib/engines/action_mailer_extensions.rb
+- vendor/plugins/engines/lib/engines/dependencies_extensions.rb
+- vendor/plugins/engines/lib/engines/action_view_extensions.rb
+- vendor/plugins/engines/lib/engines/active_record_extensions.rb
+- vendor/plugins/engines/lib/engines/testing_extensions.rb
+- vendor/plugins/engines/lib/bundles/require_resource.rb
+- vendor/plugins/engines/generators/engine
+- vendor/plugins/engines/generators/engine/templates
+- vendor/plugins/engines/generators/engine/USAGE
+- vendor/plugins/engines/generators/engine/engine_generator.rb
+- vendor/plugins/engines/generators/engine/templates/test
+- vendor/plugins/engines/generators/engine/templates/licenses
+- vendor/plugins/engines/generators/engine/templates/tasks
+- vendor/plugins/engines/generators/engine/templates/lib
+- vendor/plugins/engines/generators/engine/templates/public
+- vendor/plugins/engines/generators/engine/templates/README
+- vendor/plugins/engines/generators/engine/templates/init_engine.erb
+- vendor/plugins/engines/generators/engine/templates/install.erb
+- vendor/plugins/engines/generators/engine/templates/test/test_helper.erb
+- vendor/plugins/engines/generators/engine/templates/licenses/None
+- vendor/plugins/engines/generators/engine/templates/licenses/GPL
+- vendor/plugins/engines/generators/engine/templates/licenses/MIT
+- vendor/plugins/engines/generators/engine/templates/licenses/LGPL
+- vendor/plugins/engines/generators/engine/templates/tasks/engine.rake
+- vendor/plugins/engines/generators/engine/templates/lib/engine.erb
+- vendor/plugins/engines/generators/engine/templates/public/javascripts
+- vendor/plugins/engines/generators/engine/templates/public/stylesheets
+- vendor/plugins/engines/generators/engine/templates/public/javascripts/engine.js
+- vendor/plugins/engines/generators/engine/templates/public/stylesheets/engine.css
 - vendor/plugins/guid/lib
 - vendor/plugins/guid/README.TXT
 - vendor/plugins/guid/init.rb
+- vendor/plugins/guid/lib/uuidtools.rb
 - vendor/plugins/guid/lib/usesguid.rb
 - vendor/plugins/guid/lib/uuid22.rb
-- vendor/plugins/guid/lib/uuidtools.rb
 - vendor/plugins/file_column/test
 - vendor/plugins/file_column/lib
 - vendor/plugins/file_column/Rakefile
@@ -329,7 +333,6 @@ test_files:
 - test/unit/notifier_test.rb
 - test/unit/person_test.rb
 - test/unit/attachment_test.rb
-- test/unit/user_test.rb
 - test/unit/mail_notify_test.rb
 - test/unit/subscriber_test.rb
 rdoc_options: []

data/app/models/attachment.rb

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