dynamic-active-model 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f8e2e549471211eb31b49e3e20b8a72e1c47eb2e9c857bcb4a85c11e470558
-  data.tar.gz: 70b7edd5ecf3dbe9c164593f1866eb2bd12a9cb89b5c609898052b8ad3f5eee2
+  metadata.gz: 7040fc598ff4554e76a3c57dcd5fc32c37fc2592f0567af929c1a5f93319313a
+  data.tar.gz: 8601378b7117b7d612db65698025879a31a6e432952a44f2c77cab2ba027e7ca
 SHA512:
-  metadata.gz: 90b12783def828937bef5898a020c6e8639fbf72c83a8649f5227077fce087d1fc619bd25f472b70b83dcf6a551bc97386f57c86b76f4fdc401fbe8c92336c11
-  data.tar.gz: c3316c0eb2a01b52e3b2628c913ce1d1d53c6ba7f67a34cbfb879caa820509d5ab676e3a2f78c771ca40a3405f960e65bea4ca9674540fca3192808d32053926
+  metadata.gz: a598ae139fbe14648219525a1250061089a960978b346ff40a05f392fbd6313b69ba9a8640cb17753b7dab8086d1b2d4d7c4974f9006084d57561eabeea48f3c
+  data.tar.gz: a98ea335292e8ea96d4c7bd9123749ed425dcc8e6a0da7eaf6bd9d8a188c08859fa4bf04b2d44c81920f75aa64e7f9282ff5698a2c6e0c0716949e0546da9927

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

@@ -76,7 +76,7 @@ module DynamicActiveModel
 
       @join_tables.each do |join_table_model|
         models = join_table_model.column_names.map do |column_name|
-          foreign_key_to_models[column_name.downcase]&.first&.first
+          foreign_key_to_models.dig(column_name.downcase, 0, 0)
         end.compact
         add_has_and_belongs_to_many(join_table_model, models) if models.size == 2
       end

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

@@ -42,16 +42,17 @@ module DynamicActiveModel
         str << "  self.table_name = #{@model.table_name.to_sym.inspect}\n"
       end
       all_has_many_relationships.each do |assoc|
-        append_association!(str, assoc)
+        append_association!(str, 'has_many', assoc, has_many_association_options(assoc))
       end
       all_belongs_to_relationships.each do |assoc|
-        append_association!(str, assoc)
+        append_association!(str, 'belongs_to', assoc, belongs_to_association_options(assoc))
       end
       all_has_one_relationships.each do |assoc|
-        append_association!(str, assoc)
+        append_association!(str, 'has_one', assoc, has_one_association_options(assoc))
       end
       all_has_and_belongs_to_many_relationships.each do |assoc|
-        append_association!(str, assoc)
+        append_association!(str, 'has_and_belongs_to_many', assoc,
+                            has_and_belongs_to_many_association_options(assoc))
       end
       str << "end\n"
       str
@@ -85,35 +86,13 @@ module DynamicActiveModel
 
     # Appends an association definition to the source string
     # @param str [String] The source string being built
+    # @param assoc_type [String] The association macro, e.g. 'has_many'
     # @param assoc [ActiveRecord::Reflection::AssociationReflection] The association to add
-    def append_association!(str, assoc)
-      assoc_type = case assoc
-                   when ActiveRecord::Reflection::HasManyReflection
-                     'has_many'
-                   when ActiveRecord::Reflection::BelongsToReflection
-                     'belongs_to'
-                   when ActiveRecord::Reflection::HasOneReflection
-                     'has_one'
-                   when ActiveRecord::Reflection::HasAndBelongsToManyReflection
-                     'has_and_belongs_to_many'
-                   end
-
-      association_options = case assoc_type
-                            when 'has_many'
-                              has_many_association_options(assoc)
-                            when 'belongs_to'
-                              belongs_to_association_options(assoc)
-                            when 'has_one'
-                              has_one_association_options(assoc)
-                            when 'has_and_belongs_to_many'
-                              has_and_belongs_to_many_association_options(assoc)
-                            end
-
+    # @param association_options [Hash] Non-default options to write; nil values are skipped
+    def append_association!(str, assoc_type, assoc, association_options)
       str << "  #{assoc_type} #{assoc.name.inspect}"
-      unless association_options.empty?
-        association_options.each do |name, value|
-          str << ", #{name}: '#{value}'"
-        end
+      association_options.compact.each do |name, value|
+        str << ", #{name}: '#{value}'"
       end
       str << "\n"
     end
@@ -166,7 +145,7 @@ module DynamicActiveModel
     def has_and_belongs_to_many_association_options(assoc)
       options = {}
       options[:join_table] = assoc.options[:join_table] if assoc.options[:join_table]
-      unless assoc.options[:class_name].underscore.singularize == assoc.name.to_s
+      unless assoc.options[:class_name].underscore.pluralize == assoc.name.to_s
         options[:class_name] =
           assoc.options[:class_name]
       end
@@ -178,19 +157,5 @@ module DynamicActiveModel
     def default_foreign_key_name
       "#{@model.table_name.underscore.singularize}_id"
     end
-
-    # Generates the default foreign key for the associated model
-    # @param assoc [ActiveRecord::Reflection::HasAndBelongsToManyReflection] The association
-    # @return [String] The generated foreign key name
-    def generate_association_foreign_key(assoc)
-      "#{assoc.options[:class_name].underscore.singularize}_id"
-    end
-
-    # Gets a constant by its fully qualified name
-    # @param class_name [String] The fully qualified class name
-    # @return [Class] The resolved class
-    def const_get(class_name)
-      class_name.split('::').inject(Object) { |mod, name| mod.const_get(name) }
-    end
   end
 end

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

@@ -2,5 +2,5 @@
 
 module DynamicActiveModel
   # Gem version, bumped by release-please
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic-active-model
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Doug Youch