avromatic 2.2.2 → 2.3.0

data/lib/avromatic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Salsify Engineering
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2020-12-11 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

data/gemfiles/avro_patches_rails5_1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "avro-patches", ">= 0.4.1"
-gem "activesupport", "~> 5.1.4"
-gem "activemodel", "~> 5.1.4"
-
-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