Merge pull request #1293 from stripe/integration-next-major-version

stripe-dotnet v20.0

Author: ob-stripe

.github/ISSUE_TEMPLATE.md

@@ -2,4 +2,4 @@ Please only file issues here that you believe represent actual bugs or feature r
 
 If you're having general trouble with your Stripe integration, please reach out to Stripe support using the form at https://support.stripe.com/ (preferred) or via email to support@stripe.com.
 
-If you are reporting a bug, please include your OS version, .NET version and the version of the Stripe.net library you're using, as well as any other details that may be helpful in reproducing the problem.
+If you are reporting a bug, please include your OS version, .NET version and the version of the Stripe.net library you're using, as well as any other details that may be helpful in reproducing the problem.

.gitignore

@@ -11,4 +11,4 @@
 project.lock.json
 
 .DS_Store
-.idea/
+.idea/

LICENSE

@@ -199,4 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

appveyor.yml

@@ -2,9 +2,10 @@ version: 19.10.0.{build}
 image: Visual Studio 2017
 
 environment:
-  STRIPE_TEST_SK: sk_test_eBgAzVoEpJKfYjD9nf2YoyMM
+  COVERALLS_REPO_TOKEN:
+    secure: T0PmP8uyzCseacBCDRBlti2y9Tz5DL6fknea0MKWvbPYrzADmLY2/5kOTfYIsPUk
   # If you bump this, don't forget to bump `MinimumMockVersion` in `BaseStripeTest.cs` as well.
-  STRIPE_MOCK_VERSION: 0.30.0
+  STRIPE_MOCK_VERSION: 0.33.0
 
 deploy:
 - provider: NuGet
@@ -27,6 +28,7 @@ install:
       }
       $app = Start-Process -FilePath "stripe-mock\stripe-mock.exe" -NoNewWindow -PassThru
       Write-Host ("stripe-mock running, Id = $($app.Id)`n") -ForegroundColor Green
+  - dotnet tool install coveralls.net --version 1.0.0 --tool-path tools
 
 before_build:
   - ps: Write-Host $("`n               HOST INFORMATION               `n") -BackgroundColor DarkCyan
@@ -48,11 +50,16 @@ after_build:
   - dotnet pack -c Release src\Stripe.net
 
 test_script:
-  - ps: Write-Host $("`n               RUNNING THE NEW XUNIT + STRIPE-MOCK TESTS               `n") -BackgroundColor DarkCyan
+  - ps: Write-Host $("`n               RUNNING TESTS               `n") -BackgroundColor DarkCyan
   - dotnet test src\StripeTests\StripeTests.csproj
 
+after_test:
+  - ps: Write-Host $("`n               RUNNING COVERAGE               `n") -BackgroundColor DarkCyan
+  - dotnet test -c Debug -f netcoreapp2.1 src/StripeTests/StripeTests.csproj --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+  - .\tools\csmacnz.Coveralls --opencover -i src/StripeTests/coverage.opencover.xml --useRelativePaths
+
 artifacts:
-  - path: '**\*.nupkg'
+  - path: 'src\Stripe.net\bin\Release\*.nupkg'
 
 # these commands tell appveyor to open an RDP session for debugging
 #init:

global.json

@@ -1,4 +1,6 @@
-# Stripe.net [![Build status](https://ci.appveyor.com/api/projects/status/rg0pg5tlr1a6f8tf/branch/master?svg=true)](https://ci.appveyor.com/project/stripe/stripe-dotnet) [![NuGet](https://img.shields.io/nuget/v/stripe.net.svg)](https://www.nuget.org/packages/Stripe.net/)
+# Stripe.net
+[![Build status](https://ci.appveyor.com/api/projects/status/rg0pg5tlr1a6f8tf/branch/master?svg=true)](https://ci.appveyor.com/project/stripe/stripe-dotnet) [![NuGet](https://img.shields.io/nuget/v/stripe.net.svg)](https://www.nuget.org/packages/Stripe.net/)
+[![Coverage Status](https://coveralls.io/repos/github/stripe/stripe-dotnet/badge.svg?branch=master)](https://coveralls.io/github/stripe/stripe-dotnet?branch=master)
 
 The official Stripe library, supporting .NET Standard 1.2+, .NET Core 1.0+, and .NET Framework 4.5+
 
@@ -36,11 +38,11 @@ a) In your application initialization, set your API key (only once once during s
 StripeConfiguration.SetApiKey("[your api key here]");
 ```
 
-b) Pass the API key to [StripeRequestOptions](#requestoptions):
+b) Pass the API key to [RequestOptions](#requestoptions):
 
 ```csharp
-var planService = new StripePlanService();
-planService.Get(*planId*, new StripeRequestOptions() { ApiKey = "[your api key here]" });
+var planService = new PlanService();
+planService.Get(*planId*, new RequestOptions() { ApiKey = "[your api key here]" });
 ```
 
 You can obtain your secret API key from the [API Settings](https://dashboard.stripe.com/account/apikeys) in the Dashboard.
@@ -63,10 +65,10 @@ If you are using Xamarin/Mono, you may want to provide your own `HttpMessageHand
 
 ### Request Options
 
-All of the service methods accept an optional `StripeRequestOptions` object. This is used if you need an [Idempotency Key](https://stripe.com/docs/api?lang=curl#idempotent_requests), if you are using [Stripe Connect](https://stripe.com/docs/connect/authentication#authentication-via-the-stripe-account-header), or if you want to pass the secret API key on each method.
+All of the service methods accept an optional `RequestOptions` object. This is used if you need an [Idempotency Key](https://stripe.com/docs/api?lang=curl#idempotent_requests), if you are using [Stripe Connect](https://stripe.com/docs/connect/authentication#authentication-via-the-stripe-account-header), or if you want to pass the secret API key on each method.
 
 ```csharp
-var requestOptions = new StripeRequestOptions();
+var requestOptions = new RequestOptions();
 requestOptions.ApiKey = "SECRET API KEY";                        // (optional) set the api key on a per-request basis
 requestOptions.IdempotencyKey = "SOME STRING";                   // (optional) create an idempotent request
 requestOptions.StripeConnectAccountId = "CONNECTED ACCOUNT ID";  // (optional) authenticate as a connected account
@@ -78,7 +80,7 @@ The [`StripeResponse`](./src/Stripe.net/Infrastructure/public/StripeResponse.cs)
 
 **Example: Access the StripeResponse**
 ```csharp
-var chargeService = new StripeChargeService();
+var chargeService = new ChargeService();
 StripeCharge charge = chargeService.Create(...);
 StripeResponse response = charge.StripeResponse;
 ```
@@ -113,18 +115,18 @@ public class StripeResponse
 
 ### Date Filtering
 
-Many of the `List()`-methods support parameters to filter by date.  You can use the `StripeDateFilter` class to combine the filters to make more interesting and complex queries.
+Many of the `List()`-methods support parameters to filter by date.  You can use the `DateFilter` class to combine the filters to make more interesting and complex queries.
 
-**Example: Interesting Queries with StripeDateFilter**
+**Example: Interesting Queries with DateFilter**
 ```csharp
-var chargeService = new StripeChargeService();
+var chargeService = new ChargeService();
 
-var chargesToday = chargeService.List(new StripeChargeListOptions {
-	Created = new StripeDateFilter { GreaterThanOrEqual = DateTime.UtcNow.Date }
+var chargesToday = chargeService.List(new ChargeListOptions {
+	Created = new DateFilter { GreaterThanOrEqual = DateTime.UtcNow.Date }
 });
 
-var chargesYesterday = chargeService.List(new StripeChargeListOptions {
-	Created = new StripeDateFilter {
+var chargesYesterday = chargeService.List(new ChargeListOptions {
+	Created = new DateFilter {
 		GreaterThanOrEqual = DateTime.Now.AddDays(-1).Date,
 		LessThan = DateTime.Now.Date
 	}
@@ -135,4 +137,4 @@ var chargesYesterday = chargeService.List(new StripeChargeListOptions {
 
 We welcome contributions from anyone interested in Stripe or Stripe.net development. If you'd like to submit a pull request, it's best to start with an issue to describe what you'd like to build.
 
-Once you've written your pull request, **please make sure you test your changes**.
+Once you've written your pull request, **please make sure you test your changes**.

readme.md

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.4

src/Stripe.net.sln

@@ -0,0 +1,8 @@
+namespace Stripe
+{
+    public static class AccountType
+    {
+        public const string Custom = "custom";
+        public const string Standard = "standard";
+    }
+}

src/Stripe.net/Constants/AccountType.cs

@@ -1,8 +1,8 @@
-namespace Stripe
+namespace Stripe
 {
     public static class BankAccountHolderType
     {
         public const string Individual = "individual";
         public const string Company = "company";
     }
-}
+}