added next year

oscardelben · Mar 3, 2011 · 9577623 · 9577623
1 parent 53f3a7f
commit 9577623
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 18 deletions.
diff --git a/NSDateCalculations.xcodeproj/oscar.mode1v3 b/NSDateCalculations.xcodeproj/oscar.mode1v3
@@ -274,8 +274,8 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>3</integer>
-									<integer>1</integer>
+									<integer>5</integer>
+									<integer>4</integer>
 									<integer>0</integer>
 								</array>
 							</array>
@@ -317,29 +317,29 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>NSDate+Calculations.h</string>
+								<string>NSDateCalculationsTest.m</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
 									<dict>
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>NSDate+Calculations.h</string>
+										<string>NSDateCalculationsTest.m</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>558EE9D2131FC9F100DCE586</string>
+										<string>558EE9EF131FCD1E00DCE586</string>
 										<key>history</key>
 										<array>
 											<string>5507B7BA131A8039001918DB</string>
 											<string>5507B806131A8940001918DB</string>
 											<string>5507B83A131A8EA4001918DB</string>
 											<string>5507B83C131A8EA4001918DB</string>
 											<string>5507B844131A8EE3001918DB</string>
-											<string>558EE9C4131E82D400DCE586</string>
-											<string>558EE9D1131FC9F100DCE586</string>
-											<string>558EE9C5131E82D400DCE586</string>
+											<string>558EE9EC131FCD1E00DCE586</string>
+											<string>558EE9ED131FCD1E00DCE586</string>
+											<string>558EE9EE131FCD1E00DCE586</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>

diff --git a/NSDateCalculations.xcodeproj/oscar.pbxuser b/NSDateCalculations.xcodeproj/oscar.pbxuser
@@ -92,6 +92,10 @@
 			558EE9C7131E82D400DCE586 = 558EE9C7131E82D400DCE586 /* PBXTextBookmark */;
 			558EE9D1131FC9F100DCE586 /* PBXTextBookmark */ = 558EE9D1131FC9F100DCE586 /* PBXTextBookmark */;
 			558EE9D2131FC9F100DCE586 /* PBXTextBookmark */ = 558EE9D2131FC9F100DCE586 /* PBXTextBookmark */;
+			558EE9EC131FCD1E00DCE586 /* PBXTextBookmark */ = 558EE9EC131FCD1E00DCE586 /* PBXTextBookmark */;
+			558EE9ED131FCD1E00DCE586 /* PBXTextBookmark */ = 558EE9ED131FCD1E00DCE586 /* PBXTextBookmark */;
+			558EE9EE131FCD1E00DCE586 /* PBXTextBookmark */ = 558EE9EE131FCD1E00DCE586 /* PBXTextBookmark */;
+			558EE9EF131FCD1E00DCE586 /* PBXTextBookmark */ = 558EE9EF131FCD1E00DCE586 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 5507B71B131A7D8C001918DB /* Source Control */;
 		userBuildSettings = {
@@ -144,23 +148,23 @@
 	};
 	5507B7AC131A7EDE001918DB /* NSDateCalculationsTest.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {877, 3523}}";
-			sepNavSelRange = "{7125, 0}";
-			sepNavVisRange = "{6094, 1084}";
+			sepNavIntBoundsRect = "{{0, 0}, {877, 3796}}";
+			sepNavSelRange = "{7054, 0}";
+			sepNavVisRange = "{5917, 1239}";
 		};
 	};
 	5507B7B2131A7F72001918DB /* NSDate+Calculations.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {877, 606}}";
-			sepNavSelRange = "{909, 21}";
-			sepNavVisRange = "{0, 954}";
+			sepNavSelRange = "{950, 0}";
+			sepNavVisRange = "{0, 975}";
 		};
 	};
 	5507B7B3131A7F72001918DB /* NSDate+Calculations.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {915, 3666}}";
-			sepNavSelRange = "{7599, 0}";
-			sepNavVisRange = "{6243, 1422}";
+			sepNavIntBoundsRect = "{{0, 0}, {915, 3601}}";
+			sepNavSelRange = "{7663, 0}";
+			sepNavVisRange = "{6714, 1063}";
 		};
 	};
 	5507B7BA131A8039001918DB /* PBXTextBookmark */ = {
@@ -294,4 +298,44 @@
 		vrLen = 914;
 		vrLoc = 0;
 	};
+	558EE9EC131FCD1E00DCE586 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 5507B7B2131A7F72001918DB /* NSDate+Calculations.h */;
+		name = "NSDate+Calculations.h: 38";
+		rLen = 0;
+		rLoc = 950;
+		rType = 0;
+		vrLen = 975;
+		vrLoc = 0;
+	};
+	558EE9ED131FCD1E00DCE586 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 5507B7B3131A7F72001918DB /* NSDate+Calculations.m */;
+		name = "NSDate+Calculations.m: 280";
+		rLen = 0;
+		rLoc = 7663;
+		rType = 0;
+		vrLen = 1063;
+		vrLoc = 6714;
+	};
+	558EE9EE131FCD1E00DCE586 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 5507B7AC131A7EDE001918DB /* NSDateCalculationsTest.m */;
+		name = "NSDateCalculationsTest.m: 256";
+		rLen = 0;
+		rLoc = 6905;
+		rType = 0;
+		vrLen = 1245;
+		vrLoc = 5917;
+	};
+	558EE9EF131FCD1E00DCE586 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 5507B7AC131A7EDE001918DB /* NSDateCalculationsTest.m */;
+		name = "NSDateCalculationsTest.m: 263";
+		rLen = 0;
+		rLoc = 7054;
+		rType = 0;
+		vrLen = 1239;
+		vrLoc = 5917;
+	};
 }
diff --git a/NSDateCalculations/NSDate+Calculations.h b/NSDateCalculations/NSDate+Calculations.h
@@ -34,8 +34,8 @@
 - (int)daysInMonth;
 - (NSDate *)monthsSince:(int)months;
 - (NSDate *)nextMonth;
-
 - (NSDate *)nextWeek;
+- (NSDate *)nextYear;
 
 - (BOOL)future;
 

diff --git a/NSDateCalculations/NSDate+Calculations.m b/NSDateCalculations/NSDate+Calculations.m
@@ -275,6 +275,11 @@ - (NSDate *)nextWeek
 	return [self advance:0 months:0 weeks:1 days:0 hours:0 minutes:0 seconds:0];
 }
 
+- (NSDate *)nextYear
+{
+	return [self advance:1 months:0 weeks:0 days:0 hours:0 minutes:0 seconds:0];
+}
+
 - (BOOL)future
 {
 	return self == [self laterDate:[NSDate date]];

diff --git a/Readme b/Readme
@@ -29,8 +29,8 @@ Currently implemented methods:
 - (int)daysInMonth;
 - (NSDate *)monthsSince:(int)months;
 - (NSDate *)nextMonth;
-
 - (NSDate *)nextWeek;
+- (NSDate *)nextYear;
 
 - (BOOL)future;
 

diff --git a/Test/NSDateCalculationsTest.m b/Test/NSDateCalculationsTest.m
@@ -258,6 +258,14 @@ - (void)testNextWeek
 	STAssertEqualObjects(result, expected, nil);
 }
 
+- (void)testNextYear
+{
+	NSString *result = [self formattedDate:[[self defaultDate ] nextYear]];
+	NSString *expected = @"2012 06 23 - 10:15:00";
+
+	STAssertEqualObjects(result, expected, nil);
+}
+
 - (void)testFuture1
 {
 	NSDate *date = [self createDate:2001 month:8 day:31 hour:13 minute:12 second:0];