deimos-ruby 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe5f643562c8cebecd6991d31222c3809115cee282b2f8fcef0e36b1b19f972
-  data.tar.gz: a9de46de1265d73a7d94e94f24c43a0c210687b93f4862a7a2fefee73c40fb89
+  metadata.gz: f51b89a9bf8a619db4c9294092b5e7b4f78c075c35f4aa2bc39c547da99ec67c
+  data.tar.gz: e4da7d718fff36bb28ca249a788fbf78ad5f980e9fa32983ecf019cd53cd40b8
 SHA512:
-  metadata.gz: 0365bcefe9cd82d91bf9f5eb587f6f72725f0ef981336722571465e8308d615b69fabc7516755761ebdad473ba1b8e0027e1546a81076d1bdf5c9c8cfe5e9d0f
-  data.tar.gz: 5e4f15b372217ac878b9c82ab606c90e16a0a370947956bef2b6aae5ffa4ac8c4739ff74e10d7bf442c29968ee0bba0135624d7be2966d51b85d8c777f2e2573
+  metadata.gz: 7ac325f814c79a29985cba298ef0cde7daa4b0c561ce155eee22dab15470b2c1a933f5baa0181fd9375500062fa89fc846dcb01504d10466645275fa3644ec53
+  data.tar.gz: 021dd749b7040b136f84fcc7142a207847a982e2ab889439486af4b5dc4267ed4eed25f4d71c9a6496c51d8e84f3bedc6220e3dbd1f0a0133bca8c8cc1fe24e5

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 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

data/lib/deimos/version.rb

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

data/lib/generators/deimos/schema_class_generator.rb

@@ -88,7 +88,7 @@ module Deimos
           @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
@@ -206,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_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/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_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/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.1
+  version: 1.13.2
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf