activerecord-exclusive-arc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e01ec54aa223f1e36904771298125b451731632cca44ae6d0d15627cbcf879
-  data.tar.gz: 97990f81b596836909e67609a2d9745d6be13f0852373829656d2218454f6029
+  metadata.gz: b3824d9259213c59c55ee5287cc9bd3b8e76924be405a269c6752434811c2599
+  data.tar.gz: 2e8b6ad42b5b4cad774e7ef56e21c54fa9a0e8223fce05762ecb60cf791b4b87
 SHA512:
-  metadata.gz: 448c3910176f2f9163d0cfac054482fa2c6dc96b3e67d1093668626e2dbc94cfdeb59adcc371f3890af35541f9e4db7b8f4db0cd0108db09cd6bfe68de4954be
-  data.tar.gz: ec36d41ce0896b6505f76eb5112dd999db1cb334d9d0b956d82d7f043efba1e4999ef32ddbf0a384c140b5dcba01dfbaf7606b4638ac94381fbc8408751a7d3a
+  metadata.gz: 28d0736dfd28b87e367ab62d9ac1c39cc556bc76d999b390a4b6220b88ac566bcac66c6fda36b0237a5442180b44602c72e6ef837ed99a4f281b0e42da4aac81
+  data.tar.gz: e62da6627153c7853dde9bba360ec654ea28baf088bb4db6261fc77dd88fc78d1bf4b5f5d2c2d777682d0233e7f6ab72567ed1790e8813670b4964ec69a063a8

data/lib/exclusive_arc/version.rb

@@ -1,3 +1,3 @@
 module ExclusiveArc
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/generators/exclusive_arc_generator.rb

@@ -31,10 +31,16 @@ class ExclusiveArcGenerator < ActiveRecord::Generators::Base
       model_file_path,
       class_name.demodulize,
       <<~RB
-        #{indents}include ExclusiveArc::Model
         #{indents}has_exclusive_arc #{model_exclusive_arcs}
       RB
     )
+    inject_into_class(
+      model_file_path,
+      class_name.demodulize,
+      <<~RB
+        #{indents}include ExclusiveArc::Model
+      RB
+    )
   end
 
   no_tasks do
@@ -44,12 +50,30 @@ class ExclusiveArcGenerator < ActiveRecord::Generators::Base
       string
     end
 
+    def add_references
+      belong_tos.map do |reference|
+        add_reference(reference)
+      end.join("\n")
+    end
+
     def add_reference(reference)
-      string = "add_reference :#{table_name}, :#{reference}"
-      type = reference_type(reference)
-      string += ", type: :#{type}" unless /int/.match?(type.downcase)
-      string += ", foreign_key: true" unless options[:skip_foreign_key_constraints]
-      string += ", index: {where: \"#{reference}_id IS NOT NULL\"}" unless options[:skip_foreign_key_indexes]
+      foreign_key = foreign_key_name(reference)
+      type = reference_type(reference).downcase
+      if foreign_key == "#{reference}_id"
+        string = "    add_reference :#{table_name}, :#{reference}"
+        string += ", type: :#{type}" unless /int/.match?(type)
+        string += ", foreign_key: true" unless options[:skip_foreign_key_constraints]
+        string += ", index: {where: \"#{foreign_key} IS NOT NULL\"}" unless options[:skip_foreign_key_indexes]
+      else
+        string = "    add_column :#{table_name}, :#{foreign_key}, :#{type}"
+        unless options[:skip_foreign_key_constraints]
+          referenced_table_name = reference_table_name(reference)
+          string += "\n    add_foreign_key :#{table_name}, :#{referenced_table_name}, column: :#{foreign_key}"
+        end
+        unless options[:skip_foreign_key_indexes]
+          string += "\n    add_index :#{table_name}, :#{foreign_key}, where: \"#{foreign_key} IS NOT NULL\""
+        end
+      end
       string
     end
 
@@ -62,15 +86,38 @@ class ExclusiveArcGenerator < ActiveRecord::Generators::Base
     end
 
     def reference_type(reference)
-      klass = reference.singularize.classify.constantize
+      klass = class_name.constantize.reflections[reference].klass
       klass.columns.find { |col| col.name == klass.primary_key }.sql_type
     rescue
       "bigint"
     end
 
+    def reference_table_name(reference)
+      class_name.constantize.reflections[reference].klass.table_name
+    rescue
+      reference.tableize
+    end
+
+    def foreign_key_name(reference)
+      class_name.constantize.reflections[reference].foreign_key
+    rescue
+      "#{reference}_id"
+    end
+
+    def add_check_constraint
+      return if options[:skip_check_constraint]
+      <<-RUBY
+    add_check_constraint(
+      :#{table_name},
+      "#{check_constraint}",
+      name: :#{arc}
+    )
+      RUBY
+    end
+
     def check_constraint
       reference_checks = belong_tos.map do |reference|
-        "CASE WHEN #{reference}_id IS NULL THEN 0 ELSE 1 END"
+        "CASE WHEN #{foreign_key_name(reference)} IS NULL THEN 0 ELSE 1 END"
       end
       condition = options[:optional] ? "<= 1" : "= 1"
       "(#{reference_checks.join(" + ")}) #{condition}"

data/lib/generators/templates/migration.rb.erb

@@ -1,10 +1,6 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
-    <% belong_tos.each do |reference| %><%= add_reference(reference) %>
-    <% end %><% unless options[:skip_check_constraint] %>add_check_constraint(
-      :<%= table_name %>,
-      "<%= check_constraint %>",
-      name: :<%= arc %>
-    )<% end %>
+<%= add_references %>
+<%= add_check_constraint %>
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-exclusive-arc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - justin talbott
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-08 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord