Fix most recent rubocop issues (#797)

.rubocop.yml

@@ -6,6 +6,9 @@ Style/Documentation:
 Style/NonNilCheck:
   IncludeSemanticChanges: true
 
+Style/RedundantInitialize:
+  Enabled: false
+
 Style/EmptyMethod:
   Enabled: false
 

cancancan.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler', '~> 2.0'
   s.add_development_dependency 'rake', '~> 10.1', '>= 10.1.1'
   s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
-  s.add_development_dependency 'rubocop', '~> 1.26'
+  s.add_development_dependency 'rubocop', '~> 1.31.1'
 end

lib/cancan/ability/rules.rb

@@ -61,8 +61,8 @@ def relevant_rules_for_match(action, subject)
           next unless rule.only_raw_sql?
 
           raise Error,
-                "The can? and cannot? call cannot be used with a raw sql 'can' definition."\
-                " The checking code cannot be determined for #{action.inspect} #{subject.inspect}"
+                "The can? and cannot? call cannot be used with a raw sql 'can' definition. " \
+                "The checking code cannot be determined for #{action.inspect} #{subject.inspect}"
         end
       end
 
@@ -72,7 +72,7 @@ def relevant_rules_for_query(action, subject)
           rule.base_behavior == false && rule.attributes.present?
         end
         if rules.any?(&:only_block?)
-          raise Error, "The accessible_by call cannot be used with a block 'can' definition."\
+          raise Error, "The accessible_by call cannot be used with a block 'can' definition." \
             "The SQL cannot be determined for #{action.inspect} #{subject.inspect}"
         end
         rules

lib/cancan/controller_additions.rb

@@ -264,7 +264,7 @@ def check_authorization(options = {})
           next if options[:unless] && controller.send(options[:unless])
 
           raise AuthorizationNotPerformed,
-                'This action failed the check_authorization because it does not authorize_resource. '\
+                'This action failed the check_authorization because it does not authorize_resource. ' \
                 'Add skip_authorization_check to bypass this check.'
         end
 

lib/cancan/model_adapters/active_record_adapter.rb

@@ -133,7 +133,7 @@ def override_scope
       def raise_override_scope_error
         rule_found = @compressed_rules.detect { |rule| rule.conditions.is_a?(ActiveRecord::Relation) }
         raise Error,
-              'Unable to merge an Active Record scope with other conditions. '\
+              'Unable to merge an Active Record scope with other conditions. ' \
               "Instead use a hash or SQL for #{rule_found.actions.first} #{rule_found.subjects.first} ability."
       end
 

lib/cancan/rule.rb

@@ -123,7 +123,7 @@ def parse_attributes_from_extra_args(args)
     def condition_and_block_check(conditions, block, action, subject)
       return unless conditions.is_a?(Hash) && block
 
-      raise BlockAndConditionsError, 'A hash of conditions is mutually exclusive with a block. '\
+      raise BlockAndConditionsError, 'A hash of conditions is mutually exclusive with a block. ' \
         "Check \":#{action} #{subject}\" ability."
     end
 

spec/cancan/model_adapters/active_record_adapter_spec.rb

@@ -277,7 +277,7 @@ class User < ActiveRecord::Base
         @ability.can :read, Article, Article.where(secret: true)
         expect { Article.accessible_by(@ability) }
           .to raise_error(CanCan::Error,
-                          'Unable to merge an Active Record scope with other conditions. '\
+                          'Unable to merge an Active Record scope with other conditions. ' \
                             'Instead use a hash or SQL for read Article ability.')
       end