Merge pull request #653 from Shopify/fix-rubocop-offenses

Fix offenses from the new version of rubocop.

.rubocop.yml

@@ -118,6 +118,8 @@ Style/ClassVars:
 Style/PerlBackrefs:
   Enabled: false
 
+Style/TrivialAccessors:
+  AllowPredicates: true
+
 Style/WordArray:
   Enabled: false
-

Gemfile

@@ -6,7 +6,7 @@ gem 'stackprof', platforms: :mri_21
 group :test do
   gem 'spy', '0.4.1'
   gem 'benchmark-ips'
-  gem 'rubocop', '>=0.32.0'
+  gem 'rubocop', '0.34.2'
 
   platform :mri do
     gem 'liquid-c', github: 'Shopify/liquid-c', ref: '2570693d8d03faa0df9160ec74348a7149436df3'

lib/liquid/standardfilters.rb

@@ -42,7 +42,7 @@ module Liquid
     end
 
     def url_encode(input)
-      CGI.escape(input) rescue input
+      CGI.escape(input) unless input.nil?
     end
 
     def slice(input, offset, length = nil)