active-dbml 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8221dbee838a7444be8ba17b7e186639411170beed4acd2f6096bc4ce5d822f2
-  data.tar.gz: 2ef8374f20e734b3f0c34180cce1cb542d2e875998ff0693676728b356acbfbc
+  metadata.gz: ddecc1470323e8c7f6db8edef2bf5eac1503419eb7e58eaedfb24342ff97d15d
+  data.tar.gz: 52e7fc986872d0b5bb1322a7d20cb1ad784273d70afaa7a28c99b36011cb8657
 SHA512:
-  metadata.gz: 062d762e36de8e9e80996ef58f289930fb28955c5dfb67a069bb6b28030ad3188b69660b6629283b1b9e203304410b70e41b9f806ff954828cdff2ad2ae90de0
-  data.tar.gz: bd8626a3d86dfa3004c5495084a81164cb108d93707e1ebae45e04b8adf4bab35d3428a9d08fe60ce3f2eb9071b5d90bf8ab6466e322da93cf4875a314205a73
+  metadata.gz: cfd9f9f73ad07709ed7d4e5d4c6b95d55723a2f698dfbd175ef8d02d0d8a3aa4ad33ab64fa0435cf97ebebd89eea75798bb97f922765b5254e673b93e03bb1b7
+  data.tar.gz: 632639874f797f81ee84a26c1affbfbf71b67e43f5da9062e019548c8f9782684b71160a8b865fc53334224c09945b78a76c4f89f56aa3ca493863b3acdef3cf

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.1"
   end
 end

data/lib/active/dbml.rb

@@ -17,6 +17,9 @@ module Active
 
       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)
 
@@ -43,6 +46,10 @@ module Active
       end
 
       dbml_output.join("\n")
+      # begin
+      # rescue => exception
+      #   Rails.logger.error exception
+      # end
     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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active-dbml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - ukmshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     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: