dynamic-active-model 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73b173018e9af4d94db62bf921d964015577605528495c893e7d905b735d11ab
-  data.tar.gz: e83792d3d00058247a4f7e7ed9c8676f0166e2cb6ebc8675cbf4c8badd58be76
+  metadata.gz: 6228c3f790ef52e03bb5303386c5c706c0a3f35ae79697c790dcd8ab85a6512d
+  data.tar.gz: b1c03bf64c5593bd7348709a404ab131dff69ba854ed1ecc26b1743395145aca
 SHA512:
-  metadata.gz: 5d1058ca2a6cad412c32367a695641b57e6be67979cd337c2d83e91a994cf5b4048dc5ca3f709eac7f39d1e63632e175a4fb1348467cb885cec90badc8452f48
-  data.tar.gz: 3180c4951dfbd32e5cc1dd398306b7dec0844b4e82d47495b3b97776ebac3794636bb64cc9c87db5994d9e157e5b4c4fa785e99636e1548773a624d7687904b2
+  metadata.gz: 6684da72fa55ca7fc969f7de3136df39afabfcc7b4ca5a5c6bd72b22f2e1f4644f15a9e15570d72d84ab4b147d387655e0683defc6fdddf6bc54e3f7fd232885
+  data.tar.gz: 357df514a4846cd8641fba61c1b8bd714c37f91545f79b373d559bd2bff7c47d7af83d4698a0ff05674e4fd3fd478ebf37d108234253340ade401c9a795f409f

data/lib/dynamic-active-model/foreign_key.rb

@@ -21,11 +21,11 @@ module DynamicActiveModel
     def initialize(model)
       @model = model
       @keys = {}
-      add(generate_foreign_key(model.table_name), model.table_name.underscore)
+      add(generate_foreign_key(model.table_name))
     end
 
-    def add(key, relationship_name)
-      @keys[key] = relationship_name
+    def add(key, relationship_name = nil)
+      @keys[key] = relationship_name || model.table_name.underscore
     end
 
     def generate_foreign_key(table_name)

data/lib/dynamic-active-model/relations.rb

@@ -13,7 +13,7 @@ module DynamicActiveModel
       end
     end
 
-    def add_foreign_key(table_name, foreign_key, relationship_name)
+    def add_foreign_key(table_name, foreign_key, relationship_name = nil)
       @foreign_keys[table_name].add(foreign_key, relationship_name)
     end
 
@@ -25,10 +25,10 @@ module DynamicActiveModel
         model.column_names.each do |column_name|
           next unless foreign_key_to_models[column_name.downcase]
 
-          foreign_key_to_models[column_name.downcase].each do |foreign_model, relationship_name, additional|
+          foreign_key_to_models[column_name.downcase].each do |foreign_model, relationship_name|
             next if foreign_model == model
 
-            add_relationships(relationship_name, model, foreign_model, column_name, additional)
+            add_relationships(relationship_name, model, foreign_model, column_name)
           end
         end
       end
@@ -36,14 +36,9 @@ module DynamicActiveModel
 
     private
 
-    def add_relationships(relationship_name, model, belongs_to_model, foreign_key, additional)
+    def add_relationships(relationship_name, model, belongs_to_model, foreign_key)
       add_belongs_to(relationship_name, model, belongs_to_model, foreign_key)
-      add_has_many(
-        additional ? relationship_name : nil,
-        belongs_to_model,
-        model,
-        foreign_key
-      )
+      add_has_many(relationship_name, belongs_to_model, model, foreign_key)
     end
 
     def add_belongs_to(relationship_name, model, belongs_to_model, foreign_key)
@@ -56,10 +51,8 @@ module DynamicActiveModel
     end
 
     def add_has_many(relationship_name, model, has_many_model, foreign_key)
-      relationship_name = relationship_name ? (relationship_name + '_') : ''
-      relationship_name += has_many_model.table_name
       model.has_many(
-        relationship_name.underscore.pluralize.to_sym,
+        generate_has_many_association_name(relationship_name, model, has_many_model),
         class_name: has_many_model.name,
         foreign_key: foreign_key,
         primary_key: has_many_model.primary_key
@@ -68,13 +61,21 @@ module DynamicActiveModel
 
     def create_foreign_key_to_model_map
       @foreign_keys.values.each_with_object({}) do |foreign_key, hsh|
-        additional = false
         foreign_key.keys.each do |key, relationship_name|
           hsh[key.downcase] ||= []
-          hsh[key.downcase] << [foreign_key.model, relationship_name, additional]
-          additional = true
+          hsh[key.downcase] << [foreign_key.model, relationship_name]
         end
       end
     end
+
+    def generate_has_many_association_name(relationship_name, model, has_many_model)
+      name =
+        if relationship_name == model.table_name.underscore
+          has_many_model.table_name
+        else
+          relationship_name + '_' + has_many_model.table_name
+        end
+      name.underscore.pluralize.to_sym
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic-active-model
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Doug Youch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord