smart_properties 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 852c9747f9b84785abfd7fcd978606311cb506c1
-  data.tar.gz: 8151988ab1f61eaefa1ba848ff328a92b4157d6e
+  metadata.gz: b925a25ffc3986a157e22c2b1e15d14fffe83ac2
+  data.tar.gz: 257d8a8aa05874ae0dcc43c00a60142c4fd809b7
 SHA512:
-  metadata.gz: 7e318b3f393636f86718357432df9916dd2a36613e923e1791ae8d34e7ef2aaca80a6ac9c54eac8530f75d0cf35f54fb30378a50c98ba00f02affb658af9bac7
-  data.tar.gz: 0dfa80424f99f8fbd9148ade0430a32d9b5bd8f7f9b499d95be64ae2c9943c245524c49204792c806ea3b9dac883b11216d5eefe26c04bd9ffd3d1272d8c2b42
+  metadata.gz: 6ad62801456bd554a4cf3984438490d4dadb9054a29a9dd16d4ffc87206a3a1d1abbeee25fdffc60810a5d1451b390882541f5b5540f2230d32b19f6f3828d24
+  data.tar.gz: d2557a94805341d73a358bacb2c3b0daa9a5c2916bc288789c7db2a0c0d4f28eb0b2890d075ec56cfde6f0dc3be3770a74a916ea673183e66712361d2f728335

data/lib/smart_properties.rb

@@ -21,7 +21,7 @@
 #                           :required => true
 #
 module SmartProperties
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 
   class Error < ::ArgumentError; end
   class ConfigurationError < Error; end
@@ -315,16 +315,28 @@ module SmartProperties
   def initialize(attrs = {}, &block)
     attrs ||= {}
     properties = self.class.properties.each.to_a
+    missing_properties = []
 
     # Assign attributes or default values
     properties.each do |_, property|
-      value = attrs.fetch(property.name) { property.default(self) }
-      send(:"#{property.name}=", value) unless value.nil?
+      if attrs.key?(property.name)
+        instance_variable_set("@#{property.name}", property.prepare(attrs[property.name], self))
+      else
+        missing_properties.push(property)
+      end
     end
 
     # Exectue configuration block
     block.call(self) if block
 
+    # Set defaults
+    missing_properties.each do |property|
+      variable = "@#{property.name}"
+      if instance_variable_get(variable).nil? && !(default_value = property.default(self)).nil?
+        instance_variable_set(variable, property.prepare(default_value, self))
+      end
+    end
+
     # Check presence of all required properties
     faulty_properties =
       properties.select { |_, property| property.required?(self) && send(property.name).nil? }.map(&:last)

data/spec/smart_properties_spec.rb

@@ -468,9 +468,13 @@ describe SmartProperties do
         expect { klass.new }.to raise_error(RuntimeError, 'Boom!')
       end
 
-      it "should not evaluate the lambda expression and thus not raise during initialization if a different value for :boom has been provided" do
+      it "should not evaluate the lambda expression and thus not raise during initialization if a different value for :boom has been provided as a parameter" do
         expect { klass.new(boom: 'Everything is just fine!') }.not_to raise_error
       end
+
+      it "should not evaluate the lambda expression and thus not raise during initialization if a different value for :boom has been provided in an initilization block" do
+        expect { klass.new { |inst| inst.boom = 'Everything is just fine!' } }.not_to raise_error
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_properties
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Konstantin Tennhard