Merge branch 'master' into develop

Author: toto

NXOAuth2Account+Private.h

@@ -14,5 +14,8 @@
 #import "NXOAuth2Account.h"
 
 @interface NXOAuth2Account (Private)
+
 - (id)initAccountWithOAuthClient:(NXOAuth2Client *)oauthClient accountType:(NSString *)accountType;
+- (id)initAccountWithAccessToken:(NXOAuth2AccessToken *)accessToken accountType:(NSString *)accountType;
+
 @end

NXOAuth2Client.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'NXOAuth2Client'
-  s.version  = '1.2.3'
+  s.version  = '1.2.5'
   s.license  = {
     :type => 'BSD',
     :text => <<-LICENSETEXT

README.md

@@ -52,7 +52,7 @@ installation steps automatically.
 
 In order to install the library this way add the following line to your `Podfile`:
 
-```dependency 'NXOAuth2Client','1.2.2'```
+```pod 'NXOAuth2Client', '~> 1.2.2'```
 
 and run the following command `pod install`.
 

Sources/OAuth2Client/NXOAuth2AccessToken.m

@@ -62,7 +62,7 @@ + (id)tokenWithResponseBody:(NSString *)theResponseBody tokenType:(NSString *)to
     }
 
     NSSet *scope = nil;
-    if (scopeString) {
+    if (scopeString && ![scopeString isEqual:[NSNull null]]) {
         scope = [NSSet setWithArray:[scopeString componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]];
     }
 

Sources/OAuth2Client/NXOAuth2Account.m

@@ -42,12 +42,21 @@ @implementation NXOAuth2Account (Private)
 #pragma mark Lifecycle
 
 - (id)initAccountWithOAuthClient:(NXOAuth2Client *)anOAuthClient accountType:(NSString *)anAccountType;
+{
+    self = [self initAccountWithAccessToken:anOAuthClient.accessToken
+                                accountType:anAccountType];
+    if (self) {
+        oauthClient = anOAuthClient;
+    }
+    return self;
+}
+
+- (id)initAccountWithAccessToken:(NXOAuth2AccessToken *)anAccessToken accountType:(NSString *)anAccountType;
 {
     self = [super init];
     if (self) {
         accountType = anAccountType;
-        oauthClient = anOAuthClient;
-        accessToken = oauthClient.accessToken;
+        accessToken = anAccessToken;
         oauthClient.delegate = self;
         identifier = [NSString nxoauth2_stringWithUUID];
     }

Sources/OAuth2Client/NXOAuth2AccountStore.h

@@ -127,6 +127,7 @@ typedef void(^NXOAuth2PreparedAuthorizationURLHandler)(NSURL *preparedURL);
 - (void)requestAccessToAccountWithType:(NSString *)accountType username:(NSString *)username password:(NSString *)password;
 - (void)requestAccessToAccountWithType:(NSString *)accountType assertionType:(NSURL *)assertionType assertion:(NSString *)assertion;
 - (void)requestClientCredentialsAccessWithType:(NSString *)accountType;
+- (void)addAccount:(NXOAuth2Account *)account;
 - (void)removeAccount:(NXOAuth2Account *)account;
 
 

Sources/OAuth2Client/NXOAuth2AccountStore.m

@@ -485,6 +485,12 @@ - (void)oauthClientDidGetAccessToken:(NXOAuth2Client *)client;
     }
 
     NXOAuth2Account *account = [[NXOAuth2Account alloc] initAccountWithOAuthClient:client accountType:accountType];
+    
+    [self addAccount:account];
+}
+
+- (void)addAccount:(NXOAuth2Account *)account;
+{
     @synchronized (self.accountsDict) {
         [self.accountsDict setValue:account forKey:account.identifier];
         [NXOAuth2AccountStore storeAccountsInDefaultKeychain:self.accountsDict];

Sources/OAuth2Client/NXOAuth2Connection.m

@@ -89,10 +89,6 @@ - (void)dealloc;
     sendConnectionDidEndNotification = NO;
 
     [connection cancel];
-    
-#if (NXOAuth2ConnectionDebug)
-    [startDate release];
-#endif
 }
 
 
@@ -205,10 +201,6 @@ - (NSURLConnection *)createConnection;
     [aConnection scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];    // let's first schedule it in the current runloop. (see http://github.com/soundcloud/cocoa-api-wrapper/issues#issue/2 )
     [aConnection start];    // now start
 
-#if (NXOAuth2ConnectionDebug)
-    [startDate release]; startDate = [[NSDate alloc] init];
-#endif
-    
     if (!sendConnectionDidEndNotification) [[NSNotificationCenter defaultCenter] postNotificationName:NXOAuth2ConnectionDidStartNotification object:self];
     sendConnectionDidEndNotification = YES;
 

Sources/OAuth2Client/NXOAuth2PostBodyPart.m

@@ -36,6 +36,8 @@ - (id)initWithName:(NSString *)name content:(id)content;
 {
     if ([content isKindOfClass:[NSString class]]) {
         return [self initWithName:name stringContent:content];
+    } else if ([content isKindOfClass:[NSNumber class]]) {
+        return [self initWithName:name stringContent:[content stringValue]];
     } else if ([content isKindOfClass:[NSURL class]] && [content isFileURL]) {
         return [self initWithName:name fileContent:[content path]];
     } else if ([content isKindOfClass:[NSData class]]) {