avromatic 2.2.6 → 3.0.2

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/model_registry.rb

@@ -42,8 +42,11 @@ module Avromatic
     def ensure_registered_model(model)
       name = model_fullname(model)
       if registered?(name)
-        unless fetch(name).equal?(model)
-          raise "attempted to replace existing model #{fetch(name)} with new model #{model} as '#{name}'"
+        existing_model = fetch(name)
+        unless existing_model.equal?(model)
+          raise "Attempted to replace existing Avromatic model #{model_debug_name(existing_model)} with new model " \
+            "#{model_debug_name(model)} as '#{name}'. Perhaps '#{model_debug_name(model)}' needs to be eager loaded " \
+            'via the Avromatic eager_load_models setting?'
         end
       else
         register(model)
@@ -65,5 +68,11 @@ module Avromatic
 
       value.start_with?('.') ? value.from(1) : value
     end
+
+    private
+
+    def model_debug_name(model)
+      model.name || model.to_s
+    end
   end
 end

data/lib/avromatic/rspec.rb

@@ -12,6 +12,7 @@ RSpec.configure do |config|
 
     WebMock.stub_request(:any, /^#{registry_uri}/).to_rack(AvroSchemaRegistry::FakeServer)
     AvroSchemaRegistry::FakeServer.clear
+    Avromatic.build_schema_registry!
     Avromatic.build_messaging!
   end
 end

data/lib/avromatic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 3.0.2
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,47 +16,47 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: avro
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.9.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.11'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.9.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.11'
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: avro_turf
   requirement: !ruby/object:Gem::Requirement
@@ -144,16 +144,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
@@ -174,28 +174,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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: salsify_rubocop
   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
@@ -278,15 +292,15 @@ files:
 - gemfiles/.bundle/config
 - gemfiles/avro1_10_rails5_2.gemfile
 - gemfiles/avro1_10_rails6_0.gemfile
-- gemfiles/avro1_8_rails5_2.gemfile
+- gemfiles/avro1_10_rails6_1.gemfile
 - gemfiles/avro1_9_rails5_2.gemfile
 - gemfiles/avro1_9_rails6_0.gemfile
-- gemfiles/avro_patches_rails5_2.gemfile
-- gemfiles/avro_patches_rails6_0.gemfile
+- gemfiles/avro1_9_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
@@ -324,8 +338,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
@@ -342,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-before_script:
-  - bundle exec rubocop
-gemfile:
-  - gemfiles/avro1_8_rails5_2.gemfile
-  - gemfiles/avro1_9_rails5_2.gemfile
-  - gemfiles/avro1_10_rails5_2.gemfile
-  - gemfiles/avro1_9_rails6_0.gemfile
-  - gemfiles/avro1_10_rails6_0.gemfile
-  - gemfiles/avro_patches_rails5_2.gemfile
-  - gemfiles/avro_patches_rails6_0.gemfile
-script: bundle exec rspec

data/gemfiles/avro_patches_rails5_2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "avro-patches", ">= 0.4.1", "< 1.0"
-gem "activesupport", "~> 5.2.0"
-gem "activemodel", "~> 5.2.0"
-
-gemspec path: "../"

data/gemfiles/avro_patches_rails6_0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "avro-patches", ">= 1.0.0"
-gem "activesupport", "~> 6.0.0"
-gem "activemodel", "~> 6.0.0"
-
-gemspec path: "../"

data/lib/avromatic/patches.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-loaded_avro_patches = begin
-    require 'avro-patches'
-    true
-  rescue LoadError
-    false
-  end
-
-if loaded_avro_patches
-  require 'avromatic/patches/schema_validator_patch'
-  avro_patches_version = Gem::Version.new(AvroPatches::VERSION)
-  if avro_patches_version < Gem::Version.new('0.4.0')
-    Avro::SchemaValidator.singleton_class.prepend(Avromatic::Patches::SchemaValidatorPatch)
-  else
-    Avro::SchemaValidator.singleton_class.prepend(Avromatic::Patches::SchemaValidatorPatchV040)
-  end
-end

data/lib/avromatic/patches/schema_validator_patch.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Avromatic
-  module Patches
-    module SchemaValidatorPatch
-      # This method replaces validate_recursive in AvroPatches::LogicalTypes::SchemaValidatorPatch
-      # to enable validating datums that contain an encoding provider.
-      def validate_recursive(expected_schema, logical_datum, path, result, encoded = false)
-        datum = resolve_datum(expected_schema, logical_datum, encoded)
-        case expected_schema.type_sym
-        when :record, :error, :request
-          if datum.is_a?(Hash) && datum.key?(Avromatic::IO::ENCODING_PROVIDER)
-            return if expected_schema.sha256_resolution_fingerprint ==
-              datum[Avromatic::IO::ENCODING_PROVIDER].value_avro_schema.sha256_resolution_fingerprint
-            raise Avro::SchemaValidator::ValidationError
-          end
-        end
-        super(expected_schema, logical_datum, path, result, encoded)
-      end
-    end
-
-    module SchemaValidatorPatchV040
-      # This method replaces validate_recursive in AvroPatches::LogicalTypes::SchemaValidatorPatch
-      # to enable validating datums that contain an encoding provider.
-      def validate_recursive(expected_schema, logical_datum, path, result, options = {})
-        datum = resolve_datum(expected_schema, logical_datum, options[:encoded])
-        case expected_schema.type_sym
-        when :record, :error, :request
-          if datum.is_a?(Hash) && datum.key?(Avromatic::IO::ENCODING_PROVIDER)
-            return if expected_schema.sha256_resolution_fingerprint ==
-              datum[Avromatic::IO::ENCODING_PROVIDER].value_avro_schema.sha256_resolution_fingerprint
-            raise Avro::SchemaValidator::ValidationError
-          end
-        end
-        super(expected_schema, logical_datum, path, result, options)
-      end
-    end
-  end
-end