Skip to content

Commit dccd006

Browse files
bruslimbruslim
committed
added comments, updated ServiceStack
more comments for DTOs, updated ServiceStack version,
1 parent 09d2078 commit dccd006

19 files changed

Lines changed: 277 additions & 130 deletions

‎SsWkPdf.Specs/Properties/AssemblyInfo.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following
65
// set of attributes. Change these attribute values to modify the information
76
// associated with an assembly.
7+
88
[assembly: AssemblyTitle("SsWkPdf.Specs")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
@@ -17,9 +17,11 @@
1717
// Setting ComVisible to false makes the types in this assembly not visible
1818
// to COM components. If you need to access a type in this assembly from
1919
// COM, set the ComVisible attribute to true on that type.
20+
2021
[assembly: ComVisible(false)]
2122

2223
// The following GUID is for the ID of the typelib if this project is exposed to COM
24+
2325
[assembly: Guid("e09863af-5450-4057-a2eb-de5564a75de3")]
2426

2527
// Version information for an assembly consists of the following four values:
@@ -32,5 +34,6 @@
3234
// You can specify all the values or you can default the Build and Revision Numbers
3335
// by using the '*' as shown below:
3436
// [assembly: AssemblyVersion("1.0.*")]
37+
3538
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
39+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎SsWkPdf.Specs/ServiceInterface/describe_WebDocumentsService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace SsWkPdf.Specs.ServiceInterface
1313
{
14-
abstract class describe_WebDocumentsService : nspec
14+
internal abstract class describe_WebDocumentsService : nspec
1515
{
1616
protected const string LoremIpsum =
1717
@"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat.";
@@ -80,7 +80,7 @@ private void before_each()
8080
}
8181

8282
/// <summary>
83-
/// Spec for fixture data, ensures that fixture data exsits in memory db
83+
/// Spec for fixture data, ensures that fixture data exsits in memory db
8484
/// </summary>
8585
private void describe_the_fixture_data()
8686
{

‎SsWkPdf.Specs/ServiceInterface/describe_WebDocumentsService_DeleteRequest_handler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace SsWkPdf.Specs.ServiceInterface
1414
{
15-
class describe_WebDocumentsService_DeleteRequest_handler : describe_WebDocumentsService
15+
internal class describe_WebDocumentsService_DeleteRequest_handler : describe_WebDocumentsService
1616
{
1717
private void given_the_fixture_data()
1818
{

‎SsWkPdf.Specs/ServiceInterface/describe_WebDocumentsService_DownloadRequest_handler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace SsWkPdf.Specs.ServiceInterface
1414
{
15-
class describe_WebDocumentsService_DownloadRequest_handler : describe_WebDocumentsService
15+
internal class describe_WebDocumentsService_DownloadRequest_handler : describe_WebDocumentsService
1616
{
1717
private void given_the_fixture_data()
1818
{

‎SsWkPdf.Specs/ServiceInterface/describe_WebDocumentsService_UpdateRequest_handler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace SsWkPdf.Specs.ServiceInterface
1313
{
14-
class describe_WebDocumentsService_UpdateRequest_handler : describe_WebDocumentsService
14+
internal class describe_WebDocumentsService_UpdateRequest_handler : describe_WebDocumentsService
1515
{
1616
private void given_the_fixture_data()
1717
{

‎SsWkPdf.Specs/app.config‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
23
<configuration>
3-
<configSections>
4-
5-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
</configSections>
7-
<runtime>
8-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
9-
<dependentAssembly>
10-
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-2.6.3.13283" newVersion="2.6.3.13283" />
12-
</dependentAssembly>
13-
<dependentAssembly>
14-
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-1.0.92.0" newVersion="1.0.92.0" />
16-
</dependentAssembly>
17-
<dependentAssembly>
18-
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
20-
</dependentAssembly>
21-
</assemblyBinding>
22-
</runtime>
23-
24-
<entityFramework>
25-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
26-
<parameters>
27-
<parameter value="v11.0" />
28-
</parameters>
29-
</defaultConnectionFactory>
30-
<providers>
31-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
32-
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
33-
</providers>
34-
</entityFramework>
4+
<configSections>
5+
6+
<section name="entityFramework"
7+
type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
8+
requirePermission="false" />
9+
</configSections>
10+
<runtime>
11+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
12+
<dependentAssembly>
13+
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-2.6.3.13283" newVersion="2.6.3.13283" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-1.0.92.0" newVersion="1.0.92.0" />
19+
</dependentAssembly>
20+
<dependentAssembly>
21+
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
23+
</dependentAssembly>
24+
</assemblyBinding>
25+
</runtime>
26+
27+
<entityFramework>
28+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
29+
<parameters>
30+
<parameter value="v11.0" />
31+
</parameters>
32+
</defaultConnectionFactory>
33+
<providers>
34+
<provider invariantName="System.Data.SqlClient"
35+
type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
36+
<provider invariantName="System.Data.SQLite.EF6"
37+
type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
38+
</providers>
39+
</entityFramework>
3540
</configuration>

‎SsWkPdf.Specs/packages.config‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
23
<packages>
3-
<package id="Common.Logging" version="2.2.0" targetFramework="net451" />
4-
<package id="Common.Logging.Core" version="2.2.0" targetFramework="net451" />
5-
<package id="nspec" version="0.9.67" targetFramework="net451" />
6-
<package id="NUnit" version="2.6.3" targetFramework="net451" />
7-
<package id="ServiceStack" version="4.0.16" targetFramework="net451" />
8-
<package id="ServiceStack.Client" version="4.0.16" targetFramework="net451" />
9-
<package id="ServiceStack.Common" version="4.0.16" targetFramework="net451" />
10-
<package id="ServiceStack.Interfaces" version="4.0.16" targetFramework="net451" />
11-
<package id="ServiceStack.OrmLite" version="4.0.16" targetFramework="net451" />
12-
<package id="ServiceStack.OrmLite.Sqlite.Windows" version="4.0.16" targetFramework="net451" />
13-
<package id="ServiceStack.Text" version="4.0.16" targetFramework="net451" />
14-
<package id="System.Data.SQLite.Core" version="1.0.92.0" targetFramework="net451" />
15-
<package id="WkHtmlToXSharp" version="1.1.22.21" targetFramework="net451" />
4+
<package id="Common.Logging" version="2.2.0" targetFramework="net451" />
5+
<package id="Common.Logging.Core" version="2.2.0" targetFramework="net451" />
6+
<package id="nspec" version="0.9.67" targetFramework="net451" />
7+
<package id="NUnit" version="2.6.3" targetFramework="net451" />
8+
<package id="ServiceStack" version="4.0.16" targetFramework="net451" />
9+
<package id="ServiceStack.Client" version="4.0.16" targetFramework="net451" />
10+
<package id="ServiceStack.Common" version="4.0.16" targetFramework="net451" />
11+
<package id="ServiceStack.Interfaces" version="4.0.16" targetFramework="net451" />
12+
<package id="ServiceStack.OrmLite" version="4.0.16" targetFramework="net451" />
13+
<package id="ServiceStack.OrmLite.Sqlite.Windows" version="4.0.16" targetFramework="net451" />
14+
<package id="ServiceStack.Text" version="4.0.16" targetFramework="net451" />
15+
<package id="System.Data.SQLite.Core" version="1.0.92.0" targetFramework="net451" />
16+
<package id="WkHtmlToXSharp" version="1.1.22.21" targetFramework="net451" />
1617
</packages>

‎sswkpdf/Common/AppConfig.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.Collections;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using Funq;
43
using ServiceStack;
4+
using ServiceStack.MsgPack;
55
using ServiceStack.Validation;
66
using SsWkPdf.FluentValidation;
77
using WkHtmlToXSharp;
@@ -14,17 +14,20 @@ public static void Config(Container container)
1414
{
1515
// register pdf converter with IoC
1616
container.Register<IHtmlToPdfConverter>(new MultiplexingConverter());
17-
17+
1818
// register validators
1919
container.Register<IUriValidator>(new UriValidator());
20-
container.RegisterValidators(typeof(WebDocumentsValidators).Assembly);
20+
container.RegisterValidators(typeof (WebDocumentsValidators).Assembly);
2121
}
2222

2323
public static void EnablePlugins(IList<IPlugin> plugins)
2424
{
2525
// register plugins
2626
plugins.Add(new RequestLogsFeature(5000));
2727

28+
// enable Msessage Pack Format
29+
plugins.Add(new MsgPackFormat());
30+
2831
// enable validation
2932
plugins.Add(new ValidationFeature());
3033
}

‎sswkpdf/FluentValidation/WebDocumentValidator.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ public WebDocumentValidator()
1717
RuleFor(r => r.ContentType).NotEmpty().Length(1, 255);
1818
RuleFor(r => r.Md5Sum).NotEmpty().Length(32);
1919
RuleFor(r => r.FileLength).GreaterThan(0);
20-
21-
RuleFor(r => r.MarginBottom).Length(0,31);
22-
RuleFor(r => r.MarginLeft).Length(0,31);
23-
RuleFor(r => r.MarginRight).Length(0,31);
24-
RuleFor(r => r.MarginTop).Length(0,31);
25-
20+
21+
RuleFor(r => r.MarginBottom).Length(0, 31);
22+
RuleFor(r => r.MarginLeft).Length(0, 31);
23+
RuleFor(r => r.MarginRight).Length(0, 31);
24+
RuleFor(r => r.MarginTop).Length(0, 31);
25+
2626
RuleFor(r => r.UpdatedOn)
27-
.GreaterThanOrEqualTo(r=> r.CreatedOn);
27+
.GreaterThanOrEqualTo(r => r.CreatedOn);
2828

2929
RuleFor(r => r.RecordVersion).GreaterThan(0);
3030
}

‎sswkpdf/FluentValidation/WebDocumentsValidators.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,6 @@ namespace SsWkPdf.FluentValidation
55
{
66
public class WebDocumentsValidators
77
{
8-
public abstract class CreateAbstractValidator<T> : AbstractValidator<T> where T : WebDocuments.CreateRequest
9-
{
10-
protected CreateAbstractValidator()
11-
{
12-
RuleFor(r => r.FileName).Length(0, 255);
13-
14-
RuleFor(r => r.MarginBottom).Length(0, 31);
15-
RuleFor(r => r.MarginLeft).Length(0, 31);
16-
RuleFor(r => r.MarginRight).Length(0, 31);
17-
RuleFor(r => r.MarginTop).Length(0, 31);
18-
}
19-
}
20-
218
public class Create : CreateAbstractValidator<WebDocuments.CreateRequest>
229
{
2310
public Create()
@@ -31,6 +18,19 @@ public Create()
3118
public IUriValidator UriValidator { get; set; }
3219
}
3320

21+
public abstract class CreateAbstractValidator<T> : AbstractValidator<T> where T : WebDocuments.CreateRequest
22+
{
23+
protected CreateAbstractValidator()
24+
{
25+
RuleFor(r => r.FileName).Length(0, 255);
26+
27+
RuleFor(r => r.MarginBottom).Length(0, 31);
28+
RuleFor(r => r.MarginLeft).Length(0, 31);
29+
RuleFor(r => r.MarginRight).Length(0, 31);
30+
RuleFor(r => r.MarginTop).Length(0, 31);
31+
}
32+
}
33+
3434
public class FindById : AbstractValidator<WebDocuments.FindByIdRequest>
3535
{
3636
public FindById()
@@ -41,7 +41,7 @@ public FindById()
4141

4242
public class Update : CreateAbstractValidator<WebDocuments.UpdateRequest>
4343
{
44-
public Update()
44+
public Update()
4545
{
4646
RuleFor(r => r.Id).NotEmpty();
4747

0 commit comments

Comments
 (0)