Merge pull request #20 from vapor-community/testability

Made Routes and Models open for easier testability when mocking.
vapor-community · Nov 12, 2017 · b995ce2 · b995ce2
2 parents 0d09696 + 6b0f33b
commit b995ce2
Show file tree

Hide file tree

Showing 81 changed files with 142 additions and 184 deletions.
diff --git a/Sources/Stripe/API/Routes/AccountRoutes.swift b/Sources/Stripe/API/Routes/AccountRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class AccountRoutes {
+open class AccountRoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/BalanceRoutes.swift b/Sources/Stripe/API/Routes/BalanceRoutes.swift
@@ -8,7 +8,7 @@
 
 import Node
 
-public final class BalanceRoutes {
+open class BalanceRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/ChargeRoutes.swift b/Sources/Stripe/API/Routes/ChargeRoutes.swift
@@ -21,7 +21,7 @@ public enum ChargeType {
     case customer(String)
 }
 
-public final class ChargeRoutes {
+open class ChargeRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/CouponRoutes.swift b/Sources/Stripe/API/Routes/CouponRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class CouponRoutes {
+open class CouponRoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/CustomerRoutes.swift b/Sources/Stripe/API/Routes/CustomerRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class CustomerRoutes {
+open class CustomerRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/DisputeRoutes.swift b/Sources/Stripe/API/Routes/DisputeRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class DisputeRoutes {
+open class DisputeRoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/EphemeralKeyRoutes.swift b/Sources/Stripe/API/Routes/EphemeralKeyRoutes.swift
@@ -8,7 +8,7 @@
 import HTTP
 import Node
 
-public final class EphemeralKeyRoutes {
+open class EphemeralKeyRoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/InvoiceItemRoutes.swift b/Sources/Stripe/API/Routes/InvoiceItemRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class InvoiceItemRoutes {
+open class InvoiceItemRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/InvoiceRoutes.swift b/Sources/Stripe/API/Routes/InvoiceRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class InvoiceRoutes {
+open class InvoiceRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/OrderReturnRoutes.swift b/Sources/Stripe/API/Routes/OrderReturnRoutes.swift
@@ -8,7 +8,7 @@
 
 import Node
 
-public final class OrderReturnRoutes {
+open class OrderReturnRoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/OrderRoutes.swift b/Sources/Stripe/API/Routes/OrderRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class OrderRoutes {
+open class OrderRoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/PlanRoutes.swift b/Sources/Stripe/API/Routes/PlanRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class PlanRoutes {
+open class PlanRoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/ProductRoutes.swift b/Sources/Stripe/API/Routes/ProductRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class ProductRoutes {
+open class ProductRoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/RefundRoutes.swift b/Sources/Stripe/API/Routes/RefundRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class RefundRoutes {
+open class RefundRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/SKURoutes.swift b/Sources/Stripe/API/Routes/SKURoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class SKURoutes {
+open class SKURoutes {
     let client: StripeClient
 
     init(client: StripeClient) {

diff --git a/Sources/Stripe/API/Routes/SourceRoutes.swift b/Sources/Stripe/API/Routes/SourceRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class SourceRoutes {
+open class SourceRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/SubscriptionItemRoutes.swift b/Sources/Stripe/API/Routes/SubscriptionItemRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class SubscriptionItemRoutes {
+open class SubscriptionItemRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/SubscriptionRoutes.swift b/Sources/Stripe/API/Routes/SubscriptionRoutes.swift
@@ -9,7 +9,7 @@
 import HTTP
 import Node
 
-public final class SubscriptionRoutes {
+open class SubscriptionRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/API/Routes/TokenRoutes.swift b/Sources/Stripe/API/Routes/TokenRoutes.swift
@@ -9,7 +9,7 @@
 import Node
 import HTTP
 
-public final class TokenRoutes {
+open class TokenRoutes {
 
     let client: StripeClient
 

diff --git a/Sources/Stripe/Models/Balance/Balance.swift b/Sources/Stripe/Models/Balance/Balance.swift
@@ -8,14 +8,14 @@
 
 import Node
 
-public final class Balance: StripeModelProtocol {
+open class Balance: StripeModelProtocol {
 
     public private(set) var object: String?
     public private(set) var isLiveMode: Bool?
     public private(set) var available: [BalanceTransfer]?
     public private(set) var pending: [BalanceTransfer]?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.object = try node.get("object")
         self.isLiveMode = try node.get("livemode")
         self.available = try node.get("available")

diff --git a/Sources/Stripe/Models/Balance/BalanceHistoryList.swift b/Sources/Stripe/Models/Balance/BalanceHistoryList.swift
@@ -9,14 +9,14 @@
 import Foundation
 import Vapor
 
-public final class BalanceHistoryList: StripeModelProtocol {
+open class BalanceHistoryList: StripeModelProtocol {
 
     public private(set) var object: String?
     public private(set) var url: String?
     public private(set) var hasMore: Bool?
     public private(set) var items: [BalanceTransactionItem]?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.object = try node.get("object")
         self.url = try node.get("url")
         self.hasMore = try node.get("has_more")

diff --git a/Sources/Stripe/Models/Balance/BalanceTransactionItem.swift b/Sources/Stripe/Models/Balance/BalanceTransactionItem.swift
@@ -9,8 +9,7 @@
 import Foundation
 import Vapor
 
-
-public final class BalanceTransactionItem: StripeModelProtocol {
+open class BalanceTransactionItem: StripeModelProtocol {
 
     public private(set) var id: String?
     public private(set) var object: String?
@@ -25,7 +24,7 @@ public final class BalanceTransactionItem: StripeModelProtocol {
     public private(set) var status: StripeStatus?
     public private(set) var type: ActionType?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.id = try node.get("id")
         self.object = try node.get("object")
         self.amount = try node.get("amount")

diff --git a/Sources/Stripe/Models/Balance/BalanceTransfer.swift b/Sources/Stripe/Models/Balance/BalanceTransfer.swift
@@ -8,13 +8,11 @@
 
 import Node
 
-
-
 /**
  Balance transfer is the body object of available array.
  https://stripe.com/docs/api/curl#balance_object
  */
-public class BalanceTransfer: StripeModelProtocol {
+open class BalanceTransfer: StripeModelProtocol {
 
     public private(set) var currency: StripeCurrency?
     public private(set) var amount: Int?

diff --git a/Sources/Stripe/Models/Charges/Charge.swift b/Sources/Stripe/Models/Charges/Charge.swift
@@ -14,7 +14,7 @@ import Vapor
  Charge Model
  https://stripe.com/docs/api/curl#charge_object
  */
-public final class Charge: StripeModelProtocol {
+open class Charge: StripeModelProtocol {
 
     public private(set) var id: String?
     public private(set) var object: String?
@@ -60,9 +60,7 @@ public final class Charge: StripeModelProtocol {
     public private(set) var shippingLabel: ShippingLabel?
     public private(set) var transferGroup: String?
 
-    public init() {}
-
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.id = try node.get("id")
         self.object = try node.get("object")
         self.amount = try node.get("amount")

diff --git a/Sources/Stripe/Models/Charges/ChargeList.swift b/Sources/Stripe/Models/Charges/ChargeList.swift
@@ -9,13 +9,13 @@
 import Foundation
 import Vapor
 
-public final class ChargeList: StripeModelProtocol {
+open class ChargeList: StripeModelProtocol {
 
     public private(set) var object: String?
     public private(set) var hasMore: Bool?
     public private(set) var items: [Charge]?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.object = try node.get("object")
         self.hasMore = try node.get("has_more")
         self.items = try node.get("data")

diff --git a/Sources/Stripe/Models/Charges/FruadDetails.swift b/Sources/Stripe/Models/Charges/FruadDetails.swift
@@ -19,12 +19,12 @@ public enum FraudReport: String {
     case fraudulent = "fraudulent"
 }
 
-public final class FraudDetails: StripeModelProtocol {
+open class FraudDetails: StripeModelProtocol {
 
     public private(set) var userReport: FraudReport?
     public private(set) var stripeReport: FraudReport?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         if let value: String? = try node.get("user_report") {
             if let value = value {
                 self.userReport = FraudReport(rawValue: value)

diff --git a/Sources/Stripe/Models/Charges/Outcome.swift b/Sources/Stripe/Models/Charges/Outcome.swift
@@ -37,7 +37,7 @@ public enum OutcomeType: String {
     case invalid = "invalid"
 }
 
-public final class Outcome: StripeModelProtocol {
+open class Outcome: StripeModelProtocol {
 
     public private(set) var networkStatus: NetworkStatus?
     public private(set) var reason: String?
@@ -46,7 +46,7 @@ public final class Outcome: StripeModelProtocol {
     public private(set) var sellerMessage: String?
     public private(set) var type: OutcomeType?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         if let networkStatus = node["network_status"]?.string {
             self.networkStatus = NetworkStatus(rawValue: networkStatus)
         }

diff --git a/Sources/Stripe/Models/Charges/Refund.swift b/Sources/Stripe/Models/Charges/Refund.swift
@@ -15,15 +15,15 @@ import Vapor
  https://stripe.com/docs/api/curl#charge_object-refunds
  */
 
-public final class Refund: StripeModelProtocol {
+open class Refund: StripeModelProtocol {
 
     public private(set) var object: String?
     public private(set) var hasMore: Bool
     public private(set) var totalCount: Int?
     public private(set) var url: String?
     public private(set) var items: [RefundItem]?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.object = try node.get("object")
         self.items = try node.get("data")
         self.hasMore = try node.get("has_more")

diff --git a/Sources/Stripe/Models/Charges/RefundItem.swift b/Sources/Stripe/Models/Charges/RefundItem.swift
@@ -9,8 +9,7 @@
 import Foundation
 import Vapor
 
-
-public final class RefundItem: StripeModelProtocol {
+open class RefundItem: StripeModelProtocol {
 
     public private(set) var id: String?
     public private(set) var object: String?
@@ -25,7 +24,7 @@ public final class RefundItem: StripeModelProtocol {
     public private(set) var receiptNumber: String?
     public private(set) var status: StripeStatus?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.id = try node.get("id")
         self.object = try node.get("object")
         self.amount = try node.get("amount")

diff --git a/Sources/Stripe/Models/Connect/Account.swift b/Sources/Stripe/Models/Connect/Account.swift
@@ -15,7 +15,7 @@ import Vapor
  https://stripe.com/docs/api#account_object
  */
 
-public final class ConnectAccount: StripeModelProtocol {
+open class ConnectAccount: StripeModelProtocol {
 
     public private(set) var id: String?
     public private(set) var object: String?
@@ -46,7 +46,7 @@ public final class ConnectAccount: StripeModelProtocol {
     public private(set) var verification: Verification?
     public private(set) var keys: Node?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.id = try node.get("id")
         self.object = try node.get("object")
         self.businessName = try node.get("business_name")

diff --git a/Sources/Stripe/Models/Connect/AccountList.swift b/Sources/Stripe/Models/Connect/AccountList.swift
@@ -9,14 +9,13 @@
 import Foundation
 import Vapor
 
-
-public final class AccountList: StripeModelProtocol {
+open class AccountList: StripeModelProtocol {
     public private(set) var object: String?
     public private(set) var url: String?
     public private(set) var hasMore: Bool?
     public private(set) var items: [ConnectAccount]?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.object = try node.get("object")
         self.url = try node.get("url")
         self.hasMore = try node.get("has_more")

diff --git a/Sources/Stripe/Models/Connect/AdditionalOwner.swift b/Sources/Stripe/Models/Connect/AdditionalOwner.swift
@@ -9,16 +9,15 @@
 import Foundation
 import Vapor
 
-
-public final class AdditionalOwner: StripeModelProtocol {
+open class AdditionalOwner: StripeModelProtocol {
 
     public private(set) var firstName: String?
     public private(set) var lastName: String?
     public private(set) var dateOfBirth: Node?
     public private(set) var address: ShippingAddress?
     public private(set) var verification: Verification?
 
-    public init(node: Node) throws {
+    public required init(node: Node) throws {
         self.firstName = try node.get("first_name")
         self.lastName = try node.get("last_name")
         self.dateOfBirth = try node.get("dob")