gpi-active_model_serializers 0.8.4 → 0.8.5.alpha1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -98,7 +98,6 @@ module ActiveModel
98
98
 
99
99
  def hidden_attributes(*attrs)
100
100
  self._hidden_attributes.concat(attrs)
101
- attributes(*attrs)
102
101
  end
103
102
 
104
103
  def attribute(attr, options={})
@@ -349,7 +348,9 @@ module ActiveModel
349
348
 
350
349
  def include_associations!
351
350
  _associations.each_key do |name|
352
- include!(name) if include?(name)
351
+ if include?(name) && (!_hidden_attributes.include?(name) || (@options.key?(:only) && Array(@options[:only]).include?(name)))
352
+ include!(name)
353
+ end
353
354
  end
354
355
  end
355
356
 
@@ -1,5 +1,5 @@
1
1
  module ActiveModel
2
2
  class Serializer
3
- VERSION = "0.8.4"
3
+ VERSION = "0.8.5.alpha1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gpi-active_model_serializers
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.4
5
- prerelease:
4
+ version: 0.8.5.alpha1
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - José Valim
@@ -152,9 +152,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
152
152
  required_rubygems_version: !ruby/object:Gem::Requirement
153
153
  none: false
154
154
  requirements:
155
- - - ! '>='
155
+ - - ! '>'
156
156
  - !ruby/object:Gem::Version
157
- version: '0'
157
+ version: 1.3.1
158
158
  requirements: []
159
159
  rubyforge_project:
160
160
  rubygems_version: 1.8.23