Skip to content

Commit

Permalink
Merge branch 'pr/67'
Browse files Browse the repository at this point in the history
  • Loading branch information
s4cha committed Jun 7, 2020
2 parents dced98e + bddbfd7 commit da00410
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,27 @@ modelArrayCall().then { users in

## Settings

Want to log all network calls and responses ?
Want to log all network calls and responses?
```swift
ws.logLevels = .debug
```

Want to hide network activity indicator ?
Want to hide network activity indicator?

```swift
ws.showsNetworkActivityIndicator = false
```

Want to override the default session manager to customize trust policies?

```swift
import Alamofire

ws.sessionManager = SessionManager(serverTrustPolicyManager: ServerTrustPolicyManager(
policies: ["myspecialhostname.com" : .disableEvaluation]
))
```

## Api Example
Here is a Typical CRUD example for Articles :

Expand Down
2 changes: 2 additions & 0 deletions Sources/ws/WS.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ open class WS {
open var headers = [String: String]()
open var requestAdapter: RequestAdapter?
open var requestRetrier: RequestRetrier?
open var sessionManager: SessionManager?
open var mandatoryQueryParams = Params()

/**
Expand Down Expand Up @@ -85,6 +86,7 @@ open class WS {
r.headers = headers
r.requestAdapter = requestAdapter
r.requestRetrier = requestRetrier
r.sessionManager = sessionManager
r.errorHandler = errorHandler
return r
}
Expand Down
9 changes: 5 additions & 4 deletions Sources/ws/WSRequest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ open class WSRequest {
open var errorHandler: ((JSON) -> Error?)?
open var requestAdapter: RequestAdapter?
open var requestRetrier: RequestRetrier?
open var sessionManager: SessionManager?

private let logger = WSLogger()

Expand Down Expand Up @@ -84,14 +85,14 @@ open class WSRequest {
}

func wsSessionManager() -> SessionManager {
let sessionManager = Alamofire.SessionManager.default
let activeSessionManager = sessionManager ?? Alamofire.SessionManager.default
if let adapter = requestAdapter {
sessionManager.adapter = adapter
activeSessionManager.adapter = adapter
}
if let retrier = requestRetrier {
sessionManager.retrier = retrier
activeSessionManager.retrier = retrier
}
return sessionManager
return activeSessionManager
}

func wsRequest(_ urlRequest: URLRequestConvertible) -> DataRequest {
Expand Down
3 changes: 1 addition & 2 deletions ws.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Pod::Spec.new do |s|
s.name = "ws"
s.version = "5.1.1"
s.summary = "Elegant JSON WebService for Swift ☁️"
s.version = "5.1.1" s.summary = "Elegant JSON WebService for Swift ☁️"
s.homepage = "https://github.com/freshOS/ws"
s.license = { :type => "MIT", :file => "LICENSE" }
s.author = "S4cha"
Expand Down

0 comments on commit da00410

Please sign in to comment.