activerecord-diff 0.0.1 → 0.0.2

data/lib/active_record_diff/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordDiff
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/activerecord-diff.rb

@@ -32,6 +32,7 @@ module ActiveRecord
     end
 
     def diff(other_record = nil)
+      
       if other_record.nil?
         old_record, new_record = self.class.find(id), self
       else
@@ -40,11 +41,19 @@ module ActiveRecord
 
       if new_record.is_a?(Hash)
         diff_each(new_record) do |(attr_name, hash_value)|
-          [attr_name, old_record.send(attr_name), hash_value]
+          if block_given?
+            yield attr_name, old_record.send(attr_name), hash_value
+          else
+            [attr_name, old_record.send(attr_name), hash_value]
+          end
         end
       else
         diff_each(self.class.diff_attrs) do |attr_name|
-          [attr_name, old_record.send(attr_name), new_record.send(attr_name)]
+          if block_given?
+            yield attr_name, old_record.send(attr_name), new_record.send(attr_name)
+          else
+            [attr_name, old_record.send(attr_name), new_record.send(attr_name)]
+          end
         end
       end
     end

data/test/test.rb

@@ -19,14 +19,16 @@ end
 Person.create :name => 'alice', :email_address => 'alice@example.org'
 
 Person.create :name => 'bob', :email_address => 'bob@example.org'
+Person.create :name => 'BOB', :email_address => 'BOB@EXAMPLE.ORG'
 
 Person.create :name => 'eve', :email_address => 'bob@example.org'
 
+
 class TestCase < Test::Unit::TestCase
   def setup
     @people = Person.find(:all)
 
-    @alice, @bob, @eve = *@people
+    @alice, @bob, @capital_bob, @eve = *@people
   end
 
   def keysort(hash)
@@ -55,6 +57,17 @@ class TestCase < Test::Unit::TestCase
     assert_diff @bob, @eve, {:name => %w( bob eve )}
   end
 
+  def test_diff_with_block
+    assert_diff @bob, @capital_bob, {:name => %w( bob BOB), :email_address => %w( bob@example.org BOB@EXAMPLE.ORG )}
+    
+    diff = @bob.diff(@capital_bob) do |attrib, old, new|
+      [attrib, old.downcase, new.downcase]
+    end
+
+    assert diff.empty?
+  end
+
+
   def test_diff_against_saved_self
     assert ! @eve.diff?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-diff
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &10351960 !ruby/object:Gem::Requirement
+  requirement: &9846140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10351960
+  version_requirements: *9846140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &10351750 !ruby/object:Gem::Requirement
+  requirement: &9845930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10351750
+  version_requirements: *9845930
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10351540 !ruby/object:Gem::Requirement
+  requirement: &9845720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10351540
+  version_requirements: *9845720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10351330 !ruby/object:Gem::Requirement
+  requirement: &9845510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10351330
+  version_requirements: *9845510
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &10351120 !ruby/object:Gem::Requirement
+  requirement: &9845300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10351120
+  version_requirements: *9845300
 description: ! 'Simple diff for ActiveRecord '
 email:
 - stephenp@agrussell.com