Skip to content

Commit f1b13d1

Browse files
dethidethi
committed
initial version without Alamofire
1 parent bc8e879 commit f1b13d1

File tree

7 files changed

+170
-94
lines changed

7 files changed

+170
-94
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ env:
44
- secure: Joz57OiADTS1+vgoLfNoXkSitwuMtytmAEJeVOdzdp2IKKpWnBBitkIQzaFfOEJmudDaR1CZRd0VpZ+Co1KKSBfl3AsLPWYrzoPNIXgXlxLHuPRSl1h3SFE9xJer9P3klDj3M2o/PZX35xM0+J07T1NjIlP0hmBHnXIJMEbOog4=
55
- secure: IYzMbOCeevN07OOK1+wQ74fxPunRSJhyRjXQ8rxq4LO0toWQCt9jD8Atw7bVROVfPLfk72UVvjvcI7hopE2gI8jo3FsjM5hhEfch0KrGUpHxW1Hw/0up1Vh4kf7MPFXOe/1oy1iaYW1P7AK/7ZGQK6s2fqhxVEOQI8uwKdS7luQ=
66
before_install:
7-
- brew update
8-
- brew install carthage
97
- gem install xcpretty -N
10-
install:
11-
- carthage bootstrap --platform macosx
128
script:
139
- set -o pipefail
1410
- xcodebuild -project AlgoliaSearch.xcodeproj -scheme "AlgoliaSearch OSX" test | xcpretty -c

‎AlgoliaSearch.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
5D09E1DC1AC0773A00B799A6 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D09E1DB1AC0773A00B799A6 /* Network.swift */; };
11+
5D09E1DD1AC0773A00B799A6 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D09E1DB1AC0773A00B799A6 /* Network.swift */; };
1012
5D74958A1A8E25A600B0263F /* AlgoliaSearch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D74957E1A8E25A600B0263F /* AlgoliaSearch.framework */; };
1113
5D7495A11A8E277400B0263F /* Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D74959F1A8E277400B0263F /* Extension.swift */; };
1214
5D7495A21A8E277400B0263F /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D7495A01A8E277400B0263F /* Client.swift */; };
@@ -21,11 +23,6 @@
2123
5DB2515C1AAD9F3300945339 /* Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D74959F1A8E277400B0263F /* Extension.swift */; };
2224
5DB2515D1AAD9F3B00945339 /* IndexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D8FFA391AAB0AB80078869E /* IndexTests.swift */; };
2325
5DB2515E1AAD9F3F00945339 /* ClientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D8FFA371AAB08830078869E /* ClientTests.swift */; };
24-
5DB251661AADA6EC00945339 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DB251651AADA6EC00945339 /* Alamofire.framework */; };
25-
5DB251671AADA6F100945339 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DB251651AADA6EC00945339 /* Alamofire.framework */; };
26-
5DB2516A1AADA70500945339 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DB251681AADA6FE00945339 /* Alamofire.framework */; };
27-
5DB2516C1AADF92500945339 /* Alamofire.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5DB251651AADA6EC00945339 /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
28-
5DB2516F1AADF9C000945339 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DB251681AADA6FE00945339 /* Alamofire.framework */; };
2926
5DECA2DA1A960BC5001A6088 /* Index.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DECA2D91A960BC5001A6088 /* Index.swift */; };
3027
5DF8C1311A9CA354006E107B /* Type.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF8C1301A9CA354006E107B /* Type.swift */; };
3128
/* End PBXBuildFile section */
@@ -47,20 +44,8 @@
4744
};
4845
/* End PBXContainerItemProxy section */
4946

50-
/* Begin PBXCopyFilesBuildPhase section */
51-
5D9F70861A93BE1D004B751B /* CopyFiles */ = {
52-
isa = PBXCopyFilesBuildPhase;
53-
buildActionMask = 2147483647;
54-
dstPath = "";
55-
dstSubfolderSpec = 10;
56-
files = (
57-
5DB2516C1AADF92500945339 /* Alamofire.framework in CopyFiles */,
58-
);
59-
runOnlyForDeploymentPostprocessing = 0;
60-
};
61-
/* End PBXCopyFilesBuildPhase section */
62-
6347
/* Begin PBXFileReference section */
48+
5D09E1DB1AC0773A00B799A6 /* Network.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
6449
5D74957E1A8E25A600B0263F /* AlgoliaSearch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlgoliaSearch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6550
5D7495821A8E25A600B0263F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6651
5D7495891A8E25A600B0263F /* AlgoliaSearch OSX Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AlgoliaSearch OSX Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -72,8 +57,6 @@
7257
5D8FFA391AAB0AB80078869E /* IndexTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IndexTests.swift; sourceTree = "<group>"; };
7358
5DB2513D1AAD9EE300945339 /* AlgoliaSearch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlgoliaSearch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7459
5DB251471AAD9EE400945339 /* AlgoliaSearch iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AlgoliaSearch iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
75-
5DB251651AADA6EC00945339 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/Mac/Alamofire.framework; sourceTree = "<group>"; };
76-
5DB251681AADA6FE00945339 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
7760
5DECA2D91A960BC5001A6088 /* Index.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Index.swift; sourceTree = "<group>"; };
7861
5DF8C1301A9CA354006E107B /* Type.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Type.swift; sourceTree = "<group>"; };
7962
/* End PBXFileReference section */
@@ -83,7 +66,6 @@
8366
isa = PBXFrameworksBuildPhase;
8467
buildActionMask = 2147483647;
8568
files = (
86-
5DB251661AADA6EC00945339 /* Alamofire.framework in Frameworks */,
8769
);
8870
runOnlyForDeploymentPostprocessing = 0;
8971
};
@@ -92,15 +74,13 @@
9274
buildActionMask = 2147483647;
9375
files = (
9476
5D74958A1A8E25A600B0263F /* AlgoliaSearch.framework in Frameworks */,
95-
5DB251671AADA6F100945339 /* Alamofire.framework in Frameworks */,
9677
);
9778
runOnlyForDeploymentPostprocessing = 0;
9879
};
9980
5DB251391AAD9EE300945339 /* Frameworks */ = {
10081
isa = PBXFrameworksBuildPhase;
10182
buildActionMask = 2147483647;
10283
files = (
103-
5DB2516F1AADF9C000945339 /* Alamofire.framework in Frameworks */,
10484
);
10585
runOnlyForDeploymentPostprocessing = 0;
10686
};
@@ -109,7 +89,6 @@
10989
buildActionMask = 2147483647;
11090
files = (
11191
5DB251481AAD9EE400945339 /* AlgoliaSearch.framework in Frameworks */,
112-
5DB2516A1AADA70500945339 /* Alamofire.framework in Frameworks */,
11392
);
11493
runOnlyForDeploymentPostprocessing = 0;
11594
};
@@ -119,7 +98,6 @@
11998
5D7495741A8E25A600B0263F = {
12099
isa = PBXGroup;
121100
children = (
122-
5D74959C1A8E265C00B0263F /* Frameworks */,
123101
5D7495801A8E25A600B0263F /* Source */,
124102
5D74958D1A8E25A600B0263F /* Tests */,
125103
5D74957F1A8E25A600B0263F /* Products */,
@@ -144,6 +122,7 @@
144122
5D7495A61A8E499B00B0263F /* Query.swift */,
145123
5DECA2D91A960BC5001A6088 /* Index.swift */,
146124
5DF8C1301A9CA354006E107B /* Type.swift */,
125+
5D09E1DB1AC0773A00B799A6 /* Network.swift */,
147126
5D74959F1A8E277400B0263F /* Extension.swift */,
148127
5D7495811A8E25A600B0263F /* Supporting Files */,
149128
);
@@ -176,15 +155,6 @@
176155
name = "Supporting Files";
177156
sourceTree = "<group>";
178157
};
179-
5D74959C1A8E265C00B0263F /* Frameworks */ = {
180-
isa = PBXGroup;
181-
children = (
182-
5DB251681AADA6FE00945339 /* Alamofire.framework */,
183-
5DB251651AADA6EC00945339 /* Alamofire.framework */,
184-
);
185-
name = Frameworks;
186-
sourceTree = "<group>";
187-
};
188158
/* End PBXGroup section */
189159

190160
/* Begin PBXHeadersBuildPhase section */
@@ -229,7 +199,6 @@
229199
5D7495851A8E25A600B0263F /* Sources */,
230200
5D7495861A8E25A600B0263F /* Frameworks */,
231201
5D7495871A8E25A600B0263F /* Resources */,
232-
5D9F70861A93BE1D004B751B /* CopyFiles */,
233202
);
234203
buildRules = (
235204
);
@@ -249,7 +218,6 @@
249218
5DB251391AAD9EE300945339 /* Frameworks */,
250219
5DB2513A1AAD9EE300945339 /* Headers */,
251220
5DB2513B1AAD9EE300945339 /* Resources */,
252-
5DB251631AADA67800945339 /* Carthage copy */,
253221
);
254222
buildRules = (
255223
);
@@ -267,7 +235,6 @@
267235
5DB251431AAD9EE400945339 /* Sources */,
268236
5DB251441AAD9EE400945339 /* Frameworks */,
269237
5DB251451AAD9EE400945339 /* Resources */,
270-
5DB251701AADFB1100945339 /* Carthage copy */,
271238
);
272239
buildRules = (
273240
);
@@ -346,46 +313,14 @@
346313
};
347314
/* End PBXResourcesBuildPhase section */
348315

349-
/* Begin PBXShellScriptBuildPhase section */
350-
5DB251631AADA67800945339 /* Carthage copy */ = {
351-
isa = PBXShellScriptBuildPhase;
352-
buildActionMask = 2147483647;
353-
files = (
354-
);
355-
inputPaths = (
356-
"$(SRCROOT)/Carthage/Build/iOS/Alamofire.framework",
357-
);
358-
name = "Carthage copy";
359-
outputPaths = (
360-
);
361-
runOnlyForDeploymentPostprocessing = 0;
362-
shellPath = /bin/sh;
363-
shellScript = "/usr/local/bin/carthage copy-frameworks";
364-
};
365-
5DB251701AADFB1100945339 /* Carthage copy */ = {
366-
isa = PBXShellScriptBuildPhase;
367-
buildActionMask = 2147483647;
368-
files = (
369-
);
370-
inputPaths = (
371-
"$(SRCROOT)/Carthage/Build/iOS/Alamofire.framework",
372-
);
373-
name = "Carthage copy";
374-
outputPaths = (
375-
);
376-
runOnlyForDeploymentPostprocessing = 0;
377-
shellPath = /bin/sh;
378-
shellScript = "/usr/local/bin/carthage copy-frameworks";
379-
};
380-
/* End PBXShellScriptBuildPhase section */
381-
382316
/* Begin PBXSourcesBuildPhase section */
383317
5D7495791A8E25A600B0263F /* Sources */ = {
384318
isa = PBXSourcesBuildPhase;
385319
buildActionMask = 2147483647;
386320
files = (
387321
5DF8C1311A9CA354006E107B /* Type.swift in Sources */,
388322
5DECA2DA1A960BC5001A6088 /* Index.swift in Sources */,
323+
5D09E1DC1AC0773A00B799A6 /* Network.swift in Sources */,
389324
5D7495A21A8E277400B0263F /* Client.swift in Sources */,
390325
5D7495A71A8E499B00B0263F /* Query.swift in Sources */,
391326
5D7495A11A8E277400B0263F /* Extension.swift in Sources */,
@@ -407,6 +342,7 @@
407342
files = (
408343
5DB2515C1AAD9F3300945339 /* Extension.swift in Sources */,
409344
5DB251591AAD9F2A00945339 /* Query.swift in Sources */,
345+
5D09E1DD1AC0773A00B799A6 /* Network.swift in Sources */,
410346
5DB251581AAD9F2700945339 /* Client.swift in Sources */,
411347
5DB2515A1AAD9F2D00945339 /* Index.swift in Sources */,
412348
5DB2515B1AAD9F2F00945339 /* Type.swift in Sources */,

‎Cartfile‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Cartfile.resolved‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Source/Client.swift‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
//
2323

2424
import Foundation
25-
import Alamofire
26-
2725

2826
/// Entry point in the Swift API.
2927
///
@@ -42,7 +40,7 @@ public class Client {
4240
if let tagFilters = tagFilters {
4341
setExtraHeader(tagFilters, forKey: "X-Algolia-TagFilters")
4442
} else {
45-
Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders?.removeValueForKey("X-Algolia-TagFilters")
43+
//Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders?.removeValueForKey("X-Algolia-TagFilters")
4644
}
4745
}
4846
}
@@ -53,21 +51,22 @@ public class Client {
5351
if let userToken = userToken {
5452
setExtraHeader(userToken, forKey: "X-Algolia-UserToken")
5553
} else {
56-
Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders?.removeValueForKey("X-Algolia-UserToken")
54+
//Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders?.removeValueForKey("X-Algolia-UserToken")
5755
}
5856
}
5957
}
6058

6159
public var timeout: NSTimeInterval = 30 {
6260
didSet {
63-
Alamofire.Manager.sharedInstance.session.configuration.timeoutIntervalForRequest = timeout;
61+
//Alamofire.Manager.sharedInstance.session.configuration.timeoutIntervalForRequest = timeout;
6462
}
6563
}
6664

6765
public let appID: String
6866
public let hostnames: [String]
6967

70-
private var requestBuffer = RingBuffer<Alamofire.Request>(maxCapacity: 10)
68+
private let manager: Manager
69+
private var requestBuffer = RingBuffer<Request>(maxCapacity: 10)
7170

7271
/// Algolia Search initialization.
7372
///
@@ -123,20 +122,20 @@ public class Client {
123122
HTTPHeader["X-Algolia-UserToken"] = userToken
124123
}
125124

126-
Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders = HTTPHeader
125+
manager = Manager(HTTPHeader: HTTPHeader)
127126
}
128127

129128
/// Allow to set custom extra header.
130129
///
131130
/// :param: value value of the header
132131
/// :param: forKey key of the header
133132
public func setExtraHeader(value: String, forKey key: String) {
134-
if (Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders != nil) {
135-
Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders!.updateValue(value, forKey: key)
136-
} else {
137-
let HTTPHeader = [key: value]
138-
Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders = HTTPHeader
139-
}
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+
// }
140139
}
141140

142141
// MARK: - Operations
@@ -350,11 +349,10 @@ public class Client {
350349
// MARK: - Network
351350

352351
/// Perform an HTTP Query.
353-
func performHTTPQuery(path: String, method: Alamofire.Method, body: [String: AnyObject]?, index: Int = 0, block: CompletionHandler? = nil) {
352+
func performHTTPQuery(path: String, method: HTTPMethod, body: [String: AnyObject]?, index: Int = 0, block: CompletionHandler? = nil) {
354353
assert(index < hostnames.count, "\(index) < \(hostnames.count) !")
355354

356-
let request = Alamofire.request(method, "https://\(hostnames[index])/\(path)", parameters: body, encoding: .JSON).responseJSON {
357-
(request, response, data, error) -> Void in
355+
let request = manager.request(method, "https://\(hostnames[index])/\(path)", parameters: body) { (response, data, error) -> Void in
358356
if let statusCode = response?.statusCode {
359357
if let block = block {
360358
switch(statusCode) {
@@ -388,7 +386,7 @@ public class Client {
388386
}
389387

390388
/// Cancel a queries. Only the last ten queries can be cancelled.
391-
func cancelQueries(method: Alamofire.Method, path: String) {
389+
func cancelQueries(method: HTTPMethod, path: String) {
392390
for request in requestBuffer {
393391
if request.request.URL.path == path {
394392
if request.request.HTTPMethod == method.rawValue {

‎Source/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>1.1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)