Skip to content

Commit 6e544b1

Browse files
authored
Merge pull request #32 from RxSwiftCommunity/develop
Update dependencies and readme
2 parents e257e14 + 72b6ca0 commit 6e544b1

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ before_install:
1515

1616
before_script:
1717
- carthage version
18-
- carthage checkout --no-use-binaries
18+
- carthage checkout
1919

2020
- mkdir -p ./Carthage/Build/iOS
2121

2222
#build OHHTTPStubs
2323
- (cd ./Carthage/Checkouts/OHHTTPStubs/OHHTTPStubs && set -o pipefail && xcodebuild -scheme "OHHTTPStubs iOS Framework" -workspace "OHHTTPStubs.xcworkspace" -sdk "$SDK" -configuration Release SYMROOT=../../../../Build | xcpretty -c)
2424
#build RxSwift
25-
- (cd ./Carthage/Checkouts/RxSwift && set -o pipefail && xcodebuild -scheme "RxSwift-iOS" -workspace "Rx.xcworkspace" -sdk "$SDK" -configuration Release SYMROOT=../../../Build | xcpretty -c)
25+
#- (cd ./Carthage/Checkouts/RxSwift && set -o pipefail && xcodebuild -scheme "RxSwift-iOS" -workspace "Rx.xcworkspace" -sdk "$SDK" -configuration Release SYMROOT=../../../Build | xcpretty -c)
2626

2727
#copy frameworks to Carthage/Build folder
2828
- cp -R -f ./Build/Release-iphonesimulator/ ./Carthage/Build/iOS

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "AliSoftware/OHHTTPStubs" "57feceaabf333e72b2c637dfba6c13a7a5c49619"
2-
github "ReactiveX/RxSwift" "3.0.1"
2+
github "ReactiveX/RxSwift" "3.1.0"

Readme.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ RxHttpClient
88
RxHttpClient is a "reactive wrapper" around NSURLSession. Under the hood it implements session delegates (like NSURLSessionDelegate or NSURLSessionTaskDelegate) and translates session events into Observables using [RxSwift](https://github.com/ReactiveX/RxSwift). Main purpose of this framework is to make "streaming" data as simple as possible and provide convenient features for caching data.
99

1010
##Requirements
11-
- Xcode 8.1
12-
- Swift 3.0.1
11+
- Xcode 8.2
12+
- Swift 3.0
1313

1414
##Installation
1515
Now only [Carthage](https://github.com/Carthage/Carthage) supported:
1616
```
17-
github "ReactiveX/RxSwift" ~> 3.0
17+
github "ReactiveX/RxSwift" ~> 3.1
1818
github "Reloni/RxHttpClient"
1919
```
2020
RxHttpClient uses RxSwift so it should be included into cartfile.
@@ -64,13 +64,23 @@ It's also possible to simply invoke request and receive data using loadData meth
6464
let client = HttpClient()
6565
let bag = DisposeBag()
6666
let url = URL(string: "url_to_resource")!
67+
// by default HTTP GET request will be performed
6768
client.requestData(url: url).subscribe(onNext: { data in /* do something with returned data */ }, onError: { error in
6869
switch error {
6970
case HttpClientError.clientSideError(let error): break /* Client-side error */
7071
case let HttpClientError.invalidResponse(response, data): break /* Occurs when server did't return success HTTP code (not in 2xx) */
7172
default: break
7273
}
7374
}).addDisposableTo(bag)
75+
76+
// use HTTP POST and send data
77+
let sendJson = ["Key1":"Value1", "Key2":"Value2"]
78+
let sendJsonData = try! JSONSerialization.data(withJSONObject: sendJson, options: [])
79+
client.requestData(url: url, method: .post, body: sendJsonData).subscribe(onNext: { data in /* do something with returned data */ }).addDisposableTo(bag)
80+
81+
// or simply pass JSON as parameter
82+
let sendJson = ["Key1":"Value1", "Key2":"Value2"]
83+
client.requestData(url: url, method: .put, jsonBody: sendJson, options: [], httpHeaders: ["Header1": "HeaderVal1"]).subscribe(onNext: { _ in expectation.fulfill() }).addDisposableTo(bag)
7484
```
7585

7686
JSON deserialized object may be requested in same way:

cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "ReactiveX/RxSwift" == 3.0.1
1+
github "ReactiveX/RxSwift" == 3.1.0
22
github "AliSoftware/OHHTTPStubs" "57fecea"

0 commit comments

Comments
 (0)