Skip to content

Commit b3051dd

Browse files
dethidethi
committed
Travis for iOS + HTTP Header
1 parent f1b13d1 commit b3051dd

File tree

4 files changed

+22
-37
lines changed

4 files changed

+22
-37
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ before_install:
77
- gem install xcpretty -N
88
script:
99
- set -o pipefail
10+
- xcodebuild -project AlgoliaSearch.xcodeproj -scheme "AlgoliaSearch iOS" -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" ONLY_ACTIVE_ARCH=NO test | xcpretty -c
1011
- xcodebuild -project AlgoliaSearch.xcodeproj -scheme "AlgoliaSearch OSX" test | xcpretty -c

‎AlgoliaSearch.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -467,10 +467,7 @@
467467
DYLIB_COMPATIBILITY_VERSION = 1;
468468
DYLIB_CURRENT_VERSION = 1;
469469
DYLIB_INSTALL_NAME_BASE = "@rpath";
470-
FRAMEWORK_SEARCH_PATHS = (
471-
"$(inherited)",
472-
"$(PROJECT_DIR)/Carthage/Build/Mac",
473-
);
470+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
474471
FRAMEWORK_VERSION = A;
475472
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
476473
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -493,10 +490,7 @@
493490
DYLIB_COMPATIBILITY_VERSION = 1;
494491
DYLIB_CURRENT_VERSION = 1;
495492
DYLIB_INSTALL_NAME_BASE = "@rpath";
496-
FRAMEWORK_SEARCH_PATHS = (
497-
"$(inherited)",
498-
"$(PROJECT_DIR)/Carthage/Build/Mac",
499-
);
493+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
500494
FRAMEWORK_VERSION = A;
501495
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
502496
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -515,7 +509,6 @@
515509
FRAMEWORK_SEARCH_PATHS = (
516510
"$(DEVELOPER_FRAMEWORKS_DIR)",
517511
"$(inherited)",
518-
"$(PROJECT_DIR)/Carthage/Build/Mac",
519512
);
520513
GCC_PREPROCESSOR_DEFINITIONS = (
521514
"DEBUG=1",
@@ -534,7 +527,6 @@
534527
FRAMEWORK_SEARCH_PATHS = (
535528
"$(DEVELOPER_FRAMEWORKS_DIR)",
536529
"$(inherited)",
537-
"$(PROJECT_DIR)/Carthage/Build/Mac",
538530
);
539531
INFOPLIST_FILE = Tests/Info.plist;
540532
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
@@ -552,10 +544,7 @@
552544
DYLIB_COMPATIBILITY_VERSION = 1;
553545
DYLIB_CURRENT_VERSION = 1;
554546
DYLIB_INSTALL_NAME_BASE = "@rpath";
555-
FRAMEWORK_SEARCH_PATHS = (
556-
"$(inherited)",
557-
"$(PROJECT_DIR)/Carthage/Build/iOS",
558-
);
547+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
559548
GCC_PREPROCESSOR_DEFINITIONS = (
560549
"DEBUG=1",
561550
"$(inherited)",
@@ -581,10 +570,7 @@
581570
DYLIB_COMPATIBILITY_VERSION = 1;
582571
DYLIB_CURRENT_VERSION = 1;
583572
DYLIB_INSTALL_NAME_BASE = "@rpath";
584-
FRAMEWORK_SEARCH_PATHS = (
585-
"$(inherited)",
586-
"$(PROJECT_DIR)/Carthage/Build/iOS",
587-
);
573+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
588574
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
589575
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
590576
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -605,7 +591,6 @@
605591
FRAMEWORK_SEARCH_PATHS = (
606592
"$(SDKROOT)/Developer/Library/Frameworks",
607593
"$(inherited)",
608-
"$(PROJECT_DIR)/Carthage/Build/iOS",
609594
);
610595
GCC_PREPROCESSOR_DEFINITIONS = (
611596
"DEBUG=1",
@@ -627,7 +612,6 @@
627612
FRAMEWORK_SEARCH_PATHS = (
628613
"$(SDKROOT)/Developer/Library/Frameworks",
629614
"$(inherited)",
630-
"$(PROJECT_DIR)/Carthage/Build/iOS",
631615
);
632616
INFOPLIST_FILE = Tests/Info.plist;
633617
IPHONEOS_DEPLOYMENT_TARGET = 8.0;

‎Source/Client.swift‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class Client {
4040
if let tagFilters = tagFilters {
4141
setExtraHeader(tagFilters, forKey: "X-Algolia-TagFilters")
4242
} else {
43-
//Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders?.removeValueForKey("X-Algolia-TagFilters")
43+
manager.session.configuration.HTTPAdditionalHeaders?.removeValueForKey("X-Algolia-TagFilters")
4444
}
4545
}
4646
}
@@ -51,14 +51,14 @@ public class Client {
5151
if let userToken = userToken {
5252
setExtraHeader(userToken, forKey: "X-Algolia-UserToken")
5353
} else {
54-
//Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders?.removeValueForKey("X-Algolia-UserToken")
54+
manager.session.configuration.HTTPAdditionalHeaders?.removeValueForKey("X-Algolia-UserToken")
5555
}
5656
}
5757
}
5858

5959
public var timeout: NSTimeInterval = 30 {
6060
didSet {
61-
//Alamofire.Manager.sharedInstance.session.configuration.timeoutIntervalForRequest = timeout;
61+
manager.session.configuration.timeoutIntervalForRequest = timeout;
6262
}
6363
}
6464

@@ -109,33 +109,33 @@ public class Client {
109109
}
110110

111111
let version = NSBundle(identifier: "com.algolia.AlgoliaSearch")!.infoDictionary!["CFBundleShortVersionString"] as String
112-
var HTTPHeader = [
112+
var HTTPHeaders = [
113113
"X-Algolia-API-Key": self.apiKey,
114114
"X-Algolia-Application-Id": self.appID,
115115
"User-Agent": "Algolia for Swift \(version)"
116116
]
117117

118118
if let tagFilters = self.tagFilters {
119-
HTTPHeader["X-Algolia-TagFilters"] = tagFilters
119+
HTTPHeaders["X-Algolia-TagFilters"] = tagFilters
120120
}
121121
if let userToken = self.userToken {
122-
HTTPHeader["X-Algolia-UserToken"] = userToken
122+
HTTPHeaders["X-Algolia-UserToken"] = userToken
123123
}
124124

125-
manager = Manager(HTTPHeader: HTTPHeader)
125+
manager = Manager(HTTPHeaders: HTTPHeaders)
126126
}
127127

128128
/// Allow to set custom extra header.
129129
///
130130
/// :param: value value of the header
131131
/// :param: forKey key of the header
132132
public func setExtraHeader(value: String, forKey key: String) {
133-
// if (Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders != nil) {
134-
// Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders!.updateValue(value, forKey: key)
135-
// } else {
136-
// let HTTPHeader = [key: value]
137-
// Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders = HTTPHeader
138-
// }
133+
if (manager.session.configuration.HTTPAdditionalHeaders != nil) {
134+
manager.session.configuration.HTTPAdditionalHeaders!.updateValue(value, forKey: key)
135+
} else {
136+
let HTTPHeader = [key: value]
137+
manager.session.configuration.HTTPAdditionalHeaders = HTTPHeader
138+
}
139139
}
140140

141141
// MARK: - Operations

‎Source/Network.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ enum HTTPMethod: String {
3434
class Manager {
3535
let session: NSURLSession
3636

37-
init(HTTPHeader: [String: String]) {
37+
init(HTTPHeaders: [String: String]) {
3838
let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
39-
configuration.HTTPAdditionalHeaders = HTTPHeader
39+
configuration.HTTPAdditionalHeaders = HTTPHeaders
4040

4141
session = NSURLSession(configuration: configuration)
4242
}
@@ -50,7 +50,7 @@ class Manager {
5050
///
5151
/// :returns: The created request.
5252
func request(method: HTTPMethod, _ URLString: String, parameters: [String: AnyObject]? = nil, block: (NSHTTPURLResponse?, AnyObject?, NSError?) -> Void) -> Request {
53-
let URLRequest = encodeParameter(CreateURLRequest(method, URLString), parameters: parameters)
53+
let URLRequest = encodeParameter(CreateNSURLRequest(method, URLString), parameters: parameters)
5454

5555
var dataTask = session.dataTaskWithRequest(URLRequest, completionHandler: { (data, response, error) -> Void in
5656
let (JSON: AnyObject?, _) = self.serializeResponse(data)
@@ -140,7 +140,7 @@ class Request {
140140
}
141141
}
142142

143-
func CreateURLRequest(method: HTTPMethod, URL: String) -> NSURLRequest {
143+
func CreateNSURLRequest(method: HTTPMethod, URL: String) -> NSURLRequest {
144144
let mutableURLRequest = NSMutableURLRequest(URL: NSURL(string: URL)!)
145145
mutableURLRequest.HTTPMethod = method.rawValue
146146

0 commit comments

Comments
 (0)