model_pack 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4201ba6cb9b884ee4fefdcd9aacb0c1dd87788
-  data.tar.gz: e3c63faa6d018537021f723d131e1a53955cbbb6
+  metadata.gz: 6e3431618487aca9441dc63def598c19facee8c2
+  data.tar.gz: 6af701855851fb9d9723c3afa9d4a53de3d93682
 SHA512:
-  metadata.gz: 08f774a99e8ae7a4bde8587d737dc1ed60fc17d55f2af435dcdcd9d35b56004c579d004158417dc9c5ad11d666c3a41a2448de7950fa12f3ea00b2766df9319a
-  data.tar.gz: bb1db9adae93f9b6db89739515933698721da24f5685767a26f4afbb0748ebfe771f9cad88d6eaedbd63a62f7aa415b46b02389c4f1b317b32bed78763e37aee
+  metadata.gz: c3b66df9a504671fa2855fa778ae4569ae16c87cf0f5e4b907737c7da3571176986421fc6a7a7268d2f7753eee48c713f5496861604c067361e7e8c327ad249f
+  data.tar.gz: e64b579657bf9b061a7db270fb242e3b478ae7156f90b243f5f2a08ece9699bd2b2ad4153de9e107cb20977ac40056816c94c6896fab0891c609e88184641976

data/lib/model_pack/class_methods.rb

@@ -14,17 +14,17 @@ module ModelPack
     end
 
     def attribute_reader(name, default: nil, as: nil, serialize: nil, predicate: nil)
-      default_value = default.dup rescue default
+      dv = default.dup rescue default
 
       define_method name do
         instance_variable_defined?("@#{name}") ?
-          instance_variable_get("@#{name}") : instance_variable_set("@#{name}", (as ? as.new : default_value))
+          instance_variable_get("@#{name}") : instance_variable_set("@#{name}", (as ? as.new : (dv.is_a?(Proc) ? dv.call : dv )))
       end
 
       # define predicate method if required
       define_method "#{name}?" do
         value = (instance_variable_defined?("@#{name}") ?
-          instance_variable_get("@#{name}") : instance_variable_set("@#{name}", (default_value.is_a?(Class) ? default_value.new : default_value)))
+          instance_variable_get("@#{name}") : instance_variable_set("@#{name}", (as ? as.new : (dv.is_a?(Proc) ? dv.call : dv ))))
         predicate.is_a?(Proc) ? predicate.call(value)  : !!value  # false for nil or false
       end if predicate
 

data/lib/model_pack/version.rb

@@ -1,3 +1,3 @@
 module ModelPack
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/spec/model_pack_spec.rb

@@ -275,11 +275,13 @@ describe ModelPack::ClassMethods do
 
       attribute :always_false, default: false
       attribute :always_true,  default: true
+      attribute :dynamic_default, default: lambda { 1+5 }
     end
 
     data = BooleanData.new
 
     expect(data.always_false).to be false
     expect(data.always_true).to be true
+    expect(data.dynamic_default).to be 6
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_pack
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - inre
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Model Pack – simple models