added object content caching

scott Chacon · scott Chacon · commit de33ae22c4ee · 2007-11-15T16:37:22.000-08:00
diff --git a/lib/git/object.rb b/lib/git/object.rb
@@ -10,16 +10,18 @@ class AbstractObject
       attr_accessor :sha, :size, :type, :mode
     
       @base = nil
-    
+      @contents = nil
+      
       def initialize(base, sha)
         @base = base
         @sha = sha.to_s
         @size = @base.lib.object_size(@sha)
         setup
       end
     
+      # caches the contents of this call in memory
       def contents
-        @base.lib.object_contents(@sha)
+        @contents || @contents = @base.lib.object_contents(@sha)
       end
       
       def contents_array
diff --git a/tests/units/test_index_ops.rb b/tests/units/test_index_ops.rb
@@ -23,7 +23,7 @@ def test_add
         assert(!g.status.untracked.assoc('test-file'))
         assert(!g.status.changed.assoc('example.txt'))
         
-        append_file('example.txt', 'hahahaha')
+        new_file('example.txt', 'hahahaha')
         assert(g.status.changed.assoc('example.txt'))
         
         g.add
diff --git a/tests/units/test_object.rb b/tests/units/test_object.rb
@@ -96,6 +96,7 @@ def test_blob
   def test_blob_contents
     o = @git.object('v2.6:example.txt')
     assert_equal('replace with new text', o.contents)
+    assert_equal('replace with new text', o.contents)  # this should be cached
   end
   
   def test_revparse
