avro_turf 1.19.0 → 1.20.1

data/spec/avro_turf_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe AvroTurf do
   let(:avro) { AvroTurf.new(schemas_path: "spec/schemas/") }
 
@@ -56,7 +58,7 @@ describe AvroTurf do
       end
     end
 
-    context 'when using nested schemas' do
+    context "when using nested schemas" do
       before do
         define_schema "post.avsc", <<-AVSC
           {
@@ -138,7 +140,6 @@ describe AvroTurf do
         expect(avro.decode(encoded_data)).to eq(data)
       end
     end
-
   end
 
   describe "#decode" do
@@ -179,22 +180,22 @@ describe AvroTurf do
         }
       AVSC
 
-      encoded_data = avro.encode({ "x" => 42, "y" => 13 }, schema_name: "point")
+      encoded_data = avro.encode({"x" => 42, "y" => 13}, schema_name: "point")
       reader_avro = AvroTurf.new(schemas_path: "spec/schemas/reader")
 
-      expect(reader_avro.decode(encoded_data, schema_name: "point")).to eq({ "x" => 42 })
+      expect(reader_avro.decode(encoded_data, schema_name: "point")).to eq({"x" => 42})
     end
   end
 
   describe "#decode_all" do
     context "when data contains multiple entries" do
-      let(:encoded_data) {  "Obj\u0001\u0004\u0014avro.codec\bnull\u0016avro.schema\xB6\u0004[{\"type\": \"record\", \"name\": \"address\", \"fields\": [{\"type\": \"string\", \"name\": \"street\"}, {\"type\": \"string\", \"name\": \"city\"}]}, {\"type\": \"record\", \"name\": \"person\", \"fields\": [{\"type\": \"string\", \"name\": \"name\"}, {\"type\": \"int\", \"name\": \"age\"}, {\"type\": \"address\", \"name\": \"address\"}]}]\u0000\xF9u\x84\xA1c\u0010\x82B\xE2\xCF\xF1\x98\xF7\xF1JH\u0004\x96\u0001\u0002\u0014Python🐍\x80\u0004\u0018Green Street\u001ASan Francisco\u0002\u0010Mojo🐍\u0002\u0016Blue Street\u0014Saturn🪐\xF9u\x84\xA1c\u0010\x82B\xE2\xCF\xF1\x98\xF7\xF1JH" } 
+      let(:encoded_data) { "Obj\u0001\u0004\u0014avro.codec\bnull\u0016avro.schema\xB6\u0004[{\"type\": \"record\", \"name\": \"address\", \"fields\": [{\"type\": \"string\", \"name\": \"street\"}, {\"type\": \"string\", \"name\": \"city\"}]}, {\"type\": \"record\", \"name\": \"person\", \"fields\": [{\"type\": \"string\", \"name\": \"name\"}, {\"type\": \"int\", \"name\": \"age\"}, {\"type\": \"address\", \"name\": \"address\"}]}]\u0000\xF9u\x84\xA1c\u0010\x82B\xE2\xCF\xF1\x98\xF7\xF1JH\u0004\x96\u0001\u0002\u0014Python🐍\x80\u0004\u0018Green Street\u001ASan Francisco\u0002\u0010Mojo🐍\u0002\u0016Blue Street\u0014Saturn🪐\xF9u\x84\xA1c\u0010\x82B\xE2\xCF\xF1\x98\xF7\xF1JH" }
 
       it "returns array of entries decoded using the inlined writer's schema " do
         expect(avro.decode_all(encoded_data).entries).to eq(
           [
-            {"name"=>"Python🐍", "age"=>256, "address"=>{"street"=>"Green Street", "city"=>"San Francisco"}},
-            {"name"=>"Mojo🐍", "age"=>1, "address"=>{"street"=>"Blue Street", "city"=>"Saturn🪐"}}
+            {"name" => "Python🐍", "age" => 256, "address" => {"street" => "Green Street", "city" => "San Francisco"}},
+            {"name" => "Mojo🐍", "age" => 1, "address" => {"street" => "Blue Street", "city" => "Saturn🪐"}}
           ]
         )
       end
@@ -219,8 +220,8 @@ describe AvroTurf do
                   .decode_all(encoded_data, schema_name: "person").entries
         ).to eq(
           [
-            {"name"=>"Python🐍", "age"=>256, "fav_color"=>"red🟥"},
-            {"name"=>"Mojo🐍", "age"=>1, "fav_color"=>"red🟥"}
+            {"name" => "Python🐍", "age" => 256, "fav_color" => "red🟥"},
+            {"name" => "Mojo🐍", "age" => 1, "fav_color" => "red🟥"}
           ]
         )
       end
@@ -249,7 +250,7 @@ describe AvroTurf do
       end
 
       context "with a valid message" do
-        let(:message) { { "full_name" => "John Doe" } }
+        let(:message) { {"full_name" => "John Doe"} }
 
         it "does not raise any error" do
           define_schema "message.avsc", <<-AVSC
@@ -267,7 +268,7 @@ describe AvroTurf do
       end
 
       context "when message has wrong type" do
-        let(:message) { { "full_name" => 123 } }
+        let(:message) { {"full_name" => 123} }
 
         it "raises Avro::SchemaValidator::ValidationError with a message about type mismatch" do
           define_schema "message.avsc", <<-AVSC
@@ -285,7 +286,7 @@ describe AvroTurf do
       end
 
       context "when message contains extra fields (typo in key)" do
-        let(:message) { { "fulll_name" => "John Doe" } }
+        let(:message) { {"fulll_name" => "John Doe"} }
 
         it "raises Avro::SchemaValidator::ValidationError with a message about extra field" do
           define_schema "message.avsc", <<-AVSC
@@ -303,13 +304,12 @@ describe AvroTurf do
       end
 
       context "when the `fail_on_extra_fields` validation option is disabled" do
-        let(:message) { { "full_name" => "John Doe", "first_name" => "John", "last_name" => "Doe" } }
+        let(:message) { {"full_name" => "John Doe", "first_name" => "John", "last_name" => "Doe"} }
         subject(:encode_to_stream) do
           stream = StringIO.new
           avro.encode_to_stream(message, stream: stream, schema_name: "message",
-                                validate: true,
-                                validate_options: { recursive: true, encoded: false, fail_on_extra_fields: false }
-          )
+            validate: true,
+            validate_options: {recursive: true, encoded: false, fail_on_extra_fields: false})
         end
 
         it "should not raise Avro::SchemaValidator::ValidationError with a message about extra field" do
@@ -352,8 +352,8 @@ describe AvroTurf do
 
       expect(avro.decode_all_from_stream(stream).entries).to eq(
         [
-          {"name"=>"Python🐍", "age"=>256, "address"=>{"street"=>"Green Street", "city"=>"San Francisco"}},
-          {"name"=>"Mojo🐍", "age"=>1, "address"=>{"street"=>"Blue Street", "city"=>"Saturn🪐"}}
+          {"name" => "Python🐍", "age" => 256, "address" => {"street" => "Green Street", "city" => "San Francisco"}},
+          {"name" => "Mojo🐍", "age" => 1, "address" => {"street" => "Blue Street", "city" => "Saturn🪐"}}
         ]
       )
     end
@@ -390,7 +390,7 @@ describe AvroTurf do
         }
       AVSC
 
-      datum = { message: "hello" }
+      datum = {message: "hello"}
       expect(avro.valid?(datum, schema_name: "postcard")).to eq true
     end
 
@@ -423,7 +423,7 @@ describe AvroTurf do
     end
 
     context "when message contains extra fields (typo in key)" do
-      let(:message) { { "fulll_name" => "John Doe" } }
+      let(:message) { {"fulll_name" => "John Doe"} }
 
       before do
         define_schema "message.avsc", <<-AVSC
@@ -438,16 +438,17 @@ describe AvroTurf do
       end
 
       it "is valid" do
-        datum = { "full_name" => "John Doe", "extra" => "extra" }
+        datum = {"full_name" => "John Doe", "extra" => "extra"}
         expect(avro.valid?(datum, schema_name: "message")).to eq true
       end
 
       it "is invalid when passing fail_on_extra_fields" do
-        datum = { "full_name" => "John Doe", "extra" => "extra" }
+        datum = {"full_name" => "John Doe", "extra" => "extra"}
         validate_options = {
           recursive: true,
           encoded: false,
-          fail_on_extra_fields: true }
+          fail_on_extra_fields: true
+        }
         valid = avro.valid?(datum, schema_name: "message", validate_options: validate_options)
         expect(valid).to eq false
       end

data/spec/cached_confluent_schema_registry_spec.rb

@@ -1,17 +1,19 @@
-require 'webmock/rspec'
-require 'avro_turf/cached_confluent_schema_registry'
-require 'avro_turf/test/fake_confluent_schema_registry_server'
+# frozen_string_literal: true
+
+require "webmock/rspec"
+require "avro_turf/cached_confluent_schema_registry"
+require "avro_turf/test/fake_confluent_schema_registry_server"
 
 describe AvroTurf::CachedConfluentSchemaRegistry do
   let(:upstream) { instance_double(AvroTurf::ConfluentSchemaRegistry) }
   let(:registry) { described_class.new(upstream) }
   let(:id) { rand(999) }
-  let(:subject_name) { 'a_subject' }
+  let(:subject_name) { "a_subject" }
   let(:schema) do
     {
       type: "record",
       name: "person",
-      fields: [{ name: "name", type: "string" }]
+      fields: [{name: "name", type: "string"}]
     }.to_json
   end
 
@@ -57,7 +59,7 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
     end
   end
 
-  describe '#subject_version' do
+  describe "#subject_version" do
     let(:version) { 1 }
     let(:schema_with_meta) do
       {
@@ -68,7 +70,7 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
       }
     end
 
-    it 'caches the result of subject_version' do
+    it "caches the result of subject_version" do
       allow(upstream).to receive(:subject_version).with(subject_name, version).and_return(schema_with_meta)
       registry.subject_version(subject_name, version)
       registry.subject_version(subject_name, version)

data/spec/confluent_schema_registry_spec.rb

@@ -1,22 +1,40 @@
-require 'webmock/rspec'
-require 'avro_turf/confluent_schema_registry'
-require 'avro_turf/test/fake_confluent_schema_registry_server'
+# frozen_string_literal: true
+
+require "webmock/rspec"
+require "avro_turf/confluent_schema_registry"
+require "avro_turf/test/fake_confluent_schema_registry_server"
 
 describe AvroTurf::ConfluentSchemaRegistry do
   let(:user) { "abc" }
   let(:password) { "xxyyzz" }
   let(:client_cert) { "test client cert" }
+  let(:client_chain) { "test client cert chain" }
   let(:client_key) { "test client key" }
   let(:client_key_pass) { "test client key password" }
   let(:connect_timeout) { 10 }
 
-  context 'authenticated by cert' do
+  context "authenticated by cert" do
+    it_behaves_like "a confluent schema registry client" do
+      let(:registry) {
+        described_class.new(
+          registry_url,
+          logger: logger,
+          client_cert: client_cert,
+          client_key: client_key,
+          client_key_pass: client_key_pass
+        )
+      }
+    end
+  end
+
+  context "authenticated by cert with chain" do
     it_behaves_like "a confluent schema registry client" do
       let(:registry) {
         described_class.new(
           registry_url,
           logger: logger,
           client_cert: client_cert,
+          client_chain: client_chain,
           client_key: client_key,
           client_key_pass: client_key_pass
         )
@@ -24,23 +42,25 @@ describe AvroTurf::ConfluentSchemaRegistry do
     end
   end
 
-  context 'authenticated by basic auth' do
+  context "authenticated by basic auth" do
     it_behaves_like "a confluent schema registry client" do
       let(:registry) {
         described_class.new(
           registry_url,
+          logger: logger,
           user: user,
-          password: password,
+          password: password
         )
       }
     end
   end
 
-  context 'with connect_timeout' do
+  context "with connect_timeout" do
     it_behaves_like "a confluent schema registry client" do
       let(:registry) {
         described_class.new(
           registry_url,
+          logger: logger,
           user: user,
           password: password,
           connect_timeout: connect_timeout
@@ -49,12 +69,13 @@ describe AvroTurf::ConfluentSchemaRegistry do
     end
   end
 
-  context 'with non default schema_context' do
-    it_behaves_like "a confluent schema registry client", schema_context: 'other' do
+  context "with non default schema_context" do
+    it_behaves_like "a confluent schema registry client", schema_context: "other" do
       let(:registry) {
         described_class.new(
           registry_url,
-          schema_context: 'other',
+          logger: logger,
+          schema_context: "other",
           user: user,
           password: password,
           connect_timeout: connect_timeout

data/spec/core_ext/date_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Date, "#as_avro" do
   it "returns Date object describing the time" do
     date = Date.today

data/spec/core_ext/enumerable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Enumerable, "#as_avro" do
   it "returns an array" do
     expect(Set.new.as_avro).to eq []

data/spec/core_ext/false_class_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe FalseClass, "#as_avro" do
   it "returns itself" do
     expect(false.as_avro).to eq false

data/spec/core_ext/hash_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 describe Hash, "#as_avro" do
   it "coerces the keys and values to Avro" do
     x = double(as_avro: "x")
     y = double(as_avro: "y")
 
-    expect({ x => y }.as_avro).to eq({ "x" => "y" })
+    expect({x => y}.as_avro).to eq({"x" => "y"})
   end
 end

data/spec/core_ext/nil_class_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe NilClass, "#as_avro" do
   it "returns itself" do
     expect(nil.as_avro).to eq nil

data/spec/core_ext/numeric_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Numeric, "#as_avro" do
   it "returns the number itself" do
     expect(42.as_avro).to eq 42

data/spec/core_ext/string_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe String, "#as_avro" do
   it "returns itself" do
     expect("hello".as_avro).to eq "hello"

data/spec/core_ext/symbol_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Symbol, "#as_avro" do
   it "returns the String representation of the Symbol" do
     expect(:hello.as_avro).to eq("hello")

data/spec/core_ext/time_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Time, "#as_avro" do
   it "returns an ISO8601 string describing the time" do
     time = Time.now

data/spec/core_ext/true_class_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe TrueClass, "#as_avro" do
   it "returns itself" do
     expect(true.as_avro).to eq true

data/spec/disk_cached_confluent_schema_registry_spec.rb

@@ -1,18 +1,20 @@
-require 'webmock/rspec'
-require 'avro_turf/cached_confluent_schema_registry'
-require 'avro_turf/test/fake_confluent_schema_registry_server'
+# frozen_string_literal: true
+
+require "webmock/rspec"
+require "avro_turf/cached_confluent_schema_registry"
+require "avro_turf/test/fake_confluent_schema_registry_server"
 
 describe AvroTurf::CachedConfluentSchemaRegistry do
   let(:upstream) { instance_double(AvroTurf::ConfluentSchemaRegistry) }
   let(:logger_io) { StringIO.new }
-  let(:cache)    { AvroTurf::DiskCache.new("spec/cache", logger: Logger.new(logger_io))}
+  let(:cache) { AvroTurf::DiskCache.new("spec/cache", logger: Logger.new(logger_io)) }
   let(:registry) { described_class.new(upstream, cache: cache) }
   let(:id) { rand(999) }
   let(:schema) do
     {
       type: "record",
       name: "person",
-      fields: [{ name: "name", type: "string" }]
+      fields: [{name: "name", type: "string"}]
     }.to_json
   end
 
@@ -21,21 +23,21 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
     {
       type: "record",
       name: "city",
-      fields: [{ name: "name", type: "string" }]
+      fields: [{name: "name", type: "string"}]
     }.to_json
   end
 
-  let(:subject) { 'subject' }
+  let(:subject) { "subject" }
   let(:version) { rand(999) }
   let(:subject_version_schema) do
     {
       subject: subject,
       version: version,
       id: id,
-      schema:  {
+      schema: {
         type: "record",
         name: "city",
-        fields: { name: "name", type: "string" }
+        fields: {name: "name", type: "string"}
       }
     }.to_json
   end
@@ -47,13 +49,13 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
   describe "#fetch" do
     let(:cache_before) do
       {
-        "#{id}" => "#{schema}"
+        id.to_s => schema.to_s
       }
     end
     let(:cache_after) do
       {
-        "#{id}" => "#{schema}",
-        "#{city_id}" => "#{city_schema}"
+        id.to_s => schema.to_s,
+        city_id.to_s => city_schema.to_s
       }
     end
 
@@ -84,13 +86,13 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
   describe "#fetch (zero length cache file)" do
     let(:cache_after) do
       {
-        "#{id}" => "#{schema}"
+        id.to_s => schema.to_s
       }
     end
 
     before do
       # setup the disk cache with a zero length file
-      File.write(File.join("spec/cache", "schemas_by_id.json"), '')
+      File.write(File.join("spec/cache", "schemas_by_id.json"), "")
     end
 
     it "skips zero length disk cache" do
@@ -107,11 +109,11 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
   describe "#fetch (corrupt cache file)" do
     before do
       # setup the disk cache with a corrupt file (i.e. not json)
-      File.write(File.join("spec/cache", "schemas_by_id.json"), 'NOTJSON')
+      File.write(File.join("spec/cache", "schemas_by_id.json"), "NOTJSON")
     end
 
     it "raises error on corrupt cache file" do
-      expect{registry.fetch(id)}.to raise_error(JSON::ParserError, /unexpected token/)
+      expect { registry.fetch(id) }.to raise_error(JSON::ParserError, /unexpected token/)
     end
   end
 
@@ -124,7 +126,7 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
     end
 
     let(:city_name) { "a_city" }
-    let(:cache_after) do 
+    let(:cache_after) do
       {
         "#{subject_name}#{schema}" => id,
         "#{city_name}#{city_schema}" => city_id
@@ -139,7 +141,7 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
     it "uses preloaded disk cache" do
       # multiple calls return same result, with zero upstream calls
       allow(upstream).to receive(:register).with(subject_name, schema).and_return(id)
-      expect(registry.register(subject_name, schema)).to eq(id) 
+      expect(registry.register(subject_name, schema)).to eq(id)
       expect(registry.register(subject_name, schema)).to eq(id)
       expect(upstream).to have_received(:register).exactly(0).times
       expect(load_cache("ids_by_schema.json")).to eq cache_before
@@ -165,7 +167,7 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
 
     before do
       # setup the disk cache with a zero length file
-      File.write(File.join("spec/cache", "ids_by_schema.json"), '')
+      File.write(File.join("spec/cache", "ids_by_schema.json"), "")
     end
 
     it "skips zero length disk cache" do
@@ -182,11 +184,11 @@ describe AvroTurf::CachedConfluentSchemaRegistry do
   describe "#register (corrupt cache file)" do
     before do
       # setup the disk cache with a corrupt file (i.e. not json)
-      File.write(File.join("spec/cache", "ids_by_schema.json"), 'NOTJSON')
+      File.write(File.join("spec/cache", "ids_by_schema.json"), "NOTJSON")
     end
 
     it "raises error on corrupt cache file" do
-      expect{registry.register(subject_name, schema)}.to raise_error(JSON::ParserError, /unexpected token/)
+      expect { registry.register(subject_name, schema) }.to raise_error(JSON::ParserError, /unexpected token/)
     end
   end