parlement 0.14 → 0.17

data/config/environment.rb

@@ -39,10 +39,24 @@ Rails::Initializer.run do |config|
   # Use Active Record's schema dumper instead of SQL when creating the test database
   # (enables use of different database adapters for development and test environments)
   # config.active_record.schema_format = :ruby
-	# echarp
-  config.active_record.schema_format = :sql
 
   # See Rails::Configuration for more options
+
+  config.action_controller.session = {
+    :session_key => "_parlement_session",
+    :secret => "phrase of at least 30 characters"
+  }
+
+	config.gem "term-ansicolor", :lib => "term/ansicolor"
+	config.gem "ruby-debug"
+	config.gem "RedCloth", :lib => "redcloth"
+
+	config.gem 'locale'
+	config.gem "locale_rails"
+	config.gem "gettext_activerecord"
+	config.gem "gettext_rails"
+
+	config.gem "meta_project"
 end
 
 # Add new inflection rules using the following format 
@@ -56,16 +70,6 @@ end
 
 # Include your application configuration below
 
-
-
-# http://www.kanthak.net/opensource/file_column/
-require 'rails_file_column'
-
-require 'jcode'
-$KCODE = 'u'
-
-require 'gettext/rails'
-
 # What is the name of a quick anonymous poster
 ANONYMOUS_POSTER = 'anon'
 
@@ -79,38 +83,36 @@ LIST_LENGTH = 10
 # Number of elt's paragraphs to show initially
 NB_PARAGRAPH_TO_DISPLAY = 4
 
-require 'environments/user_environment'
+# Number of seconds between sidebar list automatic updates
+UPDATE_VIEW_PERIOD = 300
 
 CONFIG = { :default_language => 'en' }
 
 # This variable is of course used for mails, but also in the html mail
 # template, to set the base url for the generated html
 ActionMailer::Base.smtp_settings = {
-  :domain  => 'leparlement.org'
+	:domain  => 'leparlement.org'
 }
 
-#
-#  :address  => 'smtp.postoffice.net',
-#  :port  => 25, 
-#  :domain  => 'www.mywebsite.com',
-#  :user_name  => 'me@postoffice.net',
-#  :password  => 'mypass',
-#  :authentication  => :login
-#
-
-require File.join(RAILS_ROOT, "vendor", "plugins", "engines", "lib", "engines",
-	"deprecated_config_support")
-
-module LoginEngine
-	config :salt, 'parle'
-	config :email_from, 'facteur@leparlement.org'
-	config :admin_email, 'root@leparlement.org'
-	config :app_url, 'http://leparlement.org'
-	config :app_name, 'parlement'
-	config :use_email_notification, true
-end
+LOGIN_ENGINE = {
+	:salt => 'parle',
+	:email_from => 'facteur@leparlement.org',
+	:admin_email => 'root@leparlement.org',
+	:app_url => 'http://leparlement.org',
+	:app_name => 'parlement',
+	:use_email_notification => true,
+	:mail_charset => 'utf-8',
+	:security_token_life_hours => 24
+}
 
 Rubaidh::GoogleAnalytics.tracker_id = 'UA-317241-1'
 
-PARLEMENT_VERSION='0.14'
+PARLEMENT_VERSION = '0.17'
+
+def log_to(stream)
+	ActiveRecord::Base.logger = Logger.new(stream)
+	ActiveRecord::Base.clear_active_connections!
+end
+
+#log_to STDOUT
 

data/config/environments/development.rb

@@ -8,9 +8,6 @@ config.cache_classes     = false
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils        = true
 
-# Enable the breakpoint server that script/breakpointer connects to
-config.breakpoint_server = true
-
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = true
@@ -19,3 +16,5 @@ config.action_controller.perform_caching             = true
 config.action_mailer.raise_delivery_errors = false
 
 config.action_mailer.delivery_method = :test
+
+require 'ruby-debug'

data/config/environments/production.rb

@@ -17,3 +17,6 @@ config.action_controller.perform_caching             = true
 
 # Disable delivery errors if you bad email addresses should just be ignored
 # config.action_mailer.raise_delivery_errors = false
+
+ActionController::Base.cache_store = :file_store, "tmp/cache"
+

data/config/initializers/string_ruby_1.8.rb

@@ -0,0 +1,10 @@
+unless '1.9'.respond_to?(:force_encoding)
+  String.class_eval do
+    begin
+      remove_method :chars
+    rescue NameError
+      # OK
+    end
+  end
+end
+

data/config/routes.rb

@@ -1,36 +1,31 @@
 ActionController::Routing::Routes.draw do |map|
-  # Add your own custom routes here.
-  # The priority is based upon order of creation: first created -> highest priority.
-  
-  # Here's a sample route:
-  # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
-  # Keep in mind you can assign values other than :controller and :action
+	# Add your own custom routes here.
+	# The priority is based upon order of creation: first created -> highest priority.
 
-  # You can have the root of your site routed by hooking up '' 
-  # -- just remember to delete public/index.html.
-  # map.connect '', :controller => "welcome"
+	# Here's a sample route:
+	# map.connect 'products/:id', :controller => 'catalog', :action => 'view'
+	# Keep in mind you can assign values other than :controller and :action
 
-	map.connect '', :controller => 'elt', :action => 'show', :id => 'parlement'
-	map.connect 'index.rss', :controller => 'elt', :action => 'rss', :id => 'parlement'
-	map.connect 'vote.rss', :controller => 'elt', :action => 'vote_rss', :id => 'parlement'
+	# You can have the root of your site routed by hooking up '' 
+	# -- just remember to delete public/index.html.
+	# map.connect '', :controller => "welcome"
+
+	# This is to get clean nice rss urls, the empty id is necessary... it seems
+	map.connect 'index.rss', :controller => 'elt', :action => 'rss', :id => ''
+	map.connect 'vote.rss', :controller => 'elt', :action => 'vote_rss', :id => ''
 
 	map.connect ':id/index.rss', :controller => 'elt', :action => 'rss'
 	map.connect ':id/vote.rss', :controller => 'elt', :action => 'vote_rss'
-	map.connect ':id//index.rss', :controller => 'elt', :action => 'rss'
-	map.connect ':id//vote.rss', :controller => 'elt', :action => 'vote_rss'
-
-  # Allow downloading Web Service WSDL as a file with an extension
-  # instead of a file named 'wsdl'
-  #map.connect ':controller/service.wsdl', :action => 'wsdl'
 
 	map.connect ':id', :controller => 'elt', :action => 'rss', :requirements => { :id => /.*\.rss/ }
-	map.connect ':id', :controller => 'elt', :action => 'show'
+	map.connect ':id', :controller => 'elt'
 
-  # Install the default route as the lowest priority.
-  map.connect ':controller/:action/:id'
+	# Install the default route as the lowest priority.
+	map.connect ':controller/:action/:id'
 
-	map.connect 'perso/:id', :controller => 'elt', :action => 'show'
+	map.connect 'perso/:id', :controller => 'elt'
 	map.connect 'perso/:id/index.rss', :controller => 'elt', :action => 'rss'
+	map.connect 'perso/:id/vote.rss', :controller => 'elt', :action => 'rss'
 	map.connect 'perso/blog/:id', :controller => 'elt'
 	map.connect 'perso/blog/:id/index.rss', :controller => 'elt', :action => 'rss'
 	map.connect 'perso/blog/:id/vote.rss', :controller => 'elt', :action => 'vote_rss'

data/db/schema.rb

@@ -1,130 +1,158 @@
-# This file is autogenerated. Instead of editing this file, please use the
-# migrations feature of ActiveRecord to incrementally modify your database, and
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
 
 ActiveRecord::Schema.define(:version => 9) do
 
   create_table "attachments", :force => true do |t|
-    t.column "elt_id",       :text,     :null => false
-    t.column "created_on",   :datetime, :null => false
-    t.column "content_type", :text
-    t.column "file",         :text
+    t.text     "elt_id",       :null => false
+    t.datetime "created_on",   :null => false
+    t.text     "content_type"
+    t.text     "file"
   end
 
+  remove_column :attachments, :id
+  add_column :attachments, :id, :text, :null => false, :primary_key => true
+  execute 'ALTER TABLE attachments ADD CONSTRAINT attachments_pkey PRIMARY KEY (id)'
+
   create_table "choices", :force => true do |t|
-    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
+    t.string   "elt_id",                    :null => false
+    t.string   "person_id"
+    t.datetime "created_on",                :null => false
+    t.integer  "value",      :default => 1, :null => false
   end
 
   add_index "choices", ["elt_id", "person_id"], :name => "elt_person_key", :unique => true
 
   create_table "delegations", :force => true do |t|
-    t.column "elt_id",      :text,                        :null => false
-    t.column "person_id",   :text,                        :null => false
-    t.column "created_on",  :datetime,                    :null => false
-    t.column "temporary",   :boolean,  :default => false, :null => false
-    t.column "delegate_to", :text,                        :null => false
+    t.text     "elt_id",                         :null => false
+    t.text     "person_id",                      :null => false
+    t.datetime "created_on",                     :null => false
+    t.boolean  "temporary",   :default => false, :null => false
+    t.text     "delegate_to",                    :null => false
   end
 
   create_table "elts", :force => true do |t|
-    t.column "parent_id",     :text
-    t.column "position",      :float
-    t.column "created_on",    :datetime,                :null => false
-    t.column "person_id",     :text
-    t.column "subject",       :text
-    t.column "body",          :text
-    t.column "lft",           :integer
-    t.column "rgt",           :integer
-    t.column "elts_count",    :integer,  :default => 0
-    t.column "last_activity", :datetime
+    t.text     "parent_id"
+    t.float    "position"
+    t.datetime "created_on",                   :null => false
+    t.text     "person_id"
+    t.text     "subject"
+    t.text     "body"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "elts_count",    :default => 0
+    t.datetime "last_activity"
   end
 
+  add_index "elts", ["lft"], :name => "lft"
   add_index "elts", ["parent_id"], :name => "elts_parent"
   add_index "elts", ["parent_id"], :name => "elts_parent_key"
-  add_index "elts", ["lft"], :name => "lft"
   add_index "elts", ["rgt"], :name => "rgt"
 
+  remove_column :elts, :id
+  add_column :elts, :id, :text, :null => false, :primary_key => true
+  execute 'ALTER TABLE elts ADD CONSTRAINT elts_pkey PRIMARY KEY (id)'
+
   create_table "engine_schema_info", :id => false, :force => true do |t|
-    t.column "engine_name", :string
-    t.column "version",     :integer
+    t.string  "engine_name"
+    t.integer "version"
   end
 
   create_table "mails", :force => true do |t|
-    t.column "elt_id",       :text, :null => false
-    t.column "message",      :text
-    t.column "mail_parents", :text
-    t.column "file",         :text
+    t.text "elt_id",       :null => false
+    t.text "message"
+    t.text "mail_parents"
+    t.text "file"
   end
 
+  remove_column :mails, :id
+  add_column :mails, :id, :text, :null => false, :primary_key => true
+  execute 'ALTER TABLE mails ADD CONSTRAINT mails_pkey PRIMARY KEY (id)'
+
   create_table "old_visits", :force => true do |t|
-    t.column "person_id",  :string
-    t.column "elt_id",     :string,                  :null => false
-    t.column "created_on", :datetime,                :null => false
-    t.column "updated_on", :datetime
-    t.column "filter",     :integer,  :default => 0
+    t.string   "person_id"
+    t.string   "elt_id",                    :null => false
+    t.datetime "created_on",                :null => false
+    t.datetime "updated_on"
+    t.integer  "filter",     :default => 0
   end
 
-  add_index "old_visits", ["person_id", "elt_id"], :name => "old_visits_elt_person_key", :unique => true
+  add_index "old_visits", ["elt_id", "person_id"], :name => "old_visits_elt_person_key", :unique => true
 
   create_table "people", :force => true do |t|
-    t.column "created_on", :datetime, :null => false
-    t.column "name",       :text
-    t.column "email",      :text
-    t.column "image",      :text
-    t.column "last_login", :datetime
+    t.datetime "created_on", :null => false
+    t.text     "name"
+    t.text     "email"
+    t.text     "image"
+    t.datetime "last_login"
   end
 
   add_index "people", ["name"], :name => "people_name_key", :unique => true
 
+  remove_column :people, :id
+  add_column :people, :id, :text, :null => false, :primary_key => true
+  execute 'ALTER TABLE people ADD CONSTRAINT people_pkey PRIMARY KEY (id)'
+
   create_table "person_mails", :force => true do |t|
-    t.column "mail_id",    :string,   :null => false
-    t.column "person_id",  :string
-    t.column "created_on", :datetime, :null => false
+    t.string   "mail_id",    :null => false
+    t.string   "person_id"
+    t.datetime "created_on", :null => false
+  end
+
+  create_table "plugin_schema_info", :id => false, :force => true do |t|
+    t.string  "plugin_name"
+    t.integer "version"
   end
 
   create_table "subscriptions", :force => true do |t|
-    t.column "elt_id",     :text,                    :null => false
-    t.column "person_id",  :text,                    :null => false
-    t.column "filter",     :integer,  :default => 0
-    t.column "created_on", :datetime,                :null => false
+    t.text     "elt_id",                    :null => false
+    t.text     "person_id",                 :null => false
+    t.integer  "filter",     :default => 0
+    t.datetime "created_on",                :null => false
   end
 
   create_table "users", :force => true do |t|
-    t.column "login",           :text,                                  :null => false
-    t.column "salted_password", :string,   :limit => 40,                :null => false
-    t.column "email",           :string,   :limit => 60
-    t.column "firstname",       :string,   :limit => 40
-    t.column "lastname",        :string,   :limit => 40
-    t.column "salt",            :string,   :limit => 40,                :null => false
-    t.column "verified",        :integer,                :default => 0
-    t.column "role",            :string,   :limit => 40
-    t.column "security_token",  :string,   :limit => 40
-    t.column "token_expiry",    :datetime
-    t.column "deleted",         :integer,                :default => 0
-    t.column "delete_after",    :datetime
+    t.text     "login",                                        :null => false
+    t.string   "salted_password", :limit => 40,                :null => false
+    t.string   "email",           :limit => 60
+    t.string   "firstname",       :limit => 40
+    t.string   "lastname",        :limit => 40
+    t.string   "salt",            :limit => 40,                :null => false
+    t.integer  "verified",                      :default => 0
+    t.string   "role",            :limit => 40
+    t.string   "security_token",  :limit => 40
+    t.datetime "token_expiry"
+    t.integer  "deleted",                       :default => 0
+    t.datetime "delete_after"
   end
 
   create_table "usersold", :force => true do |t|
-    t.column "person_id",       :text,                   :null => false
-    t.column "salted_password", :text
-    t.column "salt",            :text
-    t.column "verified",        :integer, :default => 0
-    t.column "new_email",       :text
-    t.column "security_token",  :text
+    t.text    "person_id",                      :null => false
+    t.text    "salted_password"
+    t.text    "salt"
+    t.integer "verified",        :default => 0
+    t.text    "new_email"
+    t.text    "security_token"
   end
 
   add_index "usersold", ["person_id"], :name => "usersold_person_id_key", :unique => true
 
   create_table "visits", :force => true do |t|
-    t.column "person_id",  :string
-    t.column "elt_id",     :string,                  :null => false
-    t.column "created_on", :datetime,                :null => false
-    t.column "updated_on", :datetime
-    t.column "filter",     :integer,  :default => 0
+    t.string   "person_id"
+    t.string   "elt_id",                    :null => false
+    t.datetime "created_on",                :null => false
+    t.datetime "updated_on"
+    t.integer  "filter",     :default => 0
   end
 
-  add_index "visits", ["person_id", "elt_id"], :name => "visits_elt_person_key", :unique => true
+  add_index "visits", ["elt_id", "person_id"], :name => "visits_elt_person_key", :unique => true
 
 end

data/lib/tasks/rspec.rake

@@ -0,0 +1,167 @@
+gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec')
+$LOAD_PATH.unshift("#{rspec_plugin_dir}/lib") if File.exist?(rspec_plugin_dir)
+
+# Don't load rspec if running "rake gems:*"
+unless ARGV.any? {|a| a =~ /^gems/}
+
+begin
+  require 'spec/rake/spectask'
+rescue MissingSourceFile
+  module Spec
+    module Rake
+      class SpecTask
+        def initialize(name)
+          task name do
+            # if rspec-rails is a configured gem, this will output helpful material and exit ...
+            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+
+            # ... otherwise, do this:
+            raise <<-MSG
+
+#{"*" * 80}
+*  You are trying to run an rspec rake task defined in
+*  #{__FILE__},
+*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
+#{"*" * 80}
+MSG
+          end
+        end
+      end
+    end
+  end
+end
+
+Rake.application.instance_variable_get('@tasks').delete('default')
+
+spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+task :noop do
+end
+
+task :default => :spec
+task :stats => "spec:statsetup"
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*/*_spec.rb']
+end
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
+  end
+
+  desc "Print Specdoc for all specs (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
+  end
+
+  desc "Print Specdoc for all plugin examples"
+  Spec::Rake::SpecTask.new(:plugin_doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+  end
+
+  [:models, :controllers, :views, :helpers, :lib].each do |sub|
+    desc "Run the code examples in spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+    end
+  end
+
+  desc "Run the code examples in vendor/plugins (except RSpec's own)"
+  Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
+  end
+
+  namespace :plugins do
+    desc "Runs the examples for rspec_on_rails"
+    Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb']
+    end
+  end
+
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
+    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
+    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
+    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
+    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
+    ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
+    ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
+    ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
+  end
+
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
+      task :load => :environment do
+        ActiveRecord::Base.establish_connection(Rails.env)
+        base_dir = File.join(Rails.root, 'spec', 'fixtures')
+        fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
+        
+        require 'active_record/fixtures'
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
+
+  namespace :server do
+    daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/pids/spec_server.pid")
+    
+    desc "start spec_server."
+    task :start do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts "spec_server is already running."
+      else
+        $stderr.puts %Q{Starting up spec_server ...}
+        FileUtils.mkdir_p('tmp/pids') unless test ?d, 'tmp/pids'
+        system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
+      end
+    end
+
+    desc "stop spec_server."
+    task :stop do
+      unless File.exist?(daemonized_server_pid)
+        $stderr.puts "No server running."
+      else
+        $stderr.puts "Shutting down spec_server ..."
+        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+        File.delete(daemonized_server_pid)
+      end
+    end
+
+    desc "restart spec_server."
+    task :restart => [:stop, :start]
+    
+    desc "check if spec server is running"
+    task :status do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts %Q{spec_server is running (PID: #{File.read(daemonized_server_pid).gsub("\n","")})}
+      else
+        $stderr.puts "No server running."
+      end
+    end
+  end
+end
+
+end