fixes rubocop 0.54.0 offenses (#301)

Author: LeFnord

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-01-11 18:20:10 +0100 using RuboCop version 0.52.1.
+# on 2018-03-28 21:26:18 +0200 using RuboCop version 0.54.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,32 +11,39 @@ Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/grape_entity/exposure/represent_exposure_spec.rb'
 
-# Offense count: 6
+# Offense count: 5
 Metrics/AbcSize:
-  Max: 32
+  Max: 25
 
-# Offense count: 35
+# Offense count: 39
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
   Max: 1632
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 210
+  Max: 205
 
-# Offense count: 2
+# Offense count: 1
 Metrics/CyclomaticComplexity:
-  Max: 11
+  Max: 10
 
-# Offense count: 7
+# Offense count: 6
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 28
+  Max: 26
 
-# Offense count: 2
+# Offense count: 1
 Metrics/PerceivedComplexity:
-  Max: 13
+  Max: 11
+
+# Offense count: 3
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'spec/grape_entity/entity_spec.rb'
 
 # Offense count: 1
 Style/EvalWithLocation:
@@ -51,7 +58,7 @@ Style/SymbolProc:
   Exclude:
     - 'spec/grape_entity/entity_spec.rb'
 
-# Offense count: 250
+# Offense count: 272
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

grape-entity.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'grape_entity/version'
 
 Gem::Specification.new do |s|

lib/grape_entity/entity.rb

@@ -516,12 +516,12 @@ def delegate_attribute(attribute)
     alias as_json serializable_hash
 
     def to_json(options = {})
-      options = options.to_h if options && options.respond_to?(:to_h)
+      options = options.to_h if options&.respond_to?(:to_h)
       MultiJson.dump(serializable_hash(options))
     end
 
     def to_xml(options = {})
-      options = options.to_h if options && options.respond_to?(:to_h)
+      options = options.to_h if options&.respond_to?(:to_h)
       serializable_hash(options).to_xml(options)
     end