gpi-active_model_serializers 0.8.4 → 0.8.5.alpha1

data/lib/active_model/serializer.rb

@@ -98,7 +98,6 @@ module ActiveModel
 
       def hidden_attributes(*attrs)
         self._hidden_attributes.concat(attrs)
-        attributes(*attrs)
       end
 
       def attribute(attr, options={})
@@ -349,7 +348,9 @@ module ActiveModel
 
     def include_associations!
       _associations.each_key do |name|
-        include!(name) if include?(name)
+        if include?(name) && (!_hidden_attributes.include?(name) || (@options.key?(:only) && Array(@options[:only]).include?(name)))
+          include!(name)
+        end
       end
     end
 

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = "0.8.4"
+    VERSION = "0.8.5.alpha1"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: gpi-active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.8.4
-  prerelease: 
+  version: 0.8.5.alpha1
+  prerelease: 6
 platform: ruby
 authors:
 - José Valim
@@ -152,9 +152,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23