active-dbml 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8221dbee838a7444be8ba17b7e186639411170beed4acd2f6096bc4ce5d822f2
-  data.tar.gz: 2ef8374f20e734b3f0c34180cce1cb542d2e875998ff0693676728b356acbfbc
+  metadata.gz: d9ba556246418cfc6c5280d60b646b824fe76c2118fc8506e7b82bba21b29ae5
+  data.tar.gz: e8d7e89de5d7bb090a8388e6a97c946cd349d032d6ad8ae701f089c15f340d36
 SHA512:
-  metadata.gz: 062d762e36de8e9e80996ef58f289930fb28955c5dfb67a069bb6b28030ad3188b69660b6629283b1b9e203304410b70e41b9f806ff954828cdff2ad2ae90de0
-  data.tar.gz: bd8626a3d86dfa3004c5495084a81164cb108d93707e1ebae45e04b8adf4bab35d3428a9d08fe60ce3f2eb9071b5d90bf8ab6466e322da93cf4875a314205a73
+  metadata.gz: ae0f2a620ca97b9694801c1ca7ed3693a38aadf3bd66317272f2020d56f794be494e63bec73b9cb9dfb9b49306c037efd2e16190b8a38197466210da7c9ef4ec
+  data.tar.gz: e15bff16d349029e10a603e77462a3f0a965c06b967f83ee27ff505fb18701f0289c37d6dbd93a525a8a78059050b29bea26f666fff11c102de7d74a85cd5d08

data/README.md

@@ -13,6 +13,12 @@ ActiveDBML is open for improvements. We eagerly welcome and encourage pull reque
 - [English](/)
 - [日本語](/docs/ja.md)
 
+## Support
+Supports Rails 6 or higher.
+
+## Future plans
+- Support for Polymorphic associations.
+
 
 ## Usage
 

data/lib/active/dbml/version.rb

@@ -1,5 +1,5 @@
 module Active
   module Dbml
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/active/dbml.rb

@@ -11,38 +11,45 @@ module Active
     end
 
     def self.generate_dbml(models)
-      dbml_output = []
-      # 出力済みのEnumを追跡
-      enums_generated = Set.new
-
-      models.each do |model|
-        if ActiveRecord::Base.connection.table_exists?(model.table_name)
-          primary_key = get_primary_key(model)
-          foreign_keys = get_foreign_keys(model)
-
-          dbml_output << "Table #{model.table_name} {"
-
-          # Enumを取得
-          defined_enums = model.defined_enums.keys
-
-          # カラム情報を生成
-          generate_columns(dbml_output, model, primary_key, foreign_keys, defined_enums)
-
-          # Index情報の取得
-          generate_indexes(dbml_output, model)
-
-          # テーブルコメントの取得
-          generate_table_comment(dbml_output, model)
-
-          # テーブルを閉じる
-          dbml_output << "}\n"
-
-          # Enumの詳細を取得
-          generate_enums(dbml_output, model, enums_generated)
+      begin
+        dbml_output = []
+        # 出力済みのEnumを追跡
+        enums_generated = Set.new
+  
+        models.each do |model|
+          if ActiveRecord::Base.connection.table_exists?(model.table_name)
+            # 抽象クラスはスキップ
+            next if model.abstract_class?
+
+            primary_key = get_primary_key(model)
+            foreign_keys = get_foreign_keys(model)
+  
+            dbml_output << "Table #{model.table_name} {"
+  
+            # Enumを取得
+            defined_enums = model.defined_enums.keys
+  
+            # カラム情報を生成
+            generate_columns(dbml_output, model, primary_key, foreign_keys, defined_enums)
+  
+            # Index情報の取得
+            generate_indexes(dbml_output, model)
+  
+            # テーブルコメントの取得
+            generate_table_comment(dbml_output, model)
+  
+            # テーブルを閉じる
+            dbml_output << "}\n"
+  
+            # Enumの詳細を取得
+            generate_enums(dbml_output, model, enums_generated)
+          end
         end
+  
+        dbml_output.join("\n")
+      rescue => exception
+        Rails.logger.error exception
       end
-
-      dbml_output.join("\n")
     end
 
     private
@@ -53,12 +60,14 @@ module Active
     def self.get_foreign_keys(model)
       foreign_keys = {}
 
-      model.reflect_on_all_associations.each do |association|
-        case association.macro
-        when :belongs_to
-          foreign_key = association.options[:foreign_key]
-          foreign_key_destination = "#{association.plural_name}.#{association.class_name.constantize.primary_key}"
+      # get foreign key only belongs_to association
+      model.reflect_on_all_associations(:belongs_to).each do |association|
+        foreign_key = association.options[:foreign_key]
+        foreign_key_destination = "#{association.plural_name}.#{association.class_name.constantize.primary_key}"
 
+        # NOTE: Check model type
+        # Skip anything other than ActiveRecord::Base
+        if association.class_name.constantize < ActiveRecord::Base
           association.class_name.constantize.reflect_on_all_associations.each do |relation_association|
             if model.table_name.eql?(relation_association.plural_name)
               case relation_association.macro
@@ -70,6 +79,12 @@ module Active
               end
             end
           end
+        elsif association.class_name.constantize < ActiveYaml::Base
+          puts "⚠ #{association.class_name.constantize} is an ActiveYaml model."
+        elsif association.class_name.constantize < ActiveHash::Base
+          puts "⚠ #{association.class_name.constantize} is an ActiveHash model."
+        else
+          puts "⚠ Cannot determine type of #{association.class_name.constantize}"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-dbml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ukmshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6'
 description: Active::DBML is a new, useful Ruby gem designed to streamline database
   development.
 email: