Skip to content

Commit

Permalink
GH-42: Removed Set prefix from DynamicHandler methods. Set old method…
Browse files Browse the repository at this point in the history 
…s as Obsolete.
  • Loading branch information
@jirenius
jirenius committed Oct 21, 2019
1 parent 809ab2c commit 35ff7bb
Show file tree
Hide file tree
Showing 17 changed files with 817 additions and 466 deletions.
16 changes: 8 additions & 8 deletions README.md
View file
Expand Up @@ -20,10 +20,10 @@ Visit [Resgate.io](https://resgate.io) for more information.
```csharp
ResService service = new ResService("example");
service.AddHandler("model", new DynamicHandler()
.SetGet(r => r.Model(new {
message = "Hello, World!",
.Get(r => r.Model(new {
message = "Hello, World!"
}))
.SetAccess(r => r.AccessGranted()));
.Access(r => r.AccessGranted()));
service.Serve("nats://127.0.0.1:4222");
```

Expand Down Expand Up @@ -102,8 +102,8 @@ service.AddHandler(new MyResourceHandler());

```csharp
service.AddHandler("article.$id", new DynamicHandler()
.SetAccess(r => r.AccessGranted())
.SetModelGet(r =>
.Access(r => r.AccessGranted())
.ModelGet(r =>
{
if (DB.TryGetArticle(r.PathParams["id"], out Article article))
r.Model(article);
Expand Down Expand Up @@ -143,7 +143,7 @@ service.With("example.mycollection", resource =>

```csharp
service.AddHandler("myauth", new DynamicHandler()
.SetAuthMethod("login", r =>
.AuthMethod("login", r =>
{
if ((string)r.Params["password"] == "mysecret")
{
Expand All @@ -161,7 +161,7 @@ service.AddHandler("myauth", new DynamicHandler()

```csharp
service.AddHandler(">", new DynamicHandler()
.SetAccess(r =>
.Access(r =>
{
if (r.Token != null && (string)r.Token["user"] == "admin")
r.AccessGranted();
Expand All @@ -173,7 +173,7 @@ service.AddHandler(">", new DynamicHandler()
#### Add async handler
```csharp
service.AddHandler("store.users", new DynamicHandler()
.SetGet(async r =>
.Get(async r =>
{
var users = await DB.QueryAsync("SELECT id FROM users");
r.Collection(users.Select(u => new Ref("store.user." + u.Id)));
Expand Down
230 changes: 115 additions & 115 deletions ResgateIO.Service.UnitTests/DynamicHandlerTests.cs
View file

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions ResgateIO.Service.UnitTests/EventListenerTests.cs
View file
Expand Up @@ -28,14 +28,14 @@ public void ChangeEvent_WithApplyChange_CallsListenerWithEventChangeArgs(Diction
int called = 0;
var revert = new Dictionary<string, object> { { "foo", "baz" } };
Service.AddHandler("model", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.ChangeEvent(changed);
Assert.Equal(1, called);
r.Ok();
})
.SetApplyChange((rc, ev) => ev.SetRevert(revert)));
.ApplyChange((rc, ev) => ev.SetRevert(revert)));
Service.AddEventListener("model", (sender, ev) =>
{
called++;
Expand All @@ -62,7 +62,7 @@ public void ChangeEvent_WithoutApplyChange_CallsListenerWithEventChangeArgs(Dict
{
int called = 0;
Service.AddHandler("model", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.ChangeEvent(changed);
Expand Down Expand Up @@ -95,13 +95,13 @@ public void ChangeEvent_EmptyRevertDictionary_NoCallToListener(Dictionary<string
{
bool called = false;
Service.AddHandler("model", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
r.ChangeEvent(changed);
Assert.False(called, "event listener was called");
r.Ok();
})
.SetApplyChange((rc, ev) => ev.SetRevert(new Dictionary<string, object> { })));
.ApplyChange((rc, ev) => ev.SetRevert(new Dictionary<string, object> { })));
Service.AddEventListener("model", (sender, ev) => called = true);
Service.Serve(Conn);
Conn.GetMsg().AssertSubject("system.reset");
Expand All @@ -117,13 +117,13 @@ public void ChangeEvent_NullRevertDictionary_CallToListener(Dictionary<string, o
{
bool called = false;
Service.AddHandler("model", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
r.ChangeEvent(changed);
Assert.True(called, "event listener not called");
r.Ok();
})
.SetApplyChange((rc, ev) => { }));
.ApplyChange((rc, ev) => { }));
Service.AddEventListener("model", (sender, ev) => called = true);
Service.Serve(Conn);
Conn.GetMsg().AssertSubject("system.reset");
Expand Down Expand Up @@ -153,14 +153,14 @@ public void AddEvent_WithApplyAdd_CallsListenerWithAddEventArgs(object value, in
{
int called = 0;
Service.AddHandler("collection", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.AddEvent(value, idx);
Assert.Equal(1, called);
r.Ok();
})
.SetApplyAdd((rc, ev) => { }));
.ApplyAdd((rc, ev) => { }));
Service.AddEventListener("collection", (sender, ev) =>
{
called++;
Expand All @@ -186,7 +186,7 @@ public void AddEvent_WithoutApplyAdd_CallsListenerWithAddEventArgs(object value,
{
int called = 0;
Service.AddHandler("collection", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.AddEvent(value, idx);
Expand Down Expand Up @@ -227,14 +227,14 @@ public void RemoveEvent_WithApplyRemove_CallsListenerWithRemoveEventArgs(int idx
{
int called = 0;
Service.AddHandler("collection", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.RemoveEvent(idx);
Assert.Equal(1, called);
r.Ok();
})
.SetApplyRemove((rc, ev) => ev.SetRevert(Test.IntValue)));
.ApplyRemove((rc, ev) => ev.SetRevert(Test.IntValue)));
Service.AddEventListener("collection", (sender, ev) =>
{
called++;
Expand All @@ -260,7 +260,7 @@ public void RemoveEvent_WithoutApplyRemove_CallsListenerWithRemoveEventArgsWithN
{
int called = 0;
Service.AddHandler("collection", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.RemoveEvent(idx);
Expand Down Expand Up @@ -293,14 +293,14 @@ public void CreateEvent_WithApplyCreate_CallsListenerWithCreateEventArgs()
{
int called = 0;
Service.AddHandler("model", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.CreateEvent(Test.Model);
Assert.Equal(1, called);
r.Ok();
})
.SetApplyCreate((rc, ev) => { }));
.ApplyCreate((rc, ev) => { }));
Service.AddEventListener("model", (sender, ev) =>
{
called++;
Expand All @@ -324,7 +324,7 @@ public void CreateEvent_WithoutApplyCreate_CallsListenerWithCreateEventArgs()
{
int called = 0;
Service.AddHandler("model", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.CreateEvent(Test.Model);
Expand Down Expand Up @@ -356,14 +356,14 @@ public void DeleteEvent_WithApplyDelete_CallsListenerWithDeleteEventArgs()
{
int called = 0;
Service.AddHandler("model", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.DeleteEvent();
Assert.Equal(1, called);
r.Ok();
})
.SetApplyDelete((rc, ev) => ev.SetRevert(Test.Model)));
.ApplyDelete((rc, ev) => ev.SetRevert(Test.Model)));
Service.AddEventListener("model", (sender, ev) =>
{
called++;
Expand All @@ -387,7 +387,7 @@ public void DeleteEvent_WithoutApplyDelete_CallsListenerWithDeleteEventArgsWithN
{
int called = 0;
Service.AddHandler("model", new DynamicHandler()
.SetCall(r =>
.Call(r =>
{
Assert.Equal(0, called);
r.DeleteEvent();
Expand Down
14 changes: 7 additions & 7 deletions ResgateIO.Service.UnitTests/Examples.cs
View file
Expand Up @@ -50,10 +50,10 @@ public void Usage_HelloWorld()
{
ResService service = new ResService("example");
service.AddHandler("model", new DynamicHandler()
.SetGet(r => r.Model(new {
.Get(r => r.Model(new {
message = "Hello, World!"
}))
.SetAccess(r => r.AccessGranted()));
.Access(r => r.AccessGranted()));
service.Serve("nats://127.0.0.1:4222");
// ---
service.Shutdown();
Expand Down Expand Up @@ -139,8 +139,8 @@ public void Usage_AddHandlersForParameterizedResources()
ResService service = new ResService("example");
// ---
service.AddHandler("article.$id", new DynamicHandler()
.SetAccess(r => r.AccessGranted())
.SetModelGet(r =>
.Access(r => r.AccessGranted())
.ModelGet(r =>
{
if (DB.TryGetArticle(r.PathParams["id"], out Article article))
r.Model(article);
Expand Down Expand Up @@ -187,7 +187,7 @@ public void Usage_SendAddEventOnCollectionUpdate()
public void Usage_AddHandlersForAuthentication()
{
service.AddHandler("myauth", new DynamicHandler()
.SetAuthMethod("login", r =>
.AuthMethod("login", r =>
{
if ((string)r.Params["password"] == "mysecret")
{
Expand All @@ -212,7 +212,7 @@ public void Usage_AddHandlersForAuthentication()
public void Usage_AddHandlersForAccessControl_WithWildcard()
{
service.AddHandler(">", new DynamicHandler()
.SetAccess(r =>
.Access(r =>
{
if (r.Token != null && (string)r.Token["user"] == "admin")
r.AccessGranted();
Expand All @@ -234,7 +234,7 @@ public void Usage_AddAsyncHandler()
ResService service = new ResService("example");
// ---
service.AddHandler("store.users", new DynamicHandler()
.SetGet(async r =>
.Get(async r =>
{
var users = await DB.QueryAsync("SELECT id FROM users");
r.Collection(users.Select(u => new Ref("store.user." + u.Id)));
Expand Down

0 comments on commit 35ff7bb

Please sign in to comment.