Cleaning Git::Object a little bit

robertodecurnex · robertodecurnex · commit 209d9aa6d782 · 2014-01-15T18:03:18.000-03:00
diff --git a/lib/git/object.rb b/lib/git/object.rb
@@ -94,27 +94,24 @@ def blob?
   
     class Tree < AbstractObject
       
-      @trees = nil
-      @blobs = nil
-      
       def initialize(base, sha, mode = nil)
         super(base, sha)
         @mode = mode
+        @trees = nil
+        @blobs = nil
       end
             
       def children
         blobs.merge(subtrees)
       end
       
       def blobs
-        check_tree
-        @blobs
+        @blobs ||= check_tree[:blobs]
       end
       alias_method :files, :blobs
       
       def trees
-        check_tree
-        @trees
+        @trees ||= check_tree[:trees]
       end
       alias_method :subtrees, :trees
       alias_method :subdirectories, :trees
@@ -135,13 +132,23 @@ def tree?
 
         # actually run the git command
         def check_tree
-          unless @trees
-            @trees = {}
-            @blobs = {}
-            data = @base.lib.ls_tree(@objectish)
-            data['tree'].each { |k, d| @trees[k] = Git::Object::Tree.new(@base, d[:sha], d[:mode]) }
-            data['blob'].each { |k, d| @blobs[k] = Git::Object::Blob.new(@base, d[:sha], d[:mode]) }
+          @trees = {}
+          @blobs = {}
+          
+          data = @base.lib.ls_tree(@objectish)
+
+          data['tree'].each do |key, tree| 
+            @trees[key] = Git::Object::Tree.new(@base, tree[:sha], tree[:mode]) 
           end
+          
+          data['blob'].each do |key, blob| 
+            @blobs[key] = Git::Object::Blob.new(@base, blob[:sha], blob[:mode]) 
+          end
+
+          {
+            :trees => @trees,
+            :blobs => @blobs
+          }
         end
       
     end
