Merge branch 'release/0.8'

.compass/config.rb

@@ -0,0 +1,30 @@
+require 'bootstrap-sass'
+# Require any additional compass plugins here.
+
+
+# Set this to the root of your project when deployed:
+http_path = "/admin/"
+css_dir = "public/admin/stylesheets"
+http_css_dir = "stylesheets"
+sass_dir = "app/sass"
+images_dir = "public/admin/images"
+http_images_dir = "images"
+javascripts_dir = "public/admin/javascripts"
+
+output_style = :compact
+#output_style = :compressed
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

.gitignore

@@ -9,16 +9,17 @@
 ._*
 .DS_Store
 .autotest
-/db/test_structure.sql
 *#*#
 TAGS
 /vendor/plugins/*theme
 /locale/model_attributes.rb
 /files/
 /public/download
 /public/*theme
+!/public/adminbootstraptheme
 /vendor/bundle
 .bundle
 bin/
 config/aliases
 .sass-cache
+alaveteli.sublime*

.travis.yml

@@ -13,6 +13,8 @@ before_install:
   - git submodule update --init --recursive
   - psql -c "create database foi_test template template0 encoding 'SQL_ASCII';" -U postgres
   - cp config/database.yml-test config/database.yml
+  - cp config/general.yml-example config/general.yml
+  - cp config/newrelic.yml-example config/newrelic.yml
   - sudo apt-get update
   - export DEBIAN_FRONTEND=noninteractive
   - sudo apt-get -y install exim4-daemon-light

Gemfile

@@ -5,7 +5,7 @@ if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.s
         DL::dlopen('/lib/libuuid.so.1')
     end
 end
-source :rubygems
+source 'https://rubygems.org'
 
 # A fork of rails that is kept up to date with security patches
 git "git://github.com/mysociety/rails.git", :tag => "v2.3.18.1" do
@@ -17,15 +17,15 @@ gem 'fast_gettext', '>= 0.6.0'
 gem 'fastercsv', '>=1.5.5'
 gem 'gettext_i18n_rails', '>= 0.7.1'
 gem 'gettext', '~> 2.3.3'
-gem 'json', '~> 1.5.5'
+gem 'json'
 gem 'mahoro'
-gem 'mail', :platforms => :ruby_19
+gem 'mail', '~>2.4.4', :platforms => :ruby_19
 gem 'memcache-client', :require => 'memcache'
 gem 'locale', '>= 2.0.5'
 gem 'net-http-local'
 gem 'net-purge'
 gem 'rack', '~> 1.1.0'
-gem 'rdoc', '~> 2.4.3'
+gem 'rdoc'
 gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails'
 # :require avoids "already initialized constant" warnings
 gem 'rmagick', :require => 'RMagick'
@@ -43,11 +43,17 @@ gem 'syslog_protocol'
 gem 'newrelic_rpm'
 # erubis is required by rails_xss. Both erubis and rails_xss can be removed after upgrading to Rails 3.
 gem 'erubis'
+# rack-ssl won't be needed on upgrade to Rails 3.1 as something like it is baked in
+gem 'rack-ssl'
 
 group :test do
   gem 'fakeweb'
   gem 'rspec-rails', '~> 1.3.4'
   gem 'test-unit', '~> 1.2.3', :platforms => :ruby_19
+  gem 'coveralls', :require => false
+  # Using webrat because the preferred (capybara) doesn't work out of the box with rspec 1
+  gem 'webrat', :git => 'https://github.com/brynary/webrat', :ref => 'bea5b313783eaaf17e38a05a4eaa8c45c1eedd2a'
+  gem 'launchy'
 end
 
 group :development do

Gemfile.lock

@@ -21,46 +21,71 @@ GIT
       activesupport (= 2.3.18)
       rake (>= 0.8.3)
 
+GIT
+  remote: https://github.com/brynary/webrat
+  revision: bea5b313783eaaf17e38a05a4eaa8c45c1eedd2a
+  ref: bea5b313783eaaf17e38a05a4eaa8c45c1eedd2a
+  specs:
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    annotate (2.4.0)
+    addressable (2.3.3)
+    annotate (2.5.0)
+      rake
     archive-tar-minitar (0.5.2)
-    bootstrap-sass (2.1.1.0)
-    capistrano (2.13.4)
+    bootstrap-sass (2.3.0.1)
+      sass (~> 3.2)
+    capistrano (2.14.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    chunky_png (1.2.6)
+    chunky_png (1.2.7)
+    colorize (0.5.8)
     columnize (0.3.6)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
+    coveralls (0.6.2)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
     daemons (1.1.9)
     erubis (2.7.0)
-    eventmachine (1.0.0)
+    eventmachine (1.0.3)
     fakeweb (1.3.0)
-    fast_gettext (0.6.8)
+    fast_gettext (0.7.0)
     fastercsv (1.5.5)
-    fssm (0.2.9)
-    gettext (2.3.3)
+    fssm (0.2.10)
+    gettext (2.3.7)
+      levenshtein
       locale
-    gettext_i18n_rails (0.7.1)
+    gettext_i18n_rails (0.9.2)
       fast_gettext (>= 0.4.8)
-    haml (3.1.7)
-    highline (1.6.13)
-    hoe (3.0.8)
-      rake (~> 0.8)
-    i18n (0.6.1)
-    json (1.5.5)
+    haml (4.0.0)
+      tilt
+    highline (1.6.15)
+    hoe (3.5.1)
+      rake (>= 0.8, < 11.0)
+    i18n (0.6.4)
+    json (1.7.7)
+    launchy (2.2.0)
+      addressable (~> 2.3)
+    levenshtein (0.2.2)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    locale (2.0.5)
+    locale (2.0.8)
     mahoro (0.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -77,25 +102,34 @@ GEM
       sqlite3-ruby
       thin
     memcache-client (1.8.5)
-    mime-types (1.19)
+    mime-types (1.21)
+    multi_json (1.6.1)
     net-http-local (0.1.2)
     net-purge (0.1.0)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.5.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    newrelic_rpm (3.5.4.34)
-    pg (0.13.2)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    newrelic_rpm (3.5.8.72)
+    nokogiri (1.5.6)
+    pg (0.14.1)
     polyglot (0.3.3)
     rack (1.1.6)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rake (0.9.2.2)
     rbx-require-relative (0.0.9)
-    rdoc (2.4.3)
-    recaptcha (0.3.4)
-    rmagick (2.13.1)
+    rdoc (4.0.0)
+      json (~> 1.4)
+    recaptcha (0.3.5)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rmagick (2.13.2)
     routing-filter (0.2.4)
       actionpack
     rspec (1.3.2)
@@ -115,20 +149,24 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby-msg (1.5.0)
+    ruby-msg (1.5.1)
       ruby-ole (>= 1.2.8)
       vpim (>= 0.360)
-    ruby-ole (1.2.11.3)
+    ruby-ole (1.2.11.6)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    sass (3.2.1)
+    sass (3.2.7)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sinatra (1.2.8)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     skinny (0.2.3)
       eventmachine (~> 1.0.0)
       thin (~> 1.5.0)
-    sqlite3 (1.3.6)
+    sqlite3 (1.3.7)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     syslog_protocol (0.9.2)
@@ -138,14 +176,15 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.3.3)
-    treetop (1.4.11)
+    thor (0.17.0)
+    tilt (1.3.5)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     vpim (0.695)
     will_paginate (2.3.16)
     xapian-full-alaveteli (1.2.9.5)
-    xml-simple (1.1.1)
+    xml-simple (1.1.2)
     zip (2.0.2)
 
 PLATFORMS
@@ -156,26 +195,29 @@ DEPENDENCIES
   bootstrap-sass
   capistrano
   compass
+  coveralls
   erubis
   fakeweb
   fast_gettext (>= 0.6.0)
   fastercsv (>= 1.5.5)
   gettext (~> 2.3.3)
   gettext_i18n_rails (>= 0.7.1)
-  json (~> 1.5.5)
+  json
+  launchy
   locale (>= 2.0.5)
   mahoro
-  mail
+  mail (~> 2.4.4)
   mailcatcher
   memcache-client
   net-http-local
   net-purge
   newrelic_rpm
   pg
   rack (~> 1.1.0)
+  rack-ssl
   rails!
   rake (= 0.9.2.2)
-  rdoc (~> 2.4.3)
+  rdoc
   recaptcha (~> 0.3.1)
   rmagick
   routing-filter (~> 0.2.4)
@@ -186,6 +228,7 @@ DEPENDENCIES
   syslog_protocol
   test-unit (~> 1.2.3)
   vpim
+  webrat!
   will_paginate (~> 2.3.11)
   xapian-full-alaveteli (~> 1.2.9.5)
   xml-simple

README.md

@@ -1,6 +1,6 @@
 # Welcome to Alaveteli!
 
-[![Build Status](https://secure.travis-ci.org/mysociety/alaveteli.png)](http://travis-ci.org/mysociety/alaveteli) [![Dependency Status](https://gemnasium.com/mysociety/alaveteli.png)](https://gemnasium.com/mysociety/alaveteli)
+[![Build Status](https://secure.travis-ci.org/mysociety/alaveteli.png)](http://travis-ci.org/mysociety/alaveteli) [![Dependency Status](https://gemnasium.com/mysociety/alaveteli.png)](https://gemnasium.com/mysociety/alaveteli) [![Coverage Status](https://coveralls.io/repos/mysociety/alaveteli/badge.png?branch=master)](https://coveralls.io/r/mysociety/alaveteli) [![Code Climate](https://codeclimate.com/github/mysociety/alaveteli.png)](https://codeclimate.com/github/mysociety/alaveteli)
 
 This is an open source project to create a standard, internationalised
 platform for making Freedom of Information (FOI) requests in different

app/controllers/admin_censor_rule_controller.rb

@@ -10,7 +10,7 @@ def new
             @info_request = InfoRequest.find(params[:info_request_id])
         end
         if params[:user_id]
-            @user = User.find(params[:user_id])
+            @censor_user = User.find(params[:user_id])
         end
     end
 
@@ -26,9 +26,9 @@ def create
             end
             flash[:notice] = 'CensorRule was successfully created.'
             if !@censor_rule.info_request.nil?
-                redirect_to admin_url('request/show/' + @censor_rule.info_request.id.to_s)
+                redirect_to admin_request_show_url(@censor_rule.info_request)
             elsif !@censor_rule.user.nil?
-                redirect_to admin_url('user/show/' + @censor_rule.user.id.to_s)
+                redirect_to admin_user_show_url(@censor_rule.user)
             else
                 raise "internal error"
             end
@@ -53,9 +53,9 @@ def update
             end
             flash[:notice] = 'CensorRule was successfully updated.'
             if !@censor_rule.info_request.nil?
-                redirect_to admin_url('request/show/' + @censor_rule.info_request.id.to_s)
+                redirect_to admin_request_show_url(@censor_rule.info_request)
             elsif !@censor_rule.user.nil?
-                redirect_to admin_url('user/show/' + @censor_rule.user.id.to_s)
+                redirect_to admin_user_show_url(@censor_rule.user)
             else
                 raise "internal error"
             end
@@ -79,9 +79,9 @@ def destroy
 
         flash[:notice] = "CensorRule was successfully destroyed."
         if !info_request.nil?
-            redirect_to admin_url('request/show/' + info_request.id.to_s)
+            redirect_to admin_request_show_url(info_request)
         elsif !user.nil?
-            redirect_to admin_url('user/show/' + user.id.to_s)
+            redirect_to admin_user_show_url(user)
         else
             raise "internal error"
         end