avromatic 0.9.0.rc0 → 0.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a36670183dc6e3348395dcc336222da9ac1bd00
-  data.tar.gz: b37d41366b6737fb4aa7d4793128c13d90860920
+  metadata.gz: 8850a5d6dce59c5dd91c2476b3b541ca6d258b94
+  data.tar.gz: eb4d4df178cf748408d7346251c7b0989eab7d8d
 SHA512:
-  metadata.gz: d316d600c9e38743538abc7b1a598cb13cfa102c6181476ed7e2684ccf63000a6856998ebc9ad065bfb71c98a54adab72a8675aa06f67622f5d2eb415acfea73
-  data.tar.gz: 86ac869dd270188af7f24f22ce1259ed2cf0b109e09d23ff3da9af4288deb191ab1fc7a05f4c2d81159335216b07e3e63e8618c86d3e0c4b09055246881b830f
+  metadata.gz: 7feeb97078619ec38b8092fde8f01d5f9f7e209f7040b9dd6252cc7766f7ac700da35681c9a95ca4ce1d88e6477f68e1bf41c09414fff3cd854e97c9cdb3707b
+  data.tar.gz: 3d2f3e5b0da52a97fcb5c555cda2eeda65767b4840e2ade715449e7a48df57c42a770d1ac8a56aadb45be8924e50aa060534e1c342f0bbc44c04c077573a3b29

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## v0.9.0 (unreleased)
 - Add support for more than one non-null type in a union.
+- Fix the serialization of nested complex types.
 
 ## v0.8.0
 - Add support for logical types. Currently this requires using the

data/lib/avromatic/model/attribute/record.rb

@@ -0,0 +1,27 @@
+module Avromatic
+  module Model
+    module Attribute
+
+      # This subclass of Virtus::Attribute is defined to ensure that Avromatic
+      # generated models (identified by their inclusion of
+      # Avromatic::Model::Attributes) are always coerced by identifying an
+      # instance of the model or creating a new one.
+      # This is required to coerce models correctly with nested complex types
+      # with Virtus.
+      class Record < Virtus::Attribute
+        primitive Avromatic::Model::Attributes
+
+        def coerce(value)
+          return value if value.nil? || value_coerced?(value)
+
+          coerced = primitive.new(value)
+          coerced if coerced.valid?
+        end
+
+        def value_coerced?(value)
+          value.is_a?(primitive)
+        end
+      end
+    end
+  end
+end

data/lib/avromatic/model/attributes.rb

@@ -128,7 +128,12 @@ module Avromatic
           when :record
             # TODO: This should add the generated model to a module.
             # A hash of generated models should be kept by name for reuse.
-            Avromatic::Model.model(schema: field_type)
+            Avromatic::Model.model(schema: field_type).tap do |record_class|
+              # Register the generated model with Axiom to prevent it being
+              # treated as a BasicObject.
+              # See https://github.com/solnic/virtus/issues/284#issuecomment-56405137
+              Axiom::Types::Object.new { primitive(record_class) }
+            end
           else
             raise "Unsupported type #{field_type}"
           end

data/lib/avromatic/model/builder.rb

@@ -6,6 +6,7 @@ require 'avromatic/model/value_object'
 require 'avromatic/model/configurable'
 require 'avromatic/model/attribute/union'
 require 'avromatic/model/attributes'
+require 'avromatic/model/attribute/record'
 require 'avromatic/model/raw_serialization'
 require 'avromatic/model/messaging_serialization'
 

data/lib/avromatic/model/raw_serialization.rb

@@ -9,10 +9,28 @@ module Avromatic
       extend ActiveSupport::Concern
 
       module Encode
+        extend ActiveSupport::Concern
+
         delegate :avro_serializer, :datum_writer, :datum_reader, :attribute_set,
                  to: :class
         private :avro_serializer, :datum_writer, :datum_reader
 
+        module ClassMethods
+          def recursive_serialize(value, attribute_name = nil)
+            if value.is_a?(Avromatic::Model::Attributes)
+              value.value_attributes_for_avro
+            elsif value.is_a?(Array)
+              value.map { |v| recursive_serialize(v) }
+            elsif value.is_a?(Hash)
+              value.each_with_object({}) do |(k, v), hash|
+                hash[k] = recursive_serialize(v)
+              end
+            else
+              avro_serializer[attribute_name].call(value)
+            end
+          end
+        end
+
         def avro_raw_value
           avro_raw_encode(value_attributes_for_avro, :value)
         end
@@ -32,29 +50,9 @@ module Avromatic
           avro_hash(key_avro_field_names)
         end
 
-        def array_of_models?(key)
-          attribute_set[key].is_a?(Virtus::Attribute::Collection) &&
-            attribute_set[key].member_type.primitive.include?(Avromatic::Model::Attributes)
-        end
-
-        def hash_of_models?(key)
-          attribute_set[key].is_a?(Virtus::Attribute::Hash) &&
-            attribute_set[key].value_type.primitive.include?(Avromatic::Model::Attributes)
-        end
-
         def avro_hash(fields)
           attributes.slice(*fields).each_with_object(Hash.new) do |(key, value), result|
-            result[key.to_s] = if value.is_a?(Avromatic::Model::Attributes)
-                                 value.value_attributes_for_avro
-                               elsif array_of_models?(key)
-                                 value.map(&:value_attributes_for_avro)
-                               elsif hash_of_models?(key)
-                                 value.each_with_object({}) do |(k, v), hash|
-                                   hash[k] = v.value_attributes_for_avro
-                                 end
-                               else
-                                 avro_serializer[key].call(value)
-                               end
+            result[key.to_s] = self.class.recursive_serialize(value, key)
           end
         end
 

data/lib/avromatic/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.9.0.rc0'.freeze
+  VERSION = '0.9.0.rc1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc0
+  version: 0.9.0.rc1
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -246,6 +246,7 @@ files:
 - gemfiles/rails4_2.gemfile
 - lib/avromatic.rb
 - lib/avromatic/model.rb
+- lib/avromatic/model/attribute/record.rb
 - lib/avromatic/model/attribute/union.rb
 - lib/avromatic/model/attribute_type/union.rb
 - lib/avromatic/model/attributes.rb