active-dbml 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddecc1470323e8c7f6db8edef2bf5eac1503419eb7e58eaedfb24342ff97d15d
-  data.tar.gz: 52e7fc986872d0b5bb1322a7d20cb1ad784273d70afaa7a28c99b36011cb8657
+  metadata.gz: 8c3e035fb9fbf2783cffe7222a4675df48bf99a242c2b32a970244c0a6757640
+  data.tar.gz: c0b9e975256b8fa43b5f692f242423be0132ef8c3d4297be35e29e4509af12a9
 SHA512:
-  metadata.gz: cfd9f9f73ad07709ed7d4e5d4c6b95d55723a2f698dfbd175ef8d02d0d8a3aa4ad33ab64fa0435cf97ebebd89eea75798bb97f922765b5254e673b93e03bb1b7
-  data.tar.gz: 632639874f797f81ee84a26c1affbfbf71b67e43f5da9062e019548c8f9782684b71160a8b865fc53334224c09945b78a76c4f89f56aa3ca493863b3acdef3cf
+  metadata.gz: eca3036cced74a86f8df57295d74288af90830b36cf225248c6ed5f697a7dd14eda1f33b04ad9527e010180c05d55ebf74eb42635ae3359a7c65817e2ee16e5a
+  data.tar.gz: '0378667f33007af8d6d0b961bacfaad68dff98028c32241ae17b4c6ec04829acf42f5fdd37074d3840c78f25bf0ac036b6c25650a0503d382effbf21a54bf4f8'

data/lib/active/dbml/version.rb

@@ -1,5 +1,5 @@
 module Active
   module Dbml
-    VERSION = "0.2.1"
+    VERSION = "0.2.4"
   end
 end

data/lib/active/dbml.rb

@@ -11,45 +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)
-          # 抽象クラスはスキップ
-          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)
+      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")
-      # begin
-      # rescue => exception
-      #   Rails.logger.error exception
-      # end
     end
 
     private
@@ -62,29 +62,33 @@ module Active
 
       # 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
-              when :has_one
-                foreign_keys[foreign_key] = { destination: foreign_key_destination, relation_type: '-' }
-              when :has_many
-                foreign_keys[foreign_key] = { destination: foreign_key_destination, relation_type: '>' }
-              else
+        begin
+          foreign_key = association.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
+                when :has_one
+                  foreign_keys[foreign_key] = { destination: foreign_key_destination, relation_type: '-' }
+                when :has_many
+                  foreign_keys[foreign_key] = { destination: foreign_key_destination, relation_type: '>' }
+                else
+                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
-        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}"
+        rescue => exception
+          Rails.logger.error exception
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-dbml
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - ukmshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails