Skip to content

Allowing consumers to inject their own JSON serializer #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cdauphinee wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allowing consumers to inject their own JSON serializer #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7af83b2
Allowing consumers to inject their own JSON serializer
Oct 29, 2019
c4817e8
Fixing issues with Unity stripping message models
Nov 6, 2019
e9e7f0e
Replacing websocket library
Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions AuthHost/AuthHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'UnityRelease|AnyCPU'">
<OutputPath>bin\UnityRelease\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Nancy, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nancy.1.4.4\lib\net40\Nancy.dll</HintPath>
Expand Down
9 changes: 9 additions & 0 deletions ExampleApplication/ExampleApplication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'UnityRelease|AnyCPU'">
<OutputPath>bin\UnityRelease\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
Expand Down
9 changes: 9 additions & 0 deletions PusherClient.Tests.Utilities/PusherClient.Tests.Utilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'UnityRelease|AnyCPU'">
<OutputPath>bin\UnityRelease\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
Expand Down
30 changes: 15 additions & 15 deletions PusherClient.Tests/AcceptanceTests/EventEmitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public void EventEmitterShouldEmitAnEventToARegisteredListener()

var myAction = new Action<dynamic>(o => emittedEvent = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("listener event", myAction);

// Act
Expand All @@ -36,7 +36,7 @@ public void EventEmitterShouldEmitAnEventToARegisteredRawListener()

var myAction = new Action<string>(o => emittedEvent = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("raw listener event", myAction);

// Act
Expand All @@ -55,7 +55,7 @@ public void EventEmitterShouldEmitAnEventToARegisteredPusherEventListener()

var myAction = new Action<PusherEvent>(o => emittedEvent = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("pusher event listener event", myAction);

// Act
Expand All @@ -75,7 +75,7 @@ public void EventEmitterShouldEmitAnEventToARegisteredGeneralListener()

var myAction = new Action<string, dynamic>((e, o) => emittedEvent = new Tuple<string, dynamic>(e, o));

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.BindAll(myAction);

// Act
Expand All @@ -95,7 +95,7 @@ public void EventEmitterShouldEmitAnEventToARegisteredRawGeneralListener()

var myAction = new Action<string, string>((e, o) => emittedEvent = new Tuple<string, string>(e, o));

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.BindAll(myAction);

// Act
Expand All @@ -115,7 +115,7 @@ public void EventEmitterShouldEmitAnEventToARegisteredPusherEventGeneralListener

var myAction = new Action<string, PusherEvent>((e, o) => emittedEvent = new Tuple<string, PusherEvent>(e, o));

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.BindAll(myAction);

// Act
Expand All @@ -137,7 +137,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredListener()
var myAction = new Action<dynamic>(o => emittedEvent = o);
var myAction2 = new Action<dynamic>(o => emittedEvent2 = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("listener event", myAction);
emitter.Bind("listener event", myAction2);
emitter.Unbind("listener event", myAction);
Expand All @@ -160,7 +160,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredRawListener()
var myAction = new Action<string>(o => emittedEvent = o);
var myAction2 = new Action<string>(o => emittedEvent2 = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("raw listener event", myAction);
emitter.Bind("raw listener event", myAction2);
emitter.Unbind("raw listener event", myAction);
Expand All @@ -183,7 +183,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredPusherEventListener(
var myAction = new Action<PusherEvent>(o => emittedEvent = o);
var myAction2 = new Action<PusherEvent>(o => emittedEvent2 = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("pusher event listener event", myAction);
emitter.Bind("pusher event listener event", myAction2);
emitter.Unbind("pusher event listener event", myAction);
Expand All @@ -206,7 +206,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredEventName()
var myAction = new Action<dynamic>(o => emittedEvent = o);
var myAction2 = new Action<dynamic>(o => emittedEvent2 = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("listener event", myAction);
emitter.Bind("listener event", myAction2);
emitter.Unbind("listener event");
Expand All @@ -229,7 +229,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredRawEventName()
var myAction = new Action<string>(o => emittedEvent = o);
var myAction2 = new Action<string>(o => emittedEvent2 = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("raw listener event", myAction);
emitter.Bind("raw listener event", myAction2);
emitter.Unbind("raw listener event");
Expand All @@ -252,7 +252,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredPusherEventEventName
var myAction = new Action<PusherEvent>(o => emittedEvent = o);
var myAction2 = new Action<PusherEvent>(o => emittedEvent2 = o);

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.Bind("pusher event listener event", myAction);
emitter.Bind("pusher event listener event", myAction2);
emitter.Unbind("pusher event listener event");
Expand All @@ -273,7 +273,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredGeneralListener()

var myAction = new Action<string, dynamic>((e, o) => emittedEvent = new Tuple<string, dynamic>(e, o));

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.BindAll(myAction);
emitter.UnbindAll();

Expand All @@ -292,7 +292,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredRawGeneralListener()

var myAction = new Action<string, string>((e, o) => emittedEvent = new Tuple<string, string>(e, o));

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.BindAll(myAction);
emitter.UnbindAll();

Expand All @@ -311,7 +311,7 @@ public void EventEmitterShouldNotEmitAnEventToAnUnregisteredPusherEventGeneralLi

var myAction = new Action<string, PusherEvent>((e, o) => emittedEvent = new Tuple<string, PusherEvent>(e, o));

var emitter = new PusherClient.EventEmitter();
var emitter = new PusherClient.EventEmitter(new NewtonsoftJsonSerializer());
emitter.BindAll(myAction);
emitter.UnbindAll();

Expand Down
9 changes: 9 additions & 0 deletions PusherClient.Tests/PusherClient.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'UnityRelease|AnyCPU'">
<OutputPath>bin\UnityRelease\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
Expand Down
2 changes: 2 additions & 0 deletions PusherClient/Channel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ internal Channel(string channelName, ITriggerChannels pusher)
{
_pusher = pusher;
Name = channelName;

JsonSerializer = pusher.JsonSerializer;
}

internal virtual void SubscriptionSucceeded(string data)
Expand Down
Loading