Upgraded Rubocop to 0.21.0.

Author: dblock

.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  Excludes:
+  Exclude:
     - vendor/**
 
 LineLength:
@@ -23,15 +23,6 @@ Encoding:
   # no need to always specify encoding
   Enabled: false
 
-HashMethods:
-  # key? instead of has_key?
-  # value? instead of has_value?
-  Enabled: false
-
-StringLiterals:
-  # use single or double-quoted strings, as you please
-  Enabled: false
-
 Void:
   # == operator used in void context in specs
   Enabled: false
@@ -67,3 +58,6 @@ WordArray:
 CyclomaticComplexity:
   Enabled: false
 
+FileName:
+  # allow grape-entity.rb for a require
+  Enabled: false

Gemfile

@@ -13,7 +13,7 @@ group :development, :test do
   gem 'rspec'
   gem 'rack-test', "~> 0.6.2", :require => "rack/test"
   gem 'github-markup'
-  gem 'rubocop', '~> 0.16.0'
+  gem 'rubocop', '0.21.0'
 end
 
 platforms :rbx do

grape-entity.gemspec

@@ -1,22 +1,22 @@
-$:.push File.expand_path("../lib", __FILE__)
-require "grape_entity/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'grape_entity/version'
 
 Gem::Specification.new do |s|
-  s.name        = "grape-entity"
+  s.name        = 'grape-entity'
   s.version     = GrapeEntity::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Michael Bleigh"]
-  s.email       = ["[email protected]"]
-  s.homepage    = "https://github.com/intridea/grape-entity"
-  s.summary     = %q{A simple facade for managing the relationship between your model and API.}
-  s.description = %q{Extracted from Grape, A Ruby framework for rapid API development with great conventions.}
-  s.license     = "MIT"
+  s.authors     = ['Michael Bleigh']
+  s.email       = ['[email protected]']
+  s.homepage    = 'https://github.com/intridea/grape-entity'
+  s.summary     = %q(A simple facade for managing the relationship between your model and API.)
+  s.description = %q(Extracted from Grape, A Ruby framework for rapid API development with great conventions.)
+  s.license     = 'MIT'
 
-  s.rubyforge_project = "grape-entity"
+  s.rubyforge_project = 'grape-entity'
 
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'multi_json', '>= 1.3.2'
-  
+
   s.add_development_dependency 'rake'
   s.add_development_dependency 'maruku'
   s.add_development_dependency 'yard'
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 end

lib/grape_entity.rb

@@ -1,3 +1,4 @@
-require "active_support/core_ext"
-require "grape_entity/version"
-require "grape_entity/entity"
+require 'active_support'
+require 'active_support/core_ext'
+require 'grape_entity/version'
+require 'grape_entity/entity'

lib/grape_entity/entity.rb

@@ -127,11 +127,11 @@ def self.expose(*args, &block)
       options = merge_options(args.last.is_a?(Hash) ? args.pop : {})
 
       if args.size > 1
-        raise ArgumentError, "You may not use the :as option on multi-attribute exposures." if options[:as]
-        raise ArgumentError, "You may not use block-setting on multi-attribute exposures." if block_given?
+        raise ArgumentError, 'You may not use the :as option on multi-attribute exposures.' if options[:as]
+        raise ArgumentError, 'You may not use block-setting on multi-attribute exposures.' if block_given?
       end
 
-      raise ArgumentError, "You may not use block-setting when also using format_with" if block_given? && options[:format_with].respond_to?(:call)
+      raise ArgumentError, 'You may not use block-setting when also using format_with' if block_given? && options[:format_with].respond_to?(:call)
 
       options[:proc] = block if block_given? && block.parameters.any?
 
@@ -247,7 +247,7 @@ def self.documentation
     #   end
     #
     def self.format_with(name, &block)
-      raise ArgumentError, "You must pass a block for formatters" unless block_given?
+      raise ArgumentError, 'You must pass a block for formatters' unless block_given?
       formatters[name.to_sym] = block
     end
 
@@ -328,7 +328,7 @@ def self.represent(objects, options = {})
         inner = inner.serializable_hash if options[:serializable]
       end
 
-      root_element = if options.has_key?(:root)
+      root_element = if options.key?(:root)
                        options[:root]
                      else
                        objects.respond_to?(:to_ary) ? @collection_root : @root
@@ -346,7 +346,7 @@ def exposures
     end
 
     def valid_exposures
-      exposures.reject { |a, options| options[:nested] }.select do |attribute, exposure_options|
+      exposures.reject { |_, options| options[:nested] }.select do |attribute, exposure_options|
         valid_exposure?(attribute, exposure_options)
       end
     end
@@ -469,7 +469,7 @@ def delegate_attribute(attribute)
     def valid_exposure?(attribute, exposure_options)
       nested_exposures = self.class.nested_exposures_for(attribute)
       (nested_exposures.any? && nested_exposures.all? { |a, o| valid_exposure?(a, o) }) || \
-      exposure_options.has_key?(:proc) || \
+      exposure_options.key?(:proc) || \
       !exposure_options[:safe] || \
       object.respond_to?(self.class.name_for(attribute))
     end
@@ -500,8 +500,6 @@ def conditions_met?(exposure_options, options)
       true
     end
 
-    private
-
     # All supported options.
     OPTIONS = [
       :as, :if, :unless, :using, :with, :proc, :documentation, :format_with, :safe, :if_extras, :unless_extras
@@ -544,7 +542,7 @@ def self.valid_options(options)
         raise ArgumentError, "#{key.inspect} is not a valid option." unless OPTIONS.include?(key)
       end
 
-      options[:using] = options.delete(:with) if options.has_key?(:with)
+      options[:using] = options.delete(:with) if options.key?(:with)
       options
     end
   end