deimos-ruby 1.13.0 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57c2700b01b998f358cb4e96ee6e6b2c1c8c32936d741b2371182a6017f7adc
-  data.tar.gz: 440bf25b629ba34da51cd1c0a1b443858bcd4ca270fed800b6e277c050b0741f
+  metadata.gz: 59719a901339d9ebf5806a71e960fc68a7e75a1a217e6003215a42db04edb261
+  data.tar.gz: f9e8f274825a78298779061cf279b563d7ec40948e34ceff4458a51f51dea6b2
 SHA512:
-  metadata.gz: 05df77f7f8890959ea91817a7497c11348d3b68f349462275a1ffb133a1c8194d9ee2282ac3dbe14a389bd09f16f059c88b467c05fb959c1a334b7c3789ade92
-  data.tar.gz: bc8b8c832a7399a6c60a4a0ac71582aff4ff324d5a2c9bb2a73241bb64de3a958d09208e1c127d36e8b3c47077857224ec853aaea769ef00aaef88dc6e6cf0e9
+  metadata.gz: 62489d41c135b8141b45cf2a3b71717fc41bed0a22b26cfadd5ad22635d1f3a4ca770f7321cf5205159dd0a1f879ea6a9628623b3c5c3d9205a533d179ba7b52
+  data.tar.gz: 689f66152efe31e6b65c0eea5db5471c2a927708ca2bdcad9a859b32b85ecf1f789efefbee71059d9351c2b7a332b90be093330fd3e5be375d3c0a92b44c7837

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+- Some cleanup on the active_record generator
+- Fix crash with `test_consume_message` when using schema classes
+- Add `[]=` and `merge` methods on the base schema class
+
+# 1.13.2 - 2022-04-07
+
+- Fix an issue with generating schema classes for schemas containing an enum with default value 
+
+# 1.13.1 - 2022-04-06
+
+- Fix circular reference schema generation
+
 # 1.13.0 - 2022-03-30
 
 - Pass the Deimos logger to `AvroTurf::Messaging` for consistent logging

data/lib/deimos/schema_class/base.rb

@@ -29,6 +29,23 @@ module Deimos
         raise NotImplementedError
       end
 
+      # @param key [String|Symbol]
+      # @param val [Object]
+      def []=(key, val)
+        self.send("#{key}=", val)
+      end
+
+      # Merge a hash or an identical schema object with this one and return a new object.
+      # @param other_hash [Hash|SchemaClasses::Base]
+      # @return [SchemaClasses::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
+
       # :nodoc:
       def ==(other)
         comparison = other

data/lib/deimos/test_helpers.rb

@@ -188,7 +188,7 @@ module Deimos
                              &block)
       raise 'Cannot have both call_original and be given a block!' if call_original && block_given?
 
-      payload&.stringify_keys!
+      payload.stringify_keys! if payload.respond_to?(:stringify_keys!)
       handler_class = if handler_class_or_topic.is_a?(String)
                         _get_handler_class_from_topic(handler_class_or_topic)
                       else

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.13.0'
+  VERSION = '1.13.3'
 end

data/lib/generators/deimos/active_record/templates/migration.rb.tt

@@ -6,7 +6,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
     end
     create_table :<%= table_name %> do |t|
       <%- fields.each do |key| -%>
-      <%- next if %w(id message_id timestamp).include?(key.name) -%>
+      <%- next if %w(id message_id timestamp updated_at created_at).include?(key.name) -%>
       <%- sql_type = schema_base.sql_type(key)
          if %w(record array map).include?(sql_type)
            conn = ActiveRecord::Base.connection
@@ -15,9 +15,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       -%>
       t.<%= sql_type %> :<%= key.name %>
       <%- end -%>
-    end
 
-    # TODO add indexes as necessary
+      t.timestamps
+
+      # TODO add indexes as necessary
+    end
   end
 
   def down

data/lib/generators/deimos/active_record_generator.rb

@@ -72,7 +72,7 @@ module Deimos
       # :nodoc:
       def generate
         migration_template('migration.rb', "db/migrate/create_#{table_name.underscore}.rb")
-        template('model.rb', "app/models/#{table_name.underscore}.rb")
+        template('model.rb', "app/models/#{table_name.underscore.singularize}.rb")
       end
     end
   end

data/lib/generators/deimos/schema_class_generator.rb

@@ -63,7 +63,7 @@ module Deimos
           elsif schema.respond_to?(:items)
             [schema.items]
           elsif schema.respond_to?(:schemas)
-            schema.schemas
+            schema.schemas.reject { |s| s.class == Avro::Schema::PrimitiveSchema }
           else
             []
           end
@@ -73,17 +73,22 @@ module Deimos
         # @return [Array<Avro::Schema::NamedSchema>]
         def collect_all_schemas(schemas)
           schemas.dup.each do |schema|
+            next if @discovered_schemas.include?(schema)
+
+            @discovered_schemas << schema
             schemas.concat(collect_all_schemas(child_schemas(schema)))
           end
+
           schemas.select { |s| s.respond_to?(:name) }.uniq
         end
 
         # @param schema_base [Deimos::SchemaBackends::Base]
         # @param key_schema_base[Avro::Schema::NamedSchema]
         def generate_class_from_schema_base(schema_base, key_schema_base: nil)
+          @discovered_schemas = Set.new
           schemas = collect_all_schemas(schema_base.schema_store.schemas.values)
 
-          sub_schemas = schemas.reject { |s| s.name == schema_base.schema }
+          sub_schemas = schemas.reject { |s| s.name == schema_base.schema }.sort_by(&:name)
           @sub_schema_templates = sub_schemas.map do |schema|
             _generate_class_template_from_schema(schema)
           end
@@ -201,8 +206,8 @@ module Deimos
         return ' nil' if default == :no_default || default.nil? || IGNORE_DEFAULTS.include?(field.name)
 
         case field.type.type_sym
-        when :string
-          " '#{default}'"
+        when :string, :enum
+          " \"#{default}\""
         when :record
           schema_name = Deimos::SchemaBackends::AvroBase.schema_classname(field.type)
           class_instance = Utils::SchemaClass.instance(field.default, schema_name)

data/spec/generators/schema_class/my_schema_with_circular_reference_spec.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+# For testing the generated class.
+RSpec.describe Schemas::MySchemaWithCircularReference do
+  let(:payload_hash) do
+    {
+      properties: {
+        a_boolean: {
+          property: true
+        },
+        an_integer: {
+          property: 1
+        },
+        a_float: {
+          property: 4.5
+        },
+        a_string: {
+          property: 'string'
+        },
+        an_array: {
+          property: [1, 2, 3]
+        },
+        an_hash: {
+          property: {
+            a_key: 'a_value'
+          }
+        }
+      }
+    }
+  end
+
+  describe 'class initialization' do
+    it 'should initialize the class from keyword arguments' do
+      klass = described_class.new(properties: payload_hash[:properties])
+      expect(klass).to be_instance_of(described_class)
+    end
+
+    it 'should initialize the class from a hash with symbols as keys' do
+      klass = described_class.new(**payload_hash)
+      expect(klass).to be_instance_of(described_class)
+    end
+
+    it 'should initialize the class when missing attributes' do
+      payload_hash.delete(:properties)
+      klass = described_class.new(**payload_hash)
+      expect(klass).to be_instance_of(described_class)
+    end
+
+  end
+
+  describe 'base class methods' do
+    let(:klass) do
+      described_class.new(**payload_hash)
+    end
+
+    it 'should return the name of the schema and namespace' do
+      expect(klass.schema).to eq('MySchemaWithCircularReference')
+      expect(klass.namespace).to eq('com.my-namespace')
+      expect(klass.full_schema).to eq('com.my-namespace.MySchemaWithCircularReference')
+    end
+
+    it 'should return a json version of the payload' do
+      described_class.new(**payload_hash)
+      payload_h = {
+        'properties' => {
+          'a_boolean' => {
+            'property' => true
+          },
+          'an_integer' => {
+            'property' => 1
+          },
+          'a_float' => {
+            'property' => 4.5
+          },
+          'a_string' => {
+            'property' => 'string'
+          },
+          'an_array' => {
+            'property' => [1, 2, 3]
+          },
+          'an_hash' => {
+            'property' => {
+              'a_key' => 'a_value'
+            }
+          }
+        }
+      }
+
+      expect(klass.as_json).to eq(payload_h)
+    end
+
+    it 'should return a JSON string of the payload' do
+      s = '{"properties":{"a_boolean":{"property":true},"an_integer":{"property":1},"a_float":{"property":4.5},"a_string":{"property":"string"},"an_array":{"property":[1,2,3]},"an_hash":{"property":{"a_key":"a_value"}}}}'
+      expect(klass.to_json).to eq(s)
+    end
+  end
+end

data/spec/generators/schema_class/my_schema_with_complex_types_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe Schemas::MySchemaWithComplexTypes do
     end
 
     let(:schema_fields) do
-      %w(test_id test_float test_int_array test_optional_int test_string_array some_integer_map some_record some_optional_record some_record_array some_record_map some_enum_array some_optional_enum)
+      %w(test_id test_float test_int_array test_optional_int test_string_array some_integer_map some_record some_optional_record some_record_array some_record_map some_enum_array some_optional_enum some_enum_with_default)
     end
 
     it 'should return the name of the schema and namespace' do
@@ -90,14 +90,15 @@ RSpec.describe Schemas::MySchemaWithComplexTypes do
           'record_1' => { 'a_record_field' => 'field 5' },
           'record_2' => { 'a_record_field' => 'field 6' }
         },
-        'some_enum_array' => %w(sym1 sym2)
+        'some_enum_array' => %w(sym1 sym2),
+        'some_enum_with_default' => 'sym6'
       }
 
       expect(klass.as_json).to eq(payload_h)
     end
 
     it 'should return a JSON string of the payload' do
-      s = '{"test_id":"test id","test_float":1.2,"test_string_array":["abc","def"],"test_int_array":[123,456],"test_optional_int":123,"some_integer_map":{"int_1":1,"int_2":2},"some_record":{"a_record_field":"field 1"},"some_optional_record":{"a_record_field":"field 2"},"some_record_array":[{"a_record_field":"field 3"},{"a_record_field":"field 4"}],"some_record_map":{"record_1":{"a_record_field":"field 5"},"record_2":{"a_record_field":"field 6"}},"some_enum_array":["sym1","sym2"],"some_optional_enum":null}'
+      s = '{"test_id":"test id","test_float":1.2,"test_string_array":["abc","def"],"test_int_array":[123,456],"test_optional_int":123,"some_integer_map":{"int_1":1,"int_2":2},"some_record":{"a_record_field":"field 1"},"some_optional_record":{"a_record_field":"field 2"},"some_record_array":[{"a_record_field":"field 3"},{"a_record_field":"field 4"}],"some_record_map":{"record_1":{"a_record_field":"field 5"},"record_2":{"a_record_field":"field 6"}},"some_enum_array":["sym1","sym2"],"some_optional_enum":null,"some_enum_with_default":"sym6"}'
       expect(klass.to_json).to eq(s)
     end
   end

data/spec/generators/schema_class_generator_spec.rb

@@ -73,6 +73,32 @@ RSpec.describe Deimos::Generators::SchemaClassGenerator do
     end
   end
 
+  context 'with a Consumers Schema with a circular reference' do
+    before(:each) do
+      Deimos.configure do
+        consumer do
+          class_name 'ConsumerTest::MyConsumer'
+          topic 'MyTopic'
+          schema 'MySchemaWithCircularReference'
+          namespace 'com.my-namespace'
+          key_config field: :a_string
+        end
+      end
+      described_class.start
+    end
+
+    it 'should generate the correct number of classes' do
+      expect(files.length).to eq(1)
+    end
+
+    it 'should generate a schema class for my_schema_with_circular_reference' do
+      generated_path = files.select { |f| f =~ /my_schema_with_circular_reference/ }.first
+      expected_path = expected_files.select { |f| f =~ /my_schema_with_circular_reference/ }.first
+
+      expect(File.read(generated_path)).to eq(File.read(expected_path))
+    end
+  end
+
   context 'with a Producers Schema and a Key' do
     before(:each) do
       Deimos.configure do

data/spec/schema_classes/generated.rb

@@ -3,28 +3,6 @@
 # This file is autogenerated by Deimos, Do NOT modify
 module Schemas
   ### Secondary Schema Classes ###
-  # Autogenerated Schema for Enum at com.my-namespace.AnEnum
-  class AnEnum < Deimos::SchemaClass::Enum
-    # @return ['sym1', 'sym2']
-    attr_accessor :an_enum
-
-    # :nodoc:
-    def initialize(an_enum)
-      super
-      self.an_enum = an_enum
-    end
-
-    # @override
-    def symbols
-      %w(sym1 sym2)
-    end
-
-    # @override
-    def to_h
-      @an_enum
-    end
-  end
-
   # Autogenerated Schema for Record at com.my-namespace.ARecord
   class ARecord < Deimos::SchemaClass::Record
     ### Attribute Accessors ###
@@ -55,6 +33,28 @@ module Schemas
     end
   end
 
+  # Autogenerated Schema for Enum at com.my-namespace.AnEnum
+  class AnEnum < Deimos::SchemaClass::Enum
+    # @return ['sym1', 'sym2']
+    attr_accessor :an_enum
+
+    # :nodoc:
+    def initialize(an_enum)
+      super
+      self.an_enum = an_enum
+    end
+
+    # @override
+    def symbols
+      %w(sym1 sym2)
+    end
+
+    # @override
+    def to_h
+      @an_enum
+    end
+  end
+
   ### Primary Schema Class ###
   # Autogenerated Schema for Record at com.my-namespace.Generated
   class Generated < Deimos::SchemaClass::Record

data/spec/schema_classes/my_schema_with_circular_reference.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# This file is autogenerated by Deimos, Do NOT modify
+module Schemas
+  ### Secondary Schema Classes ###
+  # Autogenerated Schema for Record at com.my-namespace.Property
+  class Property < Deimos::SchemaClass::Record
+    ### Attribute Accessors ###
+    # @param value [Boolean, Integer, Integer, Float, Float, String, Array<Property>, Hash<String, Property>]
+    attr_accessor :property
+
+    # @override
+    def initialize(property: nil)
+      super
+      self.property = property
+    end
+
+    # @override
+    def schema
+      'Property'
+    end
+
+    # @override
+    def namespace
+      'com.my-namespace'
+    end
+
+    # @override
+    def to_h
+      {
+        'property' => @property
+      }
+    end
+  end
+
+  ### Primary Schema Class ###
+  # Autogenerated Schema for Record at com.my-namespace.MySchemaWithCircularReference
+  class MySchemaWithCircularReference < Deimos::SchemaClass::Record
+    ### Attribute Readers ###
+    # @return [Hash<String, Property>]
+    attr_reader :properties
+
+    ### Attribute Writers ###
+    # @param values [Hash<String, Property>]
+    def properties=(values)
+      @properties = values.transform_values do |value|
+        Property.initialize_from_value(value)
+      end
+    end
+
+    # @override
+    def initialize(properties: {})
+      super
+      self.properties = properties
+    end
+
+    # @override
+    def schema
+      'MySchemaWithCircularReference'
+    end
+
+    # @override
+    def namespace
+      'com.my-namespace'
+    end
+
+    # @override
+    def to_h
+      {
+        'properties' => @properties.transform_values { |v| v&.to_h }
+      }
+    end
+  end
+end

data/spec/schema_classes/my_schema_with_complex_types.rb

@@ -77,6 +77,28 @@ module Schemas
     end
   end
 
+  # Autogenerated Schema for Enum at com.my-namespace.YetAnotherEnum
+  class YetAnotherEnum < Deimos::SchemaClass::Enum
+    # @return ['sym5', 'sym6']
+    attr_accessor :yet_another_enum
+
+    # :nodoc:
+    def initialize(yet_another_enum)
+      super
+      self.yet_another_enum = yet_another_enum
+    end
+
+    # @override
+    def symbols
+      %w(sym5 sym6)
+    end
+
+    # @override
+    def to_h
+      @yet_another_enum
+    end
+  end
+
   ### Primary Schema Class ###
   # Autogenerated Schema for Record at com.my-namespace.MySchemaWithComplexTypes
   class MySchemaWithComplexTypes < Deimos::SchemaClass::Record
@@ -93,6 +115,8 @@ module Schemas
     attr_reader :some_enum_array
     # @return [nil, AnotherEnum]
     attr_reader :some_optional_enum
+    # @return [YetAnotherEnum]
+    attr_reader :some_enum_with_default
 
     ### Attribute Accessors ###
     # @param value [String]
@@ -145,6 +169,11 @@ module Schemas
       @some_optional_enum = AnotherEnum.initialize_from_value(value)
     end
 
+    # @param value [YetAnotherEnum]
+    def some_enum_with_default=(value)
+      @some_enum_with_default = YetAnotherEnum.initialize_from_value(value)
+    end
+
     # @override
     def initialize(test_id: nil,
                    test_float: nil,
@@ -157,7 +186,8 @@ module Schemas
                    some_record_array: nil,
                    some_record_map: nil,
                    some_enum_array: nil,
-                   some_optional_enum: nil)
+                   some_optional_enum: nil,
+                   some_enum_with_default: "sym6")
       super
       self.test_id = test_id
       self.test_float = test_float
@@ -171,6 +201,7 @@ module Schemas
       self.some_record_map = some_record_map
       self.some_enum_array = some_enum_array
       self.some_optional_enum = some_optional_enum
+      self.some_enum_with_default = some_enum_with_default
     end
 
     # @override
@@ -197,7 +228,8 @@ module Schemas
         'some_record_array' => @some_record_array.map { |v| v&.to_h },
         'some_record_map' => @some_record_map.transform_values { |v| v&.to_h },
         'some_enum_array' => @some_enum_array.map { |v| v&.to_h },
-        'some_optional_enum' => @some_optional_enum&.to_h
+        'some_optional_enum' => @some_optional_enum&.to_h,
+        'some_enum_with_default' => @some_enum_with_default&.to_h
       }
     end
   end

data/spec/schemas/com/my-namespace/MySchemaWithCircularReference.avsc

@@ -0,0 +1,39 @@
+{
+  "namespace": "com.my-namespace",
+  "name": "MySchemaWithCircularReference",
+  "type": "record",
+  "fields": [
+    {
+      "default": {},
+      "name": "properties",
+      "type": {
+        "type": "map",
+        "values": {
+          "fields": [
+            {
+              "name": "property",
+              "type": [
+                "boolean",
+                "int",
+                "long",
+                "float",
+                "double",
+                "string",
+                {
+                  "items": "Property",
+                  "type": "array"
+                },
+                {
+                  "type": "map",
+                  "values": "Property"
+                }
+              ]
+            }
+          ],
+          "name": "Property",
+          "type": "record"
+        }
+      }
+    }
+  ]
+}

data/spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc

@@ -101,6 +101,15 @@
           "symbols": ["sym3", "sym4"]
         }
       ]
+    },
+    {
+      "name": "some_enum_with_default",
+      "default": "sym6",
+      "type": {
+        "type": "enum",
+        "name": "YetAnotherEnum",
+        "symbols": ["sym5", "sym6"]
+      }
     }
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.3
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf
@@ -463,6 +463,7 @@ files:
 - spec/consumer_spec.rb
 - spec/deimos_spec.rb
 - spec/generators/active_record_generator_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
@@ -484,12 +485,14 @@ files:
 - spec/schema_classes/my_nested_schema.rb
 - spec/schema_classes/my_schema.rb
 - spec/schema_classes/my_schema_key.rb
+- spec/schema_classes/my_schema_with_circular_reference.rb
 - spec/schema_classes/my_schema_with_complex_types.rb
 - spec/schemas/com/my-namespace/Generated.avsc
 - spec/schemas/com/my-namespace/MyNestedSchema.avsc
 - spec/schemas/com/my-namespace/MySchema.avsc
 - spec/schemas/com/my-namespace/MySchemaCompound_key.avsc
 - spec/schemas/com/my-namespace/MySchemaWithBooleans.avsc
+- spec/schemas/com/my-namespace/MySchemaWithCircularReference.avsc
 - spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc
 - spec/schemas/com/my-namespace/MySchemaWithDateTimes.avsc
 - spec/schemas/com/my-namespace/MySchemaWithId.avsc
@@ -554,6 +557,7 @@ test_files:
 - spec/consumer_spec.rb
 - spec/deimos_spec.rb
 - spec/generators/active_record_generator_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
@@ -575,12 +579,14 @@ test_files:
 - spec/schema_classes/my_nested_schema.rb
 - spec/schema_classes/my_schema.rb
 - spec/schema_classes/my_schema_key.rb
+- spec/schema_classes/my_schema_with_circular_reference.rb
 - spec/schema_classes/my_schema_with_complex_types.rb
 - spec/schemas/com/my-namespace/Generated.avsc
 - spec/schemas/com/my-namespace/MyNestedSchema.avsc
 - spec/schemas/com/my-namespace/MySchema.avsc
 - spec/schemas/com/my-namespace/MySchemaCompound_key.avsc
 - spec/schemas/com/my-namespace/MySchemaWithBooleans.avsc
+- spec/schemas/com/my-namespace/MySchemaWithCircularReference.avsc
 - spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc
 - spec/schemas/com/my-namespace/MySchemaWithDateTimes.avsc
 - spec/schemas/com/my-namespace/MySchemaWithId.avsc