yesterday 0.5 → 0.6

data/lib/yesterday/differ.rb

@@ -29,6 +29,9 @@ module Yesterday
         if attribute == 'id'
           diff[attribute] = old_value
 
+        elsif old_value.is_a?(Hash)
+          diff[attribute] = diff_attributes(old_value, to[attribute] || {})
+
         elsif !old_value.is_a?(Array) && !ignored_attributes.include?(attribute)
           new_value = to[attribute]
           diff[attribute] = [old_value, new_value]

data/lib/yesterday/version.rb

@@ -1,3 +1,3 @@
 module Yesterday
-  VERSION = "0.5"
+  VERSION = "0.6"
 end

data/lib/yesterday/versioned_object_creator.rb

@@ -11,12 +11,15 @@ module Yesterday
       attributes = {}
 
       hash.each do |attribute, value|
-        if nested_value? value
+        if nested_objects? value
           value.each do |item|
             attributes[attribute] ||= []
-            attributes[attribute] << deserialize(item)
+            attributes[attribute] << deserialize(item) if item
           end
 
+        elsif nested_object? value
+          attributes[attribute] = deserialize(value)
+
         elsif attribute != 'id'
           attributes[attribute] = value.is_a?(Array) ? Yesterday::VersionedAttribute.new(value) : value
         end
@@ -25,9 +28,13 @@ module Yesterday
       Yesterday::VersionedObject.new(attributes.merge({ 'id' => hash['id']}))
     end
 
-    def nested_value?(value)
+    def nested_objects?(value)
       value.is_a?(Array) && value.first.is_a?(Hash)
     end
 
+    def nested_object?(value)
+      value.is_a?(Hash)
+    end
+
   end
 end

data/spec/differ_spec.rb

@@ -16,7 +16,12 @@ describe Yesterday::Differ do
               'address' => 'Sesamstreet 2' }
            ]
         }
-      ]
+      ],
+      'state' => {
+        'id' => 1,
+        'code' => 'C00',
+        'description' => 'Critical'
+      }
     }
 
     to = {
@@ -33,7 +38,12 @@ describe Yesterday::Differ do
               'address' => 'Foobar 2' }
           ]
         }
-      ]
+      ],
+      'state' => {
+        'id' => 1,
+        'code' => 'C12',
+        'description' => 'Non critical'
+      }
     }
 
     Yesterday::Differ.new(from, to).diff.should == {
@@ -54,6 +64,12 @@ describe Yesterday::Differ do
           '_event' => 'modified'
         }
       ],
+      'state' => {
+        'id' => 1,
+        'code' => ['C00', 'C12'],
+        'description' => ['Critical', 'Non critical'],
+        '_event' => 'modified'
+      },
       '_event' => 'modified'
     }
   end

data/spec/versioned_object_creator_spec.rb

@@ -16,7 +16,12 @@ describe Yesterday::VersionedObjectCreator do
               'address' => ['Sesamstreet 2', 'Sesamstreet 2'] }
            ]
         }
-      ]
+      ],
+      'state' => {
+        'id' => 1,
+        'code' => ['C00', 'C12'],
+        'description' => ['Critical', 'Non critical']
+      }
     }
 
     object = Yesterday::VersionedObjectCreator.new(from).to_object
@@ -37,5 +42,11 @@ describe Yesterday::VersionedObjectCreator do
     object.contacts.first.addresses.first.address.current.should == 'Sesamstreet 1'
     object.contacts.first.addresses.last.address.previous.should == 'Sesamstreet 2'
     object.contacts.first.addresses.last.address.current.should == 'Sesamstreet 2'
+
+    object.state.id.should == 1
+    object.state.code.current.should == 'C12'
+    object.state.code.previous.should == 'C00'
+    object.state.description.current.should == 'Non critical'
+    object.state.description.previous.should == 'Critical'
   end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: yesterday
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Diederick Lawson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +02:00
+date: 2011-04-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency