avromatic 0.21.0.rc0 → 0.21.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64c5c1ae08b3b6a93d40d6bb3943ef02ff0d4f73
-  data.tar.gz: 56000a66e436f1b85776d29b7f66839d19d9652c
+  metadata.gz: 2772458993a885959c80d6dca47736122e3eacab
+  data.tar.gz: acdadf951b66dec62337cd7a072b3ccd8a39c609
 SHA512:
-  metadata.gz: df9bc9cad465cd515ee4913d5ea1829aff99945952f2a2d35b040b44e267d46670795cd6ee5c6fb7136eda864f876f09afa9c903aecb036be05e71c19bccacf3
-  data.tar.gz: 9cb6e0825c55dab2cf0df0f80f67e79c740dd356ecddd75922c0fd9e6142daefc395fd5d7c2596e6d6deeb985284ff739fb9b2714892d5d938a2dc1193dcb716
+  metadata.gz: bff54d4180814fce8d0f464134ea964ce74565fb04140438c5db0e94d033ddbb9e9fa130dc58ddb2d6196ec67fd379ae4db8b0affbc1f47a4ff68c0d5e4c6825
+  data.tar.gz: 87d71e4fcb198adc571c509fefd2f0a0447d5ee05bf830e6dd583cba2f29cd09bc630058c45c866c546cd75cfa37c78f9a830597dfcf332b06939da6d51630ab

data/CHANGELOG.md

@@ -1,8 +1,11 @@
 # avromatic changelog
 
 ## v0.21.0
-- Add support for additional parameters to
-  `AvroTurf::ConfluentSchemaRegistry#compatible?`.
+- Remove monkey-patches for `AvroTurf::ConfluentSchemaRegistry` and
+  `FakeConfluentSchemaRegistryServer` and depend on `avro_schema_registry-client`
+  instead.
+- Rename the configuration option `use_cacheable_schema_registration` to
+  `use_schema_fingerprint_lookup`.
 
 ## v0.20.0
 - Support schema stores with a `#clear_schemas` method.

data/README.md

@@ -60,12 +60,13 @@ The configuration options below are required when using a schema registry
 (see [Confluent Schema Registry](http://docs.confluent.io/2.0.1/schema-registry/docs/intro.html))
 and the [Messaging API](#messaging-api).
   
-* **schema_registry**: An `AvroTurf::ConfluentSchemaRegistry` object used to store Avro schemas
-  so that they can be referenced by id. Either `schema_registry` or 
+* **schema_registry**: An `AvroSchemaRegistry::Client` or
+  `AvroTurf::ConfluentSchemaRegistry` object used to store Avro schemas
+  so that they can be referenced by id. Either `schema_registry` or
   `registry_url` must be configured.
 * **registry_url**: URL for the schema registry. Either `schema_registry` or 
   `registry_url` must be configured.
-* **use_cacheable_schema_registration**: Avromatic supports a Schema Registry
+* **use_schema_fingerprint_lookup**: Avromatic supports a Schema Registry
   [extension](https://github.com/salsify/avro-schema-registry#extensions) that
   provides an endpoint to lookup existing schema ids by fingerprint.
   A successful response from this GET request can be cached indefinitely.

data/avromatic.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'avro', '>= 1.7.7'
   spec.add_runtime_dependency 'virtus'
-  spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'activemodel'
-  spec.add_runtime_dependency 'avro_turf', '>= 0.8.0'
-  spec.add_runtime_dependency 'avro-resolution_canonical_form'
+  spec.add_runtime_dependency 'activesupport', '>= 4.1', '< 5.1'
+  spec.add_runtime_dependency 'activemodel', '>= 4.1', '< 5.1'
+  spec.add_runtime_dependency 'avro_turf'
+  spec.add_runtime_dependency 'avro_schema_registry-client'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'avro-builder', '>= 0.12.0'
-  # For FakeSchemaRegistryServer
+  # For AvroSchemaRegistry::FakeServer
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'salsify_rubocop', '~> 0.47.0'
   spec.add_development_dependency 'overcommit', '0.35.0'

data/lib/avromatic.rb

@@ -1,5 +1,5 @@
 require 'avromatic/version'
-require 'avro_turf'
+require 'avro_schema_registry-client'
 require 'avromatic/model'
 require 'avromatic/model_registry'
 require 'avromatic/messaging'
@@ -9,7 +9,7 @@ module Avromatic
   class << self
     attr_accessor :schema_registry, :registry_url, :schema_store, :logger,
                   :messaging, :type_registry, :nested_models,
-                  :use_custom_datum_reader, :use_cacheable_schema_registration
+                  :use_custom_datum_reader, :use_schema_fingerprint_lookup
 
     delegate :register_type, to: :type_registry
   end
@@ -18,7 +18,7 @@ module Avromatic
   self.logger = Logger.new($stdout)
   self.type_registry = Avromatic::Model::TypeRegistry.new
   self.use_custom_datum_reader = true
-  self.use_cacheable_schema_registration = true
+  self.use_schema_fingerprint_lookup = true
 
   def self.configure
     yield self
@@ -27,9 +27,15 @@ module Avromatic
 
   def self.build_schema_registry
     raise 'Avromatic must be configured with a registry_url' unless registry_url
-    AvroTurf::CachedConfluentSchemaRegistry.new(
-      AvroTurf::ConfluentSchemaRegistry.new(registry_url, logger: logger)
-    )
+    if use_schema_fingerprint_lookup
+      AvroSchemaRegistry::CachedClient.new(
+        AvroSchemaRegistry::Client.new(registry_url, logger: logger)
+      )
+    else
+      AvroTurf::CachedConfluentSchemaRegistry.new(
+        AvroTurf::ConfluentSchemaRegistry.new(registry_url, logger: logger)
+      )
+    end
   end
 
   def self.build_messaging

data/lib/avromatic/model/message_decoder.rb

@@ -1,5 +1,3 @@
-require 'avromatic/schema_registry_patch'
-
 module Avromatic
   module Model
 

data/lib/avromatic/rspec.rb

@@ -1,9 +1,9 @@
 require 'webmock/rspec'
-require 'avromatic/test/fake_confluent_schema_registry_server'
+require 'avro_schema_registry/test/fake_server'
 
 RSpec.configure do |config|
   config.before(:each) do
-    WebMock.stub_request(:any, /^#{Avromatic.registry_url}/).to_rack(FakeConfluentSchemaRegistryServer)
-    FakeConfluentSchemaRegistryServer.clear
+    WebMock.stub_request(:any, /^#{Avromatic.registry_url}/).to_rack(AvroSchemaRegistry::FakeServer)
+    AvroSchemaRegistry::FakeServer.clear
   end
 end

data/lib/avromatic/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.21.0.rc0'.freeze
+  VERSION = '0.21.0.rc1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.21.0.rc0
+  version: 0.21.0.rc1
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -44,44 +44,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   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.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   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.1'
 - !ruby/object:Gem::Dependency
   name: avro_turf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: avro-resolution_canonical_form
+  name: avro_schema_registry-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -286,9 +298,6 @@ files:
 - lib/avromatic/model_registry.rb
 - lib/avromatic/railtie.rb
 - lib/avromatic/rspec.rb
-- lib/avromatic/schema_registry_patch.rb
-- lib/avromatic/test/fake_confluent_schema_registry_server.rb
-- lib/avromatic/test/fake_schema_registry_server.rb
 - lib/avromatic/version.rb
 - log/.gitkeep
 homepage: https://github.com/salsify/avromatic.git

data/lib/avromatic/schema_registry_patch.rb

@@ -1,44 +0,0 @@
-require 'avro_turf'
-require 'avro_turf/confluent_schema_registry'
-require 'avro-resolution_canonical_form'
-
-module Avromatic
-  module CacheableSchemaRegistration
-    # Override register to first check if a schema is registered by fingerprint
-    def register(subject, schema)
-      return super unless Avromatic.use_cacheable_schema_registration
-
-      begin
-        lookup_subject_schema(subject, schema)
-      rescue Excon::Errors::NotFound
-        data = post("/subjects/#{subject}/versions", body: { schema: schema.to_s }.to_json)
-        id = data.fetch('id')
-        @logger.info("Registered schema for subject `#{subject}`; id = #{id}")
-        id
-      end
-    end
-
-    def lookup_subject_schema(subject, schema)
-      schema_object = if schema.is_a?(String)
-                        Avro::Schema.parse(schema)
-                      else
-                        schema
-                      end
-
-      data = get("/subjects/#{subject}/fingerprints/#{schema_object.sha256_resolution_fingerprint.to_s(16)}")
-      id = data.fetch('id')
-      @logger.info("Found schema for subject `#{subject}`; id = #{id}")
-      id
-    end
-
-    # Override to add support for additional params
-    def compatible?(subject, schema, version = 'latest', **params)
-      data = post("/compatibility/subjects/#{subject}/versions/#{version}",
-                  expects: [200, 404],
-                  body: { schema: schema.to_s }.merge!(params).to_json)
-      data.fetch('is_compatible', false) unless data.key?('error_code')
-    end
-  end
-end
-
-AvroTurf::ConfluentSchemaRegistry.prepend(Avromatic::CacheableSchemaRegistration)

data/lib/avromatic/test/fake_confluent_schema_registry_server.rb

@@ -1,25 +0,0 @@
-require 'avro_turf/test/fake_confluent_schema_registry_server'
-require 'avro-resolution_canonical_form'
-
-# Add support for endpoint to lookup subject schema id by fingerprint.
-FakeConfluentSchemaRegistryServer.class_eval do
-  SCHEMA_NOT_FOUND = FakeConfluentSchemaRegistryServer::SCHEMA_NOT_FOUND
-  SCHEMAS = FakeConfluentSchemaRegistryServer::SCHEMAS
-  SUBJECTS = FakeConfluentSchemaRegistryServer::SUBJECTS
-
-  get '/subjects/:subject/fingerprints/:fingerprint' do
-    subject = params[:subject]
-    halt(404, SCHEMA_NOT_FOUND) unless SUBJECTS.key?(subject)
-
-    fingerprint = params[:fingerprint]
-    fingerprint = fingerprint.to_i.to_s(16) if /^\d+$/ =~ fingerprint
-
-    schema_id = SCHEMAS.find_index do |schema|
-      Avro::Schema.parse(schema).sha256_resolution_fingerprint.to_s(16) == fingerprint
-    end
-
-    halt(404, SCHEMA_NOT_FOUND) unless schema_id && SUBJECTS[subject].include?(schema_id)
-
-    { id: schema_id }.to_json
-  end
-end

data/lib/avromatic/test/fake_schema_registry_server.rb

@@ -1,6 +0,0 @@
-require 'avromatic/test/fake_confluent_schema_registry_server'
-require 'avro_turf/test/fake_schema_registry_server'
-
-# This file is for back compatibility. The class has been renamed
-# FakeConfluentSchemaRegistryServer, but avro_turf defines an alias for the
-# old name, so we alias the require for now.