avromatic 2.2.3 → 2.4.0

data/lib/avromatic/model/types/custom_type.rb

@@ -55,7 +55,7 @@ module Avromatic
           false
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           @serializer.call(value)
         end
 

data/lib/avromatic/model/types/date_type.rb

@@ -32,7 +32,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/enum_type.rb

@@ -47,7 +47,7 @@ module Avromatic
             (input.is_a?(::Symbol) && allowed_values.include?(input.to_s))
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/fixed_type.rb

@@ -36,7 +36,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/float_type.rb

@@ -39,7 +39,7 @@ module Avromatic
           input.nil? || input.is_a?(::Float)
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/integer_type.rb

@@ -30,7 +30,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/map_type.rb

@@ -59,12 +59,12 @@ module Avromatic
           end
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           if value.nil?
             value
           else
             value.each_with_object({}) do |(element_key, element_value), result|
-              result[key_type.serialize(element_key, strict: strict)] = value_type.serialize(element_value, strict: strict)
+              result[key_type.serialize(element_key, strict)] = value_type.serialize(element_value, strict)
             end
           end
         end

data/lib/avromatic/model/types/null_type.rb

@@ -30,7 +30,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(_value, **)
+        def serialize(_value, _strict)
           nil
         end
 

data/lib/avromatic/model/types/record_type.rb

@@ -39,16 +39,13 @@ module Avromatic
           value.nil? || value.is_a?(record_class)
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           if value.nil?
             value
-          elsif !strict && Avromatic.use_custom_datum_writer && Avromatic.use_encoding_providers? && !record_class.config.mutable
-            # n.b. Ideally we'd just return value here instead of wrapping it in a
-            # hash but then we'd have no place to stash the union member index...
-            { Avromatic::IO::ENCODING_PROVIDER => value }
+          elsif strict
+            value.avro_value_datum
           else
-            # This is only used for recursive serialization so validation has already been done
-            strict ? value.avro_value_datum(validate: false) : value.value_attributes_for_avro(validate: false)
+            value.value_attributes_for_avro
           end
         end
 

data/lib/avromatic/model/types/string_type.rb

@@ -39,7 +39,7 @@ module Avromatic
           value.nil? || value.is_a?(::String)
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/union_type.rb

@@ -7,7 +7,6 @@ module Avromatic
   module Model
     module Types
       class UnionType < AbstractType
-        MEMBER_INDEX = ::Avromatic::IO::DatumReader::UNION_MEMBER_INDEX
         attr_reader :member_types, :value_classes, :input_classes
 
         def initialize(member_types:)
@@ -24,8 +23,8 @@ module Avromatic
           return input if coerced?(input)
 
           result = nil
-          if input.is_a?(Hash) && input.key?(MEMBER_INDEX)
-            result = member_types[input.delete(MEMBER_INDEX)].coerce(input)
+          if input.is_a?(Avromatic::IO::UnionDatum)
+            result = member_types[input.member_index].coerce(input.datum)
           else
             member_types.find do |member_type|
               result = safe_coerce(member_type, input)
@@ -40,18 +39,22 @@ module Avromatic
         end
 
         def coerced?(value)
+          return false if value.is_a?(Avromatic::IO::UnionDatum)
+
           value.nil? || member_types.any? do |member_type|
             member_type.coerced?(value)
           end
         end
 
         def coercible?(input)
+          return true if value.is_a?(Avromatic::IO::UnionDatum)
+
           coerced?(input) || member_types.any? do |member_type|
             member_type.coercible?(input)
           end
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           # Avromatic does not treat the null of an optional field as part of the union
           return nil if value.nil?
 
@@ -60,11 +63,11 @@ module Avromatic
             raise ArgumentError.new("Expected #{value.inspect} to be one of #{value_classes.map(&:name)}")
           end
 
-          hash = member_types[member_index].serialize(value, strict: strict)
-          if !strict && Avromatic.use_custom_datum_writer && value.is_a?(Avromatic::Model::Attributes)
-            hash[Avromatic::IO::UNION_MEMBER_INDEX] = member_index
+          serialized_value = member_types[member_index].serialize(value, strict)
+          if !strict && Avromatic.use_custom_datum_writer
+            serialized_value = Avromatic::IO::UnionDatum.new(member_index, serialized_value)
           end
-          hash
+          serialized_value
         end
 
         def referenced_model_classes

data/lib/avromatic/model/validation.rb

@@ -64,8 +64,8 @@ module Avromatic
           end
         end
 
-        unless self.class.config.mutable
-          @missing_attributes = missing_attributes.deep_freeze
+        if recursively_immutable?
+          @missing_attributes = missing_attributes.freeze
         end
 
         missing_attributes

data/lib/avromatic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avromatic
-  VERSION = '2.2.3'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Salsify Engineering
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: avro
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: 1.7.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: 1.7.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: avro_schema_registry-client
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: avro-builder
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.35.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.35.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +197,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -183,21 +211,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: salsify_rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1.1
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -211,33 +239,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: overcommit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.35.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.35.0
-- !ruby/object:Gem::Dependency
-  name: salsify_rubocop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -259,13 +273,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -276,18 +290,21 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/avro_patches_rails5_0.gemfile
-- gemfiles/avro_patches_rails5_1.gemfile
+- gemfiles/avro1_10_rails5_2.gemfile
+- gemfiles/avro1_10_rails6_0.gemfile
+- gemfiles/avro1_10_rails6_1.gemfile
+- gemfiles/avro1_8_rails5_2.gemfile
+- gemfiles/avro1_9_rails5_2.gemfile
+- gemfiles/avro1_9_rails6_0.gemfile
+- gemfiles/avro1_9_rails6_1.gemfile
 - gemfiles/avro_patches_rails5_2.gemfile
 - gemfiles/avro_patches_rails6_0.gemfile
-- gemfiles/rails5_0.gemfile
-- gemfiles/rails5_1.gemfile
-- gemfiles/rails5_2.gemfile
-- gemfiles/rails6_0.gemfile
+- gemfiles/avro_patches_rails6_1.gemfile
 - lib/avromatic.rb
 - lib/avromatic/io.rb
 - lib/avromatic/io/datum_reader.rb
 - lib/avromatic/io/datum_writer.rb
+- lib/avromatic/io/union_datum.rb
 - lib/avromatic/messaging.rb
 - lib/avromatic/model.rb
 - lib/avromatic/model/attributes.rb
@@ -325,8 +342,6 @@ files:
 - lib/avromatic/model/validation_error.rb
 - lib/avromatic/model/value_object.rb
 - lib/avromatic/model_registry.rb
-- lib/avromatic/patches.rb
-- lib/avromatic/patches/schema_validator_patch.rb
 - lib/avromatic/railtie.rb
 - lib/avromatic/rspec.rb
 - lib/avromatic/version.rb
@@ -335,7 +350,7 @@ homepage: https://github.com/salsify/avromatic.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -350,8 +365,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Generate Ruby models from Avro schemas
 test_files: []

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-before_script:
-  - bundle exec rubocop
-gemfile:
-  - gemfiles/rails5_0.gemfile
-  - gemfiles/rails5_1.gemfile
-  - gemfiles/rails5_2.gemfile
-  - gemfiles/rails6_0.gemfile
-  - gemfiles/avro_patches_rails5_0.gemfile
-  - gemfiles/avro_patches_rails5_1.gemfile
-  - gemfiles/avro_patches_rails5_2.gemfile
-  - gemfiles/avro_patches_rails6_0.gemfile
-script: bundle exec rspec
-matrix:
-  exclude:
-  - rvm: 2.4.6
-    gemfile: gemfiles/rails6_0.gemfile
-  - rvm: 2.4.6
-    gemfile: gemfiles/avro_patches_rails6_0.gemfile