avromatic 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3735485da34dc63c50632195a8def3420b62e6f
-  data.tar.gz: b08e6330739ce4a9f91345e99f5410a40e23a7b6
+  metadata.gz: 0abfee6a816f939b561c744c5ac49c5a6b2d484e
+  data.tar.gz: 1d43dfd2df53bf40b0f571cdce873bc5055c3837
 SHA512:
-  metadata.gz: 1f64185bde09c296a5020c04cccae9ce9b6aaf2a42d2d64f2cd5210e2b323fbc298b00e6b729985494e76ae55f36d4188f4d5dbd80004d068bd34849f2d296fc
-  data.tar.gz: 57482d3feca518adfe945f7af8b92d31a3dadc85b609d97d99d62454aaa90a3bd368eb932f7a02f6dbb634cd301b9c054091be7010339e267f9b8dc78234bfb9
+  metadata.gz: 802e7634ae80d35338e596db5bba3155d1378a533921716b9e14f0685ae8f94cc7d7f578820c55f16d1c1cfeb5a8c7f1bb0f2e875001732856fbc97ef3d7a92f
+  data.tar.gz: 2fa0d4b40bbafa7f15627f877536d72d9413dee8c5009f0d46ac00dd78d8efc7ed9be234d00fc069e70ed3b4baf0d5a1087234405d1717371820c2db15aef55f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # avromatic changelog
 
+## v0.21.1
+- Fix a bug in the optimization of optional union decoding.
+
 ## v0.21.0
 - Remove monkey-patches for `AvroTurf::ConfluentSchemaRegistry` and
   `FakeConfluentSchemaRegistryServer` and depend on `avro_schema_registry-client`

data/avromatic.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'avromatic/version'
@@ -34,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'avro-builder', '>= 0.12.0'
   # For AvroSchemaRegistry::FakeServer
   spec.add_development_dependency 'sinatra'
-  spec.add_development_dependency 'salsify_rubocop', '~> 0.47.0'
+  spec.add_development_dependency 'salsify_rubocop', '~> 0.48.0'
   spec.add_development_dependency 'overcommit', '0.35.0'
   spec.add_development_dependency 'appraisal'
 end

data/lib/avromatic/io/datum_reader.rb

@@ -20,7 +20,16 @@ module Avromatic
             self.class.match_schemas(writers_schema, s)
           end
 
-          union_info = { UNION_MEMBER_INDEX => rs_index }
+          optional = readers_schema.schemas.first.type_sym == :null
+          union_info = if readers_schema.schemas.size == 2 && optional
+                         # Avromatic does not treat the union of null and 1 other type as a union
+                         {}
+                       elsif optional
+                         # Avromatic does not treat the null of an optional field as part of the union
+                         { UNION_MEMBER_INDEX => rs_index - 1 }
+                       else
+                         { UNION_MEMBER_INDEX => rs_index }
+                       end
 
           return read_data(writers_schema, readers_schema.schemas[rs_index], decoder, union_info) if rs_index
           raise Avro::IO::SchemaMatchException.new(writers_schema, readers_schema)

data/lib/avromatic/model/attributes.rb

@@ -144,6 +144,9 @@ module Avromatic
         end
 
         def union_field_class(field_type)
+          null_index = field_type.schemas.index { |schema| schema.type_sym == :null }
+          raise 'a null type in a union must be the first member' if null_index && null_index > 0
+
           field_classes = field_type.schemas.reject { |schema| schema.type_sym == :null }
                             .map { |schema| avro_field_class(schema) }
 

data/lib/avromatic/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.21.0'.freeze
+  VERSION = '0.21.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -210,14 +210,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: 0.48.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: 0.48.0
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement