Merge pull request #103 from dblock/fix-rbx-build

Fix Rubinius build.

Author: dblock

.rubocop.yml

@@ -1,63 +1,5 @@
 AllCops:
   Exclude:
-    - vendor/**
+    - vendor/**/*
 
-LineLength:
-  Enabled: false
-
-MethodLength:
-  Enabled: false
-
-ClassLength:
-  Enabled: false
-
-Documentation:
-  # don't require classes to be documented
-  Enabled: false
-
-CollectionMethods:
-  # don't prefer map to collect, recuce to inject
-  Enabled: false
-
-Encoding:
-  # no need to always specify encoding
-  Enabled: false
-
-Void:
-  # == operator used in void context in specs
-  Enabled: false
-
-SignalException:
-  # prefer raise to fail
-  EnforcedStyle: only_raise
-
-RaiseArgs:
-  # don't care for what kind of raise
-  Enabled: false
-
-PerlBackrefs:
-  # TODO: regular expression matching with $1, $2, etc.
-  Enabled: false
-
-BlockNesting:
-  # TODO: fix too much nesting
-  Max: 4
-
-Lambda:
-  # TODO: replace all lambda with -> or Proc
-  Enabled: false
-
-Blocks:
-  # allow multi-line blocks like expect { }
-  Enabled: false
-
-WordArray:
-  # %w vs. [ '', ... ]
-  Enabled: false
-
-CyclomaticComplexity:
-  Enabled: false
-
-FileName:
-  # allow grape-entity.rb for a require
-  Enabled: false
+inherit_from: .rubocop_todo.yml

.rubocop_todo.yml

@@ -0,0 +1,64 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-12-11 15:27:22 -0500 using RuboCop version 0.28.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
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 5
+Metrics/AbcSize:
+  Max: 53
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 292
+
+# Offense count: 4
+Metrics/CyclomaticComplexity:
+  Max: 17
+
+# Offense count: 175
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 147
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 34
+
+# Offense count: 4
+Metrics/PerceivedComplexity:
+  Max: 15
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/Blocks:
+  Enabled: false
+
+# Offense count: 30
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 2
+Style/EachWithObject:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: Exclude.
+Style/FileName:
+  Enabled: false
+
+# Offense count: 16
+Style/Lambda:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+Style/Next:
+  Enabled: false
+
+# Offense count: 2
+Style/RegexpLiteral:
+  MaxSlashes: 0

.travis.yml

@@ -1,16 +1,17 @@
+sudo: false
+
 language: ruby
 
 cache: bundler
 
 rvm:
   - ruby-head
   - 2.1.2
-  - 2.1.0
   - 2.0.0
   - 1.9.3
   - jruby-19mode
   - jruby-head
-  - rbx-2
+  - rbx-2.2.10
 
 matrix:
   allow_failures:

Gemfile

@@ -11,12 +11,6 @@ group :development, :test do
   gem 'growl'
   gem 'json'
   gem 'rspec'
-  gem 'rack-test', "~> 0.6.2", :require => "rack/test"
-  gem 'rubocop', '0.21.0'
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'parser', '~> 2.1'
-  gem 'racc', '~> 1.4'
+  gem 'rack-test', '~> 0.6.2', require: 'rack/test'
+  gem 'rubocop', '0.28.0'
 end

Guardfile

@@ -1,11 +1,11 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec', version: 2 do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^spec/support/shared_versioning_examples.rb$}) { |m| "spec/" }
-  watch('spec/spec_helper.rb')  { "spec/" }
+  watch(%r{^spec/support/shared_versioning_examples.rb$}) { |_m| 'spec/' }
+  watch('spec/spec_helper.rb')  { 'spec/' }
 end
 
 guard 'bundler' do

Rakefile

@@ -17,6 +17,6 @@ end
 task :spec
 require 'rainbow/ext/string' unless String.respond_to?(:color)
 require 'rubocop/rake_task'
-Rubocop::RakeTask.new(:rubocop)
+RuboCop::RakeTask.new(:rubocop)
 
 task default: [:rubocop, :spec]

grape-entity.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ['Michael Bleigh']
   s.email       = ['michael@intridea.com']
   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.summary     = 'A simple facade for managing the relationship between your model and API.'
+  s.description = 'Extracted from Grape, A Ruby framework for rapid API development with great conventions.'
   s.license     = 'MIT'
 
   s.rubyforge_project = 'grape-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?
+        fail ArgumentError, 'You may not use the :as option on multi-attribute exposures.' if options[:as]
+        fail 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)
+      fail 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?
 
@@ -270,7 +270,7 @@ def self.documentation
     #   end
     #
     def self.format_with(name, &block)
-      raise ArgumentError, 'You must pass a block for formatters' unless block_given?
+      fail ArgumentError, 'You must pass a block for formatters' unless block_given?
       formatters[name.to_sym] = block
     end
 
@@ -461,9 +461,9 @@ def serializable_hash(runtime_options = {})
           output[self.class.key_for(attribute)] =
             if partial_output.respond_to? :serializable_hash
               partial_output.serializable_hash(runtime_options)
-            elsif partial_output.kind_of?(Array) && !partial_output.map { |o| o.respond_to? :serializable_hash }.include?(false)
-              partial_output.map { |o| o.serializable_hash }
-            elsif partial_output.kind_of?(Hash)
+            elsif partial_output.is_a?(Array) && !partial_output.map { |o| o.respond_to? :serializable_hash }.include?(false)
+              partial_output.map(&:serializable_hash)
+            elsif partial_output.is_a?(Hash)
               partial_output.each do |key, value|
                 partial_output[key] = value.serializable_hash if value.respond_to? :serializable_hash
               end
@@ -566,9 +566,9 @@ 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.key?(:proc) || \
-      !exposure_options[:safe] || \
-      object.respond_to?(self.class.name_for(attribute))
+        exposure_options.key?(:proc) || \
+        !exposure_options[:safe] || \
+        object.respond_to?(self.class.name_for(attribute))
     end
 
     def conditions_met?(exposure_options, options)
@@ -642,7 +642,7 @@ def self.merge_options(options)
     # @param options [Hash] Exposure options.
     def self.valid_options(options)
       options.keys.each do |key|
-        raise ArgumentError, "#{key.inspect} is not a valid option." unless OPTIONS.include?(key)
+        fail ArgumentError, "#{key.inspect} is not a valid option." unless OPTIONS.include?(key)
       end
 
       options[:using] = options.delete(:with) if options.key?(:with)

spec/grape_entity/entity_spec.rb

@@ -2,7 +2,6 @@
 require 'ostruct'
 
 describe Grape::Entity do
-
   let(:fresh_class) { Class.new(Grape::Entity) }
 
   context 'class methods' do
@@ -427,7 +426,7 @@ class Parent < Person
         representation = subject.represent(4.times.map { Object.new })
         expect(representation).to be_kind_of Array
         expect(representation.size).to eq(4)
-        expect(representation.reject { |r| r.kind_of?(subject) }).to be_empty
+        expect(representation.reject { |r| r.is_a?(subject) }).to be_empty
       end
 
       it 'adds the collection: true option if called with a collection' do
@@ -461,9 +460,9 @@ class Parent < Person
 
       it 'raises error if field not found' do
         subject.expose(:awesome)
-        expect {
+        expect do
           subject.represent(Object.new, serializable: true)
-        }.to raise_error(NoMethodError)
+        end.to raise_error(NoMethodError)
       end
     end
 
@@ -514,7 +513,7 @@ class Parent < Person
             expect(representation).to have_key 'things'
             expect(representation['things']).to be_kind_of Array
             expect(representation['things'].size).to eq 4
-            expect(representation['things'].reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation['things'].reject { |r| r.is_a?(subject) }).to be_empty
           end
         end
 
@@ -523,15 +522,15 @@ class Parent < Person
             representation = subject.represent(4.times.map { Object.new }, root: false)
             expect(representation).to be_kind_of Array
             expect(representation.size).to eq 4
-            expect(representation.reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation.reject { |r| r.is_a?(subject) }).to be_empty
           end
           it 'can use a different name' do
             representation = subject.represent(4.times.map { Object.new }, root: 'others')
             expect(representation).to be_kind_of Hash
             expect(representation).to have_key 'others'
             expect(representation['others']).to be_kind_of Array
             expect(representation['others'].size).to eq 4
-            expect(representation['others'].reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation['others'].reject { |r| r.is_a?(subject) }).to be_empty
           end
         end
       end
@@ -555,7 +554,7 @@ class Parent < Person
             representation = subject.represent(4.times.map { Object.new })
             expect(representation).to be_kind_of Array
             expect(representation.size).to eq 4
-            expect(representation.reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation.reject { |r| r.is_a?(subject) }).to be_empty
           end
         end
       end
@@ -578,7 +577,7 @@ class Parent < Person
             expect(representation).to have_key('things')
             expect(representation['things']).to be_kind_of Array
             expect(representation['things'].size).to eq 4
-            expect(representation['things'].reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation['things'].reject { |r| r.is_a?(subject) }).to be_empty
           end
         end
       end
@@ -597,14 +596,12 @@ class Parent < Person
         expect(entity.options).to eq({})
       end
     end
-
   end
 
   context 'instance methods' do
-
     let(:model) { double(attributes) }
 
-    let(:attributes) {
+    let(:attributes) do
       {
         name: 'Bob Bobson',
         email: 'bob@example.com',
@@ -615,7 +612,7 @@ class Parent < Person
           double(name: 'Friend 2', email: 'friend2@example.com', fantasies: [], birthday: Time.gm(2012, 2, 27), friends: [])
         ]
       }
-    }
+    end
 
     subject { fresh_class.new(model) }
 

spec/spec_helper.rb

@@ -9,6 +9,4 @@
 
 require 'pry'
 
-RSpec.configure do |config|
-  config.raise_errors_for_deprecations!
-end
+RSpec.configure(&:raise_errors_for_deprecations!)