grape-entity 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31f997094eb9145e0e34541cc1083562afbc7724f68c343d9bb8f897b1af8c5f
-  data.tar.gz: 271397df6ac51ffdd5e6380a1e4ab47affb3fbb14d805f6d00cc6715084d0f13
+  metadata.gz: 619c4d253ef6fbfde4f5c3bff0a0a309a67ef6ce49d408de9f3912bf12c4f690
+  data.tar.gz: e4c3f773ba0b6c1751abdbc0642e730c325be409b6d0d55dae1c1b2ce075b7e2
 SHA512:
-  metadata.gz: '0916c3b71d39463de13549202659f8e2c60634e6e6951b9999d45a045307c716f7bcada5a86c100066029a8e4f7da7aea5bf296bc8659f9a871162118c196d3d'
-  data.tar.gz: ed8956de1f403808e504a60b3759e19a0012f9d91db9200fc63891f7d5f5bc29116084619bd47e41d8afce3ef8a98180c620c1f902b3f0dbd4eb42f37d4bb596
+  metadata.gz: 8937886f91fe82d37eb9a8eca7b6d4542b8dcb12b8ea241d8b08c4116305e351c3acc980722fe60dead828140c6c56425763854287b6e0736134e994da2b1f5e
+  data.tar.gz: 3073993606e0f950e39ed8417bbc33aaff7d21544bbdb3797b3e0325ee01c0c8f71c9a63295630af21006698fae585b0bd1a5139dd6241221e2aac07442f1ac6

data/.rubocop.yml

@@ -1,37 +1,48 @@
-AllCops:
-  TargetRubyVersion: 2.4
-  Include:
-    - Dangerfile
+inherit_from: .rubocop_todo.yml
 
+AllCops:
   Exclude:
     - vendor/**/*
-    - bin/**/*
-    - Guardfile
-
-inherit_from: .rubocop_todo.yml
+    - example/**/*
+  TargetRubyVersion: 2.7
 
-Gemspec/RequiredRubyVersion:
+Layout/EmptyLinesAroundArguments:
   Enabled: false
 
-Naming/FileName:
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/LineLength:
+  Max: 120
   Exclude:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'grape-entity.gemspec'
-    - 'lib/grape-entity.rb'
+    - spec/**/*
 
-Style/Documentation:
-  Enabled: false
+Metrics/AbcSize:
+  Max: 25
 
-Style/MultilineIfModifier:
-  Enabled: false
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
 
-Style/RaiseArgs:
-  Enabled: false
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/ClassLength:
+  Max: 300
 
-Lint/BooleanSymbol:
+Metrics/MethodLength:
+  Max: 26
   Exclude:
-    - 'spec/grape_entity/exposure_spec.rb'
+    - spec/**/*
+
+Metrics/PerceivedComplexity:
+  Max: 11
+
+Naming:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
 
-Lint/UnneededDisable:
+Style/RegexpLiteral:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,47 +1,29 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-01-11 18:20:10 +0100 using RuboCop version 0.52.1.
+# on 2020-02-18 16:38:42 +0100 using RuboCop version 0.79.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: 1
-Lint/AmbiguousBlockAssociation:
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'spec/grape_entity/exposure/represent_exposure_spec.rb'
+    - 'grape-entity.gemspec'
 
 # Offense count: 6
-Metrics/AbcSize:
-  Max: 32
-
-# Offense count: 35
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 1632
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 210
-
-# Offense count: 2
-Metrics/CyclomaticComplexity:
-  Max: 11
-
-# Offense count: 7
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 28
-
-# Offense count: 2
-Metrics/PerceivedComplexity:
-  Max: 13
+Lint/BooleanSymbol:
+  Exclude:
+    - 'spec/grape_entity/exposure_spec.rb'
 
 # Offense count: 1
-Style/EvalWithLocation:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: inline, group
+Style/AccessModifierDeclarations:
   Exclude:
-    - 'lib/grape_entity/exposure/nesting_exposure/nested_exposures.rb'
+    - 'spec/grape_entity/entity_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -50,9 +32,3 @@ Style/EvalWithLocation:
 Style/SymbolProc:
   Exclude:
     - 'spec/grape_entity/entity_spec.rb'
-
-# Offense count: 250
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 146

data/.travis.yml

@@ -1,30 +1,25 @@
-sudo: false
-
 language: ruby
 
 before_install:
-  - gem update --system
   - gem install bundler
 
 after_success:
-  - coveralls
   - bundle exec danger
 
 rvm:
-  - 2.5.0
-  - 2.4.3
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
+  - ruby-head
+  - jruby-head
 
 matrix:
   fast_finish: true
 
   include:
-    - rvm: 2.3.6
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-2
+    - rvm: 2.4.9
 
   allow_failures:
-    - rvm: 2.3.6
+    - rvm: 2.4.9
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-2

data/CHANGELOG.md

@@ -8,11 +8,26 @@
 
 * Your contribution here.
 
+### 0.9.0 (2020-02-18)
+
+#### Features
+
+* [#307](https://github.com/ruby-grape/grape-entity/pull/307): Allow exposures to call methods defined in modules included in an entity - [@robertoz-01](https://github.com/robertoz-01).
+* [#319](https://github.com/ruby-grape/grape-entity/pull/319): Support hashes with string keys - [@mhenrixon](https://github.com/mhenrixon).
+* [#300](https://github.com/ruby-grape/grape-entity/pull/300): Loosens activesupport to 3 - [@ericschultz](https://github.com/ericschultz).
+
+#### Fixes
+
+* [#330](https://github.com/ruby-grape/grape-entity/pull/330): CI: use Ruby 2.5.7, 2.6.5, 2.7.0 - [@budnik](https://github.com/budnik).
+* [#329](https://github.com/ruby-grape/grape-entity/pull/329): Option expose_nil doesn't work when block is passed - [@serbiant](https://github.com/serbiant).
+* [#320](https://github.com/ruby-grape/grape-entity/pull/320): Gemspec: drop eol'd property rubyforge_project - [@olleolleolle](https://github.com/olleolleolle).
+* [#307](https://github.com/ruby-grape/grape-entity/pull/307): Allow exposures to call methods defined in modules included in an entity - [@robertoz-01](https://github.com/robertoz-01).
+
 ### 0.7.1 (2018-01-30)
 
 #### Features
 
-* [#292](https://github.com/ruby-grape/grape-entity/pull/297): Introduce `override` option for expose (fixes [#286](https://github.com/ruby-grape/grape-entity/issues/296)) - [@DmitryTsepelev](https://github.com/DmitryTsepelev).
+* [#297](https://github.com/ruby-grape/grape-entity/pull/297): Introduce `override` option for expose (fixes [#286](https://github.com/ruby-grape/grape-entity/issues/296)) - [@DmitryTsepelev](https://github.com/DmitryTsepelev).
 
 ### 0.7.0 (2018-01-25)
 

data/Gemfile

@@ -5,11 +5,11 @@ source 'http://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rubocop', '~> 0.51', require: false
+  gem 'rubocop', '~> 0.79.0', require: false
 end
 
 group :test do
-  gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
   gem 'growl'
   gem 'guard'
   gem 'guard-bundler'

data/Guardfile

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
 guard 'rspec', version: 2 do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_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('spec/spec_helper.rb') { 'spec/' }
 end
 
 guard 'bundler' do

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](http://img.shields.io/gem/v/grape-entity.svg)](http://badge.fury.io/rb/grape-entity)
 [![Build Status](http://img.shields.io/travis/ruby-grape/grape-entity.svg)](https://travis-ci.org/ruby-grape/grape-entity)
 [![Coverage Status](https://coveralls.io/repos/github/ruby-grape/grape-entity/badge.svg?branch=master)](https://coveralls.io/github/ruby-grape/grape-entity?branch=master)
-[![Dependency Status](https://gemnasium.com/ruby-grape/grape-entity.svg)](https://gemnasium.com/ruby-grape/grape-entity)
 [![Code Climate](https://codeclimate.com/github/ruby-grape/grape-entity.svg)](https://codeclimate.com/github/ruby-grape/grape-entity)
 
 ## Introduction
@@ -221,7 +220,8 @@ class ExampleEntity < Grape::Entity
 end
 ```
 
-You have always access to the presented instance with `object`
+You always have access to the presented instance (`object`) and the top-level
+entity options (`options`).
 
 ```ruby
 class ExampleEntity < Grape::Entity
@@ -230,7 +230,7 @@ class ExampleEntity < Grape::Entity
   private
 
   def formatted_value
-    "+ X #{object.value}"
+    "+ X #{object.value} #{options[:y]}"
   end
 end
 ```
@@ -265,7 +265,7 @@ class User < Grape::Entity
   expose :name
 end
 
-class Employee < UserData
+class Employee < User
   expose :name, as: :employee_name, override: true
 end
 ```

data/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|
@@ -14,11 +14,9 @@ Gem::Specification.new do |s|
   s.description = 'Extracted from Grape, A Ruby framework for rapid API development with great conventions.'
   s.license     = 'MIT'
 
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.4'
 
-  s.rubyforge_project = 'grape-entity'
-
-  s.add_runtime_dependency 'activesupport', '>=4.0'
+  s.add_runtime_dependency 'activesupport', '>= 3.0.0'
   # FIXME: remove dependecy
   s.add_runtime_dependency 'multi_json', '>= 1.3.2'
 
@@ -28,7 +26,7 @@ Gem::Specification.new do |s|
   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 'rspec', '~> 3.9'
   s.add_development_dependency 'yard'
 
   s.files         = `git ls-files`.split("\n")

data/lib/grape_entity/delegator/fetchable_object.rb

@@ -4,7 +4,7 @@ module Grape
   class Entity
     module Delegator
       class FetchableObject < Base
-        def delegate(attribute)
+        def delegate(attribute, **)
           object.fetch attribute
         end
       end

data/lib/grape_entity/delegator/hash_object.rb

@@ -4,8 +4,8 @@ module Grape
   class Entity
     module Delegator
       class HashObject < Base
-        def delegate(attribute)
-          object[attribute]
+        def delegate(attribute, hash_access: :to_sym)
+          object[attribute.send(hash_access)]
         end
       end
     end

data/lib/grape_entity/delegator/openstruct_object.rb

@@ -4,7 +4,7 @@ module Grape
   class Entity
     module Delegator
       class OpenStructObject < Base
-        def delegate(attribute)
+        def delegate(attribute, **)
           object.send attribute
         end
       end

data/lib/grape_entity/delegator/plain_object.rb

@@ -4,7 +4,7 @@ module Grape
   class Entity
     module Delegator
       class PlainObject < Base
-        def delegate(attribute)
+        def delegate(attribute, **)
           object.send attribute
         end
 

data/lib/grape_entity/entity.rb

@@ -114,6 +114,22 @@ module Grape
       end
 
       attr_writer :formatters
+
+      def hash_access
+        @hash_access ||= :to_sym
+      end
+
+      def hash_access=(value)
+        @hash_access =
+          case value
+          when :to_s, :str, :string
+            :to_s
+          when :to_sym, :sym, :symbol
+            :to_sym
+          else
+            :to_sym
+          end
+      end
     end
 
     @formatters = {}
@@ -168,18 +184,23 @@ module Grape
     # @option options :documentation Define documenation for an exposed
     #   field, typically the value is a hash with two fields, type and desc.
     # @option options :merge This option allows you to merge an exposed field to the root
+    #
+    # rubocop:disable Layout/LineLength
     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 the :expose_nil on multi-attribute exposures.' if options.key?(:expose_nil)
         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)
-
       if block_given?
+        if options[:format_with].respond_to?(:call)
+          raise ArgumentError, 'You may not use block-setting when also using format_with'
+        end
+
         if block.parameters.any?
           options[:proc] = block
         else
@@ -191,6 +212,7 @@ module Grape
       @nesting_stack ||= []
       args.each { |attribute| build_exposure_for_attribute(attribute, @nesting_stack, options, block) }
     end
+    # rubocop:enable Layout/LineLength
 
     def self.build_exposure_for_attribute(attribute, nesting_stack, options, block)
       exposure_list = nesting_stack.empty? ? root_exposures : nesting_stack.last.nested_exposures
@@ -291,6 +313,7 @@ module Grape
     #
     def self.format_with(name, &block)
       raise ArgumentError, 'You must pass a block for formatters' unless block_given?
+
       formatters[name.to_sym] = block
     end
 
@@ -454,8 +477,8 @@ module Grape
 
     def initialize(object, options = {})
       @object = object
-      @delegator = Delegator.new(object)
       @options = options.is_a?(Options) ? options : Options.new(options)
+      @delegator = Delegator.new(object)
     end
 
     def root_exposures
@@ -506,28 +529,50 @@ module Grape
     end
 
     def delegate_attribute(attribute)
-      if respond_to?(attribute, true) && Grape::Entity > method(attribute).owner
+      if is_defined_in_entity?(attribute)
         send(attribute)
       else
-        delegator.delegate(attribute)
+        delegator.delegate(attribute, hash_access: self.class.hash_access)
       end
     end
 
+    def is_defined_in_entity?(attribute)
+      return false unless respond_to?(attribute, true)
+
+      ancestors = self.class.ancestors
+      ancestors.index(Grape::Entity) > ancestors.index(method(attribute).owner)
+    end
+
     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
 
     # All supported options.
     OPTIONS = %i[
-      rewrite as if unless using with proc documentation format_with safe attr_path if_extras unless_extras merge expose_nil override
+      rewrite
+      as
+      if
+      unless
+      using
+      with
+      proc
+      documentation
+      format_with
+      safe
+      attr_path
+      if_extras
+      unless_extras
+      merge
+      expose_nil
+      override
     ].to_set.freeze
 
     # Merges the given options with current block options.

data/lib/grape_entity/exposure.rb

@@ -47,14 +47,20 @@ module Grape
             options[:unless]
           ].compact.flatten.map { |cond| Condition.new_unless(cond) }
 
-          unless_conditions << expose_nil_condition(attribute) if options[:expose_nil] == false
+          unless_conditions << expose_nil_condition(attribute, options) if options[:expose_nil] == false
 
           if_conditions + unless_conditions
         end
 
-        def expose_nil_condition(attribute)
+        def expose_nil_condition(attribute, options)
           Condition.new_unless(
-            proc { |object, _options| Delegator.new(object).delegate(attribute).nil? }
+            proc do |object, _options|
+              if options[:proc].nil?
+                Delegator.new(object).delegate(attribute).nil?
+              else
+                exec_with_object(options, &options[:proc]).nil?
+              end
+            end
           )
         end
 

data/lib/grape_entity/exposure/base.rb

@@ -54,7 +54,10 @@ module Grape
           if @is_safe
             is_delegatable
           else
-            is_delegatable || raise(NoMethodError, "#{entity.class.name} missing attribute `#{@attribute}' on #{entity.object}")
+            is_delegatable || raise(
+              NoMethodError,
+              "#{entity.class.name} missing attribute `#{@attribute}' on #{entity.object}"
+            )
           end
         end
 

data/lib/grape_entity/exposure/nesting_exposure.rb

@@ -87,6 +87,7 @@ module Grape
               exposure.should_expose?(entity, options)
             end
             next unless should_expose
+
             output[exposure.key(entity)] ||= []
             output[exposure.key(entity)] << exposure
           end

data/lib/grape_entity/exposure/nesting_exposure/nested_exposures.rb

@@ -49,7 +49,7 @@ module Grape
             length
             empty?
           ].each do |name|
-            class_eval <<-RUBY, __FILE__, __LINE__
+            class_eval <<-RUBY, __FILE__, __LINE__ + 1
               def #{name}(*args, &block)
                 @exposures.#{name}(*args, &block)
               end

data/lib/grape_entity/exposure/nesting_exposure/output_builder.rb

@@ -19,6 +19,7 @@ module Grape
               # If we have an array which should not be merged - save it with a key as a hash
               # If we have hash which should be merged - save it without a key (merge)
               return unless result
+
               @output_hash.merge! result, &merge_strategy(exposure.for_merge)
             else
               @output_hash[exposure.key(@entity)] = result

data/lib/grape_entity/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrapeEntity
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/spec/grape_entity/entity_spec.rb

@@ -126,6 +126,26 @@ describe Grape::Entity do
               expect { subject.expose(:a, :b, :c, expose_nil: false) }.to raise_error ArgumentError
             end
           end
+
+          context 'when expose_nil option is false and block passed' do
+            it 'does not expose if block returns nil' do
+              subject.expose(:a, expose_nil: false) do |_obj, _options|
+                nil
+              end
+              subject.expose(:b)
+              subject.expose(:c)
+              expect(subject.represent(model).serializable_hash).to eq(b: nil, c: 'value')
+            end
+
+            it 'exposes is block returns a value' do
+              subject.expose(:a, expose_nil: false) do |_obj, _options|
+                100
+              end
+              subject.expose(:b)
+              subject.expose(:c)
+              expect(subject.represent(model).serializable_hash).to eq(a: 100, b: nil, c: 'value')
+            end
+          end
         end
 
         context 'when model is a hash' do
@@ -1376,6 +1396,18 @@ describe Grape::Entity do
         expect(res).to have_key :nonexistent_attribute
       end
 
+      it 'exposes attributes defined through module inclusion' do
+        module SharedAttributes
+          def a_value
+            3.14
+          end
+        end
+        fresh_class.include(SharedAttributes)
+        fresh_class.expose :a_value
+        res = fresh_class.new(model).serializable_hash
+        expect(res[:a_value]).to eq(3.14)
+      end
+
       it 'does not expose attributes that are generated by a block but have not passed criteria' do
         fresh_class.expose :nonexistent_attribute,
                            proc: ->(_, _) { 'I exist, but it is not yet my time to shine' },

data/spec/grape_entity/exposure/represent_exposure_spec.rb

@@ -12,11 +12,11 @@ describe Grape::Entity::Exposure::RepresentExposure do
     let(:subexposure)      { double(:subexposure) }
 
     it 'sets using_class_name' do
-      expect { subject }.to change { exposure.using_class_name }.to(using_class_name)
+      expect { subject }.to change(exposure, :using_class_name).to(using_class_name)
     end
 
     it 'sets subexposure' do
-      expect { subject }.to change { exposure.subexposure }.to(subexposure)
+      expect { subject }.to change(exposure, :subexposure).to(subexposure)
     end
 
     context 'when using_class is set' do
@@ -25,7 +25,7 @@ describe Grape::Entity::Exposure::RepresentExposure do
       end
 
       it 'resets using_class' do
-        expect { subject }.to change { exposure.using_class }
+        expect { subject }.to change(exposure, :using_class)
       end
     end
   end

data/spec/grape_entity/hash_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Grape::Entity do
-  it 'except option for nested entity' do
+  it 'except option for nested entity', :aggregate_failures do
     module EntitySpec
       class Address < Grape::Entity
         expose :post, if: :full
@@ -12,6 +12,14 @@ describe Grape::Entity do
         expose :house
       end
 
+      class AddressWithString < Grape::Entity
+        self.hash_access = :string
+        expose :post, if: :full
+        expose :city
+        expose :street
+        expose :house
+      end
+
       class Company < Grape::Entity
         expose :full_name, if: :full
         expose :name
@@ -19,6 +27,15 @@ describe Grape::Entity do
           Address.represent c[:address], Grape::Entity::Options.new(o.opts_hash.except(:full))
         end
       end
+
+      class CompanyWithString < Grape::Entity
+        self.hash_access = :string
+        expose :full_name, if: :full
+        expose :name
+        expose :address do |c, o|
+          AddressWithString.represent c['address'], Grape::Entity::Options.new(o.opts_hash.except(:full))
+        end
+      end
     end
 
     company = {
@@ -33,6 +50,24 @@ describe Grape::Entity do
       }
     }
 
+    company_with_string = {
+      'full_name' => 'full_name',
+      'name' => 'name',
+      'address' => {
+        'post' => '123456',
+        'city' => 'city',
+        'street' => 'street',
+        'house' => 'house',
+        'something_else' => 'something_else'
+      }
+    }
+
+    expect(EntitySpec::CompanyWithString.represent(company_with_string).serializable_hash).to eq \
+      company.slice(:name).merge(address: company[:address].slice(:city, :street, :house))
+
+    expect(EntitySpec::CompanyWithString.represent(company_with_string, full: true).serializable_hash).to eq \
+      company.slice(:full_name, :name).merge(address: company[:address].slice(:city, :street, :house))
+
     expect(EntitySpec::Company.represent(company).serializable_hash).to eq \
       company.slice(:name).merge(address: company[:address].slice(:city, :street, :house))
 

data/spec/spec_helper.rb

@@ -3,6 +3,12 @@
 require 'simplecov'
 require 'coveralls'
 
+# This works around the hash extensions not being automatically included in ActiveSupport < 4
+require 'active_support/version'
+require 'active_support/core_ext/hash' if ActiveSupport::VERSION &&
+                                          ActiveSupport::VERSION::MAJOR &&
+                                          ActiveSupport::VERSION::MAJOR < 4
+
 SimpleCov.start do
   add_filter 'spec/'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -222,15 +222,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: grape-entity
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple facade for managing the relationship between your model and API.