avromatic 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db83c88fe3f792f10b7cde907caa0b77e2a0ce76
-  data.tar.gz: 2f27e065376ae2167ec50baca0907fc7fa15decd
+SHA256:
+  metadata.gz: 1870605ba70504e621a7c04a4d4a95ff32d1b83764dc6c6375e5feba60daf4fc
+  data.tar.gz: 3afe45d9fcf729f6ea2e9f203a051911cd3e5444b62040b8066e0942de8593cc
 SHA512:
-  metadata.gz: 16328ab60efa5cc65c32d384c1e2fecc7ebe4d7b92e4b36eb378bce0f6a1e053118fb96628be4cf1ab9bf53a488bdaf9ad5fad3d1fad3e26ecfb977f39ed1d2e
-  data.tar.gz: 51c155c02374503525f84c568caabe79a3b86d215e1c83cb1c97ede6d7e9b4571d017989e088a3502fb3ad547d8b6deab80f5484b6f3f90d51e2d66bc9af5d77
+  metadata.gz: 7966a6aa7a9e9387dbdf5bc8b6c735ae54f5dd801a26d6b824533c3fdb76bc5a0f4ce038cc01250fb49925d3dafaccf1eec2b4008a0b3481435e5f00e8d5b64d
+  data.tar.gz: 3917130bb19f73f597bed3701148c1150f80579bbe2616e1c126f8f00387f261bf05980bb447d8ed7604b4652fd7bdac4ad26dfadfc1168f5300cc816cfd204d

data/.ruby-gemset

@@ -0,0 +1 @@
+avromatic

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -3,17 +3,15 @@ rvm:
   - 2.5.1
   - 2.4.4
   - 2.3.5
-  - 2.2.8
 before_script:
   - bundle exec appraisal install --jobs=3
 script:
   - bundle exec rubocop
-  - bundle exec appraisal rails4_1 rake spec
-  - bundle exec appraisal rails4_2 rake spec
-  - bundle exec appraisal rails5_0 rake spec
-  - bundle exec appraisal rails5_1 rake spec
-  - bundle exec appraisal rails5_2 rake spec
-  - bundle exec appraisal avro-patches-4_1 rake spec
-  - bundle exec appraisal avro-patches-5_0 rake spec
-  - bundle exec appraisal avro-patches-5_1 rake spec
-  - bundle exec appraisal avro-patches-5_2 rake spec
+  - bundle exec appraisal rails5_0 rspec
+  - bundle exec appraisal rails5_1 rspec
+  - bundle exec appraisal rails5_2 rspec
+  - bundle exec appraisal avro-patches-5_0 rspec
+  - bundle exec appraisal avro-patches-0_3_4-rails5_1 rspec
+  - bundle exec appraisal avro-patches-0_3_4-rails5_2 rspec
+  - bundle exec appraisal avro-patches-rails5_1 rspec
+  - bundle exec appraisal avro-patches-rails5_2 rspec

data/Appraisals

@@ -1,15 +1,3 @@
-appraise 'rails4_1' do
-  gem 'avro', '1.8.2'
-  gem 'activesupport', '~> 4.1.16'
-  gem 'activemodel', '~> 4.1.16'
-end
-
-appraise 'rails4_2' do
-  gem 'avro', '1.8.2'
-  gem 'activesupport', '~> 4.2.7.1'
-  gem 'activemodel', '~> 4.2.7.1'
-end
-
 appraise 'rails5_0' do
   gem 'avro', '1.8.2'
   gem 'activesupport', '~> 5.0.6'
@@ -28,26 +16,32 @@ appraise 'rails5_2' do
   gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'avro-patches-4_1' do
-  gem 'avro-patches'
-  gem 'activesupport', '~> 4.1.16'
-  gem 'activemodel', '~> 4.1.16'
-end
-
 appraise 'avro-patches-5_0' do
   gem 'avro-patches'
   gem 'activesupport', '~> 5.0.6'
   gem 'activemodel', '~> 5.0.6'
 end
 
-appraise 'avro-patches-5_1' do
-  gem 'avro-patches'
+appraise 'avro-patches-0_3_4-rails5_1' do
+  gem 'avro-patches', '0.3.4'
   gem 'activesupport', '~> 5.1.4'
   gem 'activemodel', '~> 5.1.4'
 end
 
-appraise 'avro-patches-5_2' do
-  gem 'avro-patches'
+appraise 'avro-patches-0_3_4-rails5_2' do
+  gem 'avro-patches', '0.3.4'
+  gem 'activesupport', '~> 5.2.0'
+  gem 'activemodel', '~> 5.2.0'
+end
+
+appraise 'avro-patches-rails5_1' do
+  gem 'avro-patches', '>= 0.4.0'
+  gem 'activesupport', '~> 5.1.4'
+  gem 'activemodel', '~> 5.1.4'
+end
+
+appraise 'avro-patches-rails5_2' do
+  gem 'avro-patches', '>= 0.4.0'
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
 end

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # avromatic changelog
 
+## v0.33.0
+- Fix compatibility with avro-patches v0.4.0.
+
 ## v0.32.0
 - Improve partial assignment using a hash for records outside of unions.
 - Prevent invalid types from being assigned to primitives in unions.

data/README.md

@@ -207,7 +207,7 @@ The `ModelRegistry` can be customized to remove a namespace prefix:
 
 ```ruby
 Avromatic.nested_models =
-  Avromatic::ModelRegistry.new(remove_namespace_prefix: 'com.my_company'
+  Avromatic::ModelRegistry.new(remove_namespace_prefix: 'com.my_company')
 ```
 
 The `:remove_namespace_prefix` value can be a string or a regexp.

data/avromatic.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'avromatic/version'
@@ -20,22 +18,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'avro', '>= 1.7.7'
-  spec.add_runtime_dependency 'virtus'
-  spec.add_runtime_dependency 'activesupport', '>= 4.1', '< 5.3'
   spec.add_runtime_dependency 'activemodel', '>= 4.1', '< 5.3'
-  spec.add_runtime_dependency 'avro_turf'
+  spec.add_runtime_dependency 'activesupport', '>= 4.1', '< 5.3'
+  spec.add_runtime_dependency 'avro', '>= 1.7.7'
   spec.add_runtime_dependency 'avro_schema_registry-client', '>= 0.3.0'
+  spec.add_runtime_dependency 'avro_turf'
+  spec.add_runtime_dependency 'virtus'
 
+  spec.add_development_dependency 'avro-builder', '>= 0.12.0'
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'avro-builder', '>= 0.12.0'
   # For AvroSchemaRegistry::FakeServer
-  spec.add_development_dependency 'sinatra'
-  spec.add_development_dependency 'salsify_rubocop', '~> 0.48.0'
-  spec.add_development_dependency 'overcommit', '0.35.0'
   spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'overcommit', '0.35.0'
+  spec.add_development_dependency 'salsify_rubocop', '~> 0.52.1.1'
+  spec.add_development_dependency 'sinatra'
 end

data/gemfiles/{avro_patches_5_1.gemfile → avro_patches_0_3_4_rails5_1.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "avro-patches"
+gem "avro-patches", "0.3.4"
 gem "activesupport", "~> 5.1.4"
 gem "activemodel", "~> 5.1.4"
 

data/gemfiles/{avro_patches_5_2.gemfile → avro_patches_0_3_4_rails5_2.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "avro-patches"
+gem "avro-patches", "0.3.4"
 gem "activesupport", "~> 5.2.0"
 gem "activemodel", "~> 5.2.0"
 

data/gemfiles/avro_patches_rails5_1.gemfile

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

data/gemfiles/avro_patches_rails5_2.gemfile

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

data/lib/avromatic/io/datum_reader.rb

@@ -83,3 +83,4 @@ module Avromatic
     end
   end
 end
+# rubocop:enable Style/WhenThen

data/lib/avromatic/model/attribute/union.rb

@@ -53,7 +53,7 @@ module Avromatic
           elsif member_attribute.coerced?(coerced)
             coerced
           end
-        rescue
+        rescue StandardError
           nil
         end
 

data/lib/avromatic/model/raw_serialization.rb

@@ -22,7 +22,7 @@ module Avromatic
         end
 
         module ClassMethods
-          def recursive_serialize(value, name: nil, member_types: nil, strict: false)
+          def recursive_serialize(value, name: nil, member_types: nil, strict: false) # rubocop:disable Lint/ShadowedArgument
             member_types = attribute_member_types(name) if name
             member_types ||= EMPTY_ARRAY
 

data/lib/avromatic/model/value_object.rb

@@ -17,7 +17,7 @@ module Avromatic
       end
 
       def to_s
-        format('#<%s:0x00%x>', self.class.name, object_id.abs * 2)
+        format('#<%<class_name>s:0x00%<identifier>x>', class_name: self.class.name, identifier: object_id.abs * 2)
       end
     end
   end

data/lib/avromatic/patches/schema_validator_patch.rb

@@ -16,5 +16,22 @@ module Avromatic
         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

data/lib/avromatic/patches.rb

@@ -7,5 +7,10 @@ loaded_avro_patches = begin
 
 if loaded_avro_patches
   require 'avromatic/patches/schema_validator_patch'
-  Avro::SchemaValidator.singleton_class.prepend(Avromatic::Patches::SchemaValidatorPatch)
+  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/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.32.0'.freeze
+  VERSION = '0.33.0'.freeze
 end

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: avro
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '4.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -59,25 +51,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.3'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: avro
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: avro_schema_registry-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: avro_turf
   requirement: !ruby/object:Gem::Requirement
@@ -93,19 +93,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: avro_schema_registry-client
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: avro-builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -177,63 +191,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: avro-builder
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: overcommit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.35.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.35.0
 - !ruby/object:Gem::Dependency
   name: salsify_rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: 0.52.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: 0.52.1.1
 - !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: appraisal
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -257,6 +257,8 @@ files:
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -268,12 +270,11 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/avro_patches_4_1.gemfile
+- gemfiles/avro_patches_0_3_4_rails5_1.gemfile
+- gemfiles/avro_patches_0_3_4_rails5_2.gemfile
 - gemfiles/avro_patches_5_0.gemfile
-- gemfiles/avro_patches_5_1.gemfile
-- gemfiles/avro_patches_5_2.gemfile
-- gemfiles/rails4_1.gemfile
-- gemfiles/rails4_2.gemfile
+- gemfiles/avro_patches_rails5_1.gemfile
+- gemfiles/avro_patches_rails5_2.gemfile
 - gemfiles/rails5_0.gemfile
 - gemfiles/rails5_1.gemfile
 - gemfiles/rails5_2.gemfile
@@ -333,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Generate Ruby models from Avro schemas

data/gemfiles/avro_patches_4_1.gemfile

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

data/gemfiles/rails4_1.gemfile

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

data/gemfiles/rails4_2.gemfile

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