structx 0.1.2 → 0.1.3

data/lib/structx.rb

@@ -40,7 +40,7 @@ class StructX
     #   Same as Struct if args is Array. Consider args as key-value pairs if it is Hash.
     def new(*args)
       # create an instance
-      return orig_new(*args) if @member
+      return orig_new(*args) if @__member__ and @__member__.keys.size > 0
 
       # create subclass
       Class.new(StructX).tap do |subclass|
@@ -60,7 +60,7 @@ class StructX
 
     # Same as Struct#members.
     def members
-      (@member ||= {}).keys
+      (@__member__ ||= {}).keys
     end
 
     # Add member into structure.
@@ -70,7 +70,7 @@ class StructX
     # @param data [Hash]
     #   member options
     def member(name, data={})
-      (@member ||= {})[name] = Hash.new.merge(data)
+      (@__member__ ||= {})[name] = Hash.new.merge(data) # clone the data
 
       # define member's value reader
       define_method(name) do
@@ -88,7 +88,7 @@ class StructX
     # @return [Hash{Symbol=>Object}]
     #   default values
     def default_values
-      @member.inject({}) do |tbl, (key, val)|
+      @__member__.inject({}) do |tbl, (key, val)|
         tbl.tap {|x| x[key] = val[:default] if val.has_key?(:default)}
       end
     end
@@ -104,7 +104,7 @@ class StructX
     private
 
     def inherited(subclass)
-      @member.each {|key, data| subclass.member(key, data)} if @member
+      @__member__.each {|key, data| subclass.member(key, data)} if @__member__
       subclass.instance_variable_set(:@immutable, true) if @immutable
     end
   end
@@ -169,7 +169,8 @@ class StructX
   # Same as #[]=, but you can set values by hash.
   def set(pairs={})
     if not(immutable?)
-      pairs.each {|idx, val| obj[idx] = val}
+      pairs.each {|idx, val| self[idx] = val}
+      return self
     else
       pairs.inject(self) {|obj, (idx, val)| obj.send("[]=", idx, val)}
     end
@@ -178,9 +179,9 @@ class StructX
   # Same as Struct#inspect.
   def inspect
     name = self.class.inspect[0] == "#" ? "" : " " + self.class.inspect
-    values = @value.map do |key, val|
+    values = (@value || []).map do |key, val|
       k = (key.to_s[0] == "@" ? ":" : "") + key.to_s
-      v = self == val ? "#<struct %s:...>" % val : val.inspect
+      v = (self == val ? "#<struct %s:...>" % val : val.inspect)
       "%s=%s" % [k, v]
     end
     "#<struct%s %s>" % [name, values.join(", ")]
@@ -200,7 +201,7 @@ class StructX
   private
 
   def __build__(data)
-    tbl = data.inject({}) {|tbl, (m, val)| tbl.tap {|x| x[m] = val if val}}
+    tbl = data.inject({}) {|tbl, (m, val)| tbl.tap {|x| x[m] = val unless val.nil?}}
     default_values = self.class.default_values.inject({}) do |_tbl, (key, val)|
       _tbl.tap {|x| x[key] = __build_default_value__(val, data)}
     end

data/lib/structx/version.rb

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

data/test/spec_structx.rb

@@ -39,6 +39,9 @@ describe "StructX" do
         obj.y.should == 2
         obj.z.should == 3
       end
+      @class.new(true, false, nil).tap do |obj|
+        obj.values.should == [true, false]
+      end
     end
 
     it "should create an instance with key" do
@@ -122,10 +125,18 @@ describe "StructX" do
         x[:z].should == 5
         should.raise(NameError) { x[:a] = 1}
       end
+      # test for #set
+      @class.new(1, 2, 3).tap do |x|
+        x.set(x: 4, y: 5, z: 6)
+        x.values.should == [4, 5, 6]
+      end
+
       # immutable tests
       orig = @immutable.new(1, 2, 3)
+      orig.should.kind_of StructX
       orig.values.should == [1, 2, 3]
       updated = orig.set(x: 4, y: 5, z: 6)
+      updated.should.kind_of StructX
       updated.values.should == [4, 5, 6]
       orig.values.should == [1, 2, 3]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: structx
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwardablex
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 526403309236552593
+      hash: 3356708163444557198
 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: 526403309236552593
+      hash: 3356708163444557198
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25