deimos-ruby 1.14.5 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872f449652ea05dfe9aabf1b144391b98d63fa03b193c7160931748b514ff534
-  data.tar.gz: cf6e3b54b909d1731a06d68fbfa1f7dbad5d78ce4e7de01bf712161061515ceb
+  metadata.gz: a0c3d1a3e60a5e71ea4fd21de8b8f2ed9db064f8ea4f26891169f5e7690ad75c
+  data.tar.gz: afe45152f6834e529d1d9e63b5fd6e2f307d072464224f9e29d8d098d7053ca2
 SHA512:
-  metadata.gz: e2737082fbada9724a9e94615308e4f7cdb17a36b8202dd1bf1f83c46e6378f5a6724eeb9e4cae5b86beabff94246ae90619b4b8e55f06064adf8dcd42e2ef14
-  data.tar.gz: 70b73b45dcb4b881bfa2c50aae105af62caf2d4aad2b103a807c1d776477c49621650434ae5aba9358b7cb1f977fe246e831f655bc7bfde902417bcf9a0b9ce5
+  metadata.gz: b1359ca3c178171f7999edb2dd43385a04a119489bfc4efa4f5811462c23203b88a1ea5661727718a6142dfc725137592166bef5df36d22fc1a4a6a7ff4a6bdc
+  data.tar.gz: 7629b9f1e75dad6ef0862958e448e7b750da434e62d0be754def299919a49f6ac3d0937588bf004c08ef331ea66aba9dcad989906781465c4a4c51c801acca51

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 1.14.6 - 2022-06-21
+
+- Add `generate_namespace_folders` to configuration; this will automatically generate subfolders to the `schemas` folder so that you can have different schemas with the same name but different namespaces generate separate classes.
+
 # 1.14.5 - 2022-06-21
 
 - Fix crash with the tracer when error happens in decoding a message during batch consuming

data/docs/CONFIGURATION.md

@@ -194,6 +194,8 @@ schema.password|nil|Basic auth password.
 schema.path|nil|Local path to find your schemas.
 schema.use_schema_classes|false|Set this to true to use generated schema classes in your application.
 schema.generated_class_path|`app/lib/schema_classes`|Local path to generated schema classes.
+schema.nest_child_schemas|false|Set to true to nest subschemas within the generated class for the parent schema.
+schema.generate_namespace_folders|false|Set to true to generate folders for schemas matching the last part of the namespace.
 
 ## Database Producer Configuration
 

data/lib/deimos/config/configuration.rb

@@ -347,6 +347,10 @@ module Deimos
       # Set to false to generate child schemas as their own files.
       # @return [Boolean]
       setting :nest_child_schemas, true
+
+      # Set to true to generate folders matching the last part of the schema namespace.
+      # @return [Boolean]
+      setting :generate_namespace_folders, false
     end
 
     # The configured metrics provider.

data/lib/deimos/version.rb

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

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

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

data/lib/generators/deimos/schema_class_generator.rb

@@ -108,9 +108,17 @@ module Deimos
         # @param key_schema_base [Avro::Schema::NamedSchema, nil]
         def write_file(schema, key_schema_base)
           class_template = _generate_class_template_from_schema(schema, key_schema_base)
+          @modules = ['Schemas']
+          namespace_folder = schema.namespace.split('.').last
+          if Deimos.config.schema.generate_namespace_folders
+            @modules.push(namespace_folder.underscore.classify)
+          end
           @main_class_definition = class_template
 
           file_prefix = schema.name.underscore.singularize
+          if Deimos.config.schema.generate_namespace_folders
+            file_prefix = "#{namespace_folder}/#{file_prefix}"
+          end
           filename = "#{Deimos.config.schema.generated_class_path}/#{file_prefix}.rb"
           template(SCHEMA_CLASS_FILE, filename, force: true)
         end

data/spec/generators/schema_class_generator_spec.rb

@@ -11,7 +11,7 @@ end
 
 RSpec.describe Deimos::Generators::SchemaClassGenerator do
   let(:schema_class_path) { 'spec/app/lib/schema_classes' }
-  let(:files) { Dir["#{schema_class_path}/*.rb"].map { |f| [f, File.read(f)]}.to_h }
+  let(:files) { Dir["#{schema_class_path}/**/*.rb"].map { |f| [f, File.read(f)]}.to_h }
 
   before(:each) do
     Deimos.config.reset!
@@ -215,6 +215,15 @@ RSpec.describe Deimos::Generators::SchemaClassGenerator do
       end
     end
 
+    context 'with namespace folders' do
+      it 'should generate the correct classes' do
+        Deimos.with_config('schema.generate_namespace_folders' => true) do
+          described_class.start
+          expect(files).to match_snapshot('namespace_folders', snapshot_serializer: MultiFileSerializer)
+        end
+      end
+    end
+
     context 'nested true' do
       it 'should generate the correct classes' do
         Deimos.with_config('schema.nest_child_schemas' => true) do