avromatic 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cba28133aa9a1a1ce5bb9a03c54fc4aa01f90d6dd3a72b98d74e5eb47276925e
-  data.tar.gz: 4fc8e33b860c6213fdda238946799164f8f52655b8cd3d5995f2c095e63aa2e1
+  metadata.gz: e695eda252fc8374491c000581104f96383a397a118097e9b9c87b256823b267
+  data.tar.gz: 792f85d1fde7b223491265ff9a82024373063aeb942daa8818510e4fdbfb4d65
 SHA512:
-  metadata.gz: a027c37208e834dee9772ea0fc2cfdd0f0a65699426e4e89b00e32268f3938a2842d1b4101fdd50f04f0b61d151f8ea9a2dd08bba168875b47b39636053eebe6
-  data.tar.gz: 7568eb10634ab6dc9e80236c8cedccd18a7259858c4a4834797e91f3349f43cf34d0dec81b5cf3fec4c2cb9c8400002d4066c9240a27eca6d0751f470a1faffa
+  metadata.gz: e0fbee30489961e56e3ce6a7026beb7e687a38de373c72fd0cc6c39a0afa02ef1618f2c730e4647a3339059591ad2252744a0f1a760a1f5282dafeb0cfd93ff8
+  data.tar.gz: ef315a61ba34cefec8508a20d64eb6eb4fe530837c9ade67ac8a6075e146c3516a9dbc0a9cfc34ec71265b333865f93a4d36c588d9c9703f80b5a455e1bad408

data/.circleci/config.yml

@@ -0,0 +1,85 @@
+version: 2.1
+jobs:
+  lint:
+    docker:
+      - image: salsify/ruby_ci:2.5.8
+    working_directory: ~/avromatic
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v2-gems-ruby-2.5.8-{{ checksum "avromatic.gemspec" }}-{{ checksum "Gemfile" }}
+            - v2-gems-ruby-2.5.8-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v2-gems-ruby-2.5.8-{{ checksum "avromatic.gemspec" }}-{{ checksum "Gemfile" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
+      - run:
+          name: Run Rubocop
+          command: bundle exec rubocop
+  test:
+    parameters:
+      gemfile:
+        type: string
+      ruby-version:
+        type: string
+    docker:
+      - image: salsify/ruby_ci:<< parameters.ruby-version >>
+    environment:
+      CIRCLE_TEST_REPORTS: "test-results"
+      BUNDLE_GEMFILE: << parameters.gemfile >>
+    working_directory: ~/avromatic
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v2-gems-ruby-<< parameters.ruby-version >>-{{ checksum "avromatic.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+            - v2-gems-ruby-<< parameters.ruby-version >>-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v2-gems-ruby-<< parameters.ruby-version >>-{{ checksum "avromatic.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
+      - run:
+          name: Run Tests
+          command: |
+            bundle exec rspec --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml --format progress spec
+      - store_test_results:
+          path: "test-results"
+workflows:
+  build:
+    jobs:
+      - lint
+      - test:
+          matrix:
+            parameters:
+              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"
+              - "gemfiles/avro1_10_rails6_1.gemfile"
+              - "gemfiles/avro1_9_rails6_1.gemfile"
+              - "gemfiles/avro_patches_rails6_1.gemfile"
+              ruby-version:
+              - "2.5.8"
+              - "2.6.6"
+              - "2.7.1"

data/.rubocop.yml

@@ -3,6 +3,9 @@ inherit_gem:
 
 AllCops:
   TargetRubyVersion: 2.4
+  Exclude:
+    - 'vendor/**/*'
+    - 'gemfiles/vendor/**/*'
 
 Style/MultilineBlockChain:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.8

data/Appraisals

@@ -1,43 +1,37 @@
 # frozen_string_literal: true
 
-appraise 'rails5_0' do
+appraise 'avro1_8-rails5_2' do
   gem 'avro', '1.8.2'
-  gem 'activesupport', '~> 5.0.6'
-  gem 'activemodel', '~> 5.0.6'
+  gem 'activesupport', '~> 5.2.0'
+  gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'rails5_1' do
-  gem 'avro', '1.8.2'
-  gem 'activesupport', '~> 5.1.4'
-  gem 'activemodel', '~> 5.1.4'
+appraise 'avro1_9-rails5_2' do
+  gem 'avro', '1.9.2'
+  gem 'activesupport', '~> 5.2.0'
+  gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'rails5_2' do
-  gem 'avro', '1.8.2'
+appraise 'avro1_10-rails5_2' do
+  gem 'avro', '~> 1.10.0'
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'rails6_0' do
-  gem 'avro', '1.9.0'
+appraise 'avro1_9-rails6_0' do
+  gem 'avro', '1.9.2'
   gem 'activesupport', '~> 6.0.0'
   gem 'activemodel', '~> 6.0.0'
 end
 
-appraise 'avro-patches-rails5_0' do
-  gem 'avro-patches'
-  gem 'activesupport', '~> 5.0.6'
-  gem 'activemodel', '~> 5.0.6'
-end
-
-appraise 'avro-patches-rails5_1' do
-  gem 'avro-patches', '>= 0.4.1'
-  gem 'activesupport', '~> 5.1.4'
-  gem 'activemodel', '~> 5.1.4'
+appraise 'avro1_10-rails6_0' do
+  gem 'avro', '~> 1.10.0'
+  gem 'activesupport', '~> 6.0.0'
+  gem 'activemodel', '~> 6.0.0'
 end
 
 appraise 'avro-patches-rails5_2' do
-  gem 'avro-patches', '>= 0.4.1'
+  gem 'avro-patches', '>= 0.4.1', '< 1.0'
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
 end
@@ -47,3 +41,21 @@ appraise 'avro-patches-rails6_0' do
   gem 'activesupport', '~> 6.0.0'
   gem 'activemodel', '~> 6.0.0'
 end
+
+appraise 'avro1_9-rails6_1' do
+  gem 'avro', '1.9.2'
+  gem 'activesupport', '~> 6.1.0'
+  gem 'activemodel', '~> 6.1.0'
+end
+
+appraise 'avro1_10-rails6_1' do
+  gem 'avro', '~> 1.10.0'
+  gem 'activesupport', '~> 6.1.0'
+  gem 'activemodel', '~> 6.1.0'
+end
+
+appraise 'avro-patches-rails6_1' do
+  gem 'avro-patches', '>= 1.0.0'
+  gem 'activesupport', '~> 6.1.0'
+  gem 'activemodel', '~> 6.1.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # avromatic changelog
 
+## v2.3.0
+- Add support for Rails 6.1.
+- Optimize nested model serialization.
+
+## v2.2.6
+- Optimize memory usage when serializing models.
+
+## v2.2.5
+- Optimize memory usage when serializing, deserializing and instantiating models.
+
+## v2.2.4
+- Compatibility with Avro v1.10.x.
+
+## v2.2.3
+- Fix bug where method `#referenced_model_classes` was declared as private instead of public.
+
 ## v2.2.2
 - Fix missing models in the model registry when in development by loading the nested models of eager loaded models.
 - Fake schema registry support for stubbing URLs with usernames and passwords.

data/README.md

@@ -1,9 +1,9 @@
 # Avromatic
 
-[![Build Status](https://travis-ci.org/salsify/avromatic.svg?branch=master)][travis]
+[![Build Status](https://circleci.com/gh/salsify/avromatic.svg?style=svg)][circleci]
 [![Gem Version](https://badge.fury.io/rb/avromatic.svg)](https://badge.fury.io/rb/avromatic)
 
-[travis]: http://travis-ci.org/salsify/avromatic
+[circleci]: https://circleci.com/gh/salsify/avromatic
 
 `Avromatic` generates Ruby models from [Avro](http://avro.apache.org/) schemas
 and provides utilities to encode and decode them.
@@ -142,7 +142,7 @@ instance.eql?(MyModel.new(id: 123, name: 'Tesla Model 3', enabled: true)) # => t
 instance.hash # => -1279155042741869898
 
 # Retrieve a hash of the model's attributes via to_h, to_hash or attributes
-instance .to_h # => {:id=>123, :name=>"Tesla Model 3", :enabled=>true}
+instance.to_h # => {:id=>123, :name=>"Tesla Model 3", :enabled=>true}
 ```
 
 Or an `Avro::Schema` object can be specified directly:

data/avromatic.gemspec

@@ -22,22 +22,23 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.4'
 
-  spec.add_runtime_dependency 'activemodel', '>= 5.0', '< 6.1'
-  spec.add_runtime_dependency 'activesupport', '>= 5.0', '< 6.1'
-  spec.add_runtime_dependency 'avro', '>= 1.7.7', '< 1.10'
+  spec.add_runtime_dependency 'activemodel', '>= 5.0', '< 6.2'
+  spec.add_runtime_dependency 'activesupport', '>= 5.0', '< 6.2'
+  spec.add_runtime_dependency 'avro', '>= 1.7.7', '< 1.11'
   spec.add_runtime_dependency 'avro_schema_registry-client', '>= 0.3.0'
   spec.add_runtime_dependency 'avro_turf'
   spec.add_runtime_dependency 'ice_nine'
 
+  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'avro-builder', '>= 0.12.0'
   spec.add_development_dependency 'bundler', '>= 1.11'
+  spec.add_development_dependency 'overcommit', '0.35.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'salsify_rubocop', '~> 0.52.1.1'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
   # For AvroSchemaRegistry::FakeServer
-  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/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "avromatic"
+require 'bundler/setup'
+require 'avromatic'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "avromatic"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/gemfiles/{rails5_0.gemfile → avro1_10_rails5_2.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.8.2"
-gem "activesupport", "~> 5.0.6"
-gem "activemodel", "~> 5.0.6"
+gem "avro", "~> 1.10.0"
+gem "activesupport", "~> 5.2.0"
+gem "activemodel", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/avro1_10_rails6_0.gemfile

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

data/gemfiles/avro1_10_rails6_1.gemfile

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

data/gemfiles/{rails5_1.gemfile → avro1_9_rails5_2.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.8.2"
-gem "activesupport", "~> 5.1.4"
-gem "activemodel", "~> 5.1.4"
+gem "avro", "1.9.2"
+gem "activesupport", "~> 5.2.0"
+gem "activemodel", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/{rails6_0.gemfile → avro1_9_rails6_0.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.9.0"
+gem "avro", "1.9.2"
 gem "activesupport", "~> 6.0.0"
 gem "activemodel", "~> 6.0.0"
 

data/gemfiles/{avro_patches_rails5_0.gemfile → avro1_9_rails6_1.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "avro-patches"
-gem "activesupport", "~> 5.0.6"
-gem "activemodel", "~> 5.0.6"
+gem "avro", "1.9.2"
+gem "activesupport", "~> 6.1.0"
+gem "activemodel", "~> 6.1.0"
 
 gemspec path: "../"

data/gemfiles/avro_patches_rails5_2.gemfile

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

data/gemfiles/avro_patches_rails6_1.gemfile

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

data/lib/avromatic.rb

@@ -8,7 +8,6 @@ require 'avromatic/model'
 require 'avromatic/model_registry'
 require 'avromatic/messaging'
 require 'active_support/core_ext/string/inflections'
-require 'avromatic/patches'
 
 module Avromatic
   class << self
@@ -33,10 +32,6 @@ module Avromatic
     eager_load_models!
   end
 
-  def self.use_encoding_providers?
-    use_custom_datum_writer && defined?(Avromatic::Patches::SchemaValidatorPatch)
-  end
-
   def self.build_schema_registry
     raise 'Avromatic must be configured with a registry_url' unless registry_url
     if use_schema_fingerprint_lookup

data/lib/avromatic/io.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-module Avromatic
-  module IO
-    UNION_MEMBER_INDEX = '__avromatic_member_index'
-    ENCODING_PROVIDER = '__avromatic_encoding_provider'
-  end
-end
-
 require 'avromatic/io/datum_reader'
 require 'avromatic/io/datum_writer'
+require 'avromatic/io/union_datum'

data/lib/avromatic/io/datum_reader.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/WhenThen
 module Avromatic
   module IO
     # Subclass DatumReader to include additional information about the union
@@ -8,81 +7,32 @@ module Avromatic
     # branch 'salsify-master' with the tag 'v1.9.0.3'
     class DatumReader < Avro::IO::DatumReader
 
-      UNION_MEMBER_INDEX = Avromatic::IO::UNION_MEMBER_INDEX
-
-      def read_data(writers_schema, readers_schema, decoder, initial_record = nil)
-        # schema matching
-        unless self.class.match_schemas(writers_schema, readers_schema)
-          raise Avro::IO::SchemaMatchException.new(writers_schema, readers_schema)
-        end
-
+      def read_data(writers_schema, readers_schema, decoder)
         # schema resolution: reader's schema is a union, writer's schema is not
-        if writers_schema.type_sym != :union && readers_schema.type_sym == :union
-          rs_index = readers_schema.schemas.find_index do |s|
-            self.class.match_schemas(writers_schema, s)
-          end
+        return super unless writers_schema.type_sym != :union && readers_schema.type_sym == :union
 
-          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)
+        rs_index = readers_schema.schemas.find_index do |s|
+          self.class.match_schemas(writers_schema, s)
         end
 
-        # function dispatch for reading data based on type of writer's schema
-        datum = case writers_schema.type_sym
-                when :null;    decoder.read_null
-                when :boolean; decoder.read_boolean
-                when :string;  decoder.read_string
-                when :int;     decoder.read_int
-                when :long;    decoder.read_long
-                when :float;   decoder.read_float
-                when :double;  decoder.read_double
-                when :bytes;   decoder.read_bytes
-                when :fixed;   read_fixed(writers_schema, readers_schema, decoder)
-                when :enum;    read_enum(writers_schema, readers_schema, decoder)
-                when :array;   read_array(writers_schema, readers_schema, decoder)
-                when :map;     read_map(writers_schema, readers_schema, decoder)
-                when :union;   read_union(writers_schema, readers_schema, decoder)
-                when :record, :error, :request; read_record(writers_schema, readers_schema, decoder, initial_record || {})
-                else
-                  raise Avro::AvroError.new("Cannot read unknown schema type: #{writers_schema.type}")
-                end
+        raise Avro::IO::SchemaMatchException.new(writers_schema, readers_schema) unless rs_index
 
-        # Allow this code to be used with an official Avro release or the
-        # avro-patches gem that includes logical_type support.
-        if readers_schema.respond_to?(:logical_type)
-          readers_schema.type_adapter.decode(datum)
-        else
-          datum
-        end
-      end
+        datum = read_data(writers_schema, readers_schema.schemas[rs_index], decoder)
+        optional = readers_schema.schemas.first.type_sym == :null
 
-      # Override to specify an initial record that may contain union index
-      def read_record(writers_schema, readers_schema, decoder, initial_record = {})
-        readers_fields_hash = readers_schema.fields_hash
-        read_record = Avromatic.use_custom_datum_reader ? initial_record : {}
-        writers_schema.fields.each do |field|
-          readers_field = readers_fields_hash[field.name]
-          if readers_field
-            field_val = read_data(field.type, readers_field.type, decoder)
-            read_record[field.name] = field_val
-          else
-            skip_data(field.type, decoder)
-          end
+        if readers_schema.schemas.size == 2 && optional
+          # Avromatic does not treat the union of null and 1 other type as a union
+          datum
+        elsif datum.nil?
+          # Avromatic does not treat the null of an optional field as part of the union
+          nil
+        else
+          # Avromatic does not treat the null of an optional field as part of the union so
+          # adjust the member index accordingly
+          member_index = optional ? rs_index - 1 : rs_index
+          Avromatic::IO::UnionDatum.new(member_index, datum)
         end
-
-        read_record
       end
     end
   end
 end
-# rubocop:enable Style/WhenThen