Merge pull request #11 from vapor-cloud/unify

Unify modules
vapor-community · Aug 29, 2017 · cd56cfb · cd56cfb
2 parents 4303a74 + 0c26b4d
commit cd56cfb
Show file tree

Hide file tree

Showing 115 changed files with 131 additions and 158 deletions.
diff --git a/Package.swift b/Package.swift
@@ -5,11 +5,7 @@ import PackageDescription
 let package = Package(
     name: "Stripe",
     targets: [
-        Target(name: "Errors"),
-        Target(name: "Helpers", dependencies: ["Errors"]),
-        Target(name: "Models", dependencies: ["Helpers"]),
-        Target(name: "API", dependencies: ["Models", "Errors", "Helpers"]),
-        Target(name: "Stripe", dependencies: ["API", "Models", "Errors", "Helpers"]),
+        Target(name: "Stripe"),
     ],
     dependencies: [
         .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2),

diff --git a/Sources/API/Filter/StripeFilter.swift → Sources/Stripe/API/Filter/StripeFilter.swift b/Sources/API/Filter/StripeFilter.swift → Sources/Stripe/API/Filter/StripeFilter.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 import Vapor
-import Helpers
 import Node
 import HTTP
 

diff --git a/Sources/API/Helpers/Endpoints.swift → Sources/Stripe/API/Helpers/Endpoints.swift b/Sources/API/Helpers/Endpoints.swift → Sources/Stripe/API/Helpers/Endpoints.swift
diff --git a/Sources/API/Routes/AccountRoutes.swift → ...ces/Stripe/API/Routes/AccountRoutes.swift b/Sources/API/Routes/AccountRoutes.swift → ...ces/Stripe/API/Routes/AccountRoutes.swift
@@ -8,10 +8,7 @@
 
 import Foundation
 import Node
-import Models
-import Helpers
 import HTTP
-import Errors
 
 public final class AccountRoutes {
     let client: StripeClient

diff --git a/Sources/API/Routes/BalanceRoutes.swift → ...ces/Stripe/API/Routes/BalanceRoutes.swift b/Sources/API/Routes/BalanceRoutes.swift → ...ces/Stripe/API/Routes/BalanceRoutes.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 import Node
-import Models
 
 public final class BalanceRoutes {
 

diff --git a/Sources/API/Routes/ChargeRoutes.swift → Sources/Stripe/API/Routes/ChargeRoutes.swift b/Sources/API/Routes/ChargeRoutes.swift → Sources/Stripe/API/Routes/ChargeRoutes.swift
@@ -9,8 +9,6 @@
 import Foundation
 import Node
 import HTTP
-import Models
-import Helpers
 
 public enum ChargeType {
     /**

diff --git a/Sources/API/Routes/CouponRoutes.swift → Sources/Stripe/API/Routes/CouponRoutes.swift b/Sources/API/Routes/CouponRoutes.swift → Sources/Stripe/API/Routes/CouponRoutes.swift
@@ -9,9 +9,6 @@
 import Foundation
 import Node
 import HTTP
-import Models
-import Helpers
-import Errors
 
 public final class CouponRoutes {
     let client: StripeClient

diff --git a/Sources/API/Routes/CustomerRoutes.swift → ...es/Stripe/API/Routes/CustomerRoutes.swift b/Sources/API/Routes/CustomerRoutes.swift → ...es/Stripe/API/Routes/CustomerRoutes.swift
@@ -9,9 +9,6 @@
 import Foundation
 import Node
 import HTTP
-import Models
-import Helpers
-import Errors
 
 public final class CustomerRoutes {
 

diff --git a/Sources/API/Routes/DisputeRoutes.swift → ...ces/Stripe/API/Routes/DisputeRoutes.swift b/Sources/API/Routes/DisputeRoutes.swift → ...ces/Stripe/API/Routes/DisputeRoutes.swift
@@ -8,10 +8,7 @@
 
 import Foundation
 import Node
-import Models
-import Helpers
 import HTTP
-import Errors
 
 public final class DisputeRoutes {
     let client: StripeClient

diff --git a/Sources/API/Routes/OrderReturnRoutes.swift → ...Stripe/API/Routes/OrderReturnRoutes.swift b/Sources/API/Routes/OrderReturnRoutes.swift → ...Stripe/API/Routes/OrderReturnRoutes.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 import Node
-import Models
-import Helpers
+
+
 import HTTP
 
 public final class OrderReturnRoutes {

diff --git a/Sources/API/Routes/OrderRoutes.swift → Sources/Stripe/API/Routes/OrderRoutes.swift b/Sources/API/Routes/OrderRoutes.swift → Sources/Stripe/API/Routes/OrderRoutes.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 import Node
-import Models
-import Helpers
+
+
 import HTTP
 
 public final class OrderRoutes {

diff --git a/Sources/API/Routes/PlanRoutes.swift → Sources/Stripe/API/Routes/PlanRoutes.swift b/Sources/API/Routes/PlanRoutes.swift → Sources/Stripe/API/Routes/PlanRoutes.swift
@@ -9,9 +9,9 @@
 import Foundation
 import Node
 import HTTP
-import Models
-import Helpers
-import Errors
+
+
+
 
 public final class PlanRoutes {
     let client: StripeClient

diff --git a/Sources/API/Routes/ProductRoutes.swift → ...ces/Stripe/API/Routes/ProductRoutes.swift b/Sources/API/Routes/ProductRoutes.swift → ...ces/Stripe/API/Routes/ProductRoutes.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 import Node
-import Models
-import Helpers
+
+
 import HTTP
 
 public final class ProductRoutes {

diff --git a/Sources/API/Routes/RefundRoutes.swift → Sources/Stripe/API/Routes/RefundRoutes.swift b/Sources/API/Routes/RefundRoutes.swift → Sources/Stripe/API/Routes/RefundRoutes.swift
@@ -9,9 +9,9 @@
 import Foundation
 import Node
 import HTTP
-import Models
-import Helpers
-import Errors
+
+
+
 
 public final class RefundRoutes {
 

diff --git a/Sources/API/Routes/SKURoutes.swift → Sources/Stripe/API/Routes/SKURoutes.swift b/Sources/API/Routes/SKURoutes.swift → Sources/Stripe/API/Routes/SKURoutes.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 import Node
-import Models
-import Helpers
+
+
 import HTTP
 
 public final class SKURoutes {

diff --git a/Sources/API/Routes/SourceRoutes.swift → Sources/Stripe/API/Routes/SourceRoutes.swift b/Sources/API/Routes/SourceRoutes.swift → Sources/Stripe/API/Routes/SourceRoutes.swift
@@ -9,9 +9,9 @@
 import Foundation
 import Node
 import HTTP
-import Models
-import Helpers
-import Errors
+
+
+
 
 public final class SourceRoutes {
 

diff --git a/...s/API/Routes/SubscriptionItemRoutes.swift → ...e/API/Routes/SubscriptionItemRoutes.swift b/...s/API/Routes/SubscriptionItemRoutes.swift → ...e/API/Routes/SubscriptionItemRoutes.swift
@@ -8,10 +8,10 @@
 
 import Foundation
 import Node
-import Models
+
 import HTTP
-import Helpers
-import Errors
+
+
 
 public final class SubscriptionItemRoutes {
 

diff --git a/Sources/API/Routes/SubscriptionRoutes.swift → ...tripe/API/Routes/SubscriptionRoutes.swift b/Sources/API/Routes/SubscriptionRoutes.swift → ...tripe/API/Routes/SubscriptionRoutes.swift
@@ -7,11 +7,11 @@
 //
 
 import Foundation
-import Models
+
 import HTTP
-import Helpers
+
 import Node
-import Errors
+
 
 public final class SubscriptionRoutes {
 

diff --git a/Sources/API/Routes/TokenRoutes.swift → Sources/Stripe/API/Routes/TokenRoutes.swift b/Sources/API/Routes/TokenRoutes.swift → Sources/Stripe/API/Routes/TokenRoutes.swift
@@ -9,9 +9,9 @@
 import Foundation
 import Node
 import HTTP
-import Models
-import Helpers
-import Errors
+
+
+
 
 public final class TokenRoutes {
 

diff --git a/Sources/API/StripeClient.swift → Sources/Stripe/API/StripeClient.swift b/Sources/API/StripeClient.swift → Sources/Stripe/API/StripeClient.swift
diff --git a/Sources/API/StripeRequest.swift → Sources/Stripe/API/StripeRequest.swift b/Sources/API/StripeRequest.swift → Sources/Stripe/API/StripeRequest.swift
@@ -9,8 +9,6 @@
 import Foundation
 import Vapor
 import HTTP
-import Models
-import Errors
 
 internal enum HTTPMethod {
     case get

diff --git a/Sources/Errors/StripeError.swift → Sources/Stripe/Errors/StripeError.swift b/Sources/Errors/StripeError.swift → Sources/Stripe/Errors/StripeError.swift
diff --git a/Sources/Helpers/AccountRejectReason.swift → .../Stripe/Helpers/AccountRejectReason.swift b/Sources/Helpers/AccountRejectReason.swift → .../Stripe/Helpers/AccountRejectReason.swift
diff --git a/Sources/Helpers/ActionType.swift → Sources/Stripe/Helpers/ActionType.swift b/Sources/Helpers/ActionType.swift → Sources/Stripe/Helpers/ActionType.swift
diff --git a/Sources/Helpers/BalanceType.swift → Sources/Stripe/Helpers/BalanceType.swift b/Sources/Helpers/BalanceType.swift → Sources/Stripe/Helpers/BalanceType.swift
diff --git a/Sources/Helpers/ConnectedAccountType.swift → ...Stripe/Helpers/ConnectedAccountType.swift b/Sources/Helpers/ConnectedAccountType.swift → ...Stripe/Helpers/ConnectedAccountType.swift
diff --git a/Sources/Helpers/DeliveryEstimateType.swift → ...Stripe/Helpers/DeliveryEstimateType.swift b/Sources/Helpers/DeliveryEstimateType.swift → ...Stripe/Helpers/DeliveryEstimateType.swift
diff --git a/Sources/Helpers/DisputeReason.swift → Sources/Stripe/Helpers/DisputeReason.swift b/Sources/Helpers/DisputeReason.swift → Sources/Stripe/Helpers/DisputeReason.swift
diff --git a/Sources/Helpers/FundingType.swift → Sources/Stripe/Helpers/FundingType.swift b/Sources/Helpers/FundingType.swift → Sources/Stripe/Helpers/FundingType.swift
diff --git a/Sources/Helpers/InventoryType.swift → Sources/Stripe/Helpers/InventoryType.swift b/Sources/Helpers/InventoryType.swift → Sources/Stripe/Helpers/InventoryType.swift
diff --git a/Sources/Helpers/OrderItemType.swift → Sources/Stripe/Helpers/OrderItemType.swift b/Sources/Helpers/OrderItemType.swift → Sources/Stripe/Helpers/OrderItemType.swift
diff --git a/Sources/Helpers/OrderStatus.swift → Sources/Stripe/Helpers/OrderStatus.swift b/Sources/Helpers/OrderStatus.swift → Sources/Stripe/Helpers/OrderStatus.swift
diff --git a/Sources/Helpers/RefundReason.swift → Sources/Stripe/Helpers/RefundReason.swift b/Sources/Helpers/RefundReason.swift → Sources/Stripe/Helpers/RefundReason.swift
diff --git a/Sources/Helpers/SourceType.swift → Sources/Stripe/Helpers/SourceType.swift b/Sources/Helpers/SourceType.swift → Sources/Stripe/Helpers/SourceType.swift
diff --git a/Sources/Helpers/StripeCurrency.swift → Sources/Stripe/Helpers/StripeCurrency.swift b/Sources/Helpers/StripeCurrency.swift → Sources/Stripe/Helpers/StripeCurrency.swift
diff --git a/Sources/Helpers/StripeDuration.swift → Sources/Stripe/Helpers/StripeDuration.swift b/Sources/Helpers/StripeDuration.swift → Sources/Stripe/Helpers/StripeDuration.swift
diff --git a/Sources/Helpers/StripeInterval.swift → Sources/Stripe/Helpers/StripeInterval.swift b/Sources/Helpers/StripeInterval.swift → Sources/Stripe/Helpers/StripeInterval.swift
diff --git a/Sources/Helpers/StripeStatus.swift → Sources/Stripe/Helpers/StripeStatus.swift b/Sources/Helpers/StripeStatus.swift → Sources/Stripe/Helpers/StripeStatus.swift
diff --git a/Sources/Helpers/TokenizedMethod.swift → Sources/Stripe/Helpers/TokenizedMethod.swift b/Sources/Helpers/TokenizedMethod.swift → Sources/Stripe/Helpers/TokenizedMethod.swift
diff --git a/Sources/Helpers/ValidationCheck.swift → Sources/Stripe/Helpers/ValidationCheck.swift b/Sources/Helpers/ValidationCheck.swift → Sources/Stripe/Helpers/ValidationCheck.swift
diff --git a/Sources/Models/Balance/Balance.swift → Sources/Stripe/Models/Balance/Balance.swift b/Sources/Models/Balance/Balance.swift → Sources/Stripe/Models/Balance/Balance.swift
diff --git a/...s/Models/Balance/BalanceHistoryList.swift → ...e/Models/Balance/BalanceHistoryList.swift b/...s/Models/Balance/BalanceHistoryList.swift → ...e/Models/Balance/BalanceHistoryList.swift
diff --git a/...dels/Balance/BalanceTransactionItem.swift → ...dels/Balance/BalanceTransactionItem.swift b/...dels/Balance/BalanceTransactionItem.swift → ...dels/Balance/BalanceTransactionItem.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class BalanceTransactionItem: StripeModelProtocol {
 

diff --git a/Sources/Models/Balance/BalanceTransfer.swift → ...ripe/Models/Balance/BalanceTransfer.swift b/Sources/Models/Balance/BalanceTransfer.swift → ...ripe/Models/Balance/BalanceTransfer.swift
@@ -7,7 +7,7 @@
 //
 
 import Node
-import Helpers
+
 
 
 /**

diff --git a/Sources/Models/Charges/Charge.swift → Sources/Stripe/Models/Charges/Charge.swift b/Sources/Models/Charges/Charge.swift → Sources/Stripe/Models/Charges/Charge.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 /**
  Charge Model

diff --git a/Sources/Models/Charges/ChargeList.swift → ...es/Stripe/Models/Charges/ChargeList.swift b/Sources/Models/Charges/ChargeList.swift → ...es/Stripe/Models/Charges/ChargeList.swift
diff --git a/Sources/Models/Charges/FruadDetails.swift → .../Stripe/Models/Charges/FruadDetails.swift b/Sources/Models/Charges/FruadDetails.swift → .../Stripe/Models/Charges/FruadDetails.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 /**
  Fraud Details

diff --git a/Sources/Models/Charges/Outcome.swift → Sources/Stripe/Models/Charges/Outcome.swift b/Sources/Models/Charges/Outcome.swift → Sources/Stripe/Models/Charges/Outcome.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 /**
  Outcome

diff --git a/Sources/Models/Charges/Refund.swift → Sources/Stripe/Models/Charges/Refund.swift b/Sources/Models/Charges/Refund.swift → Sources/Stripe/Models/Charges/Refund.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 /**
  Refunds

diff --git a/Sources/Models/Charges/RefundItem.swift → ...es/Stripe/Models/Charges/RefundItem.swift b/Sources/Models/Charges/RefundItem.swift → ...es/Stripe/Models/Charges/RefundItem.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class RefundItem: StripeModelProtocol {
 

diff --git a/Sources/Models/Connect/Account.swift → Sources/Stripe/Models/Connect/Account.swift b/Sources/Models/Connect/Account.swift → Sources/Stripe/Models/Connect/Account.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 /**
  Account Model

diff --git a/Sources/Models/Connect/AccountList.swift → ...s/Stripe/Models/Connect/AccountList.swift b/Sources/Models/Connect/AccountList.swift → ...s/Stripe/Models/Connect/AccountList.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class AccountList: StripeModelProtocol {
     public private(set) var object: String?

diff --git a/Sources/Models/Connect/AdditionalOwner.swift → ...ripe/Models/Connect/AdditionalOwner.swift b/Sources/Models/Connect/AdditionalOwner.swift → ...ripe/Models/Connect/AdditionalOwner.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class AdditionalOwner: StripeModelProtocol {
 

diff --git a/...ces/Models/Connect/ConnectLoginLink.swift → ...ipe/Models/Connect/ConnectLoginLink.swift b/...ces/Models/Connect/ConnectLoginLink.swift → ...ipe/Models/Connect/ConnectLoginLink.swift
diff --git a/...ces/Models/Connect/ExternalAccounts.swift → ...ipe/Models/Connect/ExternalAccounts.swift b/...ces/Models/Connect/ExternalAccounts.swift → ...ipe/Models/Connect/ExternalAccounts.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class ExternalAccounts: StripeModelProtocol {
 

diff --git a/Sources/Models/Connect/LegalEntity.swift → ...s/Stripe/Models/Connect/LegalEntity.swift b/Sources/Models/Connect/LegalEntity.swift → ...s/Stripe/Models/Connect/LegalEntity.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 /**
  Legal Entity

diff --git a/Sources/Models/Connect/PayoutSchedule.swift → ...tripe/Models/Connect/PayoutSchedule.swift b/Sources/Models/Connect/PayoutSchedule.swift → ...tripe/Models/Connect/PayoutSchedule.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class PayoutSchedule: StripeModelProtocol {
 

diff --git a/Sources/Models/Connect/TOSAcceptance.swift → ...Stripe/Models/Connect/TOSAcceptance.swift b/Sources/Models/Connect/TOSAcceptance.swift → ...Stripe/Models/Connect/TOSAcceptance.swift
diff --git a/Sources/Models/Connect/Verification.swift → .../Stripe/Models/Connect/Verification.swift b/Sources/Models/Connect/Verification.swift → .../Stripe/Models/Connect/Verification.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class Verification: StripeModelProtocol {
     public private(set) var details: String?

diff --git a/Sources/Models/Coupons/Coupon.swift → Sources/Stripe/Models/Coupons/Coupon.swift b/Sources/Models/Coupons/Coupon.swift → Sources/Stripe/Models/Coupons/Coupon.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 /**
  Coupon Model

diff --git a/Sources/Models/Coupons/CouponList.swift → ...es/Stripe/Models/Coupons/CouponList.swift b/Sources/Models/Coupons/CouponList.swift → ...es/Stripe/Models/Coupons/CouponList.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class CouponList: StripeModelProtocol {
     public private(set) var object: String?

diff --git a/Sources/Models/Customer/Customer.swift → ...ces/Stripe/Models/Customer/Customer.swift b/Sources/Models/Customer/Customer.swift → ...ces/Stripe/Models/Customer/Customer.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 /**
  Customer Model

diff --git a/Sources/Models/Customer/CustomerList.swift → ...Stripe/Models/Customer/CustomerList.swift b/Sources/Models/Customer/CustomerList.swift → ...Stripe/Models/Customer/CustomerList.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class CustomerList: StripeModelProtocol {
     public private(set) var object: String?

diff --git a/Sources/Models/Discount/Discount.swift → ...ces/Stripe/Models/Discount/Discount.swift b/Sources/Models/Discount/Discount.swift → ...ces/Stripe/Models/Discount/Discount.swift
diff --git a/Sources/Models/Dispute/Dispute.swift → Sources/Stripe/Models/Dispute/Dispute.swift b/Sources/Models/Dispute/Dispute.swift → Sources/Stripe/Models/Dispute/Dispute.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Vapor
-import Helpers
+
 
 public final class Dispute: StripeModelProtocol {
 

diff --git a/Sources/Models/Dispute/DisputeList.swift → ...s/Stripe/Models/Dispute/DisputeList.swift b/Sources/Models/Dispute/DisputeList.swift → ...s/Stripe/Models/Dispute/DisputeList.swift
diff --git a/Sources/Models/Fee.swift → Sources/Stripe/Models/Fee.swift b/Sources/Models/Fee.swift → Sources/Stripe/Models/Fee.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 import Vapor
-import Helpers
 
 public final class Fee: StripeModelProtocol {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     //
     import Node
-    import Helpers
     /**
@@ Expand Down @@