From 0c26b4df33bb55b94ceee5895dab7ab5ea47436b Mon Sep 17 00:00:00 2001 From: tanner0101 Date: Tue, 29 Aug 2017 14:45:11 -0400 Subject: [PATCH] unify modules --- Package.swift | 6 +----- Sources/{ => Stripe}/API/Filter/StripeFilter.swift | 1 - Sources/{ => Stripe}/API/Helpers/Endpoints.swift | 0 Sources/{ => Stripe}/API/Routes/AccountRoutes.swift | 3 --- Sources/{ => Stripe}/API/Routes/BalanceRoutes.swift | 1 - Sources/{ => Stripe}/API/Routes/ChargeRoutes.swift | 2 -- Sources/{ => Stripe}/API/Routes/CouponRoutes.swift | 3 --- Sources/{ => Stripe}/API/Routes/CustomerRoutes.swift | 3 --- Sources/{ => Stripe}/API/Routes/DisputeRoutes.swift | 3 --- Sources/{ => Stripe}/API/Routes/OrderReturnRoutes.swift | 4 ++-- Sources/{ => Stripe}/API/Routes/OrderRoutes.swift | 4 ++-- Sources/{ => Stripe}/API/Routes/PlanRoutes.swift | 6 +++--- Sources/{ => Stripe}/API/Routes/ProductRoutes.swift | 4 ++-- Sources/{ => Stripe}/API/Routes/RefundRoutes.swift | 6 +++--- Sources/{ => Stripe}/API/Routes/SKURoutes.swift | 4 ++-- Sources/{ => Stripe}/API/Routes/SourceRoutes.swift | 6 +++--- .../{ => Stripe}/API/Routes/SubscriptionItemRoutes.swift | 6 +++--- Sources/{ => Stripe}/API/Routes/SubscriptionRoutes.swift | 6 +++--- Sources/{ => Stripe}/API/Routes/TokenRoutes.swift | 6 +++--- Sources/{ => Stripe}/API/StripeClient.swift | 0 Sources/{ => Stripe}/API/StripeRequest.swift | 2 -- Sources/{ => Stripe}/Errors/StripeError.swift | 0 Sources/{ => Stripe}/Helpers/AccountRejectReason.swift | 0 Sources/{ => Stripe}/Helpers/ActionType.swift | 0 Sources/{ => Stripe}/Helpers/BalanceType.swift | 0 Sources/{ => Stripe}/Helpers/ConnectedAccountType.swift | 0 Sources/{ => Stripe}/Helpers/DeliveryEstimateType.swift | 0 Sources/{ => Stripe}/Helpers/DisputeReason.swift | 0 Sources/{ => Stripe}/Helpers/FundingType.swift | 0 Sources/{ => Stripe}/Helpers/InventoryType.swift | 0 Sources/{ => Stripe}/Helpers/OrderItemType.swift | 0 Sources/{ => Stripe}/Helpers/OrderStatus.swift | 0 Sources/{ => Stripe}/Helpers/RefundReason.swift | 0 Sources/{ => Stripe}/Helpers/SourceType.swift | 0 Sources/{ => Stripe}/Helpers/StripeCurrency.swift | 0 Sources/{ => Stripe}/Helpers/StripeDuration.swift | 0 Sources/{ => Stripe}/Helpers/StripeInterval.swift | 0 Sources/{ => Stripe}/Helpers/StripeStatus.swift | 0 Sources/{ => Stripe}/Helpers/TokenizedMethod.swift | 0 Sources/{ => Stripe}/Helpers/ValidationCheck.swift | 0 Sources/{ => Stripe}/Models/Balance/Balance.swift | 0 .../{ => Stripe}/Models/Balance/BalanceHistoryList.swift | 0 .../Models/Balance/BalanceTransactionItem.swift | 2 +- Sources/{ => Stripe}/Models/Balance/BalanceTransfer.swift | 2 +- Sources/{ => Stripe}/Models/Charges/Charge.swift | 2 +- Sources/{ => Stripe}/Models/Charges/ChargeList.swift | 0 Sources/{ => Stripe}/Models/Charges/FruadDetails.swift | 2 +- Sources/{ => Stripe}/Models/Charges/Outcome.swift | 2 +- Sources/{ => Stripe}/Models/Charges/Refund.swift | 2 +- Sources/{ => Stripe}/Models/Charges/RefundItem.swift | 2 +- Sources/{ => Stripe}/Models/Connect/Account.swift | 2 +- Sources/{ => Stripe}/Models/Connect/AccountList.swift | 2 +- Sources/{ => Stripe}/Models/Connect/AdditionalOwner.swift | 2 +- .../{ => Stripe}/Models/Connect/ConnectLoginLink.swift | 0 .../{ => Stripe}/Models/Connect/ExternalAccounts.swift | 2 +- Sources/{ => Stripe}/Models/Connect/LegalEntity.swift | 2 +- Sources/{ => Stripe}/Models/Connect/PayoutSchedule.swift | 2 +- Sources/{ => Stripe}/Models/Connect/TOSAcceptance.swift | 0 Sources/{ => Stripe}/Models/Connect/Verification.swift | 2 +- Sources/{ => Stripe}/Models/Coupons/Coupon.swift | 2 +- Sources/{ => Stripe}/Models/Coupons/CouponList.swift | 2 +- Sources/{ => Stripe}/Models/Customer/Customer.swift | 2 +- Sources/{ => Stripe}/Models/Customer/CustomerList.swift | 2 +- Sources/{ => Stripe}/Models/Discount/Discount.swift | 0 Sources/{ => Stripe}/Models/Dispute/Dispute.swift | 2 +- Sources/{ => Stripe}/Models/Dispute/DisputeList.swift | 0 Sources/{ => Stripe}/Models/Fee.swift | 1 - Sources/{ => Stripe}/Models/Inventory.swift | 1 - Sources/{ => Stripe}/Models/OrderList.swift | 1 - Sources/{ => Stripe}/Models/Orders/OrderItem.swift | 2 +- Sources/{ => Stripe}/Models/Orders/OrderReturn.swift | 2 +- Sources/{ => Stripe}/Models/Orders/OrderReturnList.swift | 2 +- Sources/{ => Stripe}/Models/Orders/Orders.swift | 2 +- Sources/{ => Stripe}/Models/Other/DeletedObject.swift | 2 +- Sources/{ => Stripe}/Models/PackageDimensions.swift | 0 Sources/{ => Stripe}/Models/Plans/Plans.swift | 2 +- Sources/{ => Stripe}/Models/Plans/PlansList.swift | 2 +- Sources/{ => Stripe}/Models/Products/Products.swift | 2 +- Sources/{ => Stripe}/Models/Products/ProductsList.swift | 2 +- Sources/{ => Stripe}/Models/SKU/SKU.swift | 2 +- Sources/{ => Stripe}/Models/SKU/SKUList.swift | 2 +- .../{ => Stripe}/Models/Shipping/DeliveryEstimate.swift | 2 +- .../{ => Stripe}/Models/Shipping/ShippingAddress.swift | 2 +- Sources/{ => Stripe}/Models/Shipping/ShippingLabel.swift | 2 +- Sources/{ => Stripe}/Models/Shipping/ShippingMethod.swift | 2 +- .../{ => Stripe}/Models/Shipping/StatusTransitions.swift | 2 +- Sources/{ => Stripe}/Models/Sources/BankAccount.swift | 2 +- Sources/{ => Stripe}/Models/Sources/Card.swift | 2 +- Sources/{ => Stripe}/Models/Sources/Owner.swift | 2 +- Sources/{ => Stripe}/Models/Sources/Receiver.swift | 2 +- Sources/{ => Stripe}/Models/Sources/Source.swift | 2 +- Sources/{ => Stripe}/Models/Sources/SourceList.swift | 2 +- Sources/{ => Stripe}/Models/StripeModelProtocol.swift | 0 .../{ => Stripe}/Models/Subscriptions/Subscription.swift | 2 +- .../Models/Subscriptions/SubscriptionItem.swift | 0 .../Models/Subscriptions/SubscriptionItemList.swift | 2 +- .../Models/Subscriptions/SubscriptionList.swift | 2 +- Sources/{ => Stripe}/Models/Tokens/Token.swift | 0 Sources/Stripe/{ => Provider}/Provider.swift | 2 -- Tests/StripeTests/AccountTests.swift | 8 ++++---- Tests/StripeTests/BalanceTests.swift | 4 ++-- Tests/StripeTests/ChargeTests.swift | 6 +++--- Tests/StripeTests/CouponTests.swift | 8 ++++---- Tests/StripeTests/CustomerTests.swift | 8 ++++---- Tests/StripeTests/DisputeTests.swift | 8 ++++---- Tests/StripeTests/OrderReturnTests.swift | 8 ++++---- Tests/StripeTests/OrderTests.swift | 8 ++++---- Tests/StripeTests/PlanTests.swift | 8 ++++---- Tests/StripeTests/ProductTests.swift | 8 ++++---- Tests/StripeTests/RefundTests.swift | 8 ++++---- Tests/StripeTests/SKUTests.swift | 8 ++++---- Tests/StripeTests/SourceTests.swift | 8 ++++---- Tests/StripeTests/SubscriptionItemTests.swift | 8 ++++---- Tests/StripeTests/SubscriptionTests.swift | 8 ++++---- Tests/StripeTests/TokenTests.swift | 6 +++--- 115 files changed, 131 insertions(+), 158 deletions(-) rename Sources/{ => Stripe}/API/Filter/StripeFilter.swift (99%) rename Sources/{ => Stripe}/API/Helpers/Endpoints.swift (100%) rename Sources/{ => Stripe}/API/Routes/AccountRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/BalanceRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/ChargeRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/CouponRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/CustomerRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/DisputeRoutes.swift (97%) rename Sources/{ => Stripe}/API/Routes/OrderReturnRoutes.swift (96%) rename Sources/{ => Stripe}/API/Routes/OrderRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/PlanRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/ProductRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/RefundRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/SKURoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/SourceRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/SubscriptionItemRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/SubscriptionRoutes.swift (99%) rename Sources/{ => Stripe}/API/Routes/TokenRoutes.swift (99%) rename Sources/{ => Stripe}/API/StripeClient.swift (100%) rename Sources/{ => Stripe}/API/StripeRequest.swift (99%) rename Sources/{ => Stripe}/Errors/StripeError.swift (100%) rename Sources/{ => Stripe}/Helpers/AccountRejectReason.swift (100%) rename Sources/{ => Stripe}/Helpers/ActionType.swift (100%) rename Sources/{ => Stripe}/Helpers/BalanceType.swift (100%) rename Sources/{ => Stripe}/Helpers/ConnectedAccountType.swift (100%) rename Sources/{ => Stripe}/Helpers/DeliveryEstimateType.swift (100%) rename Sources/{ => Stripe}/Helpers/DisputeReason.swift (100%) rename Sources/{ => Stripe}/Helpers/FundingType.swift (100%) rename Sources/{ => Stripe}/Helpers/InventoryType.swift (100%) rename Sources/{ => Stripe}/Helpers/OrderItemType.swift (100%) rename Sources/{ => Stripe}/Helpers/OrderStatus.swift (100%) rename Sources/{ => Stripe}/Helpers/RefundReason.swift (100%) rename Sources/{ => Stripe}/Helpers/SourceType.swift (100%) rename Sources/{ => Stripe}/Helpers/StripeCurrency.swift (100%) rename Sources/{ => Stripe}/Helpers/StripeDuration.swift (100%) rename Sources/{ => Stripe}/Helpers/StripeInterval.swift (100%) rename Sources/{ => Stripe}/Helpers/StripeStatus.swift (100%) rename Sources/{ => Stripe}/Helpers/TokenizedMethod.swift (100%) rename Sources/{ => Stripe}/Helpers/ValidationCheck.swift (100%) rename Sources/{ => Stripe}/Models/Balance/Balance.swift (100%) rename Sources/{ => Stripe}/Models/Balance/BalanceHistoryList.swift (100%) rename Sources/{ => Stripe}/Models/Balance/BalanceTransactionItem.swift (99%) rename Sources/{ => Stripe}/Models/Balance/BalanceTransfer.swift (98%) rename Sources/{ => Stripe}/Models/Charges/Charge.swift (99%) rename Sources/{ => Stripe}/Models/Charges/ChargeList.swift (100%) rename Sources/{ => Stripe}/Models/Charges/FruadDetails.swift (98%) rename Sources/{ => Stripe}/Models/Charges/Outcome.swift (99%) rename Sources/{ => Stripe}/Models/Charges/Refund.swift (98%) rename Sources/{ => Stripe}/Models/Charges/RefundItem.swift (99%) rename Sources/{ => Stripe}/Models/Connect/Account.swift (99%) rename Sources/{ => Stripe}/Models/Connect/AccountList.swift (98%) rename Sources/{ => Stripe}/Models/Connect/AdditionalOwner.swift (98%) rename Sources/{ => Stripe}/Models/Connect/ConnectLoginLink.swift (100%) rename Sources/{ => Stripe}/Models/Connect/ExternalAccounts.swift (99%) rename Sources/{ => Stripe}/Models/Connect/LegalEntity.swift (99%) rename Sources/{ => Stripe}/Models/Connect/PayoutSchedule.swift (98%) rename Sources/{ => Stripe}/Models/Connect/TOSAcceptance.swift (100%) rename Sources/{ => Stripe}/Models/Connect/Verification.swift (98%) rename Sources/{ => Stripe}/Models/Coupons/Coupon.swift (99%) rename Sources/{ => Stripe}/Models/Coupons/CouponList.swift (98%) rename Sources/{ => Stripe}/Models/Customer/Customer.swift (99%) rename Sources/{ => Stripe}/Models/Customer/CustomerList.swift (98%) rename Sources/{ => Stripe}/Models/Discount/Discount.swift (100%) rename Sources/{ => Stripe}/Models/Dispute/Dispute.swift (99%) rename Sources/{ => Stripe}/Models/Dispute/DisputeList.swift (100%) rename Sources/{ => Stripe}/Models/Fee.swift (98%) rename Sources/{ => Stripe}/Models/Inventory.swift (98%) rename Sources/{ => Stripe}/Models/OrderList.swift (98%) rename Sources/{ => Stripe}/Models/Orders/OrderItem.swift (99%) rename Sources/{ => Stripe}/Models/Orders/OrderReturn.swift (99%) rename Sources/{ => Stripe}/Models/Orders/OrderReturnList.swift (98%) rename Sources/{ => Stripe}/Models/Orders/Orders.swift (99%) rename Sources/{ => Stripe}/Models/Other/DeletedObject.swift (97%) rename Sources/{ => Stripe}/Models/PackageDimensions.swift (100%) rename Sources/{ => Stripe}/Models/Plans/Plans.swift (99%) rename Sources/{ => Stripe}/Models/Plans/PlansList.swift (98%) rename Sources/{ => Stripe}/Models/Products/Products.swift (99%) rename Sources/{ => Stripe}/Models/Products/ProductsList.swift (98%) rename Sources/{ => Stripe}/Models/SKU/SKU.swift (99%) rename Sources/{ => Stripe}/Models/SKU/SKUList.swift (98%) rename Sources/{ => Stripe}/Models/Shipping/DeliveryEstimate.swift (98%) rename Sources/{ => Stripe}/Models/Shipping/ShippingAddress.swift (98%) rename Sources/{ => Stripe}/Models/Shipping/ShippingLabel.swift (98%) rename Sources/{ => Stripe}/Models/Shipping/ShippingMethod.swift (98%) rename Sources/{ => Stripe}/Models/Shipping/StatusTransitions.swift (98%) rename Sources/{ => Stripe}/Models/Sources/BankAccount.swift (99%) rename Sources/{ => Stripe}/Models/Sources/Card.swift (99%) rename Sources/{ => Stripe}/Models/Sources/Owner.swift (98%) rename Sources/{ => Stripe}/Models/Sources/Receiver.swift (98%) rename Sources/{ => Stripe}/Models/Sources/Source.swift (99%) rename Sources/{ => Stripe}/Models/Sources/SourceList.swift (99%) rename Sources/{ => Stripe}/Models/StripeModelProtocol.swift (100%) rename Sources/{ => Stripe}/Models/Subscriptions/Subscription.swift (99%) rename Sources/{ => Stripe}/Models/Subscriptions/SubscriptionItem.swift (100%) rename Sources/{ => Stripe}/Models/Subscriptions/SubscriptionItemList.swift (98%) rename Sources/{ => Stripe}/Models/Subscriptions/SubscriptionList.swift (98%) rename Sources/{ => Stripe}/Models/Tokens/Token.swift (100%) rename Sources/Stripe/{ => Provider}/Provider.swift (98%) diff --git a/Package.swift b/Package.swift index faded54..4a40097 100644 --- 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 b/Sources/Stripe/API/Filter/StripeFilter.swift similarity index 99% rename from Sources/API/Filter/StripeFilter.swift rename to Sources/Stripe/API/Filter/StripeFilter.swift index afd3748..737c310 100644 --- a/Sources/API/Filter/StripeFilter.swift +++ b/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 b/Sources/Stripe/API/Helpers/Endpoints.swift similarity index 100% rename from Sources/API/Helpers/Endpoints.swift rename to Sources/Stripe/API/Helpers/Endpoints.swift diff --git a/Sources/API/Routes/AccountRoutes.swift b/Sources/Stripe/API/Routes/AccountRoutes.swift similarity index 99% rename from Sources/API/Routes/AccountRoutes.swift rename to Sources/Stripe/API/Routes/AccountRoutes.swift index 89aa3e5..f86aa6c 100644 --- a/Sources/API/Routes/AccountRoutes.swift +++ b/Sources/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 b/Sources/Stripe/API/Routes/BalanceRoutes.swift similarity index 99% rename from Sources/API/Routes/BalanceRoutes.swift rename to Sources/Stripe/API/Routes/BalanceRoutes.swift index 13a644b..e5b331d 100644 --- a/Sources/API/Routes/BalanceRoutes.swift +++ b/Sources/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 b/Sources/Stripe/API/Routes/ChargeRoutes.swift similarity index 99% rename from Sources/API/Routes/ChargeRoutes.swift rename to Sources/Stripe/API/Routes/ChargeRoutes.swift index eb7186a..9c5b619 100644 --- a/Sources/API/Routes/ChargeRoutes.swift +++ b/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 b/Sources/Stripe/API/Routes/CouponRoutes.swift similarity index 99% rename from Sources/API/Routes/CouponRoutes.swift rename to Sources/Stripe/API/Routes/CouponRoutes.swift index 060db8c..ddd365d 100644 --- a/Sources/API/Routes/CouponRoutes.swift +++ b/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 b/Sources/Stripe/API/Routes/CustomerRoutes.swift similarity index 99% rename from Sources/API/Routes/CustomerRoutes.swift rename to Sources/Stripe/API/Routes/CustomerRoutes.swift index fcf1e42..3c0d345 100644 --- a/Sources/API/Routes/CustomerRoutes.swift +++ b/Sources/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 b/Sources/Stripe/API/Routes/DisputeRoutes.swift similarity index 97% rename from Sources/API/Routes/DisputeRoutes.swift rename to Sources/Stripe/API/Routes/DisputeRoutes.swift index 2db5a25..f6e30c5 100644 --- a/Sources/API/Routes/DisputeRoutes.swift +++ b/Sources/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 b/Sources/Stripe/API/Routes/OrderReturnRoutes.swift similarity index 96% rename from Sources/API/Routes/OrderReturnRoutes.swift rename to Sources/Stripe/API/Routes/OrderReturnRoutes.swift index c1d8a12..6362d1d 100644 --- a/Sources/API/Routes/OrderReturnRoutes.swift +++ b/Sources/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 b/Sources/Stripe/API/Routes/OrderRoutes.swift similarity index 99% rename from Sources/API/Routes/OrderRoutes.swift rename to Sources/Stripe/API/Routes/OrderRoutes.swift index 6bed9c3..36f16db 100644 --- a/Sources/API/Routes/OrderRoutes.swift +++ b/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 b/Sources/Stripe/API/Routes/PlanRoutes.swift similarity index 99% rename from Sources/API/Routes/PlanRoutes.swift rename to Sources/Stripe/API/Routes/PlanRoutes.swift index 9ffe2d9..0f58629 100644 --- a/Sources/API/Routes/PlanRoutes.swift +++ b/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 b/Sources/Stripe/API/Routes/ProductRoutes.swift similarity index 99% rename from Sources/API/Routes/ProductRoutes.swift rename to Sources/Stripe/API/Routes/ProductRoutes.swift index 35a2ffd..7e40adf 100644 --- a/Sources/API/Routes/ProductRoutes.swift +++ b/Sources/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 b/Sources/Stripe/API/Routes/RefundRoutes.swift similarity index 99% rename from Sources/API/Routes/RefundRoutes.swift rename to Sources/Stripe/API/Routes/RefundRoutes.swift index 5cf56e0..35f4885 100644 --- a/Sources/API/Routes/RefundRoutes.swift +++ b/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 b/Sources/Stripe/API/Routes/SKURoutes.swift similarity index 99% rename from Sources/API/Routes/SKURoutes.swift rename to Sources/Stripe/API/Routes/SKURoutes.swift index c32959f..b556dc7 100644 --- a/Sources/API/Routes/SKURoutes.swift +++ b/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 b/Sources/Stripe/API/Routes/SourceRoutes.swift similarity index 99% rename from Sources/API/Routes/SourceRoutes.swift rename to Sources/Stripe/API/Routes/SourceRoutes.swift index 96eebd7..68023d9 100644 --- a/Sources/API/Routes/SourceRoutes.swift +++ b/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/Sources/API/Routes/SubscriptionItemRoutes.swift b/Sources/Stripe/API/Routes/SubscriptionItemRoutes.swift similarity index 99% rename from Sources/API/Routes/SubscriptionItemRoutes.swift rename to Sources/Stripe/API/Routes/SubscriptionItemRoutes.swift index 400b285..5b884b7 100644 --- a/Sources/API/Routes/SubscriptionItemRoutes.swift +++ b/Sources/Stripe/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 b/Sources/Stripe/API/Routes/SubscriptionRoutes.swift similarity index 99% rename from Sources/API/Routes/SubscriptionRoutes.swift rename to Sources/Stripe/API/Routes/SubscriptionRoutes.swift index 8bd213e..6ee565b 100644 --- a/Sources/API/Routes/SubscriptionRoutes.swift +++ b/Sources/Stripe/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 b/Sources/Stripe/API/Routes/TokenRoutes.swift similarity index 99% rename from Sources/API/Routes/TokenRoutes.swift rename to Sources/Stripe/API/Routes/TokenRoutes.swift index a939e34..a12164f 100644 --- a/Sources/API/Routes/TokenRoutes.swift +++ b/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 b/Sources/Stripe/API/StripeClient.swift similarity index 100% rename from Sources/API/StripeClient.swift rename to Sources/Stripe/API/StripeClient.swift diff --git a/Sources/API/StripeRequest.swift b/Sources/Stripe/API/StripeRequest.swift similarity index 99% rename from Sources/API/StripeRequest.swift rename to Sources/Stripe/API/StripeRequest.swift index 58a7998..8e8975f 100644 --- a/Sources/API/StripeRequest.swift +++ b/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 b/Sources/Stripe/Errors/StripeError.swift similarity index 100% rename from Sources/Errors/StripeError.swift rename to Sources/Stripe/Errors/StripeError.swift diff --git a/Sources/Helpers/AccountRejectReason.swift b/Sources/Stripe/Helpers/AccountRejectReason.swift similarity index 100% rename from Sources/Helpers/AccountRejectReason.swift rename to Sources/Stripe/Helpers/AccountRejectReason.swift diff --git a/Sources/Helpers/ActionType.swift b/Sources/Stripe/Helpers/ActionType.swift similarity index 100% rename from Sources/Helpers/ActionType.swift rename to Sources/Stripe/Helpers/ActionType.swift diff --git a/Sources/Helpers/BalanceType.swift b/Sources/Stripe/Helpers/BalanceType.swift similarity index 100% rename from Sources/Helpers/BalanceType.swift rename to Sources/Stripe/Helpers/BalanceType.swift diff --git a/Sources/Helpers/ConnectedAccountType.swift b/Sources/Stripe/Helpers/ConnectedAccountType.swift similarity index 100% rename from Sources/Helpers/ConnectedAccountType.swift rename to Sources/Stripe/Helpers/ConnectedAccountType.swift diff --git a/Sources/Helpers/DeliveryEstimateType.swift b/Sources/Stripe/Helpers/DeliveryEstimateType.swift similarity index 100% rename from Sources/Helpers/DeliveryEstimateType.swift rename to Sources/Stripe/Helpers/DeliveryEstimateType.swift diff --git a/Sources/Helpers/DisputeReason.swift b/Sources/Stripe/Helpers/DisputeReason.swift similarity index 100% rename from Sources/Helpers/DisputeReason.swift rename to Sources/Stripe/Helpers/DisputeReason.swift diff --git a/Sources/Helpers/FundingType.swift b/Sources/Stripe/Helpers/FundingType.swift similarity index 100% rename from Sources/Helpers/FundingType.swift rename to Sources/Stripe/Helpers/FundingType.swift diff --git a/Sources/Helpers/InventoryType.swift b/Sources/Stripe/Helpers/InventoryType.swift similarity index 100% rename from Sources/Helpers/InventoryType.swift rename to Sources/Stripe/Helpers/InventoryType.swift diff --git a/Sources/Helpers/OrderItemType.swift b/Sources/Stripe/Helpers/OrderItemType.swift similarity index 100% rename from Sources/Helpers/OrderItemType.swift rename to Sources/Stripe/Helpers/OrderItemType.swift diff --git a/Sources/Helpers/OrderStatus.swift b/Sources/Stripe/Helpers/OrderStatus.swift similarity index 100% rename from Sources/Helpers/OrderStatus.swift rename to Sources/Stripe/Helpers/OrderStatus.swift diff --git a/Sources/Helpers/RefundReason.swift b/Sources/Stripe/Helpers/RefundReason.swift similarity index 100% rename from Sources/Helpers/RefundReason.swift rename to Sources/Stripe/Helpers/RefundReason.swift diff --git a/Sources/Helpers/SourceType.swift b/Sources/Stripe/Helpers/SourceType.swift similarity index 100% rename from Sources/Helpers/SourceType.swift rename to Sources/Stripe/Helpers/SourceType.swift diff --git a/Sources/Helpers/StripeCurrency.swift b/Sources/Stripe/Helpers/StripeCurrency.swift similarity index 100% rename from Sources/Helpers/StripeCurrency.swift rename to Sources/Stripe/Helpers/StripeCurrency.swift diff --git a/Sources/Helpers/StripeDuration.swift b/Sources/Stripe/Helpers/StripeDuration.swift similarity index 100% rename from Sources/Helpers/StripeDuration.swift rename to Sources/Stripe/Helpers/StripeDuration.swift diff --git a/Sources/Helpers/StripeInterval.swift b/Sources/Stripe/Helpers/StripeInterval.swift similarity index 100% rename from Sources/Helpers/StripeInterval.swift rename to Sources/Stripe/Helpers/StripeInterval.swift diff --git a/Sources/Helpers/StripeStatus.swift b/Sources/Stripe/Helpers/StripeStatus.swift similarity index 100% rename from Sources/Helpers/StripeStatus.swift rename to Sources/Stripe/Helpers/StripeStatus.swift diff --git a/Sources/Helpers/TokenizedMethod.swift b/Sources/Stripe/Helpers/TokenizedMethod.swift similarity index 100% rename from Sources/Helpers/TokenizedMethod.swift rename to Sources/Stripe/Helpers/TokenizedMethod.swift diff --git a/Sources/Helpers/ValidationCheck.swift b/Sources/Stripe/Helpers/ValidationCheck.swift similarity index 100% rename from Sources/Helpers/ValidationCheck.swift rename to Sources/Stripe/Helpers/ValidationCheck.swift diff --git a/Sources/Models/Balance/Balance.swift b/Sources/Stripe/Models/Balance/Balance.swift similarity index 100% rename from Sources/Models/Balance/Balance.swift rename to Sources/Stripe/Models/Balance/Balance.swift diff --git a/Sources/Models/Balance/BalanceHistoryList.swift b/Sources/Stripe/Models/Balance/BalanceHistoryList.swift similarity index 100% rename from Sources/Models/Balance/BalanceHistoryList.swift rename to Sources/Stripe/Models/Balance/BalanceHistoryList.swift diff --git a/Sources/Models/Balance/BalanceTransactionItem.swift b/Sources/Stripe/Models/Balance/BalanceTransactionItem.swift similarity index 99% rename from Sources/Models/Balance/BalanceTransactionItem.swift rename to Sources/Stripe/Models/Balance/BalanceTransactionItem.swift index 196ce1d..79eec7f 100644 --- a/Sources/Models/Balance/BalanceTransactionItem.swift +++ b/Sources/Stripe/Models/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 b/Sources/Stripe/Models/Balance/BalanceTransfer.swift similarity index 98% rename from Sources/Models/Balance/BalanceTransfer.swift rename to Sources/Stripe/Models/Balance/BalanceTransfer.swift index 0e5dfdd..5b2f0a7 100644 --- a/Sources/Models/Balance/BalanceTransfer.swift +++ b/Sources/Stripe/Models/Balance/BalanceTransfer.swift @@ -7,7 +7,7 @@ // import Node -import Helpers + /** diff --git a/Sources/Models/Charges/Charge.swift b/Sources/Stripe/Models/Charges/Charge.swift similarity index 99% rename from Sources/Models/Charges/Charge.swift rename to Sources/Stripe/Models/Charges/Charge.swift index f83853a..c987394 100644 --- a/Sources/Models/Charges/Charge.swift +++ b/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 b/Sources/Stripe/Models/Charges/ChargeList.swift similarity index 100% rename from Sources/Models/Charges/ChargeList.swift rename to Sources/Stripe/Models/Charges/ChargeList.swift diff --git a/Sources/Models/Charges/FruadDetails.swift b/Sources/Stripe/Models/Charges/FruadDetails.swift similarity index 98% rename from Sources/Models/Charges/FruadDetails.swift rename to Sources/Stripe/Models/Charges/FruadDetails.swift index 8242446..63eb5a3 100644 --- a/Sources/Models/Charges/FruadDetails.swift +++ b/Sources/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 b/Sources/Stripe/Models/Charges/Outcome.swift similarity index 99% rename from Sources/Models/Charges/Outcome.swift rename to Sources/Stripe/Models/Charges/Outcome.swift index 97d7e4d..67387e7 100644 --- a/Sources/Models/Charges/Outcome.swift +++ b/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 b/Sources/Stripe/Models/Charges/Refund.swift similarity index 98% rename from Sources/Models/Charges/Refund.swift rename to Sources/Stripe/Models/Charges/Refund.swift index f9eab69..357e50c 100644 --- a/Sources/Models/Charges/Refund.swift +++ b/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 b/Sources/Stripe/Models/Charges/RefundItem.swift similarity index 99% rename from Sources/Models/Charges/RefundItem.swift rename to Sources/Stripe/Models/Charges/RefundItem.swift index 6eeeaa4..06d487a 100644 --- a/Sources/Models/Charges/RefundItem.swift +++ b/Sources/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 b/Sources/Stripe/Models/Connect/Account.swift similarity index 99% rename from Sources/Models/Connect/Account.swift rename to Sources/Stripe/Models/Connect/Account.swift index 2687548..fcd92be 100644 --- a/Sources/Models/Connect/Account.swift +++ b/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 b/Sources/Stripe/Models/Connect/AccountList.swift similarity index 98% rename from Sources/Models/Connect/AccountList.swift rename to Sources/Stripe/Models/Connect/AccountList.swift index 356f126..2d3e2cd 100644 --- a/Sources/Models/Connect/AccountList.swift +++ b/Sources/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 b/Sources/Stripe/Models/Connect/AdditionalOwner.swift similarity index 98% rename from Sources/Models/Connect/AdditionalOwner.swift rename to Sources/Stripe/Models/Connect/AdditionalOwner.swift index 3b22e4e..197c072 100644 --- a/Sources/Models/Connect/AdditionalOwner.swift +++ b/Sources/Stripe/Models/Connect/AdditionalOwner.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class AdditionalOwner: StripeModelProtocol { diff --git a/Sources/Models/Connect/ConnectLoginLink.swift b/Sources/Stripe/Models/Connect/ConnectLoginLink.swift similarity index 100% rename from Sources/Models/Connect/ConnectLoginLink.swift rename to Sources/Stripe/Models/Connect/ConnectLoginLink.swift diff --git a/Sources/Models/Connect/ExternalAccounts.swift b/Sources/Stripe/Models/Connect/ExternalAccounts.swift similarity index 99% rename from Sources/Models/Connect/ExternalAccounts.swift rename to Sources/Stripe/Models/Connect/ExternalAccounts.swift index dede53a..58d3b11 100644 --- a/Sources/Models/Connect/ExternalAccounts.swift +++ b/Sources/Stripe/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 b/Sources/Stripe/Models/Connect/LegalEntity.swift similarity index 99% rename from Sources/Models/Connect/LegalEntity.swift rename to Sources/Stripe/Models/Connect/LegalEntity.swift index dd22c2a..0357e63 100644 --- a/Sources/Models/Connect/LegalEntity.swift +++ b/Sources/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 b/Sources/Stripe/Models/Connect/PayoutSchedule.swift similarity index 98% rename from Sources/Models/Connect/PayoutSchedule.swift rename to Sources/Stripe/Models/Connect/PayoutSchedule.swift index 0d61877..47b542d 100644 --- a/Sources/Models/Connect/PayoutSchedule.swift +++ b/Sources/Stripe/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 b/Sources/Stripe/Models/Connect/TOSAcceptance.swift similarity index 100% rename from Sources/Models/Connect/TOSAcceptance.swift rename to Sources/Stripe/Models/Connect/TOSAcceptance.swift diff --git a/Sources/Models/Connect/Verification.swift b/Sources/Stripe/Models/Connect/Verification.swift similarity index 98% rename from Sources/Models/Connect/Verification.swift rename to Sources/Stripe/Models/Connect/Verification.swift index 826f444..8d8c00c 100644 --- a/Sources/Models/Connect/Verification.swift +++ b/Sources/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 b/Sources/Stripe/Models/Coupons/Coupon.swift similarity index 99% rename from Sources/Models/Coupons/Coupon.swift rename to Sources/Stripe/Models/Coupons/Coupon.swift index 6a1c80c..04bb0df 100644 --- a/Sources/Models/Coupons/Coupon.swift +++ b/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 b/Sources/Stripe/Models/Coupons/CouponList.swift similarity index 98% rename from Sources/Models/Coupons/CouponList.swift rename to Sources/Stripe/Models/Coupons/CouponList.swift index 8090a45..9030605 100644 --- a/Sources/Models/Coupons/CouponList.swift +++ b/Sources/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 b/Sources/Stripe/Models/Customer/Customer.swift similarity index 99% rename from Sources/Models/Customer/Customer.swift rename to Sources/Stripe/Models/Customer/Customer.swift index b937d2b..74e1245 100644 --- a/Sources/Models/Customer/Customer.swift +++ b/Sources/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 b/Sources/Stripe/Models/Customer/CustomerList.swift similarity index 98% rename from Sources/Models/Customer/CustomerList.swift rename to Sources/Stripe/Models/Customer/CustomerList.swift index d50cd5b..14b4929 100644 --- a/Sources/Models/Customer/CustomerList.swift +++ b/Sources/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 b/Sources/Stripe/Models/Discount/Discount.swift similarity index 100% rename from Sources/Models/Discount/Discount.swift rename to Sources/Stripe/Models/Discount/Discount.swift diff --git a/Sources/Models/Dispute/Dispute.swift b/Sources/Stripe/Models/Dispute/Dispute.swift similarity index 99% rename from Sources/Models/Dispute/Dispute.swift rename to Sources/Stripe/Models/Dispute/Dispute.swift index 715b4a0..5f0fe64 100644 --- a/Sources/Models/Dispute/Dispute.swift +++ b/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 b/Sources/Stripe/Models/Dispute/DisputeList.swift similarity index 100% rename from Sources/Models/Dispute/DisputeList.swift rename to Sources/Stripe/Models/Dispute/DisputeList.swift diff --git a/Sources/Models/Fee.swift b/Sources/Stripe/Models/Fee.swift similarity index 98% rename from Sources/Models/Fee.swift rename to Sources/Stripe/Models/Fee.swift index 6a3f48f..95d3f7d 100644 --- a/Sources/Models/Fee.swift +++ b/Sources/Stripe/Models/Fee.swift @@ -8,7 +8,6 @@ import Foundation import Vapor -import Helpers public final class Fee: StripeModelProtocol { diff --git a/Sources/Models/Inventory.swift b/Sources/Stripe/Models/Inventory.swift similarity index 98% rename from Sources/Models/Inventory.swift rename to Sources/Stripe/Models/Inventory.swift index 02717b5..5a07981 100644 --- a/Sources/Models/Inventory.swift +++ b/Sources/Stripe/Models/Inventory.swift @@ -8,7 +8,6 @@ import Foundation import Vapor -import Helpers public final class Inventory: StripeModelProtocol { diff --git a/Sources/Models/OrderList.swift b/Sources/Stripe/Models/OrderList.swift similarity index 98% rename from Sources/Models/OrderList.swift rename to Sources/Stripe/Models/OrderList.swift index 24ca4cf..e3ad2e3 100644 --- a/Sources/Models/OrderList.swift +++ b/Sources/Stripe/Models/OrderList.swift @@ -8,7 +8,6 @@ import Foundation import Vapor -import Helpers public final class OrderList: StripeModelProtocol { public private(set) var object: String? diff --git a/Sources/Models/Orders/OrderItem.swift b/Sources/Stripe/Models/Orders/OrderItem.swift similarity index 99% rename from Sources/Models/Orders/OrderItem.swift rename to Sources/Stripe/Models/Orders/OrderItem.swift index 65853fc..3f82141 100644 --- a/Sources/Models/Orders/OrderItem.swift +++ b/Sources/Stripe/Models/Orders/OrderItem.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** OrderItem object diff --git a/Sources/Models/Orders/OrderReturn.swift b/Sources/Stripe/Models/Orders/OrderReturn.swift similarity index 99% rename from Sources/Models/Orders/OrderReturn.swift rename to Sources/Stripe/Models/Orders/OrderReturn.swift index 6b9ac45..1b982e5 100644 --- a/Sources/Models/Orders/OrderReturn.swift +++ b/Sources/Stripe/Models/Orders/OrderReturn.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** OrderReturn object diff --git a/Sources/Models/Orders/OrderReturnList.swift b/Sources/Stripe/Models/Orders/OrderReturnList.swift similarity index 98% rename from Sources/Models/Orders/OrderReturnList.swift rename to Sources/Stripe/Models/Orders/OrderReturnList.swift index 748aec0..879941d 100644 --- a/Sources/Models/Orders/OrderReturnList.swift +++ b/Sources/Stripe/Models/Orders/OrderReturnList.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class OrderReturnList: StripeModelProtocol { public private(set) var object: String? diff --git a/Sources/Models/Orders/Orders.swift b/Sources/Stripe/Models/Orders/Orders.swift similarity index 99% rename from Sources/Models/Orders/Orders.swift rename to Sources/Stripe/Models/Orders/Orders.swift index ea2148c..1b72853 100644 --- a/Sources/Models/Orders/Orders.swift +++ b/Sources/Stripe/Models/Orders/Orders.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Order object diff --git a/Sources/Models/Other/DeletedObject.swift b/Sources/Stripe/Models/Other/DeletedObject.swift similarity index 97% rename from Sources/Models/Other/DeletedObject.swift rename to Sources/Stripe/Models/Other/DeletedObject.swift index 0c7c83d..f1708ad 100644 --- a/Sources/Models/Other/DeletedObject.swift +++ b/Sources/Stripe/Models/Other/DeletedObject.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class DeletedObject: StripeModelProtocol { public private(set) var deleted: Bool? diff --git a/Sources/Models/PackageDimensions.swift b/Sources/Stripe/Models/PackageDimensions.swift similarity index 100% rename from Sources/Models/PackageDimensions.swift rename to Sources/Stripe/Models/PackageDimensions.swift diff --git a/Sources/Models/Plans/Plans.swift b/Sources/Stripe/Models/Plans/Plans.swift similarity index 99% rename from Sources/Models/Plans/Plans.swift rename to Sources/Stripe/Models/Plans/Plans.swift index 277559f..693d0f0 100644 --- a/Sources/Models/Plans/Plans.swift +++ b/Sources/Stripe/Models/Plans/Plans.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Plan Model diff --git a/Sources/Models/Plans/PlansList.swift b/Sources/Stripe/Models/Plans/PlansList.swift similarity index 98% rename from Sources/Models/Plans/PlansList.swift rename to Sources/Stripe/Models/Plans/PlansList.swift index 6f26be1..0f88310 100644 --- a/Sources/Models/Plans/PlansList.swift +++ b/Sources/Stripe/Models/Plans/PlansList.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class PlansList: StripeModelProtocol { public private(set) var object: String? diff --git a/Sources/Models/Products/Products.swift b/Sources/Stripe/Models/Products/Products.swift similarity index 99% rename from Sources/Models/Products/Products.swift rename to Sources/Stripe/Models/Products/Products.swift index b624dce..affe8c8 100644 --- a/Sources/Models/Products/Products.swift +++ b/Sources/Stripe/Models/Products/Products.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Product object diff --git a/Sources/Models/Products/ProductsList.swift b/Sources/Stripe/Models/Products/ProductsList.swift similarity index 98% rename from Sources/Models/Products/ProductsList.swift rename to Sources/Stripe/Models/Products/ProductsList.swift index cef03ff..3e030f9 100644 --- a/Sources/Models/Products/ProductsList.swift +++ b/Sources/Stripe/Models/Products/ProductsList.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class ProductsList: StripeModelProtocol { public private(set) var object: String? diff --git a/Sources/Models/SKU/SKU.swift b/Sources/Stripe/Models/SKU/SKU.swift similarity index 99% rename from Sources/Models/SKU/SKU.swift rename to Sources/Stripe/Models/SKU/SKU.swift index 273d65f..eb1c363 100644 --- a/Sources/Models/SKU/SKU.swift +++ b/Sources/Stripe/Models/SKU/SKU.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** SKU object diff --git a/Sources/Models/SKU/SKUList.swift b/Sources/Stripe/Models/SKU/SKUList.swift similarity index 98% rename from Sources/Models/SKU/SKUList.swift rename to Sources/Stripe/Models/SKU/SKUList.swift index b08ef30..714c220 100644 --- a/Sources/Models/SKU/SKUList.swift +++ b/Sources/Stripe/Models/SKU/SKUList.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class SKUList: StripeModelProtocol { public private(set) var object: String? diff --git a/Sources/Models/Shipping/DeliveryEstimate.swift b/Sources/Stripe/Models/Shipping/DeliveryEstimate.swift similarity index 98% rename from Sources/Models/Shipping/DeliveryEstimate.swift rename to Sources/Stripe/Models/Shipping/DeliveryEstimate.swift index f269c2c..bc08403 100644 --- a/Sources/Models/Shipping/DeliveryEstimate.swift +++ b/Sources/Stripe/Models/Shipping/DeliveryEstimate.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class DeliveryEstimate: StripeModelProtocol { diff --git a/Sources/Models/Shipping/ShippingAddress.swift b/Sources/Stripe/Models/Shipping/ShippingAddress.swift similarity index 98% rename from Sources/Models/Shipping/ShippingAddress.swift rename to Sources/Stripe/Models/Shipping/ShippingAddress.swift index 59241b0..2179f40 100644 --- a/Sources/Models/Shipping/ShippingAddress.swift +++ b/Sources/Stripe/Models/Shipping/ShippingAddress.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Shipping Address diff --git a/Sources/Models/Shipping/ShippingLabel.swift b/Sources/Stripe/Models/Shipping/ShippingLabel.swift similarity index 98% rename from Sources/Models/Shipping/ShippingLabel.swift rename to Sources/Stripe/Models/Shipping/ShippingLabel.swift index ac254e1..56d4de6 100644 --- a/Sources/Models/Shipping/ShippingLabel.swift +++ b/Sources/Stripe/Models/Shipping/ShippingLabel.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Shipping diff --git a/Sources/Models/Shipping/ShippingMethod.swift b/Sources/Stripe/Models/Shipping/ShippingMethod.swift similarity index 98% rename from Sources/Models/Shipping/ShippingMethod.swift rename to Sources/Stripe/Models/Shipping/ShippingMethod.swift index 35895d9..26f5734 100644 --- a/Sources/Models/Shipping/ShippingMethod.swift +++ b/Sources/Stripe/Models/Shipping/ShippingMethod.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class ShippingMethod: StripeModelProtocol { diff --git a/Sources/Models/Shipping/StatusTransitions.swift b/Sources/Stripe/Models/Shipping/StatusTransitions.swift similarity index 98% rename from Sources/Models/Shipping/StatusTransitions.swift rename to Sources/Stripe/Models/Shipping/StatusTransitions.swift index 6eb6d74..014dbc1 100644 --- a/Sources/Models/Shipping/StatusTransitions.swift +++ b/Sources/Stripe/Models/Shipping/StatusTransitions.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class StatusTransitions: StripeModelProtocol { diff --git a/Sources/Models/Sources/BankAccount.swift b/Sources/Stripe/Models/Sources/BankAccount.swift similarity index 99% rename from Sources/Models/Sources/BankAccount.swift rename to Sources/Stripe/Models/Sources/BankAccount.swift index e74b685..21eb2fc 100644 --- a/Sources/Models/Sources/BankAccount.swift +++ b/Sources/Stripe/Models/Sources/BankAccount.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Bank Account Model diff --git a/Sources/Models/Sources/Card.swift b/Sources/Stripe/Models/Sources/Card.swift similarity index 99% rename from Sources/Models/Sources/Card.swift rename to Sources/Stripe/Models/Sources/Card.swift index 9261dd4..95b1f2a 100644 --- a/Sources/Models/Sources/Card.swift +++ b/Sources/Stripe/Models/Sources/Card.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Card Model diff --git a/Sources/Models/Sources/Owner.swift b/Sources/Stripe/Models/Sources/Owner.swift similarity index 98% rename from Sources/Models/Sources/Owner.swift rename to Sources/Stripe/Models/Sources/Owner.swift index 7bafce4..78973b7 100644 --- a/Sources/Models/Sources/Owner.swift +++ b/Sources/Stripe/Models/Sources/Owner.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class Owner: StripeModelProtocol { public private(set) var address: ShippingAddress? diff --git a/Sources/Models/Sources/Receiver.swift b/Sources/Stripe/Models/Sources/Receiver.swift similarity index 98% rename from Sources/Models/Sources/Receiver.swift rename to Sources/Stripe/Models/Sources/Receiver.swift index de49204..f23a822 100644 --- a/Sources/Models/Sources/Receiver.swift +++ b/Sources/Stripe/Models/Sources/Receiver.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class Receiver: StripeModelProtocol { diff --git a/Sources/Models/Sources/Source.swift b/Sources/Stripe/Models/Sources/Source.swift similarity index 99% rename from Sources/Models/Sources/Source.swift rename to Sources/Stripe/Models/Sources/Source.swift index f202195..ff37a2b 100644 --- a/Sources/Models/Sources/Source.swift +++ b/Sources/Stripe/Models/Sources/Source.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Source Model diff --git a/Sources/Models/Sources/SourceList.swift b/Sources/Stripe/Models/Sources/SourceList.swift similarity index 99% rename from Sources/Models/Sources/SourceList.swift rename to Sources/Stripe/Models/Sources/SourceList.swift index e2caac1..9d84000 100644 --- a/Sources/Models/Sources/SourceList.swift +++ b/Sources/Stripe/Models/Sources/SourceList.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class SourceList: StripeModelProtocol { diff --git a/Sources/Models/StripeModelProtocol.swift b/Sources/Stripe/Models/StripeModelProtocol.swift similarity index 100% rename from Sources/Models/StripeModelProtocol.swift rename to Sources/Stripe/Models/StripeModelProtocol.swift diff --git a/Sources/Models/Subscriptions/Subscription.swift b/Sources/Stripe/Models/Subscriptions/Subscription.swift similarity index 99% rename from Sources/Models/Subscriptions/Subscription.swift rename to Sources/Stripe/Models/Subscriptions/Subscription.swift index 9893173..017397a 100644 --- a/Sources/Models/Subscriptions/Subscription.swift +++ b/Sources/Stripe/Models/Subscriptions/Subscription.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + /** Subscription Model diff --git a/Sources/Models/Subscriptions/SubscriptionItem.swift b/Sources/Stripe/Models/Subscriptions/SubscriptionItem.swift similarity index 100% rename from Sources/Models/Subscriptions/SubscriptionItem.swift rename to Sources/Stripe/Models/Subscriptions/SubscriptionItem.swift diff --git a/Sources/Models/Subscriptions/SubscriptionItemList.swift b/Sources/Stripe/Models/Subscriptions/SubscriptionItemList.swift similarity index 98% rename from Sources/Models/Subscriptions/SubscriptionItemList.swift rename to Sources/Stripe/Models/Subscriptions/SubscriptionItemList.swift index 26429d5..49e6eb4 100644 --- a/Sources/Models/Subscriptions/SubscriptionItemList.swift +++ b/Sources/Stripe/Models/Subscriptions/SubscriptionItemList.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class SubscriptionItemList: StripeModelProtocol { diff --git a/Sources/Models/Subscriptions/SubscriptionList.swift b/Sources/Stripe/Models/Subscriptions/SubscriptionList.swift similarity index 98% rename from Sources/Models/Subscriptions/SubscriptionList.swift rename to Sources/Stripe/Models/Subscriptions/SubscriptionList.swift index eabfa85..204f5bf 100644 --- a/Sources/Models/Subscriptions/SubscriptionList.swift +++ b/Sources/Stripe/Models/Subscriptions/SubscriptionList.swift @@ -8,7 +8,7 @@ import Foundation import Vapor -import Helpers + public final class SubscriptionList: StripeModelProtocol { diff --git a/Sources/Models/Tokens/Token.swift b/Sources/Stripe/Models/Tokens/Token.swift similarity index 100% rename from Sources/Models/Tokens/Token.swift rename to Sources/Stripe/Models/Tokens/Token.swift diff --git a/Sources/Stripe/Provider.swift b/Sources/Stripe/Provider/Provider.swift similarity index 98% rename from Sources/Stripe/Provider.swift rename to Sources/Stripe/Provider/Provider.swift index b13975f..affb57c 100644 --- a/Sources/Stripe/Provider.swift +++ b/Sources/Stripe/Provider/Provider.swift @@ -7,8 +7,6 @@ // import Vapor -import API -import Errors private var _stripe: StripeClient? diff --git a/Tests/StripeTests/AccountTests.swift b/Tests/StripeTests/AccountTests.swift index a64a8ed..3a4ab30 100644 --- a/Tests/StripeTests/AccountTests.swift +++ b/Tests/StripeTests/AccountTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Errors -@testable import Helpers + + + + class AccountTests: XCTestCase { diff --git a/Tests/StripeTests/BalanceTests.swift b/Tests/StripeTests/BalanceTests.swift index 177a51d..f9e7cf6 100644 --- a/Tests/StripeTests/BalanceTests.swift +++ b/Tests/StripeTests/BalanceTests.swift @@ -10,8 +10,8 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import API -@testable import Errors + + class BalanceTests: XCTestCase { diff --git a/Tests/StripeTests/ChargeTests.swift b/Tests/StripeTests/ChargeTests.swift index 0630ebe..f877da3 100644 --- a/Tests/StripeTests/ChargeTests.swift +++ b/Tests/StripeTests/ChargeTests.swift @@ -10,9 +10,9 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Errors + + + class ChargeTests: XCTestCase { diff --git a/Tests/StripeTests/CouponTests.swift b/Tests/StripeTests/CouponTests.swift index 6ef5b29..2086d65 100644 --- a/Tests/StripeTests/CouponTests.swift +++ b/Tests/StripeTests/CouponTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Helpers -@testable import API -@testable import Models -@testable import Errors + + + + class CouponTests: XCTestCase { var drop: Droplet? diff --git a/Tests/StripeTests/CustomerTests.swift b/Tests/StripeTests/CustomerTests.swift index 6dc8729..a4471b0 100644 --- a/Tests/StripeTests/CustomerTests.swift +++ b/Tests/StripeTests/CustomerTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Errors -@testable import Helpers + + + + class CustomerTests: XCTestCase { diff --git a/Tests/StripeTests/DisputeTests.swift b/Tests/StripeTests/DisputeTests.swift index 30f5b8a..82fe73b 100644 --- a/Tests/StripeTests/DisputeTests.swift +++ b/Tests/StripeTests/DisputeTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Errors -@testable import Helpers + + + + class DisputeTests: XCTestCase { diff --git a/Tests/StripeTests/OrderReturnTests.swift b/Tests/StripeTests/OrderReturnTests.swift index 1a31b5f..939ee6c 100644 --- a/Tests/StripeTests/OrderReturnTests.swift +++ b/Tests/StripeTests/OrderReturnTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Helpers -@testable import Errors + + + + class OrderReturnTests: XCTestCase { diff --git a/Tests/StripeTests/OrderTests.swift b/Tests/StripeTests/OrderTests.swift index f1a9449..a1048a9 100644 --- a/Tests/StripeTests/OrderTests.swift +++ b/Tests/StripeTests/OrderTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Helpers -@testable import Errors + + + + class OrderTests: XCTestCase { diff --git a/Tests/StripeTests/PlanTests.swift b/Tests/StripeTests/PlanTests.swift index 0bbd63f..4aee280 100644 --- a/Tests/StripeTests/PlanTests.swift +++ b/Tests/StripeTests/PlanTests.swift @@ -11,10 +11,10 @@ import Foundation @testable import Stripe @testable import Vapor -@testable import Helpers -@testable import API -@testable import Models -@testable import Errors + + + + @testable import Random class PlanTests: XCTestCase { diff --git a/Tests/StripeTests/ProductTests.swift b/Tests/StripeTests/ProductTests.swift index 500fe86..8373d66 100644 --- a/Tests/StripeTests/ProductTests.swift +++ b/Tests/StripeTests/ProductTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Helpers -@testable import Errors + + + + class ProductTests: XCTestCase { diff --git a/Tests/StripeTests/RefundTests.swift b/Tests/StripeTests/RefundTests.swift index 2add50a..8a66529 100644 --- a/Tests/StripeTests/RefundTests.swift +++ b/Tests/StripeTests/RefundTests.swift @@ -9,10 +9,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Helpers -@testable import Errors + + + + class RefundTests: XCTestCase { diff --git a/Tests/StripeTests/SKUTests.swift b/Tests/StripeTests/SKUTests.swift index 2385517..86aa1d4 100644 --- a/Tests/StripeTests/SKUTests.swift +++ b/Tests/StripeTests/SKUTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Helpers -@testable import Errors + + + + class SKUTests: XCTestCase { diff --git a/Tests/StripeTests/SourceTests.swift b/Tests/StripeTests/SourceTests.swift index 56e20bc..71954d4 100644 --- a/Tests/StripeTests/SourceTests.swift +++ b/Tests/StripeTests/SourceTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Helpers -@testable import Errors + + + + class SourceTests: XCTestCase { diff --git a/Tests/StripeTests/SubscriptionItemTests.swift b/Tests/StripeTests/SubscriptionItemTests.swift index 8792784..38ea764 100644 --- a/Tests/StripeTests/SubscriptionItemTests.swift +++ b/Tests/StripeTests/SubscriptionItemTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Helpers -@testable import API -@testable import Models -@testable import Errors + + + + @testable import Random class SubscriptionItemTests: XCTestCase { diff --git a/Tests/StripeTests/SubscriptionTests.swift b/Tests/StripeTests/SubscriptionTests.swift index c92a2ea..7d92c5d 100644 --- a/Tests/StripeTests/SubscriptionTests.swift +++ b/Tests/StripeTests/SubscriptionTests.swift @@ -10,10 +10,10 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Helpers -@testable import API -@testable import Models -@testable import Errors + + + + @testable import Random class SubscriptionTests: XCTestCase { diff --git a/Tests/StripeTests/TokenTests.swift b/Tests/StripeTests/TokenTests.swift index 0da7e19..b8c578b 100644 --- a/Tests/StripeTests/TokenTests.swift +++ b/Tests/StripeTests/TokenTests.swift @@ -9,9 +9,9 @@ import XCTest @testable import Stripe @testable import Vapor -@testable import Models -@testable import API -@testable import Errors + + + class TokenTests: XCTestCase {