Skip to content

Commit 6712043

Browse files
committed
Merge tag '0.3'
2 parents 4e04c28 + b70df52 commit 6712043

File tree

12 files changed

+52
-62
lines changed

12 files changed

+52
-62
lines changed

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ before_build:
1414
build:
1515
project: src/Simplify.Web.Postman.sln
1616
publish_nuget: true
17+
use_snupkg_format: true
1718
parallel: true
1819
verbosity: minimal

src/Simplify.Web.Postman/CollectionBuilder.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ public class CollectionBuilder
1616
/// </summary>
1717
/// <param name="partBuilders">The part builders.</param>
1818
/// <exception cref="ArgumentNullException">partBuilders</exception>
19-
public CollectionBuilder(IList<ICollectionPartBuilder> partBuilders)
20-
{
21-
_partBuilders = partBuilders ?? throw new ArgumentNullException(nameof(partBuilders));
22-
}
19+
public CollectionBuilder(IList<ICollectionPartBuilder> partBuilders) => _partBuilders = partBuilders ?? throw new ArgumentNullException(nameof(partBuilders));
2320

2421
/// <summary>
2522
/// Builds the collection model.

src/Simplify.Web.Postman/FileCollectionExporter.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,8 @@ public void Export(CollectionModel model)
4343
File.WriteAllText(GenerateCollectionFilePath(folderPath), _serializer.Serialize(model));
4444
}
4545

46-
private string GenerateExportFolderPath()
47-
{
48-
return Path.Combine(_environment.SitePhysicalPath, _settings.GenerationFolderPath);
49-
}
46+
private string GenerateExportFolderPath() => Path.Combine(_environment.SitePhysicalPath, _settings.GenerationFolderPath);
5047

51-
private string GenerateCollectionFilePath(string folderPath)
52-
{
53-
return Path.Combine(folderPath, _settings.CollectionFileName + _settings.CollectionFileNamePostfix + ".json");
54-
}
48+
private string GenerateCollectionFilePath(string folderPath) => Path.Combine(folderPath, _settings.CollectionFileName + _settings.CollectionFileNamePostfix + ".json");
5549
}
5650
}

src/Simplify.Web.Postman/Json/CollectionModelSerializer.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ public class CollectionModelSerializer
1313
/// </summary>
1414
/// <param name="model">The model.</param>
1515
/// <returns></returns>
16-
public string Serialize(CollectionModel model)
17-
{
18-
return JsonSerializer.Serialize(model, new JsonSerializerOptions
16+
public string Serialize(CollectionModel model) =>
17+
JsonSerializer.Serialize(model, new JsonSerializerOptions
1918
{
2019
PropertyNamingPolicy = new LowerCamelCasePolicy(),
2120
WriteIndented = true
2221
});
23-
}
2422
}
2523
}

src/Simplify.Web.Postman/Json/LowerCamelCasePolicy.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,19 @@
22

33
namespace Simplify.Web.Postman.Json
44
{
5+
/// <summary>
6+
/// Provides lower camel case policy
7+
/// </summary>
8+
/// <seealso cref="JsonNamingPolicy" />
59
public class LowerCamelCasePolicy : JsonNamingPolicy
610
{
11+
/// <summary>
12+
/// When overridden in a derived class, converts the specified name according to the policy.
13+
/// </summary>
14+
/// <param name="name">The name to convert.</param>
15+
/// <returns>
16+
/// The converted name.
17+
/// </returns>
718
public override string ConvertName(string name)
819
{
920
if (name.Length > 0)

src/Simplify.Web.Postman/Models/CollectionHeader.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ namespace Simplify.Web.Postman.Models
77
/// </summary>
88
public class CollectionHeader
99
{
10+
/// <summary>
11+
/// Gets or sets the name.
12+
/// </summary>
13+
/// <value>
14+
/// The name.
15+
/// </value>
1016
public string Name { get; set; }
1117
}
1218
}

src/Simplify.Web.Postman/Simplify.Web.Postman.csproj

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4-
<LangVersion>8.0</LangVersion>
4+
<LangVersion>9.0</LangVersion>
55
<Nullable>enable</Nullable>
6+
<IncludeSymbols>true</IncludeSymbols>
7+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
8+
<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
9+
<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.Web.Postman.xml</DocumentationFile>
10+
11+
<Version>0.3</Version>
12+
<PackageReleaseNotes>
13+
New
14+
* Simple postman requests generation
15+
</PackageReleaseNotes>
16+
617
<Authors>Alexander Krylkov</Authors>
718
<Product>Simplify</Product>
819
<Description>Postman collection and environment generation extension for Simplify.Web</Description>
920
<Copyright>Licensed under LGPL</Copyright>
10-
<Version>0.2</Version>
1121
<PackageProjectUrl>https://github.com/SimplifyNet/Simplify.Web.Postman</PackageProjectUrl>
1222
<PackageIconUrl>https://raw.githubusercontent.com/SimplifyNet/Images/master/LogoWeb32x32.png</PackageIconUrl>
1323
<RepositoryUrl>https://github.com/SimplifyNet/Simplify.Web.Postman</RepositoryUrl>
1424
<RepositoryType>GIT</RepositoryType>
1525
<PackageTags>Simplify.Web Postman API</PackageTags>
16-
<PackageReleaseNotes>
17-
</PackageReleaseNotes>
18-
<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
19-
<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.Web.Postman.xml</DocumentationFile>
2026
</PropertyGroup>
2127
<ItemGroup>
2228
<PackageReference Include="Simplify.Web" Version="4.2.*" />

src/Simplify.Web.Postman/SimplifyDIRegistratorExtensions.cs

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,44 +18,30 @@ public static class SimplifyDIRegistratorExtensions
1818
/// <param name="registrator">The registrator.</param>
1919
/// <param name="settings">The settings.</param>
2020
/// <returns></returns>
21-
public static IDIRegistrator RegisterSimplifyWebPostman(this IDIRegistrator registrator, IPostmanGenerationSettings? settings = null)
22-
{
23-
registrator.Register(r => settings ??= new PostmanGenerationSettings(), LifetimeType.Singleton);
24-
25-
registrator.RegisterPartBuilders()
21+
public static IDIRegistrator RegisterSimplifyWebPostman(this IDIRegistrator registrator, IPostmanGenerationSettings? settings = null) =>
22+
registrator.Register(r => settings ??= new PostmanGenerationSettings(), LifetimeType.Singleton)
23+
.RegisterPartBuilders()
2624
.RegisterCollectionBuilder()
27-
.RegisterCollectionExporter();
28-
29-
registrator.Register<CollectionModelSerializer>()
25+
.RegisterCollectionExporter()
26+
.Register<CollectionModelSerializer>()
3027
.Register<PostmanGenerator>();
3128

32-
return registrator;
33-
}
34-
35-
private static IDIRegistrator RegisterPartBuilders(this IDIRegistrator registrator)
36-
{
29+
private static IDIRegistrator RegisterPartBuilders(this IDIRegistrator registrator) =>
3730
registrator.Register<CollectionHeaderBuilder>(LifetimeType.Singleton)
3831
.Register<CollectionItemsBuilder>(LifetimeType.Singleton);
3932

40-
return registrator;
41-
}
42-
43-
private static IDIRegistrator RegisterCollectionBuilder(this IDIRegistrator registrator)
44-
{
45-
return registrator.Register(r => new CollectionBuilder(new List<ICollectionPartBuilder>
33+
private static IDIRegistrator RegisterCollectionBuilder(this IDIRegistrator registrator) =>
34+
registrator.Register(r => new CollectionBuilder(new List<ICollectionPartBuilder>
4635
{
4736
r.Resolve<CollectionHeaderBuilder>(),
4837
r.Resolve<CollectionItemsBuilder>()
4938
}));
50-
}
5139

52-
private static IDIRegistrator RegisterCollectionExporter(this IDIRegistrator registrator)
53-
{
54-
return registrator.Register<ICollectionExporter>(r =>
40+
private static IDIRegistrator RegisterCollectionExporter(this IDIRegistrator registrator) =>
41+
registrator.Register<ICollectionExporter>(r =>
5542
new FileCollectionExporter(r.Resolve<CollectionModelSerializer>(),
5643
r.Resolve<IEnvironment>(),
5744
r.Resolve<IPostmanGenerationSettings>()),
5845
LifetimeType.Singleton);
59-
}
6046
}
6147
}

src/TesterApp/Program.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ namespace TesterApp
55
{
66
public class Program
77
{
8-
public static void Main(string[] args)
9-
{
10-
CreateWebHostBuilder(args).Build().Run();
11-
}
8+
public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
129

1310
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
1411
WebHost.CreateDefaultBuilder(args)

src/TesterApp/Setup/IocRegistrations.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ namespace TesterApp.Setup
66
{
77
public static class IocRegistrations
88
{
9-
public static void Register()
9+
public static IDIContainerProvider RegisterAll(this IDIContainerProvider containerProvider)
1010
{
11-
DIContainer.Current.RegisterSimplifyWeb()
11+
containerProvider.RegisterSimplifyWeb()
1212
.RegisterSimplifyWebPostman();
13+
14+
return containerProvider;
1315
}
1416
}
1517
}

0 commit comments

Comments
 (0)