Merge pull request #89 from Clubjudge/timezone

Parses date strings using a standard timezone
Clubjudge · Aug 20, 2014 · 25c8909 · 25c8909
2 parents 67a8705 + 91bd3ef
commit 25c8909
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/Classes/Categories/NSDate+StringParsing.m b/Classes/Categories/NSDate+StringParsing.m
@@ -36,7 +36,7 @@ + (NSDate *)dateFromString:(NSString *)dateString
   NSLocale *locale = [[NSLocale alloc]
                       initWithLocaleIdentifier:@"en_US_POSIX"];
   [dateFormatter setLocale:locale];
-  [dateFormatter setTimeZone:[NSTimeZone systemTimeZone]];
+  [dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"UTC"]];
 
   NSDate *date = [dateFormatter dateFromString:dateString];
   return date;

diff --git a/Example/CJKitTests/CJCommentTests.m b/Example/CJKitTests/CJCommentTests.m
@@ -13,6 +13,9 @@
 SPEC_BEGIN(CJCOMMENTSPEC)
 
 describe(@"Comment Model", ^{
+  NSCalendar* calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+  [calendar setTimeZone:[NSTimeZone timeZoneWithName:@"GMT"]];
+
   NSDictionary *stub = @{
                          @"id": @"dab8df0390b14949",
                          @"message": @"This is awesome",
@@ -90,7 +93,7 @@
 
     describe(@"#createdAt", ^{
       it(@"produces a correct mapping", ^{
-        NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:comment.createdAt];
+        NSDateComponents *components = [calendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:comment.createdAt];
 
         [[theValue(components.day) should] equal:theValue(24)];
         [[theValue(components.month) should] equal:theValue(4)];

diff --git a/Example/CJKitTests/CJEventTests.m b/Example/CJKitTests/CJEventTests.m
@@ -24,6 +24,9 @@ - (BOOL)isRetinaDisplay;
 SPEC_BEGIN(CJEVENTSPEC)
 
 describe(@"Event Model", ^{
+  NSCalendar* calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+  [calendar setTimeZone:[NSTimeZone timeZoneWithName:@"GMT"]];
+
   NSDictionary *stub = @{
                          @"id": @55,
                          @"followersCount": @10,
@@ -114,7 +117,7 @@ - (BOOL)isRetinaDisplay;
 
     describe(@"#startsAt", ^{
       it(@"produces a correct mapping", ^{
-        NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:event.startsAt];
+        NSDateComponents *components = [calendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:event.startsAt];
 
         [[theValue(components.day) should] equal:theValue(21)];
         [[theValue(components.month) should] equal:theValue(4)];
@@ -127,7 +130,7 @@ - (BOOL)isRetinaDisplay;
 
     describe(@"#endsAt", ^{
       it(@"produces a correct mapping", ^{
-        NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:event.endsAt];
+        NSDateComponents *components = [calendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:event.endsAt];
 
         [[theValue(components.day) should] equal:theValue(21)];
         [[theValue(components.month) should] equal:theValue(4)];
@@ -140,7 +143,7 @@ - (BOOL)isRetinaDisplay;
 
     describe(@"#updatedAt", ^{
       it(@"produces a correct mapping", ^{
-        NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:event.updatedAt];
+        NSDateComponents *components = [calendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:event.updatedAt];
 
         [[theValue(components.day) should] equal:theValue(22)];
         [[theValue(components.month) should] equal:theValue(4)];
@@ -153,7 +156,7 @@ - (BOOL)isRetinaDisplay;
 
     describe(@"#reviewEndsAt", ^{
       it(@"produces a correct mapping", ^{
-        NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:event.reviewEndsAt];
+        NSDateComponents *components = [calendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:event.reviewEndsAt];
 
         [[theValue(components.day) should] equal:theValue(28)];
         [[theValue(components.month) should] equal:theValue(4)];

diff --git a/Example/CJKitTests/CJUserTests.m b/Example/CJKitTests/CJUserTests.m
@@ -12,6 +12,9 @@
 SPEC_BEGIN(CJUSERSPEC)
 
 describe(@"User Model", ^{
+  NSCalendar* calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+  [calendar setTimeZone:[NSTimeZone timeZoneWithName:@"GMT"]];
+
   NSDictionary *stub = @{
                            @"id": @443,
                            @"email": @"bruno.abrantes@clubjudge.com",
@@ -116,7 +119,7 @@
 
     describe(@"#createdAt", ^{
       it(@"produces a correct mapping", ^{
-        NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:user.createdAt];
+        NSDateComponents *components = [calendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:user.createdAt];
 
         [[theValue(components.day) should] equal:theValue(19)];
         [[theValue(components.month) should] equal:theValue(03)];
@@ -189,7 +192,7 @@
 
     describe(@"#birthdate", ^{
       it(@"produces a correct mapping", ^{
-        NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:user.birthdate];
+        NSDateComponents *components = [calendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:user.birthdate];
 
         [[theValue(components.day) should] equal:theValue(13)];
         [[theValue(components.month) should] equal:theValue(10)];

diff --git a/Example/CJKitTests/CJVenueTests.m b/Example/CJKitTests/CJVenueTests.m
@@ -23,6 +23,9 @@ - (BOOL)isRetinaDisplay;
 SPEC_BEGIN(CJVENUESPEC)
 
 describe(@"Venue Model", ^{
+  NSCalendar* calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+  [calendar setTimeZone:[NSTimeZone timeZoneWithName:@"GMT"]];
+
   NSDictionary *stub = @{
                          @"address": @{
                            @"city": @{
@@ -222,7 +225,7 @@ - (BOOL)isRetinaDisplay;
 
     describe(@"#updatedAt", ^{
       it(@"produces a correct mapping", ^{
-        NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:venue.updatedAt];
+        NSDateComponents *components = [calendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitTimeZone fromDate:venue.updatedAt];
 
         [[theValue(components.day) should] equal:theValue(17)];
         [[theValue(components.month) should] equal:theValue(12)];