structx 0.1.1 → 0.1.2

data/README.md

@@ -38,6 +38,20 @@ end
 B.new(1) # => #<struct B x=1, y=10, z=100>
 ```
 
+You can set dynamic default values with proc object.
+
+```ruby
+class B < StructX
+  member :x, default: lambda {$N}
+  member :y, default: lambda {|obj| $N+1}
+  member :z, default: lambda {|obj, data| $N+2}
+end
+$N = 1
+B.new # => #<struct B x=1, y=2, z=3>
+$N = 10
+B.new # => #<struct B x=10, y=11, z=12>
+```
+
 ### Immutable mode
 
 ```ruby

data/lib/structx.rb

@@ -201,6 +201,23 @@ class StructX
 
   def __build__(data)
     tbl = data.inject({}) {|tbl, (m, val)| tbl.tap {|x| x[m] = val if val}}
-    self.class.default_values.merge(tbl)
+    default_values = self.class.default_values.inject({}) do |_tbl, (key, val)|
+      _tbl.tap {|x| x[key] = __build_default_value__(val, data)}
+    end
+    default_values.merge(tbl)
+  end
+
+  def __build_default_value__(val, data)
+    return val unless val.kind_of?(Proc)
+
+    if val.arity == 1
+      val.call(self)
+    elsif val.arity > 1
+      val.call(self, data)
+    elsif val.arity < 0
+      val.call(self, data)
+    else
+      val.call
+    end
   end
 end

data/lib/structx/version.rb

@@ -1,4 +1,4 @@
 class StructX
   # version of StructX
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/spec_structx.rb

@@ -6,6 +6,12 @@ class A < StructX
   member :z, type: Integer, default: 100
 end
 
+class B < StructX
+  member :p0, default: lambda { $N }
+  member :p1, default: lambda {|obj| $N + 1}
+  member :p2, default: lambda {|obj, data| $N +2}
+end
+
 describe "StructX" do
   describe "StructX.new(:x, :y, :z)" do
     before do
@@ -200,5 +206,16 @@ describe "StructX" do
       end
     end
   end
+
+  describe "B < StructX" do
+    it "should get default value" do
+      $N = 1
+      obj1 = B.new
+      $N = 10
+      obj2 = B.new
+      obj1.values.should == [1, 2, 3]
+      obj2.values.should == [10, 11, 12]
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: structx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1674864282059584366
+      hash: 526403309236552593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1674864282059584366
+      hash: 526403309236552593
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25