Merge branch 'add-rack-sanitizer-via-platform' into develop

3 files changed, 3 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index 124447607..e259e4508 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,9 +24,7 @@ gem 'net-purge', '~> 0.1.0'
 gem 'nokogiri', '~> 1.5.9'
 gem 'open4', '~> 1.3.4'
 gem 'rack', '~> 1.4.6'
-if RUBY_VERSION.to_f >= 1.9
-  gem 'rack-utf8_sanitizer', '~> 1.3.0'
-end
+gem 'rack-utf8_sanitizer', '~> 1.3.0', :platforms => :ruby_19
 gem 'rake', '0.9.2.2'
 gem 'rails-i18n', '~> 0.7.3'
 gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails'
diff --git a/config/application.rb b/config/application.rb
index ed7488454..79784148f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -85,7 +85,7 @@ module Alaveteli
     config.middleware.insert_before ::ActionDispatch::Cookies, WhatDoTheyKnow::StripEmptySessions, :key => '_wdtk_cookie_session', :path => "/", :httponly => true
 
     # Strip non-UTF-8 request parameters
-    if RUBY_VERSION.to_f >= 1.9
+    if RUBY_VERSION == '1.9.3'
         config.middleware.insert 0, Rack::UTF8Sanitizer
     end
 
diff --git a/spec/integration/parameter_stripping_spec.rb b/spec/integration/parameter_stripping_spec.rb
index b910062a9..7e3c0adc2 100644
--- a/spec/integration/parameter_stripping_spec.rb
+++ b/spec/integration/parameter_stripping_spec.rb
@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "When handling bad requests" do
 
-    if RUBY_VERSION.to_f >= 1.9
+    if RUBY_VERSION == '1.9.3'
 
         it 'should return a 404 for GET requests to a malformed request URL' do
             get 'request/228%85'