Merge branch 'trusty-tahr'

17 files changed, 255 insertions, 51 deletions

diff --git a/.gitignore b/.gitignore
index 577167f34..72bc29420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 ._*
 
 .vagrant
+.bundle
 .DS_Store
 .carton
 local-lib5
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..eca052933
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "compass", "0.12.7"
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..c86a5ca9a
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,16 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    chunky_png (1.3.3)
+    compass (0.12.7)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.2.19)
+    fssm (0.2.10)
+    sass (3.2.19)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  compass (= 0.12.7)
diff --git a/bin/install-as-user b/bin/install-as-user
index bd48bdebb..ebff69ed2 100755
--- a/bin/install-as-user
+++ b/bin/install-as-user
@@ -71,25 +71,22 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
 fi
 
 # Install the compass gem locally - it's required for generating the
-# CSS:
+# CSS. Don't trust the bundled bundler in e.g. precise.
 echo "Setting up CSS... "
-export GEM_HOME="$DIRECTORY/gems"
-mkdir -p "$GEM_HOME"
-export GEM_PATH=
-export PATH="$GEM_HOME/bin:$PATH"
+gem1.9.1 install --user-install --no-ri --no-rdoc bundler
+FMS_GEMPATH="$DIRECTORY/gem-bin"
+FMS_GEMPATH="$FMS_GEMPATH:$(ruby1.9.1 -rubygems -e 'puts Gem.user_dir')/bin"
+export PATH="$FMS_GEMPATH:$PATH"
 
-if ! grep -q 'Set up local gem directory for FixMyStreet' $HOME/.bashrc; then
+if ! grep -q 'Set up local PATH for FixMyStreet' $HOME/.bashrc; then
     cat >>$HOME/.bashrc <<EOBRC
 
-# Set up local gem directory for FixMyStreet
-export GEM_HOME="$DIRECTORY/gems"
-export GEM_PATH=
-export PATH="\$GEM_HOME/bin:\$PATH"
+# Set up local PATH for FixMyStreet
+export PATH="$FMS_GEMPATH:\$PATH"
 EOBRC
 fi
 
-gem install --no-ri --no-rdoc sass -v 3.2.14
-gem install --no-ri --no-rdoc compass -v 0.12.2
+bundle install --deployment --path "$DIRECTORY/gems" --binstubs "$DIRECTORY/gem-bin"
 
 # Use compass to generate the CSS, if it doesn't seem to already
 # exist:
diff --git a/bin/install_perl_modules b/bin/install_perl_modules
index 883ced235..e86a55261 100755
--- a/bin/install_perl_modules
+++ b/bin/install_perl_modules
@@ -9,7 +9,7 @@ $DIR/bin/cpanm -l $DIR/local-carton Carton
 export PATH=$DIR/local-carton/bin:$PATH
 export PERL5LIB=$DIR/local-carton/lib/perl5
 
-carton install --deployment --without uk
+carton install --deployment --without uk --without zurich
 
 if ! perl -MImage::Magick -e 'exit()' >/dev/null 2>&1
 then
diff --git a/bin/make_css b/bin/make_css
index 4465f1f9b..a8afafb27 100755
--- a/bin/make_css
+++ b/bin/make_css
@@ -8,8 +8,14 @@
 #
 # Copyright (c) 2012 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
-#
-# $Id: send-reports,v 1.79 2010-01-06 16:50:26 louise Exp $
+
+COMPASS=compass
+SASS=sass
+PARENT=$(cd `dirname $0`/../.. && pwd)
+if [ -f "$PARENT/gem-bin/compass" ]; then
+    COMPASS=$PARENT/gem-bin/compass
+    SASS=$PARENT/gem-bin/sass
+fi
 
 DIRECTORY=$(cd `dirname $0`/../web && pwd)
 
@@ -17,8 +23,8 @@ DIRS=${@:-`find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`}
 
 for dir in $DIRS; do
     if [ -e "$dir/config.rb" ]; then
-        compass compile --output-style compressed $dir
+        $COMPASS compile --output-style compressed $dir
     else
-        sass --scss --update --style compressed $dir
+        $SASS --scss --update --style compressed $dir
     fi
 done
diff --git a/bin/make_css_watch b/bin/make_css_watch
index d46ee8997..63a27a35e 100755
--- a/bin/make_css_watch
+++ b/bin/make_css_watch
@@ -2,8 +2,10 @@
 use strict;
 use warnings;
 use feature 'say';
+use Cwd qw(abs_path);
 use File::ChangeNotify;
 use File::Find::Rule;
+use FindBin;
 use Path::Tiny;
 
 my @exts = qw/
@@ -24,6 +26,14 @@ my $watcher = File::ChangeNotify->instantiate_watcher(
     filter => $filter,
 );
 
+my $script_compass = 'compass';
+my $script_sass = 'sass';
+my $gem_bin = abs_path("$FindBin::Bin/../../gem-bin");
+if (-f "$gem_bin/compass") {
+    $script_compass = "$gem_bin/compass";
+    $script_sass = "$gem_bin/sass";
+}
+
 sub title {
     my $what = shift;
     # TODO, check if xtitle is installed and if so, run following command:
@@ -61,13 +71,13 @@ while ( my @events = $watcher->wait_for_events() ) {
     }
     for my $dir (@update_dirs) {
         if (-e "$dir/config.rb") {
-            system compass =>
+            system $script_compass,
                 'compile',
                 '--output-style' => 'compressed',
                 $dir;
         }
         else {
-            system sass =>
+            system $script_sass,
                 '--scss',
                 '--update',
                 '--style' => 'compressed',
diff --git a/bin/send-comments b/bin/send-comments
index 3549113c9..03adfb095 100755
--- a/bin/send-comments
+++ b/bin/send-comments
@@ -15,7 +15,6 @@ require 5.8.0;
 
 use Digest::MD5;
 use Encode;
-use Error qw(:try);
 use CronFns;
 
 use FixMyStreet::App;
diff --git a/conf/packages b/conf/packages
index 5edbe96fe..de2207f98 100644
--- a/conf/packages
+++ b/conf/packages
@@ -4,7 +4,6 @@
 
 make
 jhead
-liberror-perl
 liblocale-gettext-perl
 libsoap-lite-perl
 memcached
diff --git a/conf/packages.debian-squeeze b/conf/packages.debian-squeeze
index 4f7887484..c2f1f3f68 100644
--- a/conf/packages.debian-squeeze
+++ b/conf/packages.debian-squeeze
@@ -1,15 +1,13 @@
 make
 jhead
-liberror-perl
 liblocale-gettext-perl
-libsoap-lite-perl
 memcached
 perl
 perlmagick
 libmath-bigint-gmp-perl
 gettext
-libhaml-ruby
-postgresql-8.4
+ruby1.9.1
+postgresql
 postgresql-server-dev-8.4
 gnuplot
 ttf-bitstream-vera
diff --git a/conf/packages.debian-wheezy b/conf/packages.debian-wheezy
index d925dfcad..ef6921142 100644
--- a/conf/packages.debian-wheezy
+++ b/conf/packages.debian-wheezy
@@ -1,16 +1,14 @@
 make
 jhead
-liberror-perl
 liblocale-gettext-perl
-libsoap-lite-perl
 memcached
 perl
 perlmagick
 libmath-bigint-gmp-perl
 gettext
-ruby-compass
+ruby1.9.1
 postgresql
-postgresql-server-dev-9.1
+postgresql-server-dev-all
 gnuplot
 ttf-bitstream-vera
 libexpat1-dev
diff --git a/conf/packages.ubuntu-precise b/conf/packages.ubuntu-precise
index fc8a7d511..ef6921142 100644
--- a/conf/packages.ubuntu-precise
+++ b/conf/packages.ubuntu-precise
@@ -1,16 +1,14 @@
 make
 jhead
-liberror-perl
 liblocale-gettext-perl
-libsoap-lite-perl
 memcached
 perl
 perlmagick
 libmath-bigint-gmp-perl
 gettext
-libhaml-ruby
-postgresql-9.1
-postgresql-server-dev-9.1
+ruby1.9.1
+postgresql
+postgresql-server-dev-all
 gnuplot
 ttf-bitstream-vera
 libexpat1-dev
diff --git a/cpanfile b/cpanfile
index 4a15ea7f5..b50e433a8 100644
--- a/cpanfile
+++ b/cpanfile
@@ -69,7 +69,6 @@ requires 'POSIX';
 requires 'Readonly';
 requires 'Regexp::Common';
 requires 'Scalar::Util';
-requires 'SOAP::Lite';
 requires 'Statistics::Distributions';
 requires 'Storable';
 requires 'Template::Plugin::Comma';
@@ -81,12 +80,9 @@ requires 'XML::RSS';
 requires 'XML::Simple';
 requires 'YAML';
 
-# SOAP::Lite isn't needed by all cobrands, but it would require
-# code changes to only be imported when installed.
-
 feature 'uk', 'FixMyStreet.com specific requirements' => sub {
-#    # East Hampshire
-#    requires 'SOAP::Lite';
+    # East Hampshire
+    requires 'SOAP::Lite';
     # Barnet
     # TODO: This can perhaps be removed since Barnet switched to email for problem reports
     requires 'SOAP::WSDL';
@@ -101,10 +97,10 @@ feature 'open311-endpoint', 'Open311::Endpoint specific requirements' => sub {
     requires 'DateTime::Format::Oracle'; # for EXOR
 };
 
-#feature 'zurich', 'Zueri wie neu specific requirements' => sub {
+feature 'zurich', 'Zueri wie neu specific requirements' => sub {
 #    # Geocoder
-#    requires 'SOAP::Lite';
-#};
+    requires 'SOAP::Lite';
+};
 
 # Moderation by from_body user
 requires 'Algorithm::Diff';
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index 3fb17bc1e..c4362b4d1 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -820,6 +820,18 @@ DISTRIBUTIONS
     requirements:
       ExtUtils::MakeMaker 0
       Test::More 0
+  Compress-Raw-Bzip2-2.060
+    pathname: P/PM/PMQS/Compress-Raw-Bzip2-2.060.tar.gz
+    provides:
+      Compress::Raw::Bzip2 2.060
+    requirements:
+      ExtUtils::MakeMaker 0
+  Compress-Raw-Zlib-2.060
+    pathname: P/PM/PMQS/Compress-Raw-Zlib-2.060.tar.gz
+    provides:
+      Compress::Raw::Zlib 2.060
+    requirements:
+      ExtUtils::MakeMaker 0
   Config-Any-0.23
     pathname: B/BR/BRICAS/Config-Any-0.23.tar.gz
     provides:
@@ -1267,6 +1279,13 @@ DISTRIBUTIONS
       Symbol 0
       Test 0
       perl 5.006
+  Data-Dumper-2.145
+    pathname: S/SM/SMUELLER/Data-Dumper-2.145.tar.gz
+    provides:
+      Data::Dumper 2.145
+    requirements:
+      ExtUtils::MakeMaker 0
+      Test::More 0.98
   Data-Dumper-Concise-2.020
     pathname: F/FR/FREW/Data-Dumper-Concise-2.020.tar.gz
     provides:
@@ -1435,6 +1454,7 @@ DISTRIBUTIONS
     requirements:
       DateTime 0.17
       HTTP::Date 1.44
+      Module::Build 0.36
       Test::More 0.47
   DateTime-Format-ISO8601-0.08
     pathname: J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz
@@ -1970,7 +1990,7 @@ DISTRIBUTIONS
       DateTime::Locale::zu_ZA undef
     requirements:
       List::MoreUtils 0
-      Module::Build 0
+      Module::Build 0.36
       Params::Validate 0.91
       perl 5.006
   DateTime-TimeZone-1.58
@@ -2439,6 +2459,14 @@ DISTRIBUTIONS
       ExtUtils::MakeMaker 0
       Sub::Exporter::Progressive 0.001006
       perl 5.006
+  Devel-GlobalDestruction-XS-0.01
+    pathname: R/RI/RIBASUSHI/Devel-GlobalDestruction-XS-0.01.tar.gz
+    provides:
+      Devel::GlobalDestruction::XS 0.01
+    requirements:
+      ExtUtils::CBuilder 0.27
+      ExtUtils::MakeMaker 0
+      perl 5.006
   Devel-StackTrace-1.30
     pathname: D/DR/DROLSKY/Devel-StackTrace-1.30.tar.gz
     provides:
@@ -2660,6 +2688,33 @@ DISTRIBUTIONS
     requirements:
       ExtUtils::MakeMaker 6.17
       perl 5.006001
+  ExtUtils-CBuilder-0.280205
+    pathname: D/DA/DAGOLDEN/ExtUtils-CBuilder-0.280205.tar.gz
+    provides:
+      ExtUtils::CBuilder 0.280205
+      ExtUtils::CBuilder::Base 0.280205
+      ExtUtils::CBuilder::Platform::Unix 0.280205
+      ExtUtils::CBuilder::Platform::VMS 0.280205
+      ExtUtils::CBuilder::Platform::Windows 0.280205
+      ExtUtils::CBuilder::Platform::Windows::BCC 0.280205
+      ExtUtils::CBuilder::Platform::Windows::GCC 0.280205
+      ExtUtils::CBuilder::Platform::Windows::MSVC 0.280205
+      ExtUtils::CBuilder::Platform::aix 0.280205
+      ExtUtils::CBuilder::Platform::cygwin 0.280205
+      ExtUtils::CBuilder::Platform::darwin 0.280205
+      ExtUtils::CBuilder::Platform::dec_osf 0.280205
+      ExtUtils::CBuilder::Platform::os2 0.280205
+    requirements:
+      Cwd 0
+      ExtUtils::MakeMaker 6.30
+      File::Basename 0
+      File::Spec 3.13
+      File::Temp 0
+      IO::File 0
+      IPC::Cmd 0
+      Perl::OSType 0
+      Test::More 0.47
+      Text::ParseWords 0
   ExtUtils-Config-0.008
     pathname: L/LE/LEONT/ExtUtils-Config-0.008.tar.gz
     provides:
@@ -2739,6 +2794,30 @@ DISTRIBUTIONS
       File::Spec 0.8
       Pod::Man 0
       perl 5.006
+  ExtUtils-ParseXS-3.21
+    pathname: S/SM/SMUELLER/ExtUtils-ParseXS-3.21.tar.gz
+    provides:
+      ExtUtils::ParseXS 3.21
+      ExtUtils::ParseXS::Constants 3.21
+      ExtUtils::ParseXS::CountLines 3.21
+      ExtUtils::ParseXS::Eval 3.21
+      ExtUtils::ParseXS::Utilities 3.21
+      ExtUtils::Typemaps 3.21
+      ExtUtils::Typemaps::Cmd 3.21
+      ExtUtils::Typemaps::InputMap 3.21
+      ExtUtils::Typemaps::OutputMap 3.21
+      ExtUtils::Typemaps::Type 3.21
+    requirements:
+      Carp 0
+      Cwd 0
+      DynaLoader 0
+      Exporter 0
+      ExtUtils::CBuilder 0
+      ExtUtils::MakeMaker 6.46
+      File::Basename 0
+      File::Spec 0
+      Symbol 0
+      Test::More 0.47
   FCGI-0.74
     pathname: F/FL/FLORA/FCGI-0.74.tar.gz
     provides:
@@ -3120,6 +3199,45 @@ DISTRIBUTIONS
       Filter::Util::Call 0
       Test::More 0
       perl 5.006002
+  IO-Compress-2.060
+    pathname: P/PM/PMQS/IO-Compress-2.060.tar.gz
+    provides:
+      Compress::Zlib 2.060
+      File::GlobMapper 1.000
+      IO::Compress undef
+      IO::Compress::Adapter::Bzip2 2.060
+      IO::Compress::Adapter::Deflate 2.060
+      IO::Compress::Adapter::Identity 2.060
+      IO::Compress::Base 2.060
+      IO::Compress::Base::Common 2.060
+      IO::Compress::Bzip2 2.060
+      IO::Compress::Deflate 2.060
+      IO::Compress::Gzip 2.060
+      IO::Compress::Gzip::Constants 2.060
+      IO::Compress::RawDeflate 2.060
+      IO::Compress::Zip 2.060
+      IO::Compress::Zip::Constants 2.060
+      IO::Compress::Zlib::Constants 2.060
+      IO::Compress::Zlib::Extra 2.060
+      IO::Uncompress::Adapter::Bunzip2 2.060
+      IO::Uncompress::Adapter::Identity 2.060
+      IO::Uncompress::Adapter::Inflate 2.060
+      IO::Uncompress::AnyInflate 2.060
+      IO::Uncompress::AnyUncompress 2.060
+      IO::Uncompress::Base 2.060
+      IO::Uncompress::Bunzip2 2.060
+      IO::Uncompress::Gunzip 2.060
+      IO::Uncompress::Inflate 2.060
+      IO::Uncompress::RawInflate 2.060
+      IO::Uncompress::Unzip 2.060
+      U64 2.060
+      Zlib::OldDeflate 2.060
+      Zlib::OldInflate 2.060
+    requirements:
+      Compress::Raw::Bzip2 2.060
+      Compress::Raw::Zlib 2.060
+      ExtUtils::MakeMaker 0
+      Scalar::Util 0
   IO-HTML-1.00
     pathname: C/CJ/CJM/IO-HTML-1.00.tar.gz
     provides:
@@ -3645,6 +3763,20 @@ DISTRIBUTIONS
       Test::More 0.86
       YAML::Tiny 1.38
       perl 5.005
+  Module-Metadata-1.000014
+    pathname: B/BO/BOBTFISH/Module-Metadata-1.000014.tar.gz
+    provides:
+      Module::Metadata 1.000014
+    requirements:
+      Carp 0
+      ExtUtils::MakeMaker 0
+      File::Find 0
+      File::Spec 0
+      IO::File 0
+      strict 0
+      vars 0
+      version 0.87
+      warnings 0
   Module-Runtime-0.013
     pathname: Z/ZE/ZEFRAM/Module-Runtime-0.013.tar.gz
     provides:
@@ -4608,6 +4740,21 @@ DISTRIBUTIONS
       File::Basename 0
       Scalar::Util 0
       Test 0
+  Perl-OSType-1.003
+    pathname: D/DA/DAGOLDEN/Perl-OSType-1.003.tar.gz
+    provides:
+      Perl::OSType 1.003
+    requirements:
+      Exporter 0
+      ExtUtils::MakeMaker 6.30
+      File::Find 0
+      File::Spec::Functions 0
+      File::Temp 0
+      List::Util 0
+      Test::More 0.88
+      constant 0
+      strict 0
+      warnings 0
   Plack-1.0018
     pathname: M/MI/MIYAGAWA/Plack-1.0018.tar.gz
     provides:
@@ -5282,6 +5429,13 @@ DISTRIBUTIONS
     requirements:
       ExtUtils::MakeMaker 0
       Test::More 0.88
+  Sub-Identify-0.04
+    pathname: R/RG/RGARCIA/Sub-Identify-0.04.tar.gz
+    provides:
+      Sub::Identify 0.04
+    requirements:
+      ExtUtils::MakeMaker 0
+      Test::More 0
   Sub-Install-0.926
     pathname: R/RJ/RJBS/Sub-Install-0.926.tar.gz
     provides:
@@ -5522,6 +5676,7 @@ DISTRIBUTIONS
     provides:
       Test::Exception 0.31
     requirements:
+      Module::Build 0.36
       Sub::Uplevel 0.18
       Test::Builder 0.7
       Test::Builder::Tester 1.07
@@ -5665,6 +5820,21 @@ DISTRIBUTIONS
       Test::Requires 0
       Time::HiRes 0
       perl 5.008
+  Test-Simple-0.98
+    pathname: M/MS/MSCHWERN/Test-Simple-0.98.tar.gz
+    provides:
+      Test::Builder 0.98
+      Test::Builder::IO::Scalar 2.110
+      Test::Builder::Module 0.98
+      Test::Builder::Tester 1.22
+      Test::Builder::Tester::Color 1.22
+      Test::Builder::Tester::Tie 1.22
+      Test::More 0.98
+      Test::Simple 0.98
+    requirements:
+      ExtUtils::MakeMaker 0
+      Test::Harness 2.03
+      perl 5.006
   Test-TCP-1.21
     pathname: T/TO/TOKUHIROM/Test-TCP-1.21.tar.gz
     provides:
@@ -6499,6 +6669,8 @@ DISTRIBUTIONS
       B::Hooks::EndOfScope 0.12
       ExtUtils::CBuilder 0.27
       Package::Stash 0.23
+      Sub::Identify 0.04
+      Sub::Name 0.04
       Test::More 0.88
   strictures-1.004004
     pathname: E/ET/ETHER/strictures-1.004004.tar.gz
@@ -6506,6 +6678,17 @@ DISTRIBUTIONS
       strictures 1.004004
     requirements:
       ExtUtils::MakeMaker 0
+  version-0.9902
+    pathname: J/JP/JPEACOCK/version-0.9902.tar.gz
+    provides:
+      charstar 0.9902
+      version 0.9902
+      version::vpp 0.9902
+      version::vxs 0.9902
+    requirements:
+      ExtUtils::MakeMaker 0
+      File::Temp 0.13
+      Test::More 0.45
   warnings-illegalproto-0.001001
     pathname: F/FR/FREW/warnings-illegalproto-0.001001.tar.gz
     provides:
diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index b2bd3db3d..9c10ae36a 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -349,7 +349,6 @@ sub diff {
             my $deleted = join '', $diff->Items(1);
             unless ($deleted =~/^\s*$/) {
                 $string .= ' ' if $deleted =~/^ /;
-                my $letters = ($deleted=~s/\W//r);
                 $string .= '[...]';
                 $string .= ' ' if $deleted =~/ $/;
             }
diff --git a/perllib/FixMyStreet/Geocode/Zurich.pm b/perllib/FixMyStreet/Geocode/Zurich.pm
index 7ba3d27ad..84fd83fc7 100644
--- a/perllib/FixMyStreet/Geocode/Zurich.pm
+++ b/perllib/FixMyStreet/Geocode/Zurich.pm
@@ -16,7 +16,6 @@ use strict;
 use Digest::MD5 qw(md5_hex);
 use File::Path ();
 use Geo::Coordinates::CH1903;
-use SOAP::Lite;
 use Storable;
 use mySociety::Locale;
 
@@ -33,6 +32,8 @@ sub setup_soap {
     my $attr = 'http://ch/geoz/fixmyzuerich/service';
     my $action = "$attr/IFixMyZuerich/";
 
+    require SOAP::Lite;
+
     # Set up the SOAP handler
     $security = SOAP::Header->name("Security")->attr({
         'mustUnderstand' => 'true',
diff --git a/perllib/FixMyStreet/SendReport/EastHants.pm b/perllib/FixMyStreet/SendReport/EastHants.pm
index beab9d55c..44bc084b1 100644
--- a/perllib/FixMyStreet/SendReport/EastHants.pm
+++ b/perllib/FixMyStreet/SendReport/EastHants.pm
@@ -4,11 +4,9 @@ use Moose;
 
 BEGIN { extends 'FixMyStreet::SendReport'; }
 
-# export just what we need as error if we use :try
-use Error qw(try otherwise);
+use Try::Tiny;
 use Encode;
 use mySociety::Web qw(ent);
-use EastHantsWSDL;
 
 sub construct_message {
     my %h = @_;
@@ -37,6 +35,8 @@ sub send {
     # FIXME: should not recreate this each time
     my $eh_service;
 
+    require EastHantsWSDL;
+
     $h->{category} = 'Customer Services' if $h->{category} eq 'Other';
     $h->{message} = construct_message( %$h );
     my $return = 1;
@@ -50,8 +50,8 @@ sub send {
             '', '', '', '', '', '', $message, 'Yes', $h->{image_url}
         );
         $return = 0 if $result eq 'Report received';
-    } otherwise {
-        my $e = shift;
+    } catch {
+        my $e = $_;
         print "Caught an error: $e\n";
         $self->error( "Error sending to East Hants: $e" );
     };