statinize 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 532ce092aa6b70f135589b09d8c8f7574105e7ecbc17036e3fd2d50ffaf47813
-  data.tar.gz: deb8189b91a4703070b769968d1858ff77a261afa9565a7695e957bdbf381a86
+  metadata.gz: 18e7bbf61f4e9326827c4b721729b7dc7951865b7958633623093f10e1dca060
+  data.tar.gz: 0a01cbb40f53d9397b5e4d387c276bc98091dea54b373d6526341fb207671f8e
 SHA512:
-  metadata.gz: 83956b014f99a2a5438bbf0304d0bc094cd0ed83329269d1d7d46fa6ca5dd46abf2b19948e980216e1e5bb1a906a9670b26bcd966d2c327f5bd567f59e5f1340
-  data.tar.gz: 49bc1829a8955fccc561277a5568f7cad00fa129e6c20e8956d2037dbbea29600052eff2da1f0b8f5af720e87a9548f621cbd9488da855a3b53b8f79b652a96d
+  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,11 +69,15 @@ 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|
+        undefined_attributes.select { |a| a.options.key?(:default_exec) }.each do |attribute|
           public_send("#{attribute.name}=", instance_exec(&attribute.default_exec))
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statinize
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Barseek