Skip to content

Commit 2ca1533

Browse files
lightsprint09lightsprint09
authored
Merge pull request #96 from dbsystel/master
Master
2 parents c5c7c1d + 784f401 commit 2ca1533

File tree

10 files changed

+50
-116
lines changed

10 files changed

+50
-116
lines changed

‎DBNetworkStack.podspec‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎DBNetworkStack.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
C60BE6901D6B2C46006B0364 /* Resource.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60BE6801D6B2C46006B0364 /* Resource.swift */; };
2020
C60BE6A31D6B3807006B0364 /* NetworkServiceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60BE6A01D6B3807006B0364 /* NetworkServiceTest.swift */; };
2121
C60BE6AD1D6B3E81006B0364 /* NetworkTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60BE6AC1D6B3E81006B0364 /* NetworkTask.swift */; };
22-
C60FF0F31E5C94CD00818031 /* URLRequestConvertibleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60FF0F11E5C94AC00818031 /* URLRequestConvertibleTest.swift */; };
22+
C60FF0F31E5C94CD00818031 /* URLRequestTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60FF0F11E5C94AC00818031 /* URLRequestTest.swift */; };
2323
C61E77871E48CAFE00D55BB2 /* NetworkServiceMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6461F0A1E016C7700E0B081 /* NetworkServiceMock.swift */; };
2424
C61E77891E49A57A00D55BB2 /* NetworkServiceMockTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C61E77881E49A57A00D55BB2 /* NetworkServiceMockTest.swift */; };
2525
C61E778B1E49B53700D55BB2 /* RetryNetworkserviceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C61E778A1E49B53700D55BB2 /* RetryNetworkserviceTest.swift */; };
2626
C61E778C1E49D8A900D55BB2 /* NetworkTaskMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C40B9FD1D9D66A600620563 /* NetworkTaskMock.swift */; };
2727
C622A7961E5C7F6500BB3D17 /* URLRequest+Init.swift in Sources */ = {isa = PBXBuildFile; fileRef = C622A7951E5C7F6500BB3D17 /* URLRequest+Init.swift */; };
28-
C62925AE1FC5900000607AEA /* URLRequestConvertible+Modifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C62925AD1FC5900000607AEA /* URLRequestConvertible+Modifications.swift */; };
28+
C62925AE1FC5900000607AEA /* URLRequest+Modifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C62925AD1FC5900000607AEA /* URLRequest+Modifications.swift */; };
2929
C6363D8F1F4ED1500052E9BD /* URLSession+NetworkAccessTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6363D8D1F4ED13C0052E9BD /* URLSession+NetworkAccessTest.swift */; };
3030
C6363D901F4ED1950052E9BD /* URLSessionMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6363D8B1F4ED0840052E9BD /* URLSessionMock.swift */; };
3131
C6363D911F4ED2030052E9BD /* DefaultMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C21A3A1F21FD150004A7EB /* DefaultMocks.swift */; };
@@ -78,11 +78,11 @@
7878
C60BE6801D6B2C46006B0364 /* Resource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Resource.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
7979
C60BE6A01D6B3807006B0364 /* NetworkServiceTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NetworkServiceTest.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
8080
C60BE6AC1D6B3E81006B0364 /* NetworkTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NetworkTask.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
81-
C60FF0F11E5C94AC00818031 /* URLRequestConvertibleTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLRequestConvertibleTest.swift; sourceTree = "<group>"; };
81+
C60FF0F11E5C94AC00818031 /* URLRequestTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLRequestTest.swift; sourceTree = "<group>"; };
8282
C61E77881E49A57A00D55BB2 /* NetworkServiceMockTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkServiceMockTest.swift; sourceTree = "<group>"; };
8383
C61E778A1E49B53700D55BB2 /* RetryNetworkserviceTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetryNetworkserviceTest.swift; sourceTree = "<group>"; };
8484
C622A7951E5C7F6500BB3D17 /* URLRequest+Init.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URLRequest+Init.swift"; sourceTree = "<group>"; };
85-
C62925AD1FC5900000607AEA /* URLRequestConvertible+Modifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequestConvertible+Modifications.swift"; sourceTree = "<group>"; };
85+
C62925AD1FC5900000607AEA /* URLRequest+Modifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequest+Modifications.swift"; sourceTree = "<group>"; };
8686
C6363D8B1F4ED0840052E9BD /* URLSessionMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSessionMock.swift; sourceTree = "<group>"; };
8787
C6363D8D1F4ED13C0052E9BD /* URLSession+NetworkAccessTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URLSession+NetworkAccessTest.swift"; sourceTree = "<group>"; };
8888
C6461F011E01678100E0B081 /* RetryNetworkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetryNetworkService.swift; sourceTree = "<group>"; };
@@ -173,7 +173,7 @@
173173
C6F7E30E1E49DC4900FA625F /* NetworkTaskMockTests.swift */,
174174
C699E0761D917501006FE7C6 /* NetworkErrorTest.swift */,
175175
7C653BC81E09325500199993 /* NetworkResponseProcessorTest.swift */,
176-
C60FF0F11E5C94AC00818031 /* URLRequestConvertibleTest.swift */,
176+
C60FF0F11E5C94AC00818031 /* URLRequestTest.swift */,
177177
C6363D8D1F4ED13C0052E9BD /* URLSession+NetworkAccessTest.swift */,
178178
C6F3A400211D732500BF0086 /* URL+StaticStringInitTest.swift */,
179179
);
@@ -228,7 +228,7 @@
228228
isa = PBXGroup;
229229
children = (
230230
C622A7951E5C7F6500BB3D17 /* URLRequest+Init.swift */,
231-
C62925AD1FC5900000607AEA /* URLRequestConvertible+Modifications.swift */,
231+
C62925AD1FC5900000607AEA /* URLRequest+Modifications.swift */,
232232
C6F3A3FE211D665300BF0086 /* URL+StaticStringInit.swift */,
233233
);
234234
name = NetworkRequest;
@@ -405,7 +405,7 @@
405405
isa = PBXSourcesBuildPhase;
406406
buildActionMask = 2147483647;
407407
files = (
408-
C62925AE1FC5900000607AEA /* URLRequestConvertible+Modifications.swift in Sources */,
408+
C62925AE1FC5900000607AEA /* URLRequest+Modifications.swift in Sources */,
409409
C66C7B961FE96CD0009B8C78 /* Resource+Inspect.swift in Sources */,
410410
C6C395941E04212F00413AD2 /* ModifyRequestNetworkService.swift in Sources */,
411411
C622A7961E5C7F6500BB3D17 /* URLRequest+Init.swift in Sources */,
@@ -449,7 +449,7 @@
449449
C6C395961E0422AF00413AD2 /* ModifyRequestNetworkService.swift in Sources */,
450450
C6F7E3101E49DCBA00FA625F /* NetworkTaskMockTests.swift in Sources */,
451451
C61E778B1E49B53700D55BB2 /* RetryNetworkserviceTest.swift in Sources */,
452-
C60FF0F31E5C94CD00818031 /* URLRequestConvertibleTest.swift in Sources */,
452+
C60FF0F31E5C94CD00818031 /* URLRequestTest.swift in Sources */,
453453
C6F3A402211D732C00BF0086 /* URL+StaticStringInitTest.swift in Sources */,
454454
C6363D911F4ED2030052E9BD /* DefaultMocks.swift in Sources */,
455455
);

‎Package.swift‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// swift-tools-version:5.0
12
//
23
// Package.swift
34
//
@@ -27,5 +28,26 @@
2728
import PackageDescription
2829

2930
let package = Package(
30-
name: "DBNetworkStack"
31+
name: "DBNetworkStack",
32+
platforms: [
33+
.iOS(.v9),
34+
.tvOS(.v9),
35+
.watchOS(.v2),
36+
.macOS(.v10_10)
37+
],
38+
products: [
39+
.library(
40+
name: "DBNetworkStack",
41+
targets: ["DBNetworkStack"])
42+
],
43+
targets: [
44+
.target(
45+
name: "DBNetworkStack",
46+
dependencies: [],
47+
path: "Source")
48+
.testTarget(
49+
name: "DBNetworkStackTests",
50+
dependencies: ["DBNetworkStack"],
51+
path: "Tests")
52+
]
3153
)

‎README.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The following table shows all the protocols and their default implementations.
100100

101101
- iOS 9.0+ / macOS 10.10+ / tvOS 9.0+ / watchOS 2.0+
102102
- Xcode 10.2+
103-
- Swift5.0
103+
- Swift 5.0
104104

105105
## Installation
106106

@@ -111,13 +111,9 @@ The following table shows all the protocols and their default implementations.
111111
Specify the following in your `Cartfile`:
112112

113113
```ogdl
114-
github "dbsystel/dbnetworkstack" ~> 1.2
114+
github "dbsystel/dbnetworkstack" ~> 2.0
115115
```
116116

117-
### CocoaPods
118-
119-
`pod "DBNetworkStack"`
120-
121117
## Contributing
122118
Feel free to submit a pull request with new features, improvements on tests or documentation and bug fixes. Keep in mind that we welcome code that is well tested and documented.
123119

‎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.2.0</string>
18+
<string>2.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Source/Resource+Inspect.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
// DEALINGS IN THE SOFTWARE.
2121
//
2222

23+
import Foundation
24+
2325
extension Resource {
2426
/**
2527
This lets one inspect the data payload before data gets parsed.

‎Source/Resource.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
// DEALINGS IN THE SOFTWARE.
2222
//
2323

24+
import Foundation
25+
2426
/**
2527
`Resource` describes a remote resource of generic type.
2628
The type can be fetched via HTTP(S) and parsed into the coresponding model object.

‎Source/URLRequest+Init.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extension URLRequest {
3131
/// - path: path to the resource.
3232
/// - baseURL: the base url of the resource.
3333
/// - HTTPMethod: the HTTP method for the request. Defaults to `.GET`
34-
/// - parameters: url parameters for the request. Defaults to empty dictionary
34+
/// - parameters: url parameters for the request. Defaults to `nil`
3535
/// - body: body data payload. Defaults to `nil`
3636
/// - allHTTPHeaderFields: HTTP request header fields. Defaults to `nil`
3737
///

‎Source/URLRequestConvertible+Modifications.swift‎ renamed to ‎Source/URLRequest+Modifications.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import Foundation
2525

2626
public extension URLRequest {
2727

28-
/// Creates a new `URLRequestConvertible` with HTTPHeaderFields added into the new request.
28+
/// Creates a new `URLRequest` with HTTPHeaderFields added into the new request.
2929
/// Keep in mind that this overrides header fields which are already contained.
3030
///
3131
/// - Parameter HTTPHeaderFields: the header fileds to add to the request
32-
/// - Returns: a new `URLRequestConvertible`
32+
/// - Returns: a new `URLRequest`
3333
func added(HTTPHeaderFields: [String: String]) -> URLRequest {
3434
var request = self
3535
let headerFiels = (request.allHTTPHeaderFields ?? [:]).merging(HTTPHeaderFields, uniquingKeysWith: { $1 })
@@ -38,11 +38,11 @@ public extension URLRequest {
3838
return request
3939
}
4040

41-
/// Creates a new `URLRequestConvertible` with query items appended to the new request.
41+
/// Creates a new `URLRequest` with query items appended to the new request.
4242
///
4343
/// - Parameter queryItems: the query items to append to the request
4444
/// - Parameter overrideExisting: if `true existing items with the same name will be overridden
45-
/// - Returns: a new `URLRequestConvertible`
45+
/// - Returns: a new `URLRequest`
4646
func appending(queryItems: [URLQueryItem], overrideExisting: Bool = true) -> URLRequest {
4747
var request = self
4848
guard let url = request.url else {
@@ -52,19 +52,19 @@ public extension URLRequest {
5252
return request
5353
}
5454

55-
/// Creates a new `URLRequestConvertible` with query parameters appended to the new request.
55+
/// Creates a new `URLRequest` with query parameters appended to the new request.
5656
///
5757
/// - Parameter queryParameters: the parameters to append to the request
5858
/// - Parameter overrideExisting: if `true existing items with the same name will be overridden
59-
/// - Returns: a new `URLRequestConvertible`
59+
/// - Returns: a new `URLRequest`
6060
func appending(queryParameters: [String: String], overrideExisting: Bool = true) -> URLRequest {
6161
return appending(queryItems: queryParameters.asURLQueryItems() )
6262
}
6363

64-
/// Creates a new `URLRequestConvertible` with all existing query items replaced with new ones.
64+
/// Creates a new `URLRequest` with all existing query items replaced with new ones.
6565
///
6666
/// - Parameter queryItems: the query items to add to the request
67-
/// - Returns: a new `URLRequestConvertible`
67+
/// - Returns: a new `URLRequest`
6868
func replacingAllQueryItems(with queryItems: [URLQueryItem]) -> URLRequest {
6969
var request = self
7070
guard let url = request.url else {
@@ -74,10 +74,10 @@ public extension URLRequest {
7474
return request
7575
}
7676

77-
/// Creates a new `URLRequestConvertible` with all existing query items replaced with new ones.
77+
/// Creates a new `URLRequest` with all existing query items replaced with new ones.
7878
///
7979
/// - Parameter parameters: the parameters to add to the request
80-
/// - Returns: a new `URLRequestConvertible`
80+
/// - Returns: a new `URLRequest`
8181
func replacingAllQueryItems(with parameters: [String: String]) -> URLRequest {
8282
return replacingAllQueryItems(with: parameters.asURLQueryItems() )
8383
}

‎Tests/DBNetworkStackTests/URLRequestConvertibleTest.swift‎ renamed to ‎Tests/DBNetworkStackTests/URLRequestTest.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import Foundation
2525
import XCTest
2626
@testable import DBNetworkStack
2727

28-
class URLRequestConvertibleTest: XCTestCase {
28+
class URLRequestTest: XCTestCase {
2929

3030
func testCustomInitializer() {
3131
//Given

0 commit comments

Comments
 (0)