dynamic-active-model 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52adb8ab9614c47a5bdd4fe87a8ac14078684b37dc4caff9baebe2fd8bb65718
-  data.tar.gz: 28fc1d420cd7d5a2f08c45213bfc54b3c8d8327db757d502c1eab4cfbedbb896
+  metadata.gz: 1180fa600bbb8f28bf7f2be26b9150305b9fb4486c1229bbee4d1e7f2d461018
+  data.tar.gz: 95a4e5c46ae8990dcf2250fee577f2c437a2f382229077713a33ae9575576812
 SHA512:
-  metadata.gz: fab444d391e6c7082692281318750004fb428f8b6e71b312abe46932987481c0f2fbd1e9a01256fec548fb6fbff28fcc0c3a0c9ea04183628a16285e8e3cd454
-  data.tar.gz: 7c9fd888c54eaf0b2f92c72e98d8e8580fef3f7af0d61c068b71bd94f424378cc27ea9bd0ac87b5edbab66034953acb173fd95c59d7eb760754693be6a40f63e
+  metadata.gz: 89f510068c30b03a9eb4c9d82c57dd06c052088a9314c6c135fbde78dba8586826cc2e5f99de17f1e5bd4480d2216975bc53bd13a3222fe784daee9f5c33832d
+  data.tar.gz: 21b7af7eb2804253c4b214148d23ff86fd41c6a605ef7b86e219f0d141358f10882d1a13ab02811ea0061701a7d4620ffd6e043e36982019738aafa0276f66e5

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

@@ -154,10 +154,20 @@ module DynamicActiveModel
         relationship_name.singularize.to_sym,
         class_name: belongs_to_model.name,
         foreign_key: foreign_key,
-        primary_key: primary_key
+        primary_key: primary_key,
+        optional: nullable_column?(model, foreign_key)
       )
     end
 
+    # A nullable foreign key makes the belongs_to optional; NOT NULL makes it required,
+    # whatever belongs_to_required_by_default is set to.
+    # @param model [Class]
+    # @param column_name [String]
+    # @return [Boolean]
+    def nullable_column?(model, column_name)
+      model.columns_hash.fetch(column_name.to_s).null
+    end
+
     # Adds a has_many relationship to a model
     # @param relationship_name [String] Name of the relationship
     # @param model [Class] The referenced (parent) model that gets the association

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

@@ -111,7 +111,7 @@ module DynamicActiveModel
     def append_association!(str, assoc_type, assoc, association_options)
       str << "  #{assoc_type} #{assoc.name.inspect}"
       association_options.compact.each do |name, value|
-        str << ", #{name}: '#{value}'"
+        str << ", #{name}: #{value.is_a?(String) ? "'#{value}'" : value.inspect}"
       end
       str << "\n"
     end
@@ -141,6 +141,7 @@ module DynamicActiveModel
           assoc.options[:foreign_key]
       end
       options[:primary_key] = assoc.options[:primary_key] unless assoc.options[:primary_key] == 'id'
+      options[:optional] = true if assoc.options[:optional]
       options
     end
 

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

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

metadata

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