Merge b7acd3e into f960f9f

venmo · Jun 27, 2014 · f04d3e0 · f04d3e0
2 parents f960f9f + b7acd3e
commit f04d3e0
Show file tree

Hide file tree

Showing 16 changed files with 527 additions and 166 deletions.
diff --git a/Podfile b/Podfile
@@ -1,7 +1,7 @@
 platform :ios, '6.0'
 
 target 'VENCore', :exclusive => true do
-  pod 'AFNetworking'
+  pod 'CMDQueryStringSerialization', '~> 0.2.0'
 end
 
 target 'VENCoreUnitTests', :exclusive => true do

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,39 +1,21 @@
 PODS:
-  - AFNetworking (2.2.3):
-    - AFNetworking/NSURLConnection
-    - AFNetworking/NSURLSession
-    - AFNetworking/Reachability
-    - AFNetworking/Security
-    - AFNetworking/Serialization
-    - AFNetworking/UIKit
-  - AFNetworking/NSURLConnection (2.2.3):
-    - AFNetworking/Reachability
-    - AFNetworking/Security
-    - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.2.3):
-    - AFNetworking/NSURLConnection
-  - AFNetworking/Reachability (2.2.3)
-  - AFNetworking/Security (2.2.3)
-  - AFNetworking/Serialization (2.2.3)
-  - AFNetworking/UIKit (2.2.3):
-    - AFNetworking/NSURLConnection
-    - AFNetworking/NSURLSession
+  - CMDQueryStringSerialization (0.2.0)
   - Expecta (0.3.0)
   - Nocilla (0.8.1)
   - OCHamcrest (3.0.1)
   - OCMock (2.2.4)
   - Specta (0.2.1)
 
 DEPENDENCIES:
-  - AFNetworking
+  - CMDQueryStringSerialization (~> 0.2.0)
   - Expecta
   - Nocilla
   - OCHamcrest
   - OCMock
   - Specta
 
 SPEC CHECKSUMS:
-  AFNetworking: 47947303319594706f48a55185ea95a95159ab94
+  CMDQueryStringSerialization: e53570ccbce6004acba30b1c1210e254644cdb92
   Expecta: ce8a51b9fad15a2cd573b291cb2909aaed865350
   Nocilla: e573c2bf9113c8d77782b695a2f9362b7bc44e72
   OCHamcrest: 207233b7d7a44dadd66aca398947cc7e029c9be5

diff --git a/VENCore.podspec b/VENCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "VENCore"
-  s.version      = "1.0.0"
+  s.version      = "2.0.0"
   s.summary      = "Core Venmo client library"
   s.description  = <<-DESC
                    Core iOS client library for the Venmo api
@@ -14,6 +14,6 @@ Pod::Spec.new do |s|
                      :tag => "v#{s.version}"
   }
   s.source_files = 'VENCore/**/*.{h,m}'
-  s.dependency 'AFNetworking'
+  s.dependency 'CMDQueryStringSerialization', '~>0.2.0'
   s.requires_arc = true
 end
diff --git a/VENCore.xcodeproj/project.pbxproj b/VENCore.xcodeproj/project.pbxproj
@@ -27,6 +27,7 @@
 		EB34431319071EA200B7791E /* paymentToUser.json in Resources */ = {isa = PBXBuildFile; fileRef = EB34431219071EA200B7791E /* paymentToUser.json */; };
 		EB34AA901906FDD600663ECF /* libVENCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBCB247418E9FBAF00807472 /* libVENCore.a */; };
 		EB34AA911907006F00663ECF /* VENTestUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = EB427E5718F8451B0070EDD9 /* VENTestUtilities.m */; };
+		EB403ECC1953A1DA00F23593 /* EXPMatchers+Venmo.m in Sources */ = {isa = PBXBuildFile; fileRef = EB403ECB1953A1DA00F23593 /* EXPMatchers+Venmo.m */; };
 		EB418B9A18EB0DD20003CBF5 /* NSError+VENCoreSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = EB418B9918EB0DD20003CBF5 /* NSError+VENCoreSpec.m */; };
 		EB418B9D18EB0E060003CBF5 /* NSDictionary+VENCore.m in Sources */ = {isa = PBXBuildFile; fileRef = EB418B9C18EB0E060003CBF5 /* NSDictionary+VENCore.m */; };
 		EB418B9F18EB0E1B0003CBF5 /* NSDictionary+VENCoreSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = EB418B9E18EB0E1B0003CBF5 /* NSDictionary+VENCoreSpec.m */; };
@@ -114,6 +115,8 @@
 		EB00DB3E1906E647001836A8 /* PaymentSandboxSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PaymentSandboxSpec.m; sourceTree = "<group>"; };
 		EB00DB401906E647001836A8 /* VENCoreIntegrationTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "VENCoreIntegrationTests-Prefix.pch"; sourceTree = "<group>"; };
 		EB34431219071EA200B7791E /* paymentToUser.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = paymentToUser.json; path = API/payments/paymentToUser.json; sourceTree = "<group>"; };
+		EB403ECA1953A1DA00F23593 /* EXPMatchers+Venmo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+Venmo.h"; path = "Utilities/EXPMatchers+Venmo.h"; sourceTree = "<group>"; };
+		EB403ECB1953A1DA00F23593 /* EXPMatchers+Venmo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+Venmo.m"; path = "Utilities/EXPMatchers+Venmo.m"; sourceTree = "<group>"; };
 		EB418B9618EB0DA30003CBF5 /* VENTransactionSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VENTransactionSpec.m; sourceTree = "<group>"; };
 		EB418B9918EB0DD20003CBF5 /* NSError+VENCoreSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSError+VENCoreSpec.m"; path = "Categories/NSError+VENCoreSpec.m"; sourceTree = "<group>"; };
 		EB418B9B18EB0E060003CBF5 /* NSDictionary+VENCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+VENCore.h"; path = "Categories/NSDictionary+VENCore.h"; sourceTree = "<group>"; };
@@ -311,6 +314,8 @@
 			children = (
 				EB427E5618F8451B0070EDD9 /* VENTestUtilities.h */,
 				EB427E5718F8451B0070EDD9 /* VENTestUtilities.m */,
+				EB403ECA1953A1DA00F23593 /* EXPMatchers+Venmo.h */,
+				EB403ECB1953A1DA00F23593 /* EXPMatchers+Venmo.m */,
 			);
 			name = Utilities;
 			sourceTree = "<group>";
@@ -722,6 +727,7 @@
 				EBB8E3BE18FDB05400A22C6B /* NSString+VENCoreSpec.m in Sources */,
 				EB418B9F18EB0E1B0003CBF5 /* NSDictionary+VENCoreSpec.m in Sources */,
 				EB418B9A18EB0DD20003CBF5 /* NSError+VENCoreSpec.m in Sources */,
+				EB403ECC1953A1DA00F23593 /* EXPMatchers+Venmo.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/VENCore/Networking/VENHTTP.h b/VENCore/Networking/VENHTTP.h
@@ -8,14 +8,16 @@
 extern NSString *const VENAPIPathPayments;
 extern NSString *const VENAPIPathUsers;
 
-@class AFHTTPRequestOperationManager, AFHTTPRequestOperation, VENHTTPResponse;
+@class VENHTTPResponse;
 
 @interface VENHTTP : NSObject
 
-@property (strong, nonatomic) AFHTTPRequestOperationManager *operationManager;
+@property (nonatomic, strong, readonly) NSURL *baseURL;
 
 - (instancetype)initWithBaseURL:(NSURL *)baseURL;
 
+- (void)setProtocolClasses:(NSArray *)protocolClasses;
+
 - (void)GET:(NSString *)path parameters:(NSDictionary *)parameters
     success:(void(^)(VENHTTPResponse *response))successBlock
     failure:(void(^)(VENHTTPResponse *response, NSError *error))failureBlock;