statinize 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd5a1c15473a68cad29248c698c58fb190a37e432bfeb41d8622594904e79060
-  data.tar.gz: 7120d733e7389966c5378b924beb2a638eb2bfc283437020cd5bdf8601608fd5
+  metadata.gz: 18e7bbf61f4e9326827c4b721729b7dc7951865b7958633623093f10e1dca060
+  data.tar.gz: 0a01cbb40f53d9397b5e4d387c276bc98091dea54b373d6526341fb207671f8e
 SHA512:
-  metadata.gz: c67c423f48b274dd35b0ca582ea90e7081fb732ecf1252e97e5242ba2dfbbfc2434c93484eb2752d291ab19eeaaaf28b878925e2bd30a082709d2b64449932a5
-  data.tar.gz: af01616f0a9a41c3799c3384285ea741dee5301f88beb5d2b6afc5c762f0219b85d16c5eb5c2a6d0994bd72034db0d0e74ebf8548cec68df08f0fd796b66fad2
+  metadata.gz: bcba8fe61c715595a5b2584c90af44fe51671cc36fda434ef9afa7175e2fda0e14c8b22d9e6a51fe01d331cbf8b327db8143389e74f6080bd09ec8bf4fb15f88
+  data.tar.gz: 8d9f9f87ddb691865ce511c273864a5b1de20c78cc04134608e77f39fc28fc7f8695a211aae6b42deb3299391aca7a2dc6b9edeabd905df950f1d8149a96f619

data/lib/statinize/statinizable.rb

@@ -21,8 +21,6 @@ module Statinize
       def initialize(options = {}, *args, &block)
         symbolized = options.transform_keys(&:to_sym)
 
-        instantiate_defaults
-
         if private_methods(false).include? :initialize
           super(options, *args, &block)
           check_defined!(symbolized)
@@ -32,6 +30,8 @@ module Statinize
           end
         end
 
+        instantiate_defaults
+
         run_before_callbacks
 
         define_validation
@@ -69,12 +69,16 @@ module Statinize
       end
 
       def instantiate_defaults
-        statinizer.attributes.select { |a| a.options.key?(:default) }.each do |attribute|
+        undefined_attributes = statinizer.attributes.select do |attribute|
+          public_send(attribute.name).nil?
+        end
+
+        undefined_attributes.select { |a| a.options.key?(:default) }.each do |attribute|
           public_send("#{attribute.name}=", attribute.default.deep_dup)
         end
 
-        statinizer.attributes.select { |a| a.options.key?(:default_exec) }.each do |attribute|
-          public_send("#{attribute.name}=", attribute.default_exec.call)
+        undefined_attributes.select { |a| a.options.key?(:default_exec) }.each do |attribute|
+          public_send("#{attribute.name}=", instance_exec(&attribute.default_exec))
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statinize
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Barseek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Statinization gem. Allows for creation of attributes for a class with
   a given type.