avromatic 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de19fe8a35a25945998d529185b935c339926e83
-  data.tar.gz: 53e4b0e212c8694a090e1d6a2b786475838aea7c
+  metadata.gz: c9c8ba9dd84cfb14ff267ee892bb04520e35040a
+  data.tar.gz: b1409149a06107891b63e6fc6e5f0658d9eb6efd
 SHA512:
-  metadata.gz: 37e7ce89d805df9e6e5fe6dee3a579c97382230171daee9f96831b4156355f30174ae09685841586e7f9c19ae5630ae3fe0f0df5808bd66f2f771bfabceb6c78
-  data.tar.gz: ff6cb0b5a19804b6763a763c48d431baecc31c20677d72a908df94b0afe0ff0ae183b3eea7755c8a81e28bba79c2fa2b1bf81f7b603093ab379a7d562896df6a
+  metadata.gz: 85b08d69e19609620f4775330e1291a4839d3fa4f4e8ee0fbf4b9fd0654128b006e3c0abe891b830842c7694670881c81bfa147b82f7b7ecd1d44d64cf7ac244
+  data.tar.gz: d9b64dbc85139e8d9f0ca5f6645e5f0ae6077c2c82fc080c4ee76060f20f3de5209805cab2b8954722569c11c48b9ac5fb0377f321b8bf80a33edd42353fb299

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # avromatic changelog
 
+## v0.6.1
+- Fix serialization of array and map types that contain nested models.
+
 ## v0.6.0
 - Require `avro_turf` v0.7.0 or later.
 

data/avromatic.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'avro-builder', '>= 0.3.2'
+  spec.add_development_dependency 'avro-builder', '>= 0.7.0'
   # For FakeSchemaRegistryServer
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'salsify_rubocop', '~> 0.40.1'

data/lib/avromatic/model/raw_serialization.rb

@@ -1,4 +1,5 @@
 require 'avromatic/model/passthrough_serializer'
+require 'active_support/core_ext/hash/transform_values'
 
 module Avromatic
   module Model
@@ -9,7 +10,8 @@ module Avromatic
       extend ActiveSupport::Concern
 
       module Encode
-        delegate :avro_serializer, :datum_writer, :datum_reader, to: :class
+        delegate :avro_serializer, :datum_writer, :datum_reader, :attribute_set,
+                 to: :class
         private :avro_serializer, :datum_writer, :datum_reader
 
         def avro_raw_value
@@ -21,8 +23,6 @@ module Avromatic
           avro_raw_encode(key_attributes_for_avro, :key)
         end
 
-        protected
-
         def value_attributes_for_avro
           avro_hash(value_avro_field_names)
         end
@@ -33,10 +33,24 @@ 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.transform_values(&:value_attributes_for_avro)
                                else
                                  avro_serializer[key].call(value)
                                end

data/lib/avromatic/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement