reference simplified

lib/gitrb/gitobject.rb

@@ -7,7 +7,7 @@ def initialize(options = {})
       @id = options[:id]
     end
 
-    def object
+    def git_object
       self
     end
 

lib/gitrb/reference.rb

@@ -9,9 +9,7 @@ def initialize(properties = {})
 
     def method_missing(name, *args, &block)
       if @object
-        unless name == :to_ary || name == :to_str
-          # Ruby 1.9 uses the presence of the to_ary and to_str methods to determine if an object is coercable.
-          # If we create these methods, Ruby will incorrectly think that the object can be converted to an array.
+        if @object.respond_to? name
           instance_eval %{def self.#{name}(*args, &block); @object.send("#{name}", *args, &block); end}
         end
         @object.send(name, *args, &block)
@@ -21,17 +19,12 @@ def method_missing(name, *args, &block)
         @properties[name]
       elsif @properties.include?(name.to_s)
         @properties[name.to_s]
-      elsif object
-        method_missing(name, *args, &block)
       else
-        super
+        @object = repository.get(id)
+        method_missing(name, *args, &block)
       end
     end
 
-    def object
-      @object ||= repository.get(id)
-    end
-
     def resolved?
       @object != nil
     end

lib/gitrb/util.rb

@@ -40,4 +40,3 @@ def ord
     end
   end
 end
-

test/repository_test.rb

@@ -68,8 +68,8 @@
 
     repo.refresh
 
-    repo.root['x'].object.should.be.kind_of(Gitrb::Tree)
-    repo.root['y'].object.should.be.kind_of(Gitrb::Tree)
+    repo.root['x'].git_object.should.be.kind_of(Gitrb::Tree)
+    repo.root['y'].git_object.should.be.kind_of(Gitrb::Tree)
 
     repo.root['x']['a'].data.should.equal 'Hello'
     repo.root['y']['b'].data.should.equal 'World'
@@ -164,8 +164,8 @@
       repo.root['x/a'] = Gitrb::Blob.new(:data => 'Added')
     end
 
-    a = ls_tree(repo.root['a'].object.id)
-    x = ls_tree(repo.root['x'].object.id)
+    a = ls_tree(repo.root['a'].id)
+    x = ls_tree(repo.root['x'].id)
 
     a.should.equal [["100644", "blob", "b653cf27cef08de46da49a11fa5016421e9e3b32", "b"]]
     x.should.equal [["100644", "blob", "87d2b203800386b1cc8735a7d540a33e246357fa", "a"]]
@@ -249,7 +249,7 @@
     tag = repo.get(id)
 
     tag.tagtype.should.equal 'commit'
-    tag.object.object.should.equal repo.head
+    tag.object.git_object.should.equal repo.head
     tag.tagger.name.should.equal user.name
     tag.tagger.email.should.equal user.email
     tag.message.should =~ /message/