deimos-ruby 2.5.3 → 2.6.0.pre.beta1

data/spec/schemas/my_namespace/widget.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# This file is autogenerated by Deimos, Do NOT modify
+# This file is autogenerated by AvroGen, Do NOT modify
 module Schemas; module MyNamespace
   ### Primary Schema Class ###
   # Autogenerated Schema for Record at com.my-namespace.Widget
-  class Widget < Deimos::SchemaClass::Record
+  class Widget < AvroGen::SchemaClass::Record
 
     ### Attribute Accessors ###
     # @return [Integer]

data/spec/schemas/my_namespace/widget_the_second.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# This file is autogenerated by Deimos, Do NOT modify
+# This file is autogenerated by AvroGen, Do NOT modify
 module Schemas; module MyNamespace
   ### Primary Schema Class ###
   # Autogenerated Schema for Record at com.my-namespace.WidgetTheSecond
-  class WidgetTheSecond < Deimos::SchemaClass::Record
+  class WidgetTheSecond < AvroGen::SchemaClass::Record
 
     ### Attribute Accessors ###
     # @return [Integer]

data/spec/schemas/my_namespace/widget_the_third.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# This file is autogenerated by Deimos, Do NOT modify
+# This file is autogenerated by AvroGen, Do NOT modify
 module Schemas; module MyNamespace
   ### Primary Schema Class ###
   # Autogenerated Schema for Record at com.my-namespace.WidgetTheThird
-  class WidgetTheThird < Deimos::SchemaClass::Record
+  class WidgetTheThird < AvroGen::SchemaClass::Record
 
     ### Attribute Accessors ###
     # @return [String]

data/spec/spec_helper.rb

@@ -223,13 +223,13 @@ RSpec.configure do |config|
     set_karafka_config(:reraise_errors, true)
     Deimos.configure do |deimos_config|
       deimos_config.producers.backend = :kafka
-      deimos_config.schema.nest_child_schemas = true
+      deimos_config.avrogen.nest_child_schemas = true
       deimos_config.schema.path = File.join(File.expand_path(__dir__), 'schemas')
       deimos_config.schema.registry_url = ENV['SCHEMA_REGISTRY'] || 'http://localhost:8081'
       deimos_config.logger = Logger.new(File::NULL)
       deimos_config.logger.level = Logger::INFO
       deimos_config.schema.backend = :avro_validation
-      deimos_config.schema.generated_class_path = 'spec/schemas'
+      deimos_config.avrogen.generated_class_path = 'spec/schemas'
     end
   end
 

data/spec/utils/db_poller_spec.rb

@@ -316,7 +316,7 @@ each_db_config(Deimos::Utils::DbPoller::Base) do
             m.call(*args)
             expect(info.reload.last_sent.in_time_zone).to eq(time_value(mins: -61, secs: 32))
             expect(info.last_sent_id).to eq(widgets[1].id)
-          end
+        end
         expect(poller).to receive(:process_and_touch_info).ordered.
           with([widgets[2], widgets[3], widgets[4]], anything).and_call_original
         expect(poller).to receive(:process_and_touch_info).ordered.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0.pre.beta1
 platform: ruby
 authors:
 - Daniel Orner
@@ -9,6 +9,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: avro-gen-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -536,9 +550,7 @@ files:
 - lib/deimos/schema_backends/proto_base.rb
 - lib/deimos/schema_backends/proto_local.rb
 - lib/deimos/schema_backends/proto_schema_registry.rb
-- lib/deimos/schema_class/base.rb
-- lib/deimos/schema_class/enum.rb
-- lib/deimos/schema_class/record.rb
+- lib/deimos/schema_class.rb
 - lib/deimos/shared_config.rb
 - lib/deimos/test_helpers.rb
 - lib/deimos/tracing/datadog.rb
@@ -564,10 +576,6 @@ files:
 - lib/generators/deimos/outbox_backend/templates/migration
 - lib/generators/deimos/outbox_backend/templates/rails3_migration
 - lib/generators/deimos/outbox_backend_generator.rb
-- lib/generators/deimos/schema_class/templates/schema_class.rb.tt
-- lib/generators/deimos/schema_class/templates/schema_enum.rb.tt
-- lib/generators/deimos/schema_class/templates/schema_record.rb.tt
-- lib/generators/deimos/schema_class_generator.rb
 - lib/generators/deimos/v2/templates/karafka.rb.tt
 - lib/generators/deimos/v2_generator.rb
 - lib/tasks/deimos.rake
@@ -595,10 +603,6 @@ files:
 - spec/gen/sample/v1/sample_key_pb.rb
 - spec/gen/sample/v1/sample_pb.rb
 - spec/generators/active_record_generator_spec.rb
-- spec/generators/schema_class/my_schema_spec.rb
-- spec/generators/schema_class/my_schema_with_circular_reference_spec.rb
-- spec/generators/schema_class/my_schema_with_complex_types_spec.rb
-- spec/generators/schema_class_generator_spec.rb
 - spec/handlers/my_batch_consumer.rb
 - spec/handlers/my_consumer.rb
 - spec/kafka_source_spec.rb
@@ -618,6 +622,7 @@ files:
 - spec/schema_backends/avro_validation_spec.rb
 - spec/schema_backends/base_spec.rb
 - spec/schema_backends/proto_schema_registry_spec.rb
+- spec/schema_class_spec.rb
 - spec/schemas/com/my-namespace/Generated.avsc
 - spec/schemas/com/my-namespace/MyNestedSchema.avsc
 - spec/schemas/com/my-namespace/MySchema.avsc
@@ -669,20 +674,6 @@ files:
 - spec/schemas/my_namespace/widget.rb
 - spec/schemas/my_namespace/widget_the_second.rb
 - spec/schemas/my_namespace/widget_the_third.rb
-- spec/snapshots/consumers-no-nest.snap
-- spec/snapshots/consumers.snap
-- spec/snapshots/consumers_and_producers-no-nest.snap
-- spec/snapshots/consumers_and_producers.snap
-- spec/snapshots/consumers_circular-no-nest.snap
-- spec/snapshots/consumers_circular.snap
-- spec/snapshots/consumers_complex_types-no-nest.snap
-- spec/snapshots/consumers_complex_types.snap
-- spec/snapshots/consumers_nested-no-nest.snap
-- spec/snapshots/consumers_nested.snap
-- spec/snapshots/namespace_folders.snap
-- spec/snapshots/namespace_map.snap
-- spec/snapshots/producers_with_key-no-nest.snap
-- spec/snapshots/producers_with_key.snap
 - spec/spec_helper.rb
 - spec/test_helpers_spec.rb
 - spec/utils/db_poller_spec.rb
@@ -711,7 +702,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Kafka libraries for Ruby.
 test_files: []

data/lib/deimos/schema_class/base.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-module Deimos
-  module SchemaClass
-    # Base Class for Schema Classes generated from Avro.
-    class Base
-
-      # @param _args [Array<Object>]
-      def initialize(*_args)
-      end
-
-      # Converts the object to a hash which can be used for debugging or comparing objects.
-      # @param _opts [Hash]
-      # @return [Hash] a hash representation of the payload
-      def as_json(_opts={})
-        raise MissingImplementationError
-      end
-
-      # @param key [String,Symbol]
-      # @param val [Object]
-      # @return [void]
-      def []=(key, val)
-        self.send("#{key}=", val)
-      end
-
-      # @param other [SchemaClass::Base]
-      # @return [Boolean]
-      def ==(other)
-        comparison = other
-        if other.class == self.class
-          comparison = other.as_json
-        end
-
-        comparison == self.as_json
-      end
-
-      alias_method :eql?, :==
-
-      # @return [String]
-      def inspect
-        klass = self.class
-        "#{klass}(#{self.as_json})"
-      end
-
-      # Initializes this class from a given value
-      # @param value [Object]
-      # @return [SchemaClass::Base]
-      def self.initialize_from_value(_value)
-        raise MissingImplementationError
-      end
-
-    protected
-
-      # @return [Integer]
-      def hash
-        as_json.hash
-      end
-    end
-  end
-end

data/lib/deimos/schema_class/enum.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base'
-require 'json'
-
-module Deimos
-  module SchemaClass
-    # Base Class for Enum Classes generated from Avro.
-    class Enum < Base
-
-      # @return [String]
-      attr_accessor :value
-
-      # @param other [Deimos::SchemaClass::Enum]
-      # @return [Boolean]
-      def ==(other)
-        other.is_a?(self.class) ? other.value == @value : other == @value
-      end
-
-      # @return [String]
-      def to_s
-        @value.to_s
-      end
-
-      # @param value [String]
-      def initialize(value)
-        @value = value
-      end
-
-      # Returns all the valid symbols for this enum.
-      # @return [Array<String>]
-      def symbols
-        raise MissingImplementationError
-      end
-
-      # @return [String]
-      def as_json(_opts={})
-        @value
-      end
-
-      # @return [SchemaClass::Enum]
-      def self.initialize_from_value(value, from_message: false)
-        return nil if value.nil?
-
-        value.is_a?(self) ? value : self.new(value)
-      end
-    end
-  end
-end

data/lib/deimos/schema_class/record.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base'
-require 'json'
-
-module Deimos
-  module SchemaClass
-    # Base Class of Record Classes generated from Avro.
-    class Record < Base
-
-      attr_accessor :tombstone_key, :_from_message
-
-      # Converts the object attributes to a hash which can be used for Kafka
-      # @return [Hash] the payload as a hash.
-      def to_h
-        if self.tombstone_key
-          { payload_key: self.tombstone_key&.as_json }
-        else
-          self.as_json
-        end
-      end
-
-      # Merge a hash or an identical schema object with this one and return a new object.
-      # @param other_hash [Hash,SchemaClass::Base]
-      # @return [SchemaClass::Base]
-      def merge(other_hash)
-        obj = self.class.new(**self.to_h.symbolize_keys)
-        other_hash.to_h.each do |k, v|
-          obj.send("#{k}=", v)
-        end
-        obj
-      end
-
-      # Element access method as if this Object were a hash
-      # @param key[String,Symbol]
-      # @return [Object] The value of the attribute if exists, nil otherwise
-      def [](key)
-        self.try(key.to_sym)
-      end
-
-      # @return [SchemaClass::Record]
-      def with_indifferent_access
-        self
-      end
-
-      # Returns the schema name of the inheriting class.
-      # @return [String]
-      def schema
-        raise MissingImplementationError
-      end
-
-      # Returns the namespace for the schema of the inheriting class.
-      # @return [String]
-      def namespace
-        raise MissingImplementationError
-      end
-
-      # Returns the full schema name of the inheriting class.
-      # @return [String]
-      def full_schema
-        "#{namespace}.#{schema}"
-      end
-
-      # Returns the schema validator from the schema backend
-      # @return [Deimos::SchemaBackends::Base]
-      def validator
-        Deimos.schema_backend(schema: schema, namespace: namespace)
-      end
-
-      # @return [Array<String>] an array of fields names in the schema.
-      def schema_fields
-        validator.schema_fields.map(&:name)
-      end
-
-      # Used internally within Deimos so that we don't crash on unknown fields that come from
-      # a backwards compatible schema.
-      # @param kwargs [Hash] the attributes to set on the new object.
-      # @return [SchemaClass::Record]
-      def self.new_from_message(**kwargs)
-        record = self.new
-        attrs = kwargs.select { |k, _v| record.respond_to?("#{k}=") }
-        self.new(_from_message: true, **attrs)
-      end
-
-      # @return [SchemaClass::Record]
-      # @param from_message [Boolean] whether it's being initialized from a real Avro message.
-      def self.initialize_from_value(value, from_message: false)
-        return nil if value.nil?
-
-        return value if value.is_a?(self)
-
-        if from_message
-          self.new_from_message(**value&.symbolize_keys || {})
-        else
-          self.new(**value&.symbolize_keys || {})
-        end
-      end
-    end
-  end
-end

data/lib/generators/deimos/schema_class/templates/schema_class.rb.tt

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# This file is autogenerated by Deimos, Do NOT modify
-<%= @modules.map { |m| "module #{m}"}.join('; ') %>
-  ### Primary Schema Class ###
-  <%=- @main_class_definition -%>
-
-<%= @modules.map { "end" }.join('; ') %>

data/lib/generators/deimos/schema_class/templates/schema_enum.rb.tt

@@ -1,13 +0,0 @@
-  # Autogenerated Schema for Enum at <%= @current_schema.namespace %>.<%= @current_schema.name %>
-  class <%= Deimos::SchemaBackends::AvroBase.schema_classname(@current_schema) %> < Deimos::SchemaClass::Enum
-    # @override
-    def symbols
-      %w(<%= @current_schema.symbols.join(' ') %>)
-    end
-
-    <% @current_schema.symbols.each do |symbol| %>
-    def <%= symbol.underscore %>?
-      @value == '<%= symbol %>'
-    end
-    <% end %>
-  end

data/lib/generators/deimos/schema_class/templates/schema_record.rb.tt

@@ -1,102 +0,0 @@
-  # Autogenerated Schema for Record at <%= @current_schema.namespace %>.<%= @current_schema.name %>
-  class <%= Deimos::SchemaBackends::AvroBase.schema_classname(@current_schema) %> < Deimos::SchemaClass::Record
-<% if @sub_schema_templates.present? -%>
-
-    ### Secondary Schema Classes ###
-  <%- @sub_schema_templates.each do |schema_template| -%>
-  <%=- schema_template.gsub(/^/, "  ") %>
-
-  <%- end -%>
-<% end -%>
-
-  <%- if @field_assignments.select{ |h| h[:is_schema_class] }.any? -%>
-    ### Attribute Readers ###
-  <%- @field_assignments.select{ |h| h[:is_schema_class] }.each do |method_definition| -%>
-    # @return [<%= method_definition[:deimos_type] %>]
-    attr_reader :<%= method_definition[:field].name %>
-  <%- end -%>
-
-<% end -%>
-<%- if @field_assignments.select{ |h| !h[:is_schema_class] }.any? -%>
-    ### Attribute Accessors ###
-  <%- @field_assignments.select{ |h| !h[:is_schema_class] }.each do |method_definition| -%>
-    # @return [<%= method_definition[:deimos_type] %>]
-    attr_accessor :<%= method_definition[:field].name %>
-  <%- end -%>
-
-<% end -%>
-<%- if @field_assignments.select{ |h| h[:is_schema_class] }.any? -%>
-    ### Attribute Writers ###
-  <%- @field_assignments.select{ |h| h[:is_schema_class] }.each do |method_definition| -%>
-    # @return [<%= method_definition[:deimos_type] %>]
-    def <%= method_definition[:field].name %>=(<%= method_definition[:method_argument] %>)
-    <%- if method_definition[:field_type] == :array -%>
-      @<%= method_definition[:field].name %> = values&.map do |value|
-        <%= method_definition[:field_initialization] %>
-      end
-    <%- elsif method_definition[:field_type] == :map -%>
-      @<%= method_definition[:field].name %> = values&.transform_values do |value|
-        <%= method_definition[:field_initialization] %>
-      end
-    <%- else -%>
-      @<%= method_definition[:field].name %> = <%= method_definition[:field_initialization] %>
-    <%- end -%>
-    end
-
-  <%- end -%>
-<% end -%>
-<%- if @field_assignments.select{ |h| h[:is_complex_union] }.any? -%>
-    <%- @field_assignments.select{ |h| h[:is_complex_union] }.each do |method_definition| -%>
-    # Helper method to determine which schema type to use for <%= method_definition[:field].name %>
-    # @param value [Hash, nil]
-    # @param from_message [Boolean] whether this was initialized from a real Avro message
-    # @return [Object, nil]
-    def initialize_<%= method_definition[:field].name %>_type(value, from_message: false)
-      return nil if value.nil?
-
-      klass = [<%= method_definition[:field].type.schemas.reject { |s| s.type_sym == :null }.select { |s| s.type_sym == :record }.map { |s| Deimos::SchemaBackends::AvroBase.schema_classname(s) }.join(', ') %>].find do |candidate|
-        fields = candidate.new.as_json.keys
-        (value.keys - fields).empty?
-      end
-
-      klass.initialize_from_value(value, from_message: self._from_message)
-    end
-
-    <%- end -%>
-<% end -%>
-    # @override
-    <%= @initialization_definition %>
-      @_from_message = _from_message
-      super
-<%- @fields.each do |field| -%>
-      self.<%= field.name %> = <%= field.name %>
-<% end -%>
-    end
-
-    # @override
-    def schema
-      '<%= @current_schema.name %>'
-    end
-
-    # @override
-    def namespace
-      '<%= @current_schema.namespace %>'
-    end
-<%- if @tombstone_assignment %>
-    def self.tombstone(key)
-      record = self.allocate
-<%- if @tombstone_assignment.present? -%>
-      <%= @tombstone_assignment %>
-<%- end -%>
-      record
-    end
-<%- end %>
-    # @override
-    def as_json(_opts={})
-      {
-<%- @fields.each do |field| -%>
-        <%= field_as_json(field) %>
-<% end -%>
-      }
-    end
-  end