updates to latest rubocop, allow failures for ruby 2.2.8 (#283)

* updates rubocop, includes minor code changes

* allows failures for ruby 2.2.8

.rubocop.yml

@@ -26,5 +26,9 @@ Style/MultilineIfModifier:
 Style/RaiseArgs:
   Enabled: false
 
+Lint/BooleanSymbol:
+  Exclude:
+    - 'spec/grape_entity/exposure_spec.rb'
+
 Lint/UnneededDisable:
   Enabled: false

.travis.yml

@@ -3,25 +3,29 @@ sudo: false
 language: ruby
 
 before_install:
+  - gem update --system
   - gem install bundler
 
 after_success:
   - coveralls
+  - bundle exec danger
+
+rvm:
+  - 2.4.2
+  - 2.3.5
 
 matrix:
+  fast_finish: true
+
   include:
-    - rvm: 2.4.2
-      script:
-        - bundle exec danger
-    - rvm: 2.4.2
-    - rvm: 2.3.5
-    - rvm: 2.2.7
+    - rvm: 2.2.8
     - rvm: ruby-head
     - rvm: jruby-9.1.10.0
     - rvm: jruby-head
     - rvm: rbx-2
 
   allow_failures:
+    - rvm: 2.2.8
     - rvm: ruby-head
     - rvm: jruby-9.1.10.0
     - rvm: jruby-head

Gemfile

@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rubocop', '~> 0.48.0', require: false
+  gem 'rubocop', '~> 0.51', require: false
 end
 
 group :test do

Rakefile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'rubygems'

grape-entity.gemspec

@@ -18,17 +18,17 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'grape-entity'
 
-  s.add_runtime_dependency 'multi_json', '>= 1.3.2'
   s.add_runtime_dependency 'activesupport', '>= 4.0.0'
+  s.add_runtime_dependency 'multi_json', '>= 1.3.2'
 
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rack-test'
   s.add_development_dependency 'maruku'
-  s.add_development_dependency 'yard'
   s.add_development_dependency 'pry' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
   s.add_development_dependency 'pry-byebug' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
+  s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'yard'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec}/*`.split("\n")

lib/grape_entity/entity.rb

@@ -561,7 +561,7 @@ def self.merge_options(options)
     #
     # @param options [Hash] Exposure options.
     def self.valid_options(options)
-      options.keys.each do |key|
+      options.each_key do |key|
         raise ArgumentError, "#{key.inspect} is not a valid option." unless OPTIONS.include?(key)
       end
 

lib/grape_entity/options.rb

@@ -72,7 +72,7 @@ def should_return_key?(key)
 
         only = only_fields.nil? ||
                only_fields.key?(key)
-        except = except_fields && except_fields.key?(key) &&
+        except = except_fields&.key?(key) &&
                  except_fields[key] == true
         only && !except
       end