grape-entity 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 230adb183db517d87581a13ad117183b6ed035a0
-  data.tar.gz: 9a7b29b6b1418f08367304c0413ebcf7a15945cf
+  metadata.gz: 04e39a2c99114bcf750f4ca63fa6119ffa0cd5ca
+  data.tar.gz: 1875a1693ff3de51c40db11a8c755464a93f09bd
 SHA512:
-  metadata.gz: 7c09517473a2401944335070e9d9d9f48ef32358c47b936627d8997f18bcefe08692d64d8e6caa88b1e4fbc4e914c5e26a7b4af76eec2e5525fe27434395b98b
-  data.tar.gz: 034ba7079bc7dc1e5d1a42d011d92130ea83cef5f673137c1e4622eace4c614fdf4f695bb7614bd2c576df4369990af79c6f14423ef9c03129182810fb9ff0fa
+  metadata.gz: 3cc6b4795400645718b1228affae6067dabb1214a13d033f0b979e096d649d03d9b05897df537c7e7d0cba2991914e958fe3d26f96b58c4ae62bfc51a63a42e7
+  data.tar.gz: 2cec009315195a548380c46fa057036a21f8e25b7da03a368f150a3cfe2a3e290c5c67b56ccce262db8a485a51b6b130d3d760e992a6aa7d863033af3a4494d7

data/.rspec

@@ -1,2 +1,2 @@
+--format documentation
 --color
---format=progress

data/.rubocop_todo.yml

@@ -13,7 +13,7 @@ Metrics/AbcSize:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 206
+  Max: 208
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:

data/.travis.yml

@@ -7,20 +7,19 @@ bundler_args: --without test
 
 matrix:
   include:
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       script:
         - bundle exec danger
-    - rvm: 2.3.1
-    - rvm: 2.3.0
-    - rvm: 2.2
-    - rvm: 2.1
+    - rvm: 2.4.0
+    - rvm: 2.3.3
+    - rvm: 2.2.6
     - rvm: ruby-head
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
     - rvm: jruby-head
     - rvm: rbx-2
 
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
     - rvm: jruby-head
     - rvm: rbx-2

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### Next
+
+#### Features
+
+* Your contribution here.
+
+#### Fixes
+
+* Your contribution here.
+
+### 0.6.1 (2017-01-09)
+
+#### Features
+
+* [#253](https://github.com/ruby-grape/grape-entity/pull/253): Adds ruby 2.4.0 support, updates dependencies - [@LeFnord](https://github.com/LeFnord).
+
+#### Fixes
+
+* [#251](https://github.com/ruby-grape/grape-entity/pull/251): Avoid noise when code runs with Ruby warnings - [@cpetschnig](https://github.com/cpetschnig).
+
 ### 0.6.0 (2016-11-20)
 
 #### Features

data/Gemfile

@@ -2,19 +2,14 @@ source 'http://rubygems.org'
 
 gemspec
 
-if RUBY_VERSION < '2.2.2'
-  gem 'rack', '<2.0.0'
-  gem 'activesupport', '<5.0.0'
-end
-
 group :development, :test do
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.1.1', require: false
 end
 
 group :test do
+  gem 'growl'
   gem 'guard'
-  gem 'guard-rspec'
   gem 'guard-bundler'
+  gem 'guard-rspec'
   gem 'rb-fsevent'
-  gem 'growl'
 end

data/Rakefile

@@ -17,4 +17,4 @@ RSpec::Core::RakeTask.new(:spec)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :spec]
+task default: [:spec, :rubocop]

data/grape-entity.gemspec

@@ -12,10 +12,12 @@ 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.2.6'
+
   s.rubyforge_project = 'grape-entity'
 
   s.add_runtime_dependency 'multi_json', '>= 1.3.2'
-  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency 'activesupport', '>= 5.0.0'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

data/lib/grape_entity/entity.rb

@@ -392,6 +392,7 @@ module Grape
     # @option options :only [Array] all the fields that should be returned
     # @option options :except [Array] all the fields that should not be returned
     def self.represent(objects, options = {})
+      @present_collection ||= nil
       if objects.respond_to?(:to_ary) && !@present_collection
         root_element = root_element(:collection_root)
         inner = objects.to_ary.map { |object| new(object, options.reverse_merge(collection: true)).presented }
@@ -409,8 +410,9 @@ module Grape
     # This method returns the entity's root or collection root node, or its parent's
     # @param root_type: either :collection_root or just :root
     def self.root_element(root_type)
-      if instance_variable_get("@#{root_type}")
-        instance_variable_get("@#{root_type}")
+      instance_variable = "@#{root_type}"
+      if instance_variable_defined?(instance_variable) && instance_variable_get(instance_variable)
+        instance_variable_get(instance_variable)
       elsif superclass.respond_to? :root_element
         superclass.root_element(root_type)
       end

data/lib/grape_entity/exposure/base.rb

@@ -34,8 +34,7 @@ module Grape
             @conditions == other.conditions
         end
 
-        def setup
-        end
+        def setup; end
 
         def nesting?
           false

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

@@ -7,6 +7,7 @@ module Grape
 
           def initialize(exposures)
             @exposures = exposures
+            @deep_complex_nesting = nil
           end
 
           def find_by(attribute)

data/lib/grape_entity/version.rb

@@ -1,3 +1,3 @@
 module GrapeEntity
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: grape-entity
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A simple facade for managing the relationship between your model and API.
@@ -253,4 +253,3 @@ test_files:
 - spec/grape_entity/exposure_spec.rb
 - spec/grape_entity/hash_spec.rb
 - spec/spec_helper.rb
-has_rdoc: