structure 0.3.0 → 0.3.1

data/README.md

@@ -39,7 +39,7 @@ Define a model:
     class Person < Structure
       key :name
       key :age,     :type => Integer
-      key :friends, :type => Array, :value => []
+      key :friends, :type => Array, :default => []
     end
 
 Typecast values:
@@ -59,14 +59,14 @@ Dump good-looking JSON:
     require 'structure/json'
 
     json = p1.to_json
-    => {"json_class":"Person","name":"John","age":28,"friends":[{"json_class":"Person","name": null,"age":null,"friends":[]}]}
+    => {"json_class":"Person","name":"John","age":28,"friends":[{"json_class":"Person","name": "Jane","age":null,"friends":[]}]}
 
-Load the JSON in a different app back into Ruby seamlessly, provided you
-have the same models defined there:
+Load the JSON elsewhere back into Ruby seamlessly, provided you have the same
+models set up:
 
     person = JSON.parse(json)
-    person.friends.first.class
-    => Person
+    person.friends.first
+    => #<Person:0x0000010107d030 @attributes={:name=>"Jane", :age=>nil, :friends=>[#<Person:0x0000010107d030 ...>]}, @modifiable=true>
 
 Types
 -----

data/lib/structure/version.rb

@@ -1,3 +1,3 @@
 class Sucker
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/structure.rb

@@ -11,8 +11,6 @@ class Structure
 
   TYPES = [Array, Boolean, Float, Hash, Integer, String]
 
-  @@default_attributes = {}
-
   # Defines an attribute key.
   #
   # Takes a name and an optional hash of options. Available options are:
@@ -42,7 +40,7 @@ class Structure
       raise TypeError, "#{default} is not #{%w{AEIOU}.include?(type.to_s[0]) ? 'an' : 'a'} #{type}"
     end
 
-    @@default_attributes[name] = default
+    default_attributes[name] = default
 
     module_eval do
 
@@ -112,10 +110,14 @@ class Structure
 
   private
 
+  def self.default_attributes
+    @default_attributes ||= {}
+  end
+
   def initialize_attributes
     @attributes =
-      @@default_attributes.inject({}) do |attributes, (key, value)|
-        attributes[key] = value
+      self.class.default_attributes.inject({}) do |attributes, (key, value)|
+        attributes[key] = value.is_a?(Array) ? value.dup : value
         attributes
       end
   end

data/spec/models/book.rb

@@ -0,0 +1,4 @@
+class Book < Structure
+  key :title
+  key :authors, :type => Array, :value => []
+end

data/spec/structure_spec.rb

@@ -49,6 +49,16 @@ describe Structure do
     end
   end
 
+  describe "#default_attributes" do
+    it "returns the default attributes for the structure" do
+      Person.send(:default_attributes).should == { :name    => nil,
+                                                   :age     => nil,
+                                                   :friends => [] }
+      Book.send(:default_attributes).should == { :title   => nil,
+                                                 :authors => nil }
+    end
+  end
+
   describe "attribute getter" do
     it "returns the value of the attribute" do
       person.instance_variable_get(:@attributes)[:name] = 'Joe'
@@ -56,9 +66,12 @@ describe Structure do
     end
 
     context "when type is Array and default value is []" do
+      let(:friend) { Person.new }
+
       it "supports the `<<' idiom" do
-        person.friends << Person.new
+        person.friends << friend
         person.friends.count.should eql 1
+        friend.friends.count.should eql 0
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Paper Cavalier
@@ -68,6 +68,7 @@ files:
 - lib/structure.rb
 - lib/structure/json.rb
 - lib/structure/version.rb
+- spec/models/book.rb
 - spec/models/person.rb
 - spec/spec_helper.rb
 - spec/structure/json_spec.rb
@@ -106,6 +107,7 @@ signing_key:
 specification_version: 3
 summary: A better Struct
 test_files: 
+- spec/models/book.rb
 - spec/models/person.rb
 - spec/spec_helper.rb
 - spec/structure/json_spec.rb