Add some methods to GTIndexEntry

Author: sagmor

ObjectiveGit/GTIndexEntry.h

@@ -29,6 +29,9 @@
 
 #import <Foundation/Foundation.h>
 #include "git2/index.h"
+#import "GTObject.h"
+
+@class GTIndex;
 
 typedef NS_ENUM(NSInteger, GTIndexEntryStatus) {
 	GTIndexEntryStatusUpdated = 0,
@@ -40,6 +43,22 @@ typedef NS_ENUM(NSInteger, GTIndexEntryStatus) {
 
 @interface GTIndexEntry : NSObject
 
+/// Initializes the receiver with the given libgit2 index entry.
+///
+/// entry - The libgit2 index entry. Cannot be NULL.
+/// index - The index this entry belongs to.
+/// error - will be filled if an error occurs
+///
+/// Returns the initialized object.
+- (instancetype)initWithGitIndexEntry:(const git_index_entry *)entry index:(GTIndex *)index error:(NSError **)error NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithGitIndexEntry:(const git_index_entry *)entry;
+
+/// The underlying `git_index_entry` object.
+- (const git_index_entry *)git_index_entry __attribute__((objc_returns_inner_pointer));
+
+/// The entry's index. This may be nil if nil is passed in to -initWithGitIndexEntry:
+@property (nonatomic, strong, readonly) GTIndex *index;
+
 /// The repository-relative path for the entry.
 @property (nonatomic, readonly, copy) NSString *path;
 
@@ -49,14 +68,21 @@ typedef NS_ENUM(NSInteger, GTIndexEntryStatus) {
 /// What is the entry's status?
 @property (nonatomic, readonly) GTIndexEntryStatus status;
 
-/// Initializes the receiver with the given libgit2 index entry.
+/// The OID of the entry.
+@property (nonatomic, strong, readonly) GTOID *OID;
+
+/// Convert the entry into an GTObject
 ///
-/// entry - The libgit2 index entry. Cannot be NULL.
+/// error - will be filled if an error occurs
 ///
-/// Returns the initialized object.
-- (id)initWithGitIndexEntry:(const git_index_entry *)entry NS_DESIGNATED_INITIALIZER;
+/// Returns this entry as a GTObject or nil if an error occurred.
+- (GTObject *)GTObject:(NSError **)error;
 
-/// The underlying `git_index_entry` object.
-- (const git_index_entry *)git_index_entry __attribute__((objc_returns_inner_pointer));
+@end
+
+@interface GTObject (GTIndexEntry)
+
++ (instancetype)objectWithIndexEntry:(GTIndexEntry *)treeEntry error:(NSError **)error;
+- (instancetype)initWithIndexEntry:(GTIndexEntry *)treeEntry error:(NSError **)error;
 
 @end

ObjectiveGit/GTIndexEntry.m

@@ -30,6 +30,11 @@
 #import "GTIndexEntry.h"
 #import "NSError+Git.h"
 #import "NSString+Git.h"
+#import "GTOID.h"
+#import "GTRepository.h"
+#import "GTIndex.h"
+
+#import "git2.h"
 
 @interface GTIndexEntry ()
 @property (nonatomic, assign, readonly) const git_index_entry *git_index_entry;
@@ -45,17 +50,22 @@ - (NSString *)description {
 
 #pragma mark Lifecycle
 
-- (id)initWithGitIndexEntry:(const git_index_entry *)entry {
+- (instancetype)initWithGitIndexEntry:(const git_index_entry *)entry index:(GTIndex *)index error:(NSError **)error {
 	NSParameterAssert(entry != NULL);
 
 	self = [super init];
 	if (self == nil) return nil;
 
 	_git_index_entry = entry;
+	_index = index;
 
 	return self;
 }
 
+- (instancetype)initWithGitIndexEntry:(const git_index_entry *)entry {
+	return [self initWithGitIndexEntry:entry index:nil error:NULL];
+}
+
 #pragma mark Properties
 
 - (NSString *)path {
@@ -86,4 +96,44 @@ - (GTIndexEntryStatus)status {
 	return GTIndexEntryStatusUpToDate;
 }
 
+- (GTOID *)OID {
+	return [GTOID oidWithGitOid:&self.git_index_entry->id];
+}
+
+#pragma mark API
+
+- (GTRepository *)repository {
+	return self.index.repository;
+}
+
+- (GTObject *)GTObject:(NSError **)error {
+	return [GTObject objectWithIndexEntry:self error:error];
+}
+
+@end
+
+@implementation GTObject (GTIndexEntry)
+
++ (instancetype)objectWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError **)error {
+	return [[self alloc] initWithIndexEntry:indexEntry error:error];
+}
+
+- (instancetype)initWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError **)error {
+
+	git_object *obj;
+	int gitError = git_object_lookup(&obj, indexEntry.repository.git_repository, indexEntry.OID.git_oid, (git_otype)GTObjectTypeAny);
+
+	if (gitError < GIT_OK) {
+		if (error != NULL) {
+    		*error = [NSError git_errorFor:gitError description:@"Failed to get object for index entry."];
+		}
+
+		return nil;
+	}
+
+
+    return [self initWithObj:obj inRepository:indexEntry.repository];
+}
+
 @end
+

ObjectiveGitTests/GTIndexSpec.m

@@ -295,10 +295,9 @@
 		[index addData:data withName:@"bar/foo" error:&error];
 		expect(error).to(beNil());
 
-		NSData *returnData = [index dataWithName:@"bar/foo" error:&error];
+		GTIndexEntry *entry = [index entryWithName:@"bar/foo" error:&error];
+		expect(entry).notTo(beNil());
 		expect(error).to(beNil());
-//		expect([[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]).to(equal(@"foo"));
-		expect(returnData).to(equal(data));
 	});
 });