yesterday 0.3 → 0.4

data/README.rdoc

@@ -74,11 +74,16 @@ Diff's within associations:
 
 
 To check if associations are created, just use the created_ prefix before the appropiate association:
-  contact.created_addresses
+  contact.addresses.first.created?
 
 Or, for removed associations:
-  contact.destroyed_addresses
+  contact.addresses.first.destroyed?
 
+Or, just modified:
+  contact.addresses.first.modified?
+
+Or... nothing:
+  contact.addresses.first.unmodified?
 
 = License and credits
 Use it and have fun with it! Comments, cakes and hugs are welcome! Just stick to the license!

data/lib/yesterday/changeset.rb

@@ -26,6 +26,22 @@ module Yesterday
       @object ||= VersionedObjectCreator.new(object_attributes).to_object if object_attributes.present?
     end
 
+    def made_changes
+      @made_changes ||= {}
+
+      unless @made_changes[compare_with_version_number]
+        compare_with_version_number ||= version_number > 1 ? (version_number - 1) : 1
+
+        from_attributes   = changeset_for(compare_with_version_number, changed_object).object_attributes
+        to_attributes     = object_attributes
+        diff              = Differ.new(from_attributes, to_attributes).diff
+
+        @made_changes[compare_with_version_number] = VersionedObjectCreator.new(diff).to_object
+      end
+
+      @made_changes[compare_with_version_number]
+    end
+
     private
 
     def determine_version_number

data/lib/yesterday/differ.rb

@@ -11,8 +11,9 @@ module Yesterday
       diff = diff_attributes(from, to)
 
       diff.merge! diff_collection(from, to)
-      diff.merge! diff_created_objects(from, to)
-      diff.merge! diff_destroyed_objects(from, to)
+
+      diff_created_objects from, to, diff
+      diff_destroyed_objects from, to, diff
 
       diff
     end
@@ -23,9 +24,12 @@ module Yesterday
       from.each do |attribute, old_value|
         if attribute == 'id'
           diff[attribute] = old_value
-        elsif !old_value.is_a?(Array)
+
+        elsif !old_value.is_a?(Array) && attribute != '_event'
           new_value = to[attribute]
           diff[attribute] = [old_value, new_value]
+          diff['_event'] = 'modified' if old_value != new_value
+
         end
       end
 
@@ -53,17 +57,15 @@ module Yesterday
       diff
     end
 
-    def diff_created_objects(from, to)
-      diff_object_creation from, to, 'created'
+    def diff_created_objects(from, to, diff)
+      diff_object_creation from, to, 'created', diff
     end
 
-    def diff_destroyed_objects(from, to)
-      diff_object_creation to, from, 'destroyed'
+    def diff_destroyed_objects(from, to, diff)
+      diff_object_creation to, from, 'destroyed', diff
     end
 
-    def diff_object_creation(from, to, event)
-      diff = {}
-
+    def diff_object_creation(from, to, event, diff)
       to.each do |attribute, to_objects|
         if to_objects.is_a? Array
           from_objects = from[attribute] || []
@@ -72,8 +74,9 @@ module Yesterday
             from_object = find_object(from_objects, to_object['id'])
 
             unless from_object
-              diff["#{event}_#{attribute}"] ||= []
-              diff["#{event}_#{attribute}"] << to_object
+              to_object['_event'] = event
+              diff[attribute] ||= []
+              diff[attribute] << to_object
             end
           end
         end

data/lib/yesterday/version.rb

@@ -1,3 +1,3 @@
 module Yesterday
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/lib/yesterday/versioned_object.rb

@@ -13,6 +13,22 @@ module Yesterday
       end
     end
 
+    def modified?
+      attributes['_event'] && attributes['_event'] == 'modified'
+    end
+
+    def created?
+      attributes['_event'] && attributes['_event'] == 'created'
+    end
+
+    def destroyed?
+      attributes['_event'] && attributes['_event'] == 'destroyed'
+    end
+
+    def unmodified?
+      !attributes.has_key?('_event')
+    end
+
   end
 
 end

data/spec/differ_spec.rb

@@ -45,12 +45,16 @@ describe Yesterday::Differ do
           'name' => ['Harold', 'Peter'],
           'addresses' => [
             { 'id' => 1,
-              'address' => ['Sesamstreet 1', 'Foobar 1'] },
+              'address' => ['Sesamstreet 1', 'Foobar 1'],
+              '_event' => 'modified' },
             { 'id' => 2,
-              'address' => ['Sesamstreet 2', 'Foobar 2'] }
-           ]
+              'address' => ['Sesamstreet 2', 'Foobar 2'],
+              '_event' => 'modified' }
+           ],
+          '_event' => 'modified'
         }
-      ]
+      ],
+      '_event' => 'modified'
     }
   end
 
@@ -106,15 +110,12 @@ describe Yesterday::Differ do
           'name' => ['Harold', 'Harold'],
           'addresses' => [
             { 'id' => 2,
-              'address' => ['Sesamstreet 2', 'Sesamstreet 2'] }
-           ],
-           'destroyed_addresses' => [
-              { 'id' => 1,
-                'address' => 'Sesamstreet 1' }
+              'address' => ['Sesamstreet 2', 'Sesamstreet 2'] },
+            { 'id' => 1,
+              'address' => 'Sesamstreet 1',
+              '_event' => 'destroyed' }
            ]
-        }
-      ],
-      'destroyed_contacts' => [
+        },
         {
           'id' => 2,
           'name' => 'Peter',
@@ -123,7 +124,8 @@ describe Yesterday::Differ do
               'address' => 'Sesamstreet 1' },
             { 'id' => 2,
               'address' => 'Sesamstreet 2' }
-           ]
+           ],
+          '_event' => 'destroyed'
         }
       ]
     }
@@ -142,6 +144,18 @@ describe Yesterday::Differ do
               'address' => 'Sesamstreet 2' }
            ]
         }
+      ],
+      'companies' => [
+        {
+          'id' => 1,
+          'name' => 'Some company',
+          'contacts' => [
+            {
+              'id' => 1,
+              'name' => 'Some contact'
+            }
+          ]
+        }
       ]
     }
 
@@ -169,6 +183,22 @@ describe Yesterday::Differ do
               'address' => 'Sesamstreet 2' }
            ]
         }
+      ],
+      'companies' => [
+        {
+          'id' => 1,
+          'name' => 'Some company',
+          'contacts' => [
+            {
+              'id' => 1,
+              'name' => 'Some contact'
+            },
+            {
+              'id' => 2,
+              'name' => 'Some other contact'
+            }
+          ]
+        }
       ]
     }
 
@@ -181,15 +211,12 @@ describe Yesterday::Differ do
           'name' => ['Harold', 'Harold'],
           'addresses' => [
             { 'id' => 2,
-              'address' => ['Sesamstreet 2', 'Sesamstreet 2'] }
-           ],
-           'created_addresses' => [
-              { 'id' => 1,
-                'address' => 'Sesamstreet 1' }
+              'address' => ['Sesamstreet 2', 'Sesamstreet 2'] },
+            { 'id' => 1,
+              'address' => 'Sesamstreet 1',
+              '_event' => 'created' }
            ]
-        }
-      ],
-      'created_contacts' => [
+        },
         {
           'id' => 2,
           'name' => 'Peter',
@@ -198,7 +225,25 @@ describe Yesterday::Differ do
               'address' => 'Sesamstreet 1' },
             { 'id' => 2,
               'address' => 'Sesamstreet 2' }
-           ]
+           ],
+          '_event' => 'created'
+        }
+      ],
+      'companies' => [
+        {
+          'id' => 1,
+          'name' => ['Some company', 'Some company'],
+          'contacts' => [
+            {
+              'id' => 1,
+              'name' => ['Some contact', 'Some contact']
+            },
+            {
+              'id' => 2,
+              'name' => 'Some other contact',
+              '_event' => 'created'
+            }
+          ]
         }
       ]
     }

data/spec/yesterday_model_spec.rb

@@ -149,12 +149,11 @@ describe Yesterday::Model do
       diff = report.diff_version(1, 2)
 
       diff.contacts.count.should == 1
-      diff.contacts.first.addresses.count.should == 1
-      diff.contacts.first.addresses.first.id.should == address1.id
 
-      diff.contacts.first.created_addresses.count.should == 2
-      diff.contacts.first.created_addresses.first.id.should == address2.id
-      diff.contacts.first.created_addresses.last.id.should ==  address3.id
+      diff.contacts.first.addresses.count.should == 3
+
+      diff.contacts.first.addresses.select(&:unmodified?).map(&:id).should == [address1.id]
+      diff.contacts.first.addresses.select(&:created?).map(&:id).should == [address2.id, address3.id]
     end
 
     describe 'association removal' do
@@ -215,23 +214,19 @@ describe Yesterday::Model do
         diff = @report.diff_version(2, 3)
         diff.contacts.count.should == 1
 
-        diff.contacts.first.addresses.count.should == 1
-        diff.contacts.first.destroyed_addresses.count.should == 1
-
-        diff.contacts.first.destroyed_addresses.first.id.should == @address2.id
-        diff.contacts.first.addresses.first.id.should == @address1.id
+        diff.contacts.first.addresses.count.should == 2
+        diff.contacts.first.addresses.select(&:unmodified?).count.should == 1
+        diff.contacts.first.addresses.select(&:destroyed?).count.should == 1
 
-        diff.companies.first.created_addresses.count.should == 1
+        diff.contacts.first.addresses.select(&:unmodified?).map(&:id).should == [@address1.id]
+        diff.contacts.first.addresses.select(&:destroyed?).map(&:id).should == [@address2.id]
       end
 
       it 'should detect that associations are created when diffing version 1 with 3' do
         diff = @report.diff_version(1, 3)
         diff.contacts.first.should_not respond_to(:addresses)
 
-        diff.contacts.first.created_addresses.count.should == 1
-        diff.contacts.first.created_addresses.first.id.should == @address1.id
-
-        diff.companies.first.created_addresses.count.should == 1
+        diff.contacts.first.addresses.select(&:created?).map(&:id).should == [@address1.id]
       end
     end
   end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: yesterday
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Diederick Lawson