avro_turf 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fffcc17349a4bbbcaa1204610da74800c9a519d4774af83c7059c47bb75efb1b
-  data.tar.gz: e5afce0fa557da110a0dd1fe73add073f994a72bb8e3a1e37865a3393f864c2b
+  metadata.gz: 0f3d6b25c3e25a9137581fbe4bdb3e45015d371c479f8beeb54fa30ee8a3475e
+  data.tar.gz: a59d1634303784ae309a40c45f6abf70acdd5b681abe9a89bac40fa0497c5a63
 SHA512:
-  metadata.gz: 06aac90715b06f0fdf04918ba73c2533a0cad0b9dff769e1bfc30a1488e0916fc3b38c8f4bee6efab5d667688bd9d407330c603f209ead30d67cb13b3b46c4a5
-  data.tar.gz: 1a3c95047a2522914394b181eaf01afaee84547d64a72d1aebe3534252f49168cebec0cf7edda8bc8a62f769dd22294eb3916d317a71a65305cb6c46ffba84ad
+  metadata.gz: 85b800371ca6102518333c64732a26af7d103d35453923e1ac332b6c643e1826c00c90b826e9332c23e4de5f995bd40c8411447184289c2834fc45dbeded1664
+  data.tar.gz: df05accd07e4876a776a6dffb1850bfecd73d82727fc22ab5d25a4e002c069d50c7d9bb0e5fe9ae23e2f528b189c49d31ad87189d0ec07f5c2dcefb707110719

data/.github/workflows/ruby.yml

@@ -4,20 +4,29 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.0, 3.1, 3.2, 3.3]
+        ruby: ["3.0", 3.1, 3.2, 3.3, 3.4]
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Build and test with RSpec
+        env:
+          RUBYOPT: '--enable=frozen-string-literal --debug=frozen-string-literal'
+        run: bundle exec rspec
 
+  lint:
+    runs-on: ubuntu-24.04-arm
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Build and test with RSpec
-      run: |
-        bundle exec rspec
+      - uses: actions/checkout@v5
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3
+          bundler-cache: true
+      - run: bundle exec standardrb

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v1.20.0
+
+- Add support for client certificate chains via `client_chain` and `client_chain_data` parameters (#233)
+- Ensure the gem works with frozen strings.
+- Stop caching nested sub-schemas in MutableSchemaStore (#232)
+
 ## v1.19.0
 
 - Loosen excon dependency to allow 1.x (#220)

data/Gemfile

@@ -1,6 +1,9 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in avro_turf.gemspec
 gemspec
 
-gem 'gem-release'
+gem "gem-release"
+gem "standard"

data/Rakefile

@@ -1,2 +1,3 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require "bundler/gem_tasks"

data/avro_turf.gemspec

@@ -1,22 +1,22 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'avro_turf/version'
+require "avro_turf/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "avro_turf"
-  spec.version       = AvroTurf::VERSION
-  spec.authors       = ["Daniel Schierbeck"]
-  spec.email         = ["dasch@zendesk.com"]
-  spec.summary       = "A library that makes it easier to use the Avro serialization format from Ruby"
-  spec.homepage      = "https://github.com/dasch/avro_turf"
-  spec.license       = "MIT"
+  spec.name = "avro_turf"
+  spec.version = AvroTurf::VERSION
+  spec.authors = ["Daniel Schierbeck"]
+  spec.email = ["dasch@zendesk.com"]
+  spec.summary = "A library that makes it easier to use the Avro serialization format from Ruby"
+  spec.homepage = "https://github.com/dasch/avro_turf"
+  spec.license = "MIT"
 
   spec.metadata["rubygems_mfa_required"] = "true"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "avro", ">= 1.11.3", "< 1.13"
@@ -25,14 +25,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "fakefs", "< 3"
+  spec.add_development_dependency "fakefs", "~> 3"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "sinatra"
   spec.add_development_dependency "json_spec"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "resolv"
 
-  spec.post_install_message = %{
+  spec.post_install_message = %(
 avro_turf v0.8.0 deprecates the names AvroTurf::SchemaRegistry,
 AvroTurf::CachedSchemaRegistry, and FakeSchemaRegistryServer.
 
@@ -40,5 +40,5 @@ Use AvroTurf::ConfluentSchemaRegistry, AvroTurf::CachedConfluentSchemaRegistry,
 and FakeConfluentSchemaRegistryServer instead.
 
 See https://github.com/dasch/avro_turf#deprecation-notice
-}
+)
 end

data/lib/avro_turf/cached_confluent_schema_registry.rb

@@ -1,10 +1,11 @@
-require 'avro_turf/confluent_schema_registry'
-require 'avro_turf/in_memory_cache'
-require 'avro_turf/disk_cache'
+# frozen_string_literal: true
+
+require "avro_turf/confluent_schema_registry"
+require "avro_turf/in_memory_cache"
+require "avro_turf/disk_cache"
 
 # Caches registrations and lookups to the schema registry in memory.
 class AvroTurf::CachedConfluentSchemaRegistry
-
   # Instantiate a new CachedConfluentSchemaRegistry instance with the given configuration.
   # By default, uses a provided InMemoryCache to prevent repeated calls to the upstream registry.
   #
@@ -17,8 +18,8 @@ class AvroTurf::CachedConfluentSchemaRegistry
   end
 
   # Delegate the following methods to the upstream
-  %i(subjects subject_versions schema_subject_versions compatible?
-     global_config update_global_config subject_config update_subject_config).each do |name|
+  %i[subjects subject_versions schema_subject_versions compatible?
+    global_config update_global_config subject_config update_subject_config].each do |name|
     define_method(name) do |*args|
       instance_variable_get(:@upstream).send(name, *args)
     end
@@ -36,8 +37,8 @@ class AvroTurf::CachedConfluentSchemaRegistry
     @cache.lookup_by_schema(subject, schema) || @cache.store_by_schema(subject, schema, @upstream.register(subject, schema))
   end
 
-  def subject_version(subject, version = 'latest')
-    return @upstream.subject_version(subject, version) if version == 'latest'
+  def subject_version(subject, version = "latest")
+    return @upstream.subject_version(subject, version) if version == "latest"
 
     @cache.lookup_by_version(subject, version) ||
       @cache.store_by_version(subject, version, @upstream.subject_version(subject, version))

data/lib/avro_turf/cached_schema_registry.rb

@@ -1,4 +1,6 @@
-require 'avro_turf/cached_confluent_schema_registry'
+# frozen_string_literal: true
+
+require "avro_turf/cached_confluent_schema_registry"
 
 # AvroTurf::CachedSchemaRegistry is deprecated and will be removed in a future release.
 # Use AvroTurf::CachedConfluentSchemaRegistry instead.

data/lib/avro_turf/confluent_schema_registry.rb

@@ -1,7 +1,9 @@
-require 'excon'
+# frozen_string_literal: true
+
+require "excon"
 
 class AvroTurf::ConfluentSchemaRegistry
-  CONTENT_TYPE = "application/vnd.schemaregistry.v1+json".freeze
+  CONTENT_TYPE = "application/vnd.schemaregistry.v1+json"
 
   def initialize(
     url,
@@ -12,9 +14,11 @@ class AvroTurf::ConfluentSchemaRegistry
     password: nil,
     ssl_ca_file: nil,
     client_cert: nil,
+    client_chain: nil,
     client_key: nil,
     client_key_pass: nil,
     client_cert_data: nil,
+    client_chain_data: nil,
     client_key_data: nil,
     path_prefix: nil,
     connect_timeout: nil,
@@ -22,7 +26,7 @@ class AvroTurf::ConfluentSchemaRegistry
     retry_limit: nil
   )
     @path_prefix = path_prefix
-    @schema_context_prefix = schema_context.nil? ? '' : ":.#{schema_context}:"
+    @schema_context_prefix = schema_context.nil? ? "" : ":.#{schema_context}:"
     @schema_context_options = schema_context.nil? ? {} : {query: {subject: @schema_context_prefix}}
     @logger = logger
     headers = Excon.defaults[:headers].merge(
@@ -35,9 +39,11 @@ class AvroTurf::ConfluentSchemaRegistry
       proxy: proxy,
       ssl_ca_file: ssl_ca_file,
       client_cert: client_cert,
+      client_chain: client_chain,
       client_key: client_key,
       client_key_pass: client_key_pass,
       client_cert_data: client_cert_data,
+      client_chain_data: client_chain_data,
       client_key_data: client_key_data,
       resolv_resolver: resolv_resolver,
       connect_timeout: connect_timeout,
@@ -53,12 +59,12 @@ class AvroTurf::ConfluentSchemaRegistry
 
   def fetch(id)
     @logger.info "Fetching schema with id #{id}"
-    data = get("/schemas/ids/#{id}", idempotent: true, **@schema_context_options, )
+    data = get("/schemas/ids/#{id}", idempotent: true, **@schema_context_options)
     data.fetch("schema")
   end
 
   def register(subject, schema)
-    data = post("/subjects/#{@schema_context_prefix}#{subject}/versions", body: { schema: schema.to_s }.to_json)
+    data = post("/subjects/#{@schema_context_prefix}#{subject}/versions", body: {schema: schema.to_s}.to_json)
 
     id = data.fetch("id")
 
@@ -69,7 +75,7 @@ class AvroTurf::ConfluentSchemaRegistry
 
   # List all subjects
   def subjects
-    get('/subjects', idempotent: true)
+    get("/subjects", idempotent: true)
   end
 
   # List all versions for a subject
@@ -78,7 +84,7 @@ class AvroTurf::ConfluentSchemaRegistry
   end
 
   # Get a specific version for a subject
-  def subject_version(subject, version = 'latest')
+  def subject_version(subject, version = "latest")
     get("/subjects/#{@schema_context_prefix}#{subject}/versions/#{version}", idempotent: true)
   end
 
@@ -90,9 +96,9 @@ class AvroTurf::ConfluentSchemaRegistry
   # Check if a schema exists. Returns nil if not found.
   def check(subject, schema)
     data = post("/subjects/#{@schema_context_prefix}#{subject}",
-                expects: [200, 404],
-                body: { schema: schema.to_s }.to_json,
-                idempotent: true)
+      expects: [200, 404],
+      body: {schema: schema.to_s}.to_json,
+      idempotent: true)
     data unless data.has_key?("error_code")
   end
 
@@ -102,10 +108,10 @@ class AvroTurf::ConfluentSchemaRegistry
   # - nil if the subject or version does not exist
   # - false if incompatible
   # http://docs.confluent.io/3.1.2/schema-registry/docs/api.html#compatibility
-  def compatible?(subject, schema, version = 'latest')
+  def compatible?(subject, schema, version = "latest")
     data = post("/compatibility/subjects/#{@schema_context_prefix}#{subject}/versions/#{version}",
-                expects: [200, 404], body: { schema: schema.to_s }.to_json, idempotent: true)
-    data.fetch('is_compatible', false) unless data.has_key?('error_code')
+      expects: [200, 404], body: {schema: schema.to_s}.to_json, idempotent: true)
+    data.fetch("is_compatible", false) unless data.has_key?("error_code")
   end
 
   # Check for specific schema compatibility issues
@@ -113,11 +119,11 @@ class AvroTurf::ConfluentSchemaRegistry
   # - nil if the subject or version does not exist
   # - a list of compatibility issues
   # https://docs.confluent.io/platform/current/schema-registry/develop/api.html#sr-api-compatibility
-  def compatibility_issues(subject, schema, version = 'latest')
+  def compatibility_issues(subject, schema, version = "latest")
     data = post("/compatibility/subjects/#{@schema_context_prefix}#{subject}/versions/#{version}",
-      expects: [200, 404], body: { schema: schema.to_s }.to_json, query: { verbose: true }, idempotent: true)
+      expects: [200, 404], body: {schema: schema.to_s}.to_json, query: {verbose: true}, idempotent: true)
 
-    data.fetch('messages', []) unless data.has_key?('error_code')
+    data.fetch("messages", []) unless data.has_key?("error_code")
   end
 
   # Get global config
@@ -155,7 +161,7 @@ class AvroTurf::ConfluentSchemaRegistry
   end
 
   def request(path, **options)
-    options = { expects: 200 }.merge!(options)
+    options = {expects: 200}.merge!(options)
     path = File.join(@path_prefix, path) unless @path_prefix.nil?
     response = @connection.request(path: path, **options)
     JSON.parse(response.body)

data/lib/avro_turf/core_ext/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Date
   def as_avro
     self

data/lib/avro_turf/core_ext/enumerable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Enumerable
   def as_avro
     map(&:as_avro)

data/lib/avro_turf/core_ext/false_class.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FalseClass
   def as_avro
     self

data/lib/avro_turf/core_ext/hash.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Hash
   def as_avro
-    hsh = Hash.new
-    each {|k, v| hsh[k.as_avro] = v.as_avro }
+    hsh = {}
+    each { |k, v| hsh[k.as_avro] = v.as_avro }
     hsh
   end
 end

data/lib/avro_turf/core_ext/nil_class.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class NilClass
   def as_avro
     self

data/lib/avro_turf/core_ext/numeric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Numeric
   def as_avro
     self

data/lib/avro_turf/core_ext/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class String
   def as_avro
     self

data/lib/avro_turf/core_ext/symbol.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Symbol
   def as_avro
     to_s

data/lib/avro_turf/core_ext/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Time
   def as_avro
     iso8601

data/lib/avro_turf/core_ext/true_class.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TrueClass
   def as_avro
     self

data/lib/avro_turf/core_ext.rb

@@ -1,10 +1,12 @@
-require 'avro_turf/core_ext/string'
-require 'avro_turf/core_ext/numeric'
-require 'avro_turf/core_ext/enumerable'
-require 'avro_turf/core_ext/hash'
-require 'avro_turf/core_ext/time'
-require 'avro_turf/core_ext/date'
-require 'avro_turf/core_ext/symbol'
-require 'avro_turf/core_ext/nil_class'
-require 'avro_turf/core_ext/true_class'
-require 'avro_turf/core_ext/false_class'
+# frozen_string_literal: true
+
+require "avro_turf/core_ext/string"
+require "avro_turf/core_ext/numeric"
+require "avro_turf/core_ext/enumerable"
+require "avro_turf/core_ext/hash"
+require "avro_turf/core_ext/time"
+require "avro_turf/core_ext/date"
+require "avro_turf/core_ext/symbol"
+require "avro_turf/core_ext/nil_class"
+require "avro_turf/core_ext/true_class"
+require "avro_turf/core_ext/false_class"

data/lib/avro_turf/disk_cache.rb

@@ -1,23 +1,24 @@
+# frozen_string_literal: true
+
 # A cache for the CachedConfluentSchemaRegistry.
 # Extends the InMemoryCache to provide a write-thru to disk for persistent cache.
 class AvroTurf::DiskCache
-
   def initialize(disk_path, logger: Logger.new($stdout))
     @logger = logger
 
     # load the write-thru cache on startup, if it exists
-    @schemas_by_id_path = File.join(disk_path, 'schemas_by_id.json')
+    @schemas_by_id_path = File.join(disk_path, "schemas_by_id.json")
     hash = read_from_disk_cache(@schemas_by_id_path)
     @schemas_by_id = hash || {}
 
-    @ids_by_schema_path = File.join(disk_path, 'ids_by_schema.json')
+    @ids_by_schema_path = File.join(disk_path, "ids_by_schema.json")
     hash = read_from_disk_cache(@ids_by_schema_path)
     @ids_by_schema = hash || {}
 
-    @schemas_by_subject_version_path = File.join(disk_path, 'schemas_by_subject_version.json')
+    @schemas_by_subject_version_path = File.join(disk_path, "schemas_by_subject_version.json")
     @schemas_by_subject_version = {}
 
-    @data_by_schema_path = File.join(disk_path, 'data_by_schema.json')
+    @data_by_schema_path = File.join(disk_path, "data_by_schema.json")
     hash = read_from_disk_cache(@data_by_schema_path)
     @data_by_schema = hash || {}
   end
@@ -94,11 +95,11 @@ class AvroTurf::DiskCache
     key = "#{subject}#{version}"
     hash = read_from_disk_cache(@schemas_by_subject_version_path)
     hash = if hash
-             hash[key] = schema
-             hash
-           else
-             { key => schema }
-           end
+      hash[key] = schema
+      hash
+    else
+      {key => schema}
+    end
 
     write_to_disk_cache(@schemas_by_subject_version_path, hash)
 
@@ -110,7 +111,7 @@ class AvroTurf::DiskCache
   private def read_from_disk_cache(path)
     if File.exist?(path)
       if File.size(path) != 0
-        json_data = File.open(path, 'r') do |file|
+        json_data = File.open(path, "r") do |file|
           file.flock(File::LOCK_SH)
           file.read
         end
@@ -127,7 +128,7 @@ class AvroTurf::DiskCache
 
   private def write_to_disk_cache(path, hash)
     # don't use "w" because it truncates the file before lock
-    File.open(path, File::RDWR | File::CREAT, 0644) do |file|
+    File.open(path, File::RDWR | File::CREAT, 0o644) do |file|
       file.flock(File::LOCK_EX)
       file.write(JSON.pretty_generate(hash))
     end

data/lib/avro_turf/in_memory_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A cache for the CachedConfluentSchemaRegistry.
 # Simply stores the schemas and ids in in-memory hashes.
 class AvroTurf::InMemoryCache

data/lib/avro_turf/messaging.rb

@@ -1,13 +1,15 @@
-require 'logger'
-require 'avro_turf'
-require 'avro_turf/schema_store'
-require 'avro_turf/confluent_schema_registry'
-require 'avro_turf/cached_confluent_schema_registry'
+# frozen_string_literal: true
+
+require "logger"
+require "avro_turf"
+require "avro_turf/schema_store"
+require "avro_turf/confluent_schema_registry"
+require "avro_turf/cached_confluent_schema_registry"
 
 # For back-compatibility require the aliases along with the Messaging API.
 # These names are deprecated and will be removed in a future release.
-require 'avro_turf/schema_registry'
-require 'avro_turf/cached_schema_registry'
+require "avro_turf/schema_registry"
+require "avro_turf/cached_schema_registry"
 
 class AvroTurf
   class IncompatibleSchemaError < StandardError; end
@@ -56,7 +58,9 @@ class AvroTurf
     # client_key           - Name of file containing client private key to go with client_cert (optional).
     # client_key_pass      - Password to go with client_key (optional).
     # client_cert_data     - In-memory client certificate (optional).
+    # client_chain         - Name of file containing client certificate chain (optional).
     # client_key_data      - In-memory client private key to go with client_cert_data (optional).
+    # client_chain_data    - In-memory client certificate chain (optional).
     # connect_timeout      - Timeout to use in the connection with the schema registry (optional).
     # resolv_resolver      - Custom domain name resolver (optional).
     def initialize(
@@ -73,9 +77,11 @@ class AvroTurf
       password: nil,
       ssl_ca_file: nil,
       client_cert: nil,
+      client_chain: nil,
       client_key: nil,
       client_key_pass: nil,
       client_cert_data: nil,
+      client_chain_data: nil,
       client_key_data: nil,
       connect_timeout: nil,
       resolv_resolver: nil,
@@ -94,9 +100,11 @@ class AvroTurf
           password: password,
           ssl_ca_file: ssl_ca_file,
           client_cert: client_cert,
+          client_chain: client_chain,
           client_key: client_key,
           client_key_pass: client_key_pass,
           client_cert_data: client_cert_data,
+          client_chain_data: client_chain_data,
           client_key_data: client_key_data,
           path_prefix: registry_path_prefix,
           connect_timeout: connect_timeout,
@@ -129,7 +137,7 @@ class AvroTurf
     #
     # Returns the encoded data as a String.
     def encode(message, schema_name: nil, namespace: @namespace, subject: nil, version: nil, schema_id: nil, validate: false,
-               register_schemas: true)
+      register_schemas: true)
       schema, schema_id = if schema_id
         fetch_schema_by_id(schema_id)
       elsif subject && version
@@ -139,7 +147,7 @@ class AvroTurf
       elsif schema_name
         register_schema(subject: subject, schema_name: schema_name, namespace: namespace)
       else
-        raise ArgumentError.new('Neither schema_name nor schema_id nor subject + version provided to determine the schema.')
+        raise ArgumentError.new("Neither schema_name nor schema_id nor subject + version provided to determine the schema.")
       end
 
       if validate
@@ -203,7 +211,7 @@ class AvroTurf
       end
 
       # The schema id is a 4-byte big-endian integer.
-      schema_id = decoder.read(4).unpack("N").first
+      schema_id = decoder.read(4).unpack1("N")
 
       writers_schema = @schemas_by_id.fetch(schema_id) do
         schema_json = @registry.fetch(schema_id)
@@ -221,14 +229,14 @@ class AvroTurf
     # Providing subject and version to determine the schema,
     # which skips the auto registration of schema on the schema registry.
     # Fetch the schema from registry with the provided subject name and version.
-    def fetch_schema(subject:, version: 'latest')
+    def fetch_schema(subject:, version: "latest")
       schema_data = @registry.subject_version(subject, version)
-      schema_id = schema_data.fetch('id')
-      schema_type = schema_data['schemaType']
+      schema_id = schema_data.fetch("id")
+      schema_type = schema_data["schemaType"]
       if schema_type && schema_type != "AVRO"
         raise IncompatibleSchemaError, "The #{schema_type} schema for #{subject} is incompatible."
       end
-      schema = Avro::Schema.parse(schema_data.fetch('schema'))
+      schema = Avro::Schema.parse(schema_data.fetch("schema"))
       [schema, schema_id]
     end
 

data/lib/avro_turf/mutable_schema_store.rb

@@ -1,18 +1,39 @@
-require 'avro_turf/schema_store'
+# frozen_string_literal: true
+
+require "avro_turf/schema_store"
 
 class AvroTurf
   # A schema store that allows you to add or remove schemas, and to access
   # them externally.
+  #
+  # Only the top-level schema is cached. It is important to not register
+  # sub-schema as other schemas may define the same sub-schema and
+  # the Avro gem will raise an Avro::SchemaParseError when parsing another
+  # schema with a subschema with the same name as one encounted previously:
+  # <Avro::SchemaParseError: The name "foo.bar" is already in use.>
+  #
+  # Essentially, the only schemas that should be resolvable in @schemas
+  # are those that have their own .avsc files on disk.
+  #
+  # See https://github.com/dasch/avro_turf/pull/111
+  # and the implementation in AvroTurf::SchemaStore#load_schema!
   class MutableSchemaStore < SchemaStore
     attr_accessor :schemas
 
     # @param schema_hash [Hash]
     def add_schema(schema_hash)
-      name = schema_hash['name']
-      namespace = schema_hash['namespace']
+      name = schema_hash["name"]
+      namespace = schema_hash["namespace"]
       full_name = Avro::Name.make_fullname(name, namespace)
       return if @schemas.key?(full_name)
-      Avro::Schema.real_parse(schema_hash, @schemas)
+
+      # We pass in copy of @schemas which Avro can freely modify
+      # and register the sub-schema. It doesn't matter because
+      # we will discard it.
+      schema = Avro::Schema.real_parse(schema_hash, @schemas.dup)
+      @schemas[full_name] = schema
+
+      schema
     end
   end
 end

data/lib/avro_turf/schema_registry.rb

@@ -1,4 +1,6 @@
-require 'avro_turf/confluent_schema_registry'
+# frozen_string_literal: true
+
+require "avro_turf/confluent_schema_registry"
 
 # AvroTurf::SchemaRegistry is deprecated and will be removed in a future release.
 # Use AvroTurf::ConfluentSchemaRegistry instead.