Merge branch 'release/2.7.7'

.gitignore

@@ -1,2 +1,4 @@
 XcodeCoverage
 RELEASE_NOTES.md
+.DS_Store
+*.xcuserstate

.jazzy.yaml

@@ -4,11 +4,11 @@ source_directory: XCDYouTubeKit
 framework_root: .
 umbrella_header: XCDYouTubeKit/XCDYouTubeKit.h
 module: XCDYouTubeKit
-module_version: 2.7.6
+module_version: 2.7.7
 
 author: Cédric Luthi
 author_url: https://twitter.com/0xced
 
 readme: README.md
 github_url: https://github.com/0xced/XCDYouTubeKit
-github_file_prefix: https://github.com/0xced/XCDYouTubeKit/tree/2.7.6/XCDYouTubeKit
+github_file_prefix: https://github.com/0xced/XCDYouTubeKit/tree/2.7.7/XCDYouTubeKit

CHANGELOG.md

@@ -1,3 +1,7 @@
+#### Version 2.7.7
+
+* Add another player script regular expression (#438)
+
 #### Version 2.7.6
 
 * Adaptation to YouTube API change. (#437)

XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj

@@ -760,7 +760,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2.7.6;
+				CURRENT_PROJECT_VERSION = 2.7.7;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -804,7 +804,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 2.7.6;
+				CURRENT_PROJECT_VERSION = 2.7.7;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;

XCDYouTubeKit Tests/VCRURLConnection/VCRURLConnection/VCR.h

@@ -108,4 +108,7 @@
  */
 + (void)save:(NSString *)path;
 
++ (NSArray<NSHTTPCookie *>*)cookies;
++ (void)setCookies:(NSArray<NSHTTPCookie *>*)cookies;
+
 @end

XCDYouTubeKit Tests/VCRURLConnection/VCRURLConnection/VCR.m

@@ -31,6 +31,7 @@
 
 static BOOL _VCRIsRecording;
 static BOOL _VCRIsReplaying;
+static NSArray *_VCRCookies;
 
 
 @implementation VCR
@@ -76,6 +77,9 @@ + (void)start {
 }
 
 + (void)stop {
+	for (NSHTTPCookie *cookie in [NSHTTPCookieStorage sharedHTTPCookieStorage].cookies) {
+		[[NSHTTPCookieStorage sharedHTTPCookieStorage]deleteCookie:cookie];
+	}
     [self setRecording:NO];
     [self setReplaying:NO];
 }
@@ -84,6 +88,16 @@ + (void)save:(NSString *)path {
     return [[VCRCassetteManager defaultManager] save:path];
 }
 
++ (NSArray<NSHTTPCookie *> *)cookies {
+	return  _VCRCookies;
+}
+
++ (void)setCookies:(NSArray<NSHTTPCookie *> *)cookies {
+	if (_VCRCookies != cookies) {
+		_VCRCookies = cookies;
+	}
+}
+
 @end
 
 

XCDYouTubeKit Tests/VCRURLConnection/VCRURLConnection/VCRRecordingURLProtocol.m

@@ -42,6 +42,9 @@ + (BOOL)canInitWithRequest:(NSURLRequest *)request {
 }
 
 + (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request {
+	for (NSHTTPCookie *cookie in [VCR cookies]) {
+		[[NSHTTPCookieStorage sharedHTTPCookieStorage]setCookie:cookie];
+	}
     return request;
 }
 

XCDYouTubeKit Tests/XCDYouTubeKitTestCase.h

@@ -8,4 +8,6 @@
 #import "VCRCassetteManager.h"
 
 @interface XCDYouTubeKitTestCase : XCTestCase
+- (void) setUpTestWithSelector:(SEL)selector;
+@property NSArray<NSHTTPCookie *>*cookies;
 @end

XCDYouTubeKit Tests/XCDYouTubeKitTestCase.m

@@ -52,6 +52,7 @@ + (NSArray *) testInvocations
 - (void) setUpTestWithSelector:(SEL)selector
 {
 	[super setUpTestWithSelector:selector];
+	[VCR setCookies:self.cookies];
 
 	BOOL onlineTests = [[[[NSProcessInfo processInfo] environment] objectForKey:@"ONLINE_TESTS"] boolValue];
 

XCDYouTubeKit Tests/XCDYouTubeProtectedVideosTestCase.m

@@ -8,15 +8,14 @@
 #import "XCDYouTubeVideo+Private.h"
 
 @interface XCDYouTubeProtectedVideosTestCase : XCDYouTubeKitTestCase
-extern NSArray <NSHTTPCookie *>* XCDYouTubeProtectedVideosAdultUserCookies(void);
-extern NSArray <NSHTTPCookie *>* XCDYouTubeProtectedVideosMinorUserCookies(void);
+extern NSArray <NSHTTPCookie *>* XCDYouTubeProtectedVideosCookies(void);
 @end
 
 @implementation XCDYouTubeProtectedVideosTestCase
 
-NSArray <NSHTTPCookie *>* XCDYouTubeProtectedVideosMinorUserCookies()
+NSArray <NSHTTPCookie *>* XCDYouTubeProtectedVideosCookies()
 {
-	NSURL *cookieURL = [[NSBundle bundleForClass:[XCDYouTubeProtectedVideosTestCase class]]URLForResource:@"minorUserCookieData" withExtension:nil subdirectory:@"Cookies"];
+	NSURL *cookieURL = [[NSBundle bundleForClass:[XCDYouTubeProtectedVideosTestCase class]]URLForResource:@"UserCookieData" withExtension:nil subdirectory:@"Cookies"];
 
 	NSCAssert(cookieURL != nil, @"Cookie data could not be found!");
 	NSData *cookieData = [NSData dataWithContentsOfURL:cookieURL];
@@ -29,71 +28,25 @@ @implementation XCDYouTubeProtectedVideosTestCase
 	return cookies;
 }
 
-NSArray <NSHTTPCookie *>* XCDYouTubeProtectedVideosAdultUserCookies()
+- (void)tearDown
 {
-	NSURL *cookieURL = [[NSBundle bundleForClass:[XCDYouTubeProtectedVideosTestCase class]]URLForResource:@"adultUserCookieData" withExtension:nil subdirectory:@"Cookies"];
-
-	NSCAssert(cookieURL != nil, @"Cookie data could not be found!");
-	NSData *cookieData = [NSData dataWithContentsOfURL:cookieURL];
-	NSCAssert(cookieData != nil, @"Cookie data could not be found!");
-	NSKeyedUnarchiver *unArchiver = [[NSKeyedUnarchiver alloc]initForReadingFromData:cookieData error:nil];
-	unArchiver.requiresSecureCoding = NO;
-	NSSet *codingClasses = [NSSet setWithArray:@[ [NSArray classForCoder],[NSHTTPCookie classForCoder] ]];
-	NSArray <NSHTTPCookie *>*cookies = [unArchiver decodeObjectOfClasses:codingClasses forKey:NSKeyedArchiveRootObjectKey];
-	NSCAssert(cookies.count != 0, @"No cookies found!");
-	return cookies;
+	self.cookies = nil;
+	[super tearDown];
 }
 
-- (void) testAgeRestrictedVideoThatRequiresCookiesWithAdultUserCookies_online
+- (void)setUpTestWithSelector:(SEL)selector
 {
-	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"vhG9_yBJmVE" cookies:XCDYouTubeProtectedVideosAdultUserCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
-	 {
-		 XCTAssertNil(error);
-		 XCTAssertNotNil(video.title);
-		 XCTAssertNotNil(video.expirationDate);
-		 XCTAssertNotNil(video.thumbnailURL);
-		 XCTAssertTrue(video.streamURLs.count > 0);
-		 XCTAssertTrue(video.duration > 0);
-		 [video.streamURLs enumerateKeysAndObjectsUsingBlock:^(NSNumber *key, NSURL *streamURL, BOOL *stop)
-		  {
-			  XCTAssertTrue([streamURL.query rangeOfString:@"signature="].location != NSNotFound || [streamURL.query rangeOfString:@"sig="].location != NSNotFound);
-		  }];
-		 [expectation fulfill];
-	 }];
-
-	[self waitForExpectationsWithTimeout:30 handler:nil];
-}
-
-- (void) testAgeRestrictedVideoThatRequiresCookiesWithAdultUserCookiesIsPlayable_online
-{
-	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"vhG9_yBJmVE" cookies:XCDYouTubeProtectedVideosAdultUserCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
-	 {
-		 XCTAssertNil(error);
-		 XCTAssertNotNil(video.title);
-		 XCTAssertNotNil(video.expirationDate);
-		 XCTAssertNotNil(video.thumbnailURL);
-		 XCTAssertTrue(video.streamURLs.count > 0);
-		 XCTAssertTrue(video.duration > 0);
-		 NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:video.streamURLs[@(XCDYouTubeVideoQualityMedium360)]];
-		 request.HTTPMethod = @"HEAD";
-		 NSURLSessionDataTask *dataTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *connectionError)
-		 {
-			XCTAssertEqual([(NSHTTPURLResponse *)response statusCode], 200);
-			[expectation fulfill];
-		}];
-
-		[dataTask resume];
-	 }];
-
-	[self waitForExpectationsWithTimeout:30 handler:nil];
+	if ([NSStringFromSelector(selector) containsString:@"Cookies"])
+	{
+		self.cookies = XCDYouTubeProtectedVideosCookies();
+	}
+	[super setUpTestWithSelector:selector];
 }
 
-- (void) testAgeRestrictedVideoThatRequiresCookiesWithMinorUserCookies_online
+- (void) testAgeRestrictedVideoThatRequiresCookiesWithUserCookies
 {
 	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"vhG9_yBJmVE" cookies:XCDYouTubeProtectedVideosMinorUserCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
+	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"vhG9_yBJmVE" cookies:XCDYouTubeProtectedVideosCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
 	 {
 		 XCTAssertNil(error);
 		 XCTAssertNotNil(video.title);
@@ -108,13 +61,13 @@ - (void) testAgeRestrictedVideoThatRequiresCookiesWithMinorUserCookies_online
 		 [expectation fulfill];
 	 }];
 
-	[self waitForExpectationsWithTimeout:30 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
-- (void) testAgeRestrictedVideoThatRequiresCookiesWithMinortUserCookiesIsPlayable_online
+- (void) testAgeRestrictedVideoThatRequiresCookiesWithUserCookiesIsPlayable
 {
 	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"vhG9_yBJmVE" cookies:XCDYouTubeProtectedVideosMinorUserCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
+	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"vhG9_yBJmVE" cookies:XCDYouTubeProtectedVideosCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
 	 {
 		 XCTAssertNil(error);
 		 XCTAssertNotNil(video.title);
@@ -133,7 +86,7 @@ - (void) testAgeRestrictedVideoThatRequiresCookiesWithMinortUserCookiesIsPlayabl
 		[dataTask resume];
 	 }];
 
-	[self waitForExpectationsWithTimeout:30 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 - (void) testAgeRestrictedVideoThatRequiresCookiesWithoutCookies
@@ -291,10 +244,10 @@ - (void) testDASHAudioWithRateBypassIsPlayable
 	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
-- (void) testAgeRestrictedVEVOVideoWithAdultUserCookies_online
+- (void) testAgeRestrictedVEVOVideoWithUserCookies
 {
 	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"07FYdnEawAQ" cookies:XCDYouTubeProtectedVideosAdultUserCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
+	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"07FYdnEawAQ" cookies:XCDYouTubeProtectedVideosCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
 	{
 		XCTAssertNil(error);
 		XCTAssertNotNil(video.title);
@@ -309,13 +262,13 @@ - (void) testAgeRestrictedVEVOVideoWithAdultUserCookies_online
 		[expectation fulfill];
 	}];
 
-	[self waitForExpectationsWithTimeout:30 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
-- (void) testAgeRestrictedVEVOVideoWithAdultUserCookiesIsPlayable_online
+- (void) testAgeRestrictedVEVOVideoWithUserCookiesIsPlayable
 {
 	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"07FYdnEawAQ" cookies:XCDYouTubeProtectedVideosAdultUserCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
+	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"07FYdnEawAQ" cookies:XCDYouTubeProtectedVideosCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
 	 {
 		 XCTAssertNil(error);
 		 XCTAssertNotNil(video.title);
@@ -334,54 +287,9 @@ - (void) testAgeRestrictedVEVOVideoWithAdultUserCookiesIsPlayable_online
 		[dataTask resume];
 	 }];
 
-	[self waitForExpectationsWithTimeout:30 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
-- (void) testAgeRestrictedVEVOVideoWithMinorUserCookies_online
-{
-	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"07FYdnEawAQ" cookies:XCDYouTubeProtectedVideosMinorUserCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
-	 {
-		 XCTAssertNil(error);
-		 XCTAssertNotNil(video.title);
-		 XCTAssertNotNil(video.expirationDate);
-		 XCTAssertNotNil(video.thumbnailURL);
-		 XCTAssertTrue(video.streamURLs.count > 0);
-		 XCTAssertTrue(video.duration > 0);
-		 [video.streamURLs enumerateKeysAndObjectsUsingBlock:^(NSNumber *key, NSURL *streamURL, BOOL *stop)
-		  {
-			  XCTAssertTrue([streamURL.query rangeOfString:@"signature="].location != NSNotFound || [streamURL.query rangeOfString:@"sig="].location != NSNotFound);
-		  }];
-		 [expectation fulfill];
-	 }];
-
-	[self waitForExpectationsWithTimeout:30 handler:nil];
-}
-
-- (void) testAgeRestrictedVEVOVideoWithMinorUserCookiesIsPlayable_online
-{
-	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"07FYdnEawAQ" cookies:XCDYouTubeProtectedVideosMinorUserCookies() completionHandler:^(XCDYouTubeVideo *video, NSError *error)
-	 {
-		 XCTAssertNil(error);
-		 XCTAssertNotNil(video.title);
-		 XCTAssertNotNil(video.expirationDate);
-		 XCTAssertNotNil(video.thumbnailURL);
-		 XCTAssertTrue(video.streamURLs.count > 0);
-		 XCTAssertTrue(video.duration > 0);
-		 NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:video.streamURLs[@(XCDYouTubeVideoQualityMedium360)]];
-		 request.HTTPMethod = @"HEAD";
-		 NSURLSessionDataTask *dataTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *connectionError)
-		 {
-			XCTAssertEqual([(NSHTTPURLResponse *)response statusCode], 200);
-			[expectation fulfill];
-		}];
-
-		[dataTask resume];
-	 }];
-
-	[self waitForExpectationsWithTimeout:30 handler:nil];
-}
 
 // With Charles
 //   * Enable SSL proxying for *.youtube.com
@@ -397,7 +305,7 @@ - (void) testProtectedVideoWithWebPageConnectionError_offline
 		XCTAssertEqualObjects(error.localizedDescription, @"This video is unavailable.");
 		[expectation fulfill];
 	}];
-	[self waitForExpectationsWithTimeout:1 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 // With Charles: Tools -> Black List... -> Add host:www.youtube.com and path:yts/* to simulate connection error on the player script
@@ -412,7 +320,7 @@ - (void) testProtectedVideoWithPlayerScriptConnectionError_offline
 		XCTAssertEqualObjects(error.localizedDescription, @"This video is unavailable.");
 		[expectation fulfill];
 	}];
-	[self waitForExpectationsWithTimeout:1 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 // Edit testProtectedVideoWithoutSignatureFunction.json by replacing `c&&a.set(b,encodeURIComponent(Bv(` with `c.&&a.set(b,encodeURIComponent(Bv(` and
@@ -428,7 +336,7 @@ - (void) testProtectedVideoWithoutSignatureFunction_offline
 		XCTAssertEqualObjects(error.localizedDescription, @"This video is unavailable.");
 		[expectation fulfill];
 	}];
-	[self waitForExpectationsWithTimeout:1 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 // Edit testProtectedVideoWithBrokenSignatureFunction.json by returning null in the signature function
@@ -445,7 +353,7 @@ - (void) testProtectedVideoWithBrokenSignatureFunction_offline
 		XCTAssertEqualObjects(error.localizedDescription, @"This video is unavailable.");
 		[expectation fulfill];
 	}];
-	[self waitForExpectationsWithTimeout:1 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 // Edit testProtectedVideoWithoutJavaScriptPlayerURL.json by replacing `\"js\":` with `\"xs\":`
@@ -460,7 +368,7 @@ - (void) testProtectedVideoWithoutJavaScriptPlayerURL_offline
 		XCTAssertEqualObjects(error.localizedDescription, @"This video is unavailable.");
 		[expectation fulfill];
 	}];
-	[self waitForExpectationsWithTimeout:1 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 // Edit testProtectedVideoWithNonAnonymousJavaScriptPlayerFunction.json by replacing all `(function` with `(Xfunction`
@@ -476,7 +384,7 @@ - (void) testProtectedVideoWithNonAnonymousJavaScriptPlayerFunction_offline
 		XCTAssertEqualObjects(error.localizedDescription, @"This video is unavailable.");
 		[expectation fulfill];
 	}];
-	[self waitForExpectationsWithTimeout:1 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 // With Charles: Tools -> Black List... -> Add host:www.youtube.com and path:embed/* to simulate connection error on the web page
@@ -491,7 +399,7 @@ - (void) testAgeRestrictedVEVOVideoWithEmbedWebPageConnectionError_offline
 		XCTAssertEqualObjects(error.localizedDescription, @"Sign in to confirm your age");
 		[expectation fulfill];
 	}];
-	[self waitForExpectationsWithTimeout:1 handler:nil];
+	[self waitForExpectationsWithTimeout:5  handler:nil];
 }
 
 // See https://github.com/0xced/XCDYouTubeKit/issues/431
@@ -528,7 +436,7 @@ - (void) testAgeRestrictedVideo1WithNoJavaScriptPlayerURL_offline
 		 XCTAssertEqualObjects(error.localizedDescription, @"Sign in to confirm your age");
 		 [expectation fulfill];
 	 }];
-	[self waitForExpectationsWithTimeout:1 handler:nil];
+	[self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 @end