graphiti 1.0.alpha.10 → 1.0.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d73c18bd56aa9ce3103c3e1be9d6aa53df14d246
-  data.tar.gz: da7f2ff960fb4592610dfb6ea30a5ff981378bda
+  metadata.gz: 8b451b3a2214bfee53214b84b53455b40df0a555
+  data.tar.gz: f3208a80a842591303a7f091f6544edb1c26ac3b
 SHA512:
-  metadata.gz: 69a8290f78ca0abcee5971e6ffec58c3884d9f81a44f5b2bb59967cfb18311cb9274ad3329689b31c338586347fa2089df0d82e136d1d74a91c2073d591062a3
-  data.tar.gz: ac000566edc5afc1c05af3db4a179454a9766da798995b3c35fcdda9bc01bbff40d697b598c217b39619378a8052f56c7961e931c44ced3663361e9950409503
+  metadata.gz: 877bbfdfc4af3bd92c6ff59bc932d5dc1022a9fee8ed2d138da4045cd01c7c5249e2ef06c993e83084fce6c5fa89f7f54ae6a05ca778750d4eb95e7ff01ee887
+  data.tar.gz: 075a9538fd31ecc16c84a317d3d80445d447de5598eb4bd23afa493c482845789fe33b66af0b4c699c976e513e1f9bd721096d7b0b7018303d6b56fa1d9420a4

data/lib/graphiti/serializer.rb

@@ -5,6 +5,16 @@ module Graphiti
     include Graphiti::SerializableHash
     prepend Graphiti::SerializableTempId
 
+    # Keep track of what attributes have been applied by the Resource,
+    # via .attribute, and which have been applied by a custom serializer
+    # class/file.
+    # This way, we can ensure attributes NOT applied by a resource still
+    # go through type checking/coercion
+    class_attribute :attributes_applied_via_resource
+    class_attribute :extra_attributes_applied_via_resource
+    self.attributes_applied_via_resource = []
+    self.extra_attributes_applied_via_resource = []
+
     def self.inherited(klass)
       super
       klass.class_eval do

data/lib/graphiti/util/serializer_attributes.rb

@@ -20,15 +20,28 @@ module Graphiti
           if @serializer.attribute_blocks[@name].nil?
             @serializer.send(_method, @name, serializer_options, &proc)
           else
-            inner = @serializer.attribute_blocks.delete(@name)
-            wrapped = wrap_proc(inner)
-            @serializer.send(_method, @name, serializer_options, &wrapped)
+            unless @serializer.send(applied_method).include?(@name)
+              inner = @serializer.attribute_blocks.delete(@name)
+              wrapped = wrap_proc(inner)
+              @serializer.send(_method, @name, serializer_options, &wrapped)
+            end
           end
         end
+
+        existing = @serializer.send(applied_method)
+        @serializer.send(:"#{applied_method}=", [@name] | existing)
       end
 
       private
 
+      def applied_method
+        if extra?
+          :extra_attributes_applied_via_resource
+        else
+          :attributes_applied_via_resource
+        end
+      end
+
       def _method
         extra? ? :extra_attribute : :attribute
       end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.alpha.10"
+  VERSION = "1.0.alpha.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.10
+  version: 1.0.alpha.11
 platform: ruby
 authors:
 - Lee Richmond