Removing the objectivec examples. We don't support these officially anymore.

We should be sending application/json for all POST requests.

Making sure all the examples have both types of credentials in the example.

Adding new fields to international autocomplete.

Author: RyanLCox1

Sources/SmartyStreets/HTTPSender.swift

@@ -62,7 +62,7 @@ class HttpSender: SmartySender {
             httpRequest.httpMethod = "GET"
         } else {
             httpRequest.setValue("gzip", forHTTPHeaderField: "Accept-Encoding")
-            httpRequest.setValue("text/plain; charset=utf-8", forHTTPHeaderField: "Content-Type")
+            httpRequest.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
             httpRequest.httpMethod = "POST"
             httpRequest.httpBody = request.payload
         }

Sources/SmartyStreets/InternationalAutocomplete/InternationalAutocompleteClient.swift

@@ -48,10 +48,16 @@ public class InternationalAutocompleteClient: NSObject {
 
         request.setValue(value: lookup.search ?? "", HTTPParameterField: "search")
         request.setValue(value: lookup.country ?? "", HTTPParameterField: "country")
-        request.setValue(value: lookup.getMaxResultsStringIfSet(), HTTPParameterField: "max_results")
+        request.setValue(value: lookup.maxResults.flatMap { String($0) } ?? "10", HTTPParameterField: "max_results")
+        request.setValue(value: lookup.distance.flatMap { String($0) } ?? "5", HTTPParameterField: "distance")
+        if lookup.geolocation != InternationalAutocompleteLookup.InternationalGeolocateType.none {
+            request.setValue(value: lookup.geolocation?.rawValue ?? "", HTTPParameterField: "geolocation")
+        }
         request.setValue(value: lookup.administrativeArea ?? "", HTTPParameterField: "include_only_administrative_area")
         request.setValue(value: lookup.locality ?? "", HTTPParameterField: "include_only_locality")
         request.setValue(value: lookup.postalCode ?? "", HTTPParameterField: "include_only_postal_code")
+        request.setValue(value: lookup.longitude.flatMap { String($0) } ?? "", HTTPParameterField: "longitude")
+        request.setValue(value: lookup.latitude.flatMap { String($0) } ?? "", HTTPParameterField: "latitude")
 
         return request
     }

Sources/SmartyStreets/InternationalAutocomplete/InternationalAutocompleteLookup.swift

@@ -6,27 +6,45 @@ import Foundation
     //
     //    See "https://smartystreets.com/docs/cloud/international-address-autocomplete-api#pro-http-request-input-fields"
 
-    let SSMaxResults = 10
+    static let SSMaxResults = 10
+    static let SSDistance = 5
 
     public var result:InternationalAutocompleteResult?
     public var country:String?
     public var search:String?
     public var maxResults:Int?
+    public var distance:Int?
+    public var geolocation:InternationalGeolocateType?
     public var administrativeArea:String?
     public var locality:String?
     public var postalCode:String?
+    public var latitude:Double?
+    public var longitude:Double?
+    
+    public enum InternationalGeolocateType: String, Codable {
+        case adminarea
+        case locality
+        case postalcode
+        case geocodes
+        case none
+    }
 
     enum CodingKeys: String, CodingKey {
         case country = "country"
         case search = "search"
         case maxResults = "max_results"
+        case distance = "distance"
+        case geolocation = "geolocation"
         case administrativeArea = "include_only_administrative_area"
         case locality = "include_only_locality"
         case postalCode = "include_only_postal_code"
+        case latitude = "latitude"
+        case longitude = "longitude"
     }
 
     override public init() {
-        self.maxResults = SSMaxResults
+        self.maxResults = InternationalAutocompleteLookup.SSMaxResults
+        self.distance = InternationalAutocompleteLookup.SSDistance
     }
 
     public func withSearch(search:String) -> InternationalAutocompleteLookup {
@@ -42,14 +60,6 @@ import Foundation
         }
     }
 
-    func getMaxResultsStringIfSet() -> String {
-        if self.maxResults == SSMaxResults {
-            return String()
-        } else {
-            return "\(self.maxResults ?? 0)"
-        }
-    }
-    
     public func setMaxResults(maxResults: Int, error: inout NSError?) {
         if maxResults > 0 && maxResults <= 10 {
             self.maxResults = maxResults

Sources/SmartyStreets/USExtract/USExtractAddress.swift

@@ -11,6 +11,11 @@ import Foundation
     public var candidates:[USStreetCandidate]?
 
     enum CodingKeys: String, CodingKey {
+        case text = "text"
+        case verified = "verified"
+        case line = "line"
+        case start = "start"
+        case end = "end"
         case candidates = "api_output"
     }
 

Sources/SmartyStreets/USReverseGeo/USReverseGeoAddress.swift

@@ -6,6 +6,13 @@ import Foundation
     public var stateAbbreviation:String?
     public var zipcode:String?
 
+    enum CodingKeys: String, CodingKey {
+        case street = "street"
+        case city = "city"
+        case stateAbbreviation = "state_abbreviation"
+        case zipcode = "zipcode"
+    }
+
     init(dictionary: NSDictionary) {
         self.street = dictionary["street"] as? String
         self.city = dictionary["city"] as? String

Tests/SmartyStreetsTests/InternationalAutocompleteTests/InternationalAutocompleteClientTests.swift

@@ -28,7 +28,11 @@ class InternationalAutocompleteClientTests: XCTestCase {
         lookup.locality = "3"
         lookup.administrativeArea = "4"
         lookup.maxResults = 5
+        lookup.distance = 7
+        lookup.geolocation = InternationalAutocompleteLookup.InternationalGeolocateType.geocodes
         lookup.postalCode = "6"
+        lookup.longitude = 112.1
+        lookup.latitude = -23.4
 
         _ = client.sendLookup(lookup:&lookup, error:&error)
 
@@ -37,7 +41,34 @@ class InternationalAutocompleteClientTests: XCTestCase {
         XCTAssertEqual("3", capturingSender.request.parameters["include_only_locality"])
         XCTAssertEqual("4", capturingSender.request.parameters["include_only_administrative_area"])
         XCTAssertEqual("5", capturingSender.request.parameters["max_results"])
+        XCTAssertEqual("7", capturingSender.request.parameters["distance"])
+        XCTAssertEqual("geocodes", capturingSender.request.parameters["geolocation"])
         XCTAssertEqual("6", capturingSender.request.parameters["include_only_postal_code"])
+        XCTAssertEqual("112.1", capturingSender.request.parameters["longitude"])
+        XCTAssertEqual("-23.4", capturingSender.request.parameters["latitude"])
+        XCTAssertNil(self.error)
+    }
+    
+    func testSendingSingleMinimumParams() {
+        let sender = URLPrefixSender(urlPrefix: "http://localhost/", inner: self.capturingSender as Any)
+        let serializer = MockSerializer(result: InternationalAutocompleteResult(dictionary: NSDictionary()))
+        let client = InternationalAutocompleteClient(sender:sender, serializer:serializer)
+        var lookup = InternationalAutocompleteLookup()
+        lookup.search = "1"
+        lookup.country = "2"
+        
+        _ = client.sendLookup(lookup:&lookup, error:&error)
+        
+        XCTAssertEqual("1", capturingSender.request.parameters["search"])
+        XCTAssertEqual("2", capturingSender.request.parameters["country"])
+        XCTAssertEqual(nil, capturingSender.request.parameters["include_only_locality"])
+        XCTAssertEqual(nil, capturingSender.request.parameters["include_only_administrative_area"])
+        XCTAssertEqual("10", capturingSender.request.parameters["max_results"])
+        XCTAssertEqual("5", capturingSender.request.parameters["distance"])
+        XCTAssertEqual(nil, capturingSender.request.parameters["geolocation"])
+        XCTAssertEqual(nil, capturingSender.request.parameters["include_only_postal_code"])
+        XCTAssertEqual(nil, capturingSender.request.parameters["longitude"])
+        XCTAssertEqual(nil, capturingSender.request.parameters["latitude"])
         XCTAssertNil(self.error)
     }
 }

samples/Package.swift

@@ -10,9 +10,6 @@ let package = Package(
         .target(
             name: "swiftExamples",
             dependencies: ["SmartyStreets"]),
-        .target(
-            name: "objcExamples",
-            dependencies: ["SmartyStreets"]),
         .testTarget(
             name: "samplesTests",
             dependencies: ["swiftExamples"],