avro_turf 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c6f4cafa2c752c6b0dbe23703a4d2efccf558e11cec1c33db5a1af911cca43a
-  data.tar.gz: 61c9bc9c1963bb89f8b00c01ad0c4195d8cf48473ea191b3d91afa88361c7aa5
+  metadata.gz: fffcc17349a4bbbcaa1204610da74800c9a519d4774af83c7059c47bb75efb1b
+  data.tar.gz: e5afce0fa557da110a0dd1fe73add073f994a72bb8e3a1e37865a3393f864c2b
 SHA512:
-  metadata.gz: 1b7792365879b2d4dab3f7a160687ba7308c8f5cb6f9d788506ad087bfb56056f867328bc5357ab011917588bb7e67219300c00e3cadcdef389b927f8cf398de
-  data.tar.gz: 834dcc062ca3e2a6f6b4eafecd8425abacad9ca64d972bbe03100def4e7af2adb706d2fcde541d31d6ff199e9b3ce51f47774269adc55191a7b6d9dc2ed5e224
+  metadata.gz: 06aac90715b06f0fdf04918ba73c2533a0cad0b9dff769e1bfc30a1488e0916fc3b38c8f4bee6efab5d667688bd9d407330c603f209ead30d67cb13b3b46c4a5
+  data.tar.gz: 1a3c95047a2522914394b181eaf01afaee84547d64a72d1aebe3534252f49168cebec0cf7edda8bc8a62f769dd22294eb3916d317a71a65305cb6c46ffba84ad

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.19.0
+
+- Loosen excon dependency to allow 1.x (#220)
+
 ## v1.18.0
 
 - Add `compatibility_issues` method to `ConfluentSchemaRegistry` to debug compatibility issues between a schema versions for a given subject (#212)

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in avro_turf.gemspec
 gemspec
+
+gem 'gem-release'

data/README.md

@@ -282,7 +282,7 @@ require 'avro_turf/test/fake_confluent_schema_registry_server'
 require 'webmock/rspec'
 
 class AuthorizedFakeConfluentSchemaRegistryServer < FakeConfluentSchemaRegistryServer
-  set :host_authentication, permitted_hosts: ['registry.example.com']
+  set :host_authorization, permitted_hosts: ['registry.example.com']
 end
 
 # within an example

data/avro_turf.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "avro", ">= 1.11.3", "< 1.13"
-  spec.add_dependency "excon", "~> 0.104"
+  spec.add_dependency "excon", ">= 0.104", "< 2"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/avro_turf/confluent_schema_registry.rb

@@ -18,7 +18,8 @@ class AvroTurf::ConfluentSchemaRegistry
     client_key_data: nil,
     path_prefix: nil,
     connect_timeout: nil,
-    resolv_resolver: nil
+    resolv_resolver: nil,
+    retry_limit: nil
   )
     @path_prefix = path_prefix
     @schema_context_prefix = schema_context.nil? ? '' : ":.#{schema_context}:"
@@ -27,20 +28,26 @@ class AvroTurf::ConfluentSchemaRegistry
     headers = Excon.defaults[:headers].merge(
       "Content-Type" => CONTENT_TYPE
     )
-    headers[:proxy] = proxy unless proxy.nil?
-    @connection = Excon.new(
-      url,
+    params = {
       headers: headers,
       user: user,
       password: password,
+      proxy: proxy,
       ssl_ca_file: ssl_ca_file,
       client_cert: client_cert,
       client_key: client_key,
       client_key_pass: client_key_pass,
       client_cert_data: client_cert_data,
       client_key_data: client_key_data,
+      resolv_resolver: resolv_resolver,
       connect_timeout: connect_timeout,
-      resolv_resolver: resolv_resolver
+      retry_limit: retry_limit
+    }
+    # Remove nil params to allow Excon to use its default values
+    params.reject! { |_, v| v.nil? }
+    @connection = Excon.new(
+      url,
+      params
     )
   end
 

data/lib/avro_turf/messaging.rb

@@ -10,6 +10,7 @@ require 'avro_turf/schema_registry'
 require 'avro_turf/cached_schema_registry'
 
 class AvroTurf
+  class IncompatibleSchemaError < StandardError; end
 
   # Provides a way to encode and decode messages without having to embed schemas
   # in the encoded data. Confluent's Schema Registry[1] is used to register
@@ -77,7 +78,8 @@ class AvroTurf
       client_cert_data: nil,
       client_key_data: nil,
       connect_timeout: nil,
-      resolv_resolver: nil
+      resolv_resolver: nil,
+      retry_limit: nil
     )
       @logger = logger || Logger.new($stderr)
       @namespace = namespace
@@ -98,7 +100,8 @@ class AvroTurf
           client_key_data: client_key_data,
           path_prefix: registry_path_prefix,
           connect_timeout: connect_timeout,
-          resolv_resolver: resolv_resolver
+          resolv_resolver: resolv_resolver,
+          retry_limit: retry_limit
         )
       )
       @schemas_by_id = {}
@@ -216,11 +219,15 @@ class AvroTurf
     end
 
     # Providing subject and version to determine the schema,
-    # which skips the auto registeration of schema on the schema registry.
+    # 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')
       schema_data = @registry.subject_version(subject, version)
       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, schema_id]
     end

data/lib/avro_turf/version.rb

@@ -1,3 +1,3 @@
 class AvroTurf
-  VERSION = "1.18.0"
+  VERSION = "1.19.0"
 end

data/spec/messaging_spec.rb

@@ -377,6 +377,18 @@ describe AvroTurf::Messaging do
       it 'gets schema from registry' do
         expect(subject).to eq([schema, schema_id])
       end
+
+      context "with an incompatible schema type" do
+        let(:response) { {'id' => schema_id, 'schema' => 'blah', 'schemaType' => schema_type } }
+        let(:schema_type) { 'PROTOBUF' }
+
+        it 'raises IncompatibleSchemaError' do
+          expect { subject }.to raise_error(
+            AvroTurf::IncompatibleSchemaError,
+            "The #{schema_type} schema for #{subj} is incompatible."
+          )
+        end
+      end
     end
 
     context 'using fetch_schema_by_id' do
@@ -504,6 +516,54 @@ describe AvroTurf::Messaging do
     end
   end
 
+  context 'with a connect timeout' do
+    let(:avro) {
+      AvroTurf::Messaging.new(
+        registry_url: registry_url,
+        schemas_path: "spec/schemas",
+        logger: logger,
+        client_cert: client_cert,
+        client_key: client_key,
+        client_key_pass: client_key_pass,
+        retry_limit: 5
+      )
+    }
+
+    it_behaves_like "encoding and decoding with the schema from schema store"
+    it_behaves_like 'encoding and decoding with the schema from registry'
+    it_behaves_like 'encoding and decoding with the schema_id from registry'
+
+    it 'passes the connect timeout setting to Excon' do
+      expect(Excon).to receive(:new).with(anything, hash_including(retry_limit: 5)).and_call_original
+      avro
+    end
+  end
+
+  context 'with a proxy' do
+    let(:proxy_url) { 'http://proxy.example.com' }
+    let(:avro) {
+      AvroTurf::Messaging.new(
+        registry_url: registry_url,
+        schemas_path: "spec/schemas",
+        logger: logger,
+        client_cert: client_cert,
+        client_key: client_key,
+        client_key_pass: client_key_pass,
+        proxy: proxy_url
+      )
+    }
+
+    it_behaves_like "encoding and decoding with the schema from schema store"
+    it_behaves_like 'encoding and decoding with the schema from registry'
+    it_behaves_like 'encoding and decoding with the schema_id from registry'
+
+    it 'passes the proxy setting to Excon' do
+      expect(Excon).to receive(:new).with(anything, hash_including(proxy: proxy_url)).and_call_original
+      avro
+    end
+  end
+
+
   context 'with a custom domain name resolver' do
     let(:resolv_resolver) { Resolv.new([Resolv::Hosts.new, Resolv::DNS.new(nameserver: ['127.0.0.1', '127.0.0.1'])]) }
     let(:avro) {

data/spec/support/confluent_schema_registry_context.rb

@@ -18,7 +18,7 @@ shared_examples_for "a confluent schema registry client" do |schema_context: nil
     {
       'Accept'=>'*/*',
       'Content-Type'=> AvroTurf::ConfluentSchemaRegistry::CONTENT_TYPE,
-      'Host'=> "#{URI.parse(registry_url).host}:80",
+      'Host'=> "#{URI.parse(registry_url).host}",
       'User-Agent'=> "excon/#{Excon::VERSION}"
     }
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: avro_turf
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Daniel Schierbeck
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -34,16 +33,22 @@ dependencies:
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.104'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.104'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +175,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - dasch@zendesk.com
 executables: []
@@ -268,8 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A library that makes it easier to use the Avro serialization format from
   Ruby