fix: annotating nested models & virtual models (#18)

swiknaba · Sep 23, 2024 · 3beaf3e · 3beaf3e
1 parent 273313c
commit 3beaf3e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/cli/commands/new_app/files/db_rake.rb b/lib/cli/commands/new_app/files/db_rake.rb
@@ -175,6 +175,8 @@ def self.content(app_name, db_name)
                     modules = model_file.gsub("app/models/", "").gsub(".rb", "").split("/").map { |mod| Zeitwerk::Inflector.new.camelize(mod, model_path) }
                     const_name = modules.join("::")
                     model_klass = Object.const_get(const_name)
+                    next unless model_klass.ancestors.include?(Kirei::Model)
+
                     table_name = model_klass.table_name
                     schema = db.schema(table_name)
 
@@ -183,7 +185,7 @@ def self.content(app_name, db_name)
                     file_contents = File.read(model_path)
 
                     # Remove existing schema info comments if present
-                    updated_contents = file_contents.sub(/# == Schema Info\\n(.*?)(\\n#\\n)?\\n(?=\\s*class)/m, "")
+                    updated_contents = file_contents.sub(/# == Schema Info\\n(.*?)(\\n#\\n)?\\n(?=\\s*(?:class|module))/m, "")
 
                     # Insert the new schema comments before the module/class definition
                     first_const = modules.first