0
@@ -1,8 +1,6 @@
0
 module Grit
0
   
0
   class Commit
0
-    include Lazy
0
-    
0
     attr_reader :id
0
     lazy_reader :parents
0
     lazy_reader :tree
0
@@ -35,8 +33,6 @@
0
       @committed_date = committed_date
0
       @message = message.join("\n")
0
       @short_message = message[0] || ''
0
-      
0
-      __baked__
0
     end
0
     
0
     def id_abbrev
0
0
0
@@ -58,40 +54,15 @@
0
     #
0
     # Returns Grit::Commit (unbaked)
0
     def create_initialize(repo, atts)
0
-      @repo = nil
0
-      @id = nil
0
-      @parents = nil
0
-      @tree = nil
0
-      @author = nil
0
-      @authored_date = nil
0
-      @committer = nil
0
-      @committed_date = nil
0
-      @message = nil
0
-      @short_message = nil
0
-      @__baked__ = nil
0
-      
0
       @repo = repo
0
       atts.each do |k, v|
0
-        instance_variable_set("@#{k}".to_sym, v)
0
+        instance_variable_set("@#{k}", v)
0
       end
0
       self
0
     end
0
     
0
-    # Use the id of this instance to populate all of the other fields
0
-    # when any of them are called.
0
-    #
0
-    # Returns nil
0
-    def __bake__
0
-      temp = self.class.find_all(@repo, @id, {:max_count => 1}).first
0
-      @parents = temp.parents
0
-      @tree = temp.tree
0
-      @author = temp.author
0
-      @authored_date = temp.authored_date
0
-      @committer = temp.committer
0
-      @committed_date = temp.committed_date
0
-      @message = temp.message
0
-      @short_message = temp.short_message
0
-      nil
0
+    def lazy_source
0
+      self.class.find_all(@repo, @id, {:max_count => 1}).first
0
     end
0
     
0
     # Count the number of commits reachable from this ref
0
@@ -212,6 +183,25 @@
0
     def self.actor(line)
0
       m, actor, epoch = *line.match(/^.+? (.*) (\d+) .*$/)
0
       [Actor.from_string(actor), Time.at(epoch.to_i)]
0
+    end
0
+
0
+    def to_hash
0
+      {
0
+        'id'       => id,
0
+        'parents'  => parents.map { |p| { 'id' => p.id } },
0
+        'tree'     => tree.id,
0
+        'message'  => message,
0
+        'author'   => {
0
+          'name'  => author.name,
0
+          'email' => author.email
0
+        },
0
+        'committer' => {
0
+          'name'  => committer.name,
0
+          'email' => committer.email
0
+        },
0
+        'authored_date'  => authored_date.xmlschema,
0
+        'committed_date' => committed_date.xmlschema,
0
+      }
0
     end
0
   end # Commit
0
   

0
@@ -1,54 +1,32 @@
0
+##
0
 # Allows attributes to be declared as lazy, meaning that they won't be
0
-# computed until they are asked for. Just mix this module in:
0
+# computed until they are asked for. 
0
 #
0
-#   class Foo
0
-#     include Lazy
0
-#     ...
0
-#   end
0
+# Works by delegating each lazy_reader to a cached lazy_source method.
0
 #
0
-# To specify a lazy reader:
0
+# class Person
0
+#   lazy_reader :eyes
0
 #
0
-#   lazy_reader :att
0
-#
0
-# Then, define a method called __bake__ that computes all your lazy
0
-# attributes:
0
-#
0
-#   def __bake__
0
-#     @att = ...
0
+#   def lazy_source
0
+#     OpenStruct.new(:eyes => 2)
0
 #   end
0
+# end
0
 #
0
-# If you happen to have already done all the hard work, you can mark an instance
0
-# as already baked by calling:
0
+# >> Person.new.eyes
0
+# => 2
0
 #
0
-#   __baked__
0
-#
0
-# That's it! (Tom Preston-Werner: rubyisawesome.com)
0
 module Lazy
0
-  module ClassMethods
0
-    def lazy_reader(*args)
0
-      args.each do |arg|
0
-        define_method(arg) do
0
-          val = instance_variable_get("@#{arg}")
0
-          return val if val
0
-          self.__prebake__
0
-          instance_variable_get("@#{arg}")
0
-        end
0
+  def lazy_reader(*args)
0
+    args.each do |arg|
0
+      ivar = "@#{arg}"
0
+      define_method(arg) do
0
+        val = instance_variable_get(ivar) 
0
+        return val if val
0
+        instance_variable_set(ivar, (@lazy_source ||= lazy_source).send(arg))
0
       end
0
     end
0
   end
0
-  
0
-  def __prebake__
0
-    return if @__baked__
0
-    self.__bake__
0
-    @__baked__ = true
0
-  end
0
-  
0
-  def __baked__
0
-    @__baked__ = true
0
-  end
0
-  
0
-  def self.included(base)
0
-    base.extend(ClassMethods)
0
-  end 
0
 end
0
+
0
+Object.extend Lazy unless Object.ancestors.include? Lazy

0
@@ -1,18 +1,11 @@
0
 module Grit
0
   
0
   class Tree
0
-    include Lazy
0
-    
0
     lazy_reader :contents
0
     attr_reader :id
0
     attr_reader :mode
0
     attr_reader :name
0
     
0
-    def initialize
0
-      @contents = nil
0
-      @__baked__ = nil
0
-    end
0
-    
0
     # Construct the contents of the tree
0
     #   +repo+ is the Repo
0
     #   +treeish+ is the reference
0
0
0
@@ -29,19 +22,17 @@
0
       @repo = repo
0
       @id = id
0
       @contents = []
0
-      @__baked__ = nil
0
       
0
       text.split("\n").each do |line|
0
         @contents << content_from_string(repo, line)
0
       end
0
       @contents.compact!
0
-      __baked__
0
+
0
       self
0
     end
0
     
0
-    def __bake__
0
-      temp = Tree.construct(@repo, @id, [])
0
-      @contents = temp.contents
0
+    def lazy_source
0
+      Tree.construct(@repo, @id, [])
0
     end
0
     
0
     # Create an unbaked Tree containing just the specified attributes
0
0
@@ -60,11 +51,9 @@
0
     # Returns Grit::Tree (unbaked)
0
     def create_initialize(repo, atts)
0
       @repo = repo
0
-      @contents = nil
0
-      @__baked__ = nil
0
       
0
       atts.each do |k, v|
0
-        instance_variable_set("@#{k}".to_sym, v)
0
+        instance_variable_set("@#{k}", v)
0
       end
0
       self
0
     end

0
@@ -160,5 +160,24 @@
0
     @c = Commit.create(@r, :id => 'abc')
0
     assert_equal %Q{#<Grit::Commit "abc">}, @c.inspect
0
   end
0
+
0
+  # to_hash
0
+
0
+  def test_to_hash
0
+    @c = Commit.create(@r, :id => '4c8124ffcf4039d292442eeccabdeca5af5c5017')
0
+
0
+    expected = {
0
+      'parents' => ['id' => "634396b2f541a9f2d58b00be1a07f0c358b999b3"],
0
+      'committed_date' => "2007-10-10T00:06:12-07:00",
0
+      'tree' => "672eca9b7f9e09c22dcb128c283e8c3c8d7697a4",
0
+      'authored_date' => "2007-10-10T00:06:12-07:00",
0
+      'committer' => {'email' => "tom@mojombo.com", 'name' => "Tom Preston-Werner"},
0
+      'message' => "implement Grit#heads",
0
+      'author' => {'email' => "tom@mojombo.com", 'name' => "Tom Preston-Werner"},
0
+      'id' => "4c8124ffcf4039d292442eeccabdeca5af5c5017"
0
+    }
0
+
0
+    assert_equal expected, @c.to_hash
0
+  end
0
 end