Merge pull request #101 from k-tsuchiya-jp/fix-100

Explicitly define `:_default_attribute_values` using `class_attribute` in child class
FooBarWidget · Jan 3, 2025 · 1486999 · 1486999
2 parents 2196b23 + ab9ccba
commit 1486999
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/lib/default_value_for.rb b/lib/default_value_for.rb
@@ -65,23 +65,18 @@ def default_value_for(attribute, options = {}, &block)
         allows_nil = opts.fetch('allows_nil', true)
       end
 
-      if !method_defined?(:set_default_values)
+      if !singleton_methods(false).include?(:_default_attribute_values)
         include(InstanceMethods)
 
         after_initialize :set_default_values
 
         class_attribute :_default_attribute_values
         class_attribute :_default_attribute_values_not_allowing_nil
 
-        extend(DelayedClassMethods)
-        init_hash = true
-      else
-        init_hash = !singleton_methods(false).include?(:_default_attribute_values)
-      end
-
-      if init_hash
         self._default_attribute_values = {}
         self._default_attribute_values_not_allowing_nil = []
+
+        extend(DelayedClassMethods)
       end
 
       if block_given?