deimos-ruby 1.12.6 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945958ca7b49192f533a47eac766f4ca463d7ed85702b2c85b41fc22d8aaeef1
-  data.tar.gz: 8e7a6bf75f733d1903810a85e6ccf0185a868d8dbc07a1544d210bb160135417
+  metadata.gz: c57c2700b01b998f358cb4e96ee6e6b2c1c8c32936d741b2371182a6017f7adc
+  data.tar.gz: 440bf25b629ba34da51cd1c0a1b443858bcd4ca270fed800b6e277c050b0741f
 SHA512:
-  metadata.gz: 220de8bc9a38b50affdc56e0f25c6a185ffc1646cf39de21478b6906fc1fcf3bf20c197d4105132ecc7cae004e75498299ebc104fcb8d46f530fe8a67ac92883
-  data.tar.gz: fd89136dea1f76acb4de3bda22ee06e1d5ef88dc827a2690b588d2e84284584041818bbb257b71db99212586005a4b6818f89e8f627dc727e2eb8ba1b144c94f
+  metadata.gz: 05df77f7f8890959ea91817a7497c11348d3b68f349462275a1ffb133a1c8194d9ee2282ac3dbe14a389bd09f16f059c88b467c05fb959c1a334b7c3789ade92
+  data.tar.gz: bc8b8c832a7399a6c60a4a0ac71582aff4ff324d5a2c9bb2a73241bb64de3a958d09208e1c127d36e8b3c47077857224ec853aaea769ef00aaef88dc6e6cf0e9

data/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 1.13.0 - 2022-03-30
+
+- Pass the Deimos logger to `AvroTurf::Messaging` for consistent logging
+- Fix an issue with nullable enums not being included in the auto-generated schema class
+
 # 1.12.6 - 2022-03-14
 
 - Fix NameError when using Datadog Metrics

data/lib/deimos/schema_backends/avro_schema_registry.rb

@@ -28,7 +28,8 @@ module Deimos
           schemas_path: Deimos.config.schema.path,
           user: Deimos.config.schema.user,
           password: Deimos.config.schema.password,
-          namespace: @namespace
+          namespace: @namespace,
+          logger: Deimos.config.logger
         )
       end
     end

data/lib/deimos/version.rb

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

data/lib/generators/deimos/schema_class_generator.rb

@@ -62,6 +62,8 @@ module Deimos
             [schema.values]
           elsif schema.respond_to?(:items)
             [schema.items]
+          elsif schema.respond_to?(:schemas)
+            schema.schemas
           else
             []
           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)
+      %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)
     end
 
     it 'should return the name of the schema and namespace' do
@@ -77,6 +77,7 @@ RSpec.describe Schemas::MySchemaWithComplexTypes do
         'test_float' => 1.2,
         'test_string_array' => %w(abc def),
         'test_int_array' => [123, 456],
+        'some_optional_enum' => nil,
         'test_optional_int' => 123,
         'some_integer_map' => { 'int_1' => 1, 'int_2' => 2 },
         'some_record' => { 'a_record_field' => 'field 1' },
@@ -96,7 +97,7 @@ RSpec.describe Schemas::MySchemaWithComplexTypes do
     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"]}'
+      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}'
       expect(klass.to_json).to eq(s)
     end
   end

data/spec/schema_classes/my_schema_with_complex_types.rb

@@ -55,6 +55,28 @@ module Schemas
     end
   end
 
+  # Autogenerated Schema for Enum at com.my-namespace.AnotherEnum
+  class AnotherEnum < Deimos::SchemaClass::Enum
+    # @return ['sym3', 'sym4']
+    attr_accessor :another_enum
+
+    # :nodoc:
+    def initialize(another_enum)
+      super
+      self.another_enum = another_enum
+    end
+
+    # @override
+    def symbols
+      %w(sym3 sym4)
+    end
+
+    # @override
+    def to_h
+      @another_enum
+    end
+  end
+
   ### Primary Schema Class ###
   # Autogenerated Schema for Record at com.my-namespace.MySchemaWithComplexTypes
   class MySchemaWithComplexTypes < Deimos::SchemaClass::Record
@@ -69,6 +91,8 @@ module Schemas
     attr_reader :some_record_map
     # @return [Array<AnEnum>]
     attr_reader :some_enum_array
+    # @return [nil, AnotherEnum]
+    attr_reader :some_optional_enum
 
     ### Attribute Accessors ###
     # @param value [String]
@@ -116,6 +140,11 @@ module Schemas
       end
     end
 
+    # @param value [nil, AnotherEnum]
+    def some_optional_enum=(value)
+      @some_optional_enum = AnotherEnum.initialize_from_value(value)
+    end
+
     # @override
     def initialize(test_id: nil,
                    test_float: nil,
@@ -127,7 +156,8 @@ module Schemas
                    some_optional_record: nil,
                    some_record_array: nil,
                    some_record_map: nil,
-                   some_enum_array: nil)
+                   some_enum_array: nil,
+                   some_optional_enum: nil)
       super
       self.test_id = test_id
       self.test_float = test_float
@@ -140,6 +170,7 @@ module Schemas
       self.some_record_array = some_record_array
       self.some_record_map = some_record_map
       self.some_enum_array = some_enum_array
+      self.some_optional_enum = some_optional_enum
     end
 
     # @override
@@ -165,7 +196,8 @@ module Schemas
         'some_optional_record' => @some_optional_record&.to_h,
         '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_enum_array' => @some_enum_array.map { |v| v&.to_h },
+        'some_optional_enum' => @some_optional_enum&.to_h
       }
     end
   end

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

@@ -90,6 +90,17 @@
           "symbols": ["sym1", "sym2"]
         }
       }
+    },
+    {
+      "name": "some_optional_enum",
+      "type": [
+        "null",
+        {
+          "type": "enum",
+          "name": "AnotherEnum",
+          "symbols": ["sym3", "sym4"]
+        }
+      ]
     }
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.12.6
+  version: 1.13.0
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf