Splitting Podspec into multiple subspecs

OHHTTPStubs.podspec

@@ -31,18 +31,50 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '5.0'
   s.osx.deployment_target = '10.7'
   s.watchos.deployment_target = '2.0'
-  s.default_subspec = 'Core'
 
+  s.default_subspec = 'Default'
+
+  # Default subspec that includes the most commonly-used components
+  s.subspec 'Default' do |default|
+    default.dependency 'OHHTTPStubs/Core'
+    default.dependency 'OHHTTPStubs/NSURLSession'
+    default.dependency 'OHHTTPStubs/JSON'
+    default.dependency 'OHHTTPStubs/OHPathHelpers'
+  end
+
+  # The Core subspec, containing the library core needed in all cases
   s.subspec 'Core' do |core|
-  # subspec for users who don't want the Mocktail extension
-      core.source_files = "OHHTTPStubs/Sources/*.{h,m}"
-      core.public_header_files = "OHHTTPStubs/Sources/*.h"
+    core.source_files = "OHHTTPStubs/Sources/*.{h,m}"
+    core.public_header_files = "OHHTTPStubs/Sources/*.h"
+  end
+
+  # Optional subspecs
+  s.subspec 'NSURLSession' do |urlsession|
+    urlsession.dependency 'OHHTTPStubs/Core'
+    urlsession.source_files = "OHHTTPStubs/Sources/NSURLSession/*.{h,m}"
+  end
+
+  s.subspec 'JSON' do |json|
+    json.dependency 'OHHTTPStubs/Core'
+    json.source_files = "OHHTTPStubs/Sources/JSON/*.{h,m}"
+    json.public_header_files = "OHHTTPStubs/Sources/JSON/*.h"
+  end
+
+  s.subspec 'HTTPMessage' do |httpmessage|
+    httpmessage.dependency 'OHHTTPStubs/Core'
+    httpmessage.source_files = "OHHTTPStubs/Sources/HTTPMessage/*.{h,m}"
+    httpmessage.public_header_files = "OHHTTPStubs/Sources/HTTPMessage/*.h"
   end
-  
+
   s.subspec 'Mocktail' do |mocktail|
-      mocktail.dependency 'OHHTTPStubs/Core'
-      mocktail.source_files = "OHHTTPStubs/Sources/Mocktail/*.{h,m}"
-      mocktail.public_header_files = "OHHTTPStubs/Mocktail/Mocktail/*.h"
+    mocktail.dependency 'OHHTTPStubs/Core'
+    mocktail.source_files = "OHHTTPStubs/Sources/Mocktail/*.{h,m}"
+    mocktail.public_header_files = "OHHTTPStubs/Sources/Mocktail/*.h"
+  end
+
+  s.subspec 'OHPathHelpers' do |pathhelper|
+    pathhelper.source_files = "OHHTTPStubs/Sources/OHPathHelpers/*.{h,m}", "OHHTTPStubs/Sources/Compatibility.h"
+    pathhelper.public_header_files = "OHHTTPStubs/Sources/OHPathHelpers/*.h", "OHHTTPStubs/Sources/Compatibility.h"
   end
 
 end

OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj

@@ -300,8 +300,7 @@
 				1D6DB84D1B763B7A00FCF855 /* Mocktail */,
 				09110A6D1980605D00D175E4 /* OHHTTPStubsResponse */,
 				09110A771980607200D175E4 /* NSURLSession Support */,
-				095B1AD31AE30BA7009D1B56 /* OHPathHelpers.h */,
-				095B1AD41AE30BA7009D1B56 /* OHPathHelpers.m */,
+				093443011B80F88700A91535 /* OHPathHelpers */,
 			);
 			name = OHHTTPStubs;
 			path = Sources;
@@ -331,10 +330,8 @@
 			children = (
 				09110A6E1980606A00D175E4 /* OHHTTPStubsResponse.h */,
 				09110A6F1980606A00D175E4 /* OHHTTPStubsResponse.m */,
-				09110A701980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.h */,
-				09110A711980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m */,
-				09110A721980606A00D175E4 /* OHHTTPStubsResponse+JSON.h */,
-				09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */,
+				093442FF1B80F85700A91535 /* JSON */,
+				093442FE1B80F84800A91535 /* HTTPMessage */,
 			);
 			name = OHHTTPStubsResponse;
 			sourceTree = "<group>";
@@ -345,6 +342,34 @@
 				09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */,
 			);
 			name = "NSURLSession Support";
+			path = NSURLSession;
+			sourceTree = "<group>";
+		};
+		093442FE1B80F84800A91535 /* HTTPMessage */ = {
+			isa = PBXGroup;
+			children = (
+				09110A701980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.h */,
+				09110A711980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m */,
+			);
+			path = HTTPMessage;
+			sourceTree = "<group>";
+		};
+		093442FF1B80F85700A91535 /* JSON */ = {
+			isa = PBXGroup;
+			children = (
+				09110A721980606A00D175E4 /* OHHTTPStubsResponse+JSON.h */,
+				09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */,
+			);
+			path = JSON;
+			sourceTree = "<group>";
+		};
+		093443011B80F88700A91535 /* OHPathHelpers */ = {
+			isa = PBXGroup;
+			children = (
+				095B1AD31AE30BA7009D1B56 /* OHPathHelpers.h */,
+				095B1AD41AE30BA7009D1B56 /* OHPathHelpers.m */,
+			);
+			path = OHPathHelpers;
 			sourceTree = "<group>";
 		};
 		095981461980663000807DBE /* Test Suites */ = {

OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m

@@ -176,7 +176,7 @@ +(NSArray *)stubRequestsUsingMocktailsAtPath:(NSString *)path inBundle:(nullable
     }
 
     // Handle binary which is base64 encoded
-    unsigned long long bodyOffset = [headerMatter dataUsingEncoding:NSUTF8StringEncoding].length + 2;
+    NSUInteger bodyOffset = [headerMatter dataUsingEncoding:NSUTF8StringEncoding].length + 2;
 
     return [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
         NSString *absoluteURL = (request.URL).absoluteString;

OHHTTPStubs/Sources/OHHTTPStubs.h

@@ -190,4 +190,6 @@ NS_ASSUME_NONNULL_END
 #if __has_include(<OHHTTPStubs/OHHTTPStubs+Mocktail.h>)
   #import <OHHTTPStubs/OHHTTPStubs+Mocktail.h>
 #endif
+#if __has_include(<OHHTTPStubs/OHPathHelpers.h>)
 #import <OHHTTPStubs/OHPathHelpers.h>
+#endif