gpi-active_model_serializers 0.8.4.alpha4 → 0.8.4.alpha5

data/lib/active_model/serializer.rb

@@ -428,34 +428,23 @@ module ActiveModel
     # Returns a hash representation of the serializable
     # object attributes.
     def attributes
-      puts "PARSING ATTRIBUTES"
-
-      hash = _fast_attributes
+      _fast_attributes
       rescue NameError
         method = "def _fast_attributes\n"
 
         method << "  h = {}\n"
 
         _attributes.each do |name,key|
-          method << "  h[:\"#{key}\"] = read_attribute_for_serialization(:\"#{name}\") if include?(:\"#{name}\")\n"
+          method << "  if include?(:\"#{name}\") && (!_hidden_attributes.include?(:\"#{name}\") || (@options.key?(:only) && Array(@options[:only]).include?(:\"#{name}\")))\n"
+          method << "    h[:\"#{key}\"] = read_attribute_for_serialization(:\"#{name}\")\n"
+          method << "  end\n"
         end
         method << "  h\nend"
 
-        self.class.class_eval method
-        hash = _fast_attributes
-
-      puts "FAST ATTRIBUTES: #{hash}"
-
-      _hidden_attributes.each do |name|
-        explicitly_included = @options.key?(:only) && Array(@options[:only]).include?(name)
-        puts "HIDDEN ATTRIBUTE: #{name} INCLUDE?: #{explicitly_included}"
+        puts "METHOD: #{method}"
 
-        if _hidden_attributes.include?(name) && !explicitly_included
-          hash.except!(name)
-        end
-      end
-
-      hash
+        self.class.class_eval method
+        _fast_attributes
     end
 
     # Returns options[:scope]

data/lib/active_model/serializer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpi-active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.8.4.alpha4
+  version: 0.8.4.alpha5
   prerelease: 6
 platform: ruby
 authors: