Supporting iOS8 frameworks and Carthage package manager

Cartfile.private

@@ -0,0 +1,4 @@
+github "specta/specta" => 0.2
+github "specta/expecta" => 0.3
+github "erikdoe/ocmock" => 3.1
+github "AliSoftware/OHHTTPStubs" => 3.1

NXOAuth2Account+Private.h

@@ -11,14 +11,20 @@
 //  the full licence.
 //
 
-#import "NXOAuth2Account.h"
+#import <OAuth2Client/NXOAuth2Account.h>
+
+@protocol NXApplication;
 
 @interface NXOAuth2Account (Private)
 
+@property (nonatomic, readonly) id<NXApplication> application;
+
 - (instancetype)initAccountWithOAuthClient:(NXOAuth2Client *)oauthClient
-                               accountType:(NSString *)accountType;
+                               accountType:(NSString *)accountType
+                               application:(id<NXApplication>)app;
 
 - (instancetype)initAccountWithAccessToken:(NXOAuth2AccessToken *)accessToken
-                               accountType:(NSString *)accountType;
+                               accountType:(NSString *)accountType
+                               application:(id<NXApplication>)app /*NS_DESIGNATED_INITIALIZER*/ NS_REQUIRES_SUPER;
 
 @end

OAuth2Client-iOS-Framework/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.nxtbgthng.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

OAuth2Client-iOS-Framework/OAuth2Client-iOS-Framework.h

@@ -0,0 +1,19 @@
+//
+//  OAuth2Client-iOS-Framework.h
+//  OAuth2Client-iOS-Framework
+//
+//  Created by dodikk on 2/8/15.
+//  Copyright (c) 2015 nxtbgthng. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for OAuth2Client-iOS-Framework.
+FOUNDATION_EXPORT double OAuth2Client_iOS_FrameworkVersionNumber;
+
+//! Project version string for OAuth2Client-iOS-Framework.
+FOUNDATION_EXPORT const unsigned char OAuth2Client_iOS_FrameworkVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <OAuth2Client_iOS_Framework/PublicHeader.h>
+
+

OAuth2Client-iOS-FrameworkTests/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.nxtbgthng.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

OAuth2Client.framework-Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.nxtbgthng.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.nxtbgthng.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

OAuth2Client.xcodeproj/xcshareddata/xcschemes/OAuth2Client-iOS-Framework-Shared.xcscheme

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0610"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7E91AEE51A87561B0060BD28"
+               BuildableName = "OAuth2Client.framework"
+               BlueprintName = "OAuth2Client-iOS-Framework"
+               ReferencedContainer = "container:OAuth2Client.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E91AEE51A87561B0060BD28"
+            BuildableName = "OAuth2Client.framework"
+            BlueprintName = "OAuth2Client-iOS-Framework"
+            ReferencedContainer = "container:OAuth2Client.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E91AEE51A87561B0060BD28"
+            BuildableName = "OAuth2Client.framework"
+            BlueprintName = "OAuth2Client-iOS-Framework"
+            ReferencedContainer = "container:OAuth2Client.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E91AEE51A87561B0060BD28"
+            BuildableName = "OAuth2Client.framework"
+            BlueprintName = "OAuth2Client-iOS-Framework"
+            ReferencedContainer = "container:OAuth2Client.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

OAuth2Client/NXApplication.h

@@ -0,0 +1,15 @@
+//
+//  NXApplication.h
+//  OAuth2Client
+//
+//  Created by Oleksandr Dodatko on 2/2/15.
+//  Copyright (c) 2015 nxtbgthng. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol NXApplication <NSObject>
+
+-(BOOL)openURL:(NSURL*)url;
+
+@end

OAuth2Client/NXOAuth2.h

@@ -0,0 +1,33 @@
+//
+//  NXOAuth2.h
+//  OAuth2Client
+//
+//  Created by Ullrich Schäfer on 13.09.10.
+//
+//  Copyright 2010 nxtbgthng. All rights reserved.
+//
+//  Licenced under the new BSD-licence.
+//  See README.md in this repository for
+//  the full licence.
+//
+
+
+#import <OAuth2Client/NXApplication.h>
+#import <OAuth2Client/NXOAuth2Client.h>
+#import <OAuth2Client/NXOAuth2ClientDelegate.h>
+#import <OAuth2Client/NXOAuth2AccessToken.h>
+#import <OAuth2Client/NXOAuth2Connection.h>
+#import <OAuth2Client/NXOAuth2ConnectionDelegate.h>
+#import <OAuth2Client/NXOAuth2TrustDelegate.h>
+#import <OAuth2Client/NXOAuth2Constants.h>
+#import <OAuth2Client/NXOAuth2FileStreamWrapper.h>
+#import <OAuth2Client/NXOAuth2PostBodyStream.h>
+#import <OAuth2Client/NXOAuth2AccountStore.h>
+#import <OAuth2Client/NXOAuth2Account.h>
+#import <OAuth2Client/NXOAuth2Request.h>
+
+#pragma mark Helpers
+
+#import <OAuth2Client/NSURL+NXOAuth2.h>
+#import <OAuth2Client/NSString+NXOAuth2.h>
+#import <OAuth2Client/NSData+NXOAuth2.h>

Sources/OAuth2Client/NXOAuth2AccountStore.h → OAuth2Client/NXOAuth2AccountStore.h

@@ -13,10 +13,11 @@
 
 #import <Foundation/Foundation.h>
 
-#import "NXOAuth2TrustDelegate.h"
 
 @class NXOAuth2Account;
 @class NXOAuth2Connection;
+@protocol NXApplication;
+
 
 #pragma mark Notifications
 
@@ -75,7 +76,13 @@ typedef void(^NXOAuth2PreparedAuthorizationURLHandler)(NSURL *preparedURL);
     NSMutableDictionary *trustedCertificatesHandler;
 }
 
-+ (instancetype)sharedStore;
++(instancetype)sharedStoreForApplication:(id<NXApplication>)uiApplication;
+-(instancetype)init NS_UNAVAILABLE;
++(instancetype)new NS_UNAVAILABLE;
+
+// Private API
+//-(instancetype)initWithApplication:(id<NXApplication>)uiApplication NS_DESIGNATED_INITIALIZER NS_REQUIRES_SUPER __attribute((nonnull));
+
 
 #pragma mark Accessors
 

Sources/OAuth2Client/NXOAuth2Client.h → OAuth2Client/NXOAuth2Client.h

@@ -12,14 +12,14 @@
 //
 
 #import <Foundation/Foundation.h>
-
-#import "NXOAuth2ClientDelegate.h"
-#import "NXOAuth2ConnectionDelegate.h"
+#import <OAuth2Client/NXOAuth2ConnectionDelegate.h>
 
 extern NSString * const NXOAuth2ClientConnectionContextTokenRequest;
 extern NSString * const NXOAuth2ClientConnectionContextTokenRefresh;
 
-@class NXOAuth2Connection, NXOAuth2AccessToken;
+@class NXOAuth2Connection;
+@class NXOAuth2AccessToken;
+@protocol NXOAuth2ClientDelegate;
 
 /*!
  * The OAuth 2.0 client

Sources/OAuth2Client/NXOAuth2ClientDelegate.h → OAuth2Client/NXOAuth2ClientDelegate.h

@@ -11,8 +11,8 @@
 //  the full licence.
 //
 
-#import "NXOAuth2Constants.h"
-#import "NXOAuth2TrustDelegate.h"
+
+#import <OAuth2Client/NXOAuth2TrustDelegate.h>
 
 @class NXOAuth2Client;
 

Sources/OAuth2Client/NXOAuth2Connection.h → OAuth2Client/NXOAuth2Connection.h

@@ -12,8 +12,8 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <OAuth2Client/NXOAuth2RequestCallbacks.h>
 
-#import "NXOAuth2Constants.h"
 
 @class NXOAuth2Client;
 @protocol NXOAuth2ConnectionDelegate;
@@ -46,10 +46,6 @@ extern NSString * const NXOAuth2ConnectionDidStartNotification;
 extern NSString * const NXOAuth2ConnectionDidEndNotification;
 
 
-typedef void(^NXOAuth2ConnectionResponseHandler)(NSURLResponse *response, NSData *responseData, NSError *error);
-typedef void(^NXOAuth2ConnectionSendingProgressHandler)(unsigned long long bytesSend, unsigned long long bytesTotal);
-
-
 @interface NXOAuth2Connection : NSObject {
 @private
     NSURLConnection        *connection;
@@ -87,11 +83,11 @@ typedef void(^NXOAuth2ConnectionSendingProgressHandler)(unsigned long long bytes
 @property (nonatomic, strong) NSDictionary *userInfo;
 @property (nonatomic, strong, readonly) NXOAuth2Client *client;
 
-- (instancetype) initWithRequest:(NSMutableURLRequest *)request
-               requestParameters:(NSDictionary *)requestParameters
-                     oauthClient:(NXOAuth2Client *)client
-          sendingProgressHandler:(NXOAuth2ConnectionSendingProgressHandler)sendingProgressHandler
-                 responseHandler:(NXOAuth2ConnectionResponseHandler)responseHandler;
+- (instancetype)initWithRequest:(NSMutableURLRequest *)request
+              requestParameters:(NSDictionary *)requestParameters
+                    oauthClient:(NXOAuth2Client *)client
+         sendingProgressHandler:(NXOAuth2ConnectionSendingProgressHandler)sendingProgressHandler
+                responseHandler:(NXOAuth2ConnectionResponseHandler)responseHandler;
 
 - (instancetype)initWithRequest:(NSMutableURLRequest *)request
               requestParameters:(NSDictionary *)requestParameters

Sources/OAuth2Client/NXOAuth2ConnectionDelegate.h → OAuth2Client/NXOAuth2ConnectionDelegate.h

@@ -11,8 +11,9 @@
 //  the full licence.
 //
 
-#import "NXOAuth2Constants.h"
-#import "NXOAuth2TrustDelegate.h"
+
+#import <Foundation/Foundation.h>
+#import <OAuth2Client/NXOAuth2TrustDelegate.h>
 
 @class NXOAuth2Connection;
 

Sources/OAuth2Client/NXOAuth2PostBodyStream.h → OAuth2Client/NXOAuth2PostBodyStream.h

@@ -27,8 +27,8 @@
 
 - (instancetype)initWithParameters:(NSDictionary *)postParameters;
 
-@property (readonly) NSString *boundary;
-@property (readonly) unsigned long long length;
+@property (readonly, nonatomic) NSString *boundary;
+@property (readonly, nonatomic) unsigned long long length;
 
 @end
 

Sources/OAuth2Client/NXOAuth2Request.h → OAuth2Client/NXOAuth2Request.h

@@ -12,10 +12,10 @@
 //
 
 #import <Foundation/Foundation.h>
-
-#import "NXOAuth2Connection.h"
+#import <OAuth2Client/NXOAuth2RequestCallbacks.h>
 
 @class NXOAuth2Account;
+@class NXOAuth2Connection;
 
 @interface NXOAuth2Request : NSObject {
 @private

OAuth2Client/NXOAuth2RequestCallbacks.h

@@ -0,0 +1,19 @@
+//
+//  NXOAuth2RequestCallbacks.h
+//  OAuth2Client
+//
+//  Created by Oleksandr Dodatko on 2/2/15.
+//  Copyright (c) 2015 nxtbgthng. All rights reserved.
+//
+
+#ifndef OAuth2Client_NXOAuth2RequestCallbacks_h
+#define OAuth2Client_NXOAuth2RequestCallbacks_h
+
+
+#import <Foundation/Foundation.h>
+
+typedef void(^NXOAuth2ConnectionResponseHandler)(NSURLResponse *response, NSData *responseData, NSError *error);
+typedef void(^NXOAuth2ConnectionSendingProgressHandler)(unsigned long long bytesSend, unsigned long long bytesTotal);
+
+
+#endif