Dev

.gitignore

@@ -17,6 +17,29 @@ DerivedData/
 !default.perspectivev3
 xcuserdata/
 
+## Other
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
 ## Other
 *.moved-aside
 *.xccheckout

.travis.yml

@@ -4,6 +4,6 @@ language:
   - swift
 script:
   - swift package generate-xcodeproj
-  - xcodebuild clean test -project Request.xcodeproj -scheme "Request-Package" -destination "OS=13.0,name=iPhone XS" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet -enableCodeCoverage YES -derivedDataPath .build/derivedData
+  - xcodebuild clean test -project Request.xcodeproj -scheme "Request-Package" -destination "OS=13.0,name=iPhone 11" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet -enableCodeCoverage YES -derivedDataPath .build/derivedData
 after_success:
   - bash <(curl -s https://codecov.io/bash) -D .build/derivedData

README.md

@@ -114,6 +114,14 @@ Body(["key": "value"])
 Body("myBodyContent")
 Body(myJson)
 ```
+- `Timeout`
+
+Sets the timeout for a request or resource:
+```swift
+Timeout(60)
+Timeout(60, for: .request)
+Timeout(30, for: .resource)
+```
 - `RequestParam`
 
 Add a param directly
@@ -196,6 +204,17 @@ RequestChain {
 }
 ```
 
+## Repeated Calls
+`.update` is used to run additional calls after the initial one. You can pass it either a number or a custom `Publisher`. You can also chain together multiple `.update`s. The two `.update`s in the following example are equivalent, so the end result is that the `Request` will be called once immediately and twice every 10 seconds thereafter.
+```swift
+Request {
+    Url("https://jsonplaceholder.typicode.com/todo")
+}
+.update(every: 10)
+.update(publisher: Timer.publish(every: 10, on: .main, in: .common).autoconnect())
+.call()
+```
+
 ## Json
 `swift-request` includes support for `Json`.
 `Json` is used as the response type in the `onJson` callback on a `Request` object.

Sources/Json/Json.swift

@@ -96,6 +96,7 @@ public struct Json {
                     newSubs.remove(at: 0)
                     var json = self[subs.first!]
                     json[newSubs] = newValue
+                    self[subs.first!] = json
             }
         }
     }

Sources/Json/Literals.swift

@@ -45,6 +45,8 @@ extension Json: ExpressibleByArrayLiteral {
 
 extension Json: ExpressibleByDictionaryLiteral {
     public init(dictionaryLiteral elements: (String, Any)...) {
-        self.init { elements }
+        jsonData = Dictionary(elements, uniquingKeysWith: { (value1, value2) -> Any in
+            return value1
+        })
     }
 }

Sources/Request/Helpers/Auth.swift

@@ -44,7 +44,7 @@ public struct Auth {
 extension Auth {
     /// Authenticates using `username` and `password` directly
     public static func basic(username: String, password: String) -> Auth {
-        return Auth(type: .basic, key: "\(username):\(password)")
+        return Auth(type: .basic, key: Data("\(username):\(password)".utf8).base64EncodedString())
     }
 
     /// Authenticates using a `token`