From 71e62f6f6e8fc3703a92075d0cbb7b40ff327842 Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Mon, 6 Apr 2020 09:55:14 +0100 Subject: [PATCH 01/20] Added question template and moved release drafter to GitHub Actions --- .github/ISSUE_TEMPLATE/question.md | 10 ++++++++++ .github/release-drafter.yml | 20 ++++++++++---------- .github/workflows/release-drafter.yml | 14 ++++++++++++++ 3 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/question.md create mode 100644 .github/workflows/release-drafter.yml diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 0000000..e6de743 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,10 @@ +--- +name: Question +about: Ask a question about this project +title: "[Question]" +labels: Question, Triage +assignees: '' + +--- + +**Please be sure to check the readme file before raising an issue.** diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 16c5ce0..5778a3d 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,16 +1,16 @@ -name-template: 'v$NEXT_PATCH_VERSION 🌈' +name-template: 'v$NEXT_PATCH_VERSION' tag-template: 'v$NEXT_PATCH_VERSION' +template: | + # What's Changed + + $CHANGES categories: - title: '🚀 Features' - labels: - - 'Feature' + label: 'Feature' - title: '🐛 Bug Fixes' - labels: - - 'Bug' + label: 'Bug' - title: '🧰 Maintenance' label: 'Maintenance' -change-template: '- (#$NUMBER) $TITLE - Thanks to @$AUTHOR ' -template: | - # What's Changed - - $CHANGES \ No newline at end of file + - title: '📖 Documentation' + label: 'Docs' +change-template: '- (#$NUMBER) $TITLE - Thanks to @$AUTHOR ' \ No newline at end of file diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 0000000..3fb8ef3 --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,14 @@ +name: Release Drafter + +on: + push: + branches: + - master + +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + - uses: release-drafter/release-drafter@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 589f7dee065d752e84ef2d647187fb4762f196f3 Mon Sep 17 00:00:00 2001 From: Jan Johansson Date: Thu, 21 May 2020 19:50:43 +0200 Subject: [PATCH 02/20] Added configuration option for JsonSerializer, added TimespanJsonConverter and amended documentation --- README.md | 78 +++++++++++++++---- .../Blazored.SessionStorage.csproj | 7 +- .../ISessionStorageService.cs | 2 +- .../ISyncSessionStorageService.cs | 2 +- .../JsonConverters/TimespanJsonConverter.cs | 46 +++++++++++ .../ServiceCollectionExtensions.cs | 23 +++++- .../SessionStorageService.cs | 49 +++++++----- .../StorageOptions/SessionStorageOptions.cs | 18 +++++ 8 files changed, 180 insertions(+), 45 deletions(-) create mode 100644 src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs create mode 100644 src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs diff --git a/README.md b/README.md index aedfe9d..8a08178 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Blazored SessionStorage -A library to provide access to session storage in Blazor applications +A library to provide access to local storage in Blazor applications [![Build Status](https://dev.azure.com/blazored/SessionStorage/_apis/build/status/Blazored.SessionStorage?branchName=master)](https://dev.azure.com/blazored/SessionStorage/_build/latest?definitionId=1&branchName=master) -![Nuget](https://img.shields.io/nuget/v/blazored.sessionstorage.svg) +[![Nuget](https://img.shields.io/nuget/v/blazored.localstorage.svg)](https://www.nuget.org/packages/Blazored.SessionStorage/) ### Installing @@ -11,11 +11,11 @@ You can install from NuGet using the following command: `Install-Package Blazored.SessionStorage` -Or via the Visual Studio package manger. +Or via the Visual Studio package manager. ### Setup -You will need to register the session storage services with the service collection in your _startup.cs_ file. +You will need to register the local storage services with the service collection in your _Startup.cs_ file in Blazor Server. ```c# public void ConfigureServices(IServiceCollection services) @@ -24,34 +24,75 @@ public void ConfigureServices(IServiceCollection services) } ``` +Or in your _Program.cs_ file in Blazor WebAssembly. + +```c# +public static async Task Main(string[] args) +{ + var builder = WebAssemblyHostBuilder.CreateDefault(args); + builder.RootComponents.Add("app"); + + builder.Services.AddBlazoredSessionStorage(); + + await builder.Build().RunAsync(); +} +``` + +### Configuration + +The local storage provides options that can be modified by you at registration in your _Startup.cs_ file in Blazor Server. + + +```c# +public void ConfigureServices(IServiceCollection services) +{ + services.AddBlazoredSessionStorage(config => + config.JsonSerializerOptions.WriteIndented = true); +} +``` +Or in your _Program.cs_ file in Blazor WebAssembly. + +```c# +public static async Task Main(string[] args) +{ + var builder = WebAssemblyHostBuilder.CreateDefault(args); + builder.RootComponents.Add("app"); + + builder.Services.AddBlazoredSessionStorage(config => + config.JsonSerializerOptions.WriteIndented = true); + + await builder.Build().RunAsync(); +} +``` + ### Usage (Blazor WebAssembly) To use Blazored.SessionStorage in Blazor WebAssembly, inject the `ISessionStorageService` per the example below. ```c# -@inject Blazored.SessionStorage.ISessionStorageService sessionStorage +@inject Blazored.SessionStorage.ISessionStorageService localStorage @code { protected override async Task OnInitializedAsync() { - await sessionStorage.SetItemAsync("name", "John Smith"); - var name = await sessionStorage.GetItemAsync("name"); + await localStorage.SetItemAsync("name", "John Smith"); + var name = await localStorage.GetItemAsync("name"); } } ``` -With Blazor WebAssembly you also have the option of a synchronous API, if your use case requires it. You can swap the `ISessionStorageService` for `ISyncSessionStorageService` which allows you to avoid use of `async`/`await`. For either interface, the method names are the same. +With Blazor WebAssembly you also have the option of a synchronous API, if your use case requires it. You can swap the `ISessionStorageService` for `ISyncStorageService` which allows you to avoid use of `async`/`await`. For either interface, the method names are the same. ```c# -@inject Blazored.SessionStorage.ISyncSessionStorageService sessionStorage +@inject Blazored.SessionStorage.ISyncStorageService localStorage @code { protected override void OnInitialized() { - sessionStorage.SetItem("name", "John Smith"); - var name = sessionStorage.GetItem("name"); + localStorage.SetItem("name", "John Smith"); + var name = localStorage.GetItem("name"); } } @@ -62,14 +103,14 @@ With Blazor WebAssembly you also have the option of a synchronous API, if your u **NOTE:** Due to pre-rendering in Blazor Server you can't perform any JS interop until the `OnAfterRender` lifecycle method. ```c# -@inject Blazored.SessionStorage.ISessionStorageService sessionStorage +@inject Blazored.SessionStorage.ISessionStorageService localStorage -@functions { +@code { - protected override async Task OnAfterRenderAsync() + protected override async Task OnAfterRenderAsync(bool firstRender) { - await sessionStorage.SetItemAsync("name", "John Smith"); - var name = await sessionStorage.GetItemAsync("name"); + await localStorage.SetItemAsync("name", "John Smith"); + var name = await localStorage.GetItemAsync("name"); } } @@ -84,12 +125,15 @@ The APIs available are: - ClearAsync() - LengthAsync() - KeyAsync() -- synchronous via `ISyncSessionStorageService`: + - ContainsKeyAsync() + +- synchronous via `ISyncStorageService` (Synchronous methods are **only** available in Blazor WebAssembly): - SetItem() - GetItem() - RemoveItem() - Clear() - Length() - Key() + - ContainsKey() **Note:** Blazored.SessionStorage methods will handle the serialisation and de-serialisation of the data for you. diff --git a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj index 35c85c1..c6c6963 100644 --- a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj +++ b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj @@ -4,7 +4,6 @@ netstandard2.0 3.0 Blazored.SessionStorage - 3.2 Blazored.SessionStorage 1.0.11 @@ -18,10 +17,10 @@ Blazor SessionStorage Blazored Razor Components - + - - + + diff --git a/src/Blazored.SessionStorage/ISessionStorageService.cs b/src/Blazored.SessionStorage/ISessionStorageService.cs index f8d85cd..97724f7 100644 --- a/src/Blazored.SessionStorage/ISessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISessionStorageService.cs @@ -15,7 +15,7 @@ public interface ISessionStorageService Task RemoveItemAsync(string key); - Task SetItemAsync(string key, object data); + Task SetItemAsync(string key, T data); event EventHandler Changing; event EventHandler Changed; diff --git a/src/Blazored.SessionStorage/ISyncSessionStorageService.cs b/src/Blazored.SessionStorage/ISyncSessionStorageService.cs index b85ee84..a994f6a 100644 --- a/src/Blazored.SessionStorage/ISyncSessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISyncSessionStorageService.cs @@ -14,7 +14,7 @@ public interface ISyncSessionStorageService void RemoveItem(string key); - void SetItem(string key, object data); + void SetItem(string key, T data); event EventHandler Changing; event EventHandler Changed; diff --git a/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs b/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs new file mode 100644 index 0000000..f2436e3 --- /dev/null +++ b/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs @@ -0,0 +1,46 @@ +using System; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.Text.RegularExpressions; + +namespace Blazored.SessionStorage.JsonConverters +{ + /// + /// The new Json.NET doesn't support Timespan at this time + /// https://github.com/dotnet/corefx/issues/38641 + /// + public class TimespanJsonConverter : JsonConverter + { + /// + /// Format: Days.Hours:Minutes:Seconds:Milliseconds + /// + public const string TimeSpanFormatString = @"d\.hh\:mm\:ss\:FFF"; + + public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + var s = reader.GetString(); + if (string.IsNullOrWhiteSpace(s)) + { + return TimeSpan.Zero; + } + else + { + TimeSpan parsedTimeSpan; + if (!TimeSpan.TryParseExact(s, TimeSpanFormatString, null, out parsedTimeSpan)) + { + throw new FormatException($"Input timespan is not in an expected format : expected {Regex.Unescape(TimeSpanFormatString)}. Please retrieve this key as a string and parse manually."); + } + else + { + return parsedTimeSpan; + } + } + } + + public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options) + { + var timespanFormatted = $"{value.ToString(TimeSpanFormatString)}"; + writer.WriteStringValue(timespanFormatted); + } + } +} diff --git a/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs b/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs index a76e37f..4bb05e7 100644 --- a/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs +++ b/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs @@ -1,4 +1,7 @@ -using Microsoft.Extensions.DependencyInjection; +using System; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.StorageOptions; +using Microsoft.Extensions.DependencyInjection; namespace Blazored.SessionStorage { @@ -8,7 +11,23 @@ public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollecti { return services .AddScoped() - .AddScoped(); + .AddScoped() + .Configure(configureOptions => + { + configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); + }); } + + public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollection services, Action configure) + { + return services + .AddScoped() + .AddScoped() + .Configure(configureOptions => + { + configure?.Invoke(configureOptions); + configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); + }); + } } } diff --git a/src/Blazored.SessionStorage/SessionStorageService.cs b/src/Blazored.SessionStorage/SessionStorageService.cs index beb04d1..efb0922 100644 --- a/src/Blazored.SessionStorage/SessionStorageService.cs +++ b/src/Blazored.SessionStorage/SessionStorageService.cs @@ -1,4 +1,6 @@ -using Microsoft.JSInterop; +using Blazored.SessionStorage.StorageOptions; +using Microsoft.Extensions.Options; +using Microsoft.JSInterop; using System; using System.Text.Json; using System.Threading.Tasks; @@ -9,14 +11,19 @@ public class SessionStorageService : ISessionStorageService, ISyncSessionStorage { private readonly IJSRuntime _jSRuntime; private readonly IJSInProcessRuntime _jSInProcessRuntime; + private readonly JsonSerializerOptions _jsonOptions; - public SessionStorageService(IJSRuntime jSRuntime) + public event EventHandler Changing; + public event EventHandler Changed; + + public SessionStorageService(IJSRuntime jSRuntime, IOptions options) { - _jSRuntime = jSRuntime; - _jSInProcessRuntime = jSRuntime as IJSInProcessRuntime; + _jSRuntime = jSRuntime; + _jsonOptions = options.Value.JsonSerializerOptions; + _jSInProcessRuntime = jSRuntime as IJSInProcessRuntime; } - public async Task SetItemAsync(string key, object data) + public async Task SetItemAsync(string key, T data) { if (string.IsNullOrEmpty(key)) throw new ArgumentNullException(nameof(key)); @@ -24,9 +31,11 @@ public async Task SetItemAsync(string key, object data) var e = await RaiseOnChangingAsync(key, data); if (e.Cancel) - return; - - await _jSRuntime.InvokeAsync("sessionStorage.setItem", key, JsonSerializer.Serialize(data)); + return; + + var serialisedData = JsonSerializer.Serialize(data, _jsonOptions); + + await _jSRuntime.InvokeVoidAsync("sessionStorage.setItem", key, serialisedData); RaiseOnChanged(key, e.OldValue, data); } @@ -39,9 +48,9 @@ public async Task GetItemAsync(string key) var serialisedData = await _jSRuntime.InvokeAsync("sessionStorage.getItem", key); if (serialisedData == null) - return default(T); - - return JsonSerializer.Deserialize(serialisedData); + return default; + + return JsonSerializer.Deserialize(serialisedData, _jsonOptions); } public async Task RemoveItemAsync(string key) @@ -58,7 +67,7 @@ public async Task RemoveItemAsync(string key) public async Task KeyAsync(int index) => await _jSRuntime.InvokeAsync("sessionStorage.key", index); - public void SetItem(string key, object data) + public void SetItem(string key, T data) { if (string.IsNullOrEmpty(key)) throw new ArgumentNullException(nameof(key)); @@ -71,7 +80,9 @@ public void SetItem(string key, object data) if (e.Cancel) return; - _jSInProcessRuntime.Invoke("sessionStorage.setItem", key, JsonSerializer.Serialize(data)); + var serialisedData = JsonSerializer.Serialize(data, _jsonOptions); + + _jSInProcessRuntime.InvokeVoid("sessionStorage.setItem", key, serialisedData); RaiseOnChanged(key, e.OldValue, data); } @@ -87,9 +98,9 @@ public T GetItem(string key) var serialisedData = _jSInProcessRuntime.Invoke("sessionStorage.getItem", key); if (serialisedData == null) - return default(T); - - return JsonSerializer.Deserialize(serialisedData); + return default; + + return JsonSerializer.Deserialize(serialisedData, _jsonOptions); } public void RemoveItem(string key) @@ -100,7 +111,7 @@ public void RemoveItem(string key) if (_jSInProcessRuntime == null) throw new InvalidOperationException("IJSInProcessRuntime not available"); - _jSInProcessRuntime.Invoke("sessionStorage.removeItem", key); + _jSInProcessRuntime.InvokeVoid("sessionStorage.removeItem", key); } public void Clear() @@ -108,7 +119,7 @@ public void Clear() if (_jSInProcessRuntime == null) throw new InvalidOperationException("IJSInProcessRuntime not available"); - _jSInProcessRuntime.Invoke("sessionStorage.clear"); + _jSInProcessRuntime.InvokeVoid("sessionStorage.clear"); } public int Length() @@ -127,7 +138,6 @@ public string Key(int index) return _jSInProcessRuntime.Invoke("sessionStorage.key", index); } - public event EventHandler Changing; private async Task RaiseOnChangingAsync(string key, object data) { var e = new ChangingEventArgs @@ -156,7 +166,6 @@ private ChangingEventArgs RaiseOnChangingSync(string key, object data) return e; } - public event EventHandler Changed; private void RaiseOnChanged(string key, object oldValue, object data) { var e = new ChangedEventArgs diff --git a/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs b/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs new file mode 100644 index 0000000..b005f1a --- /dev/null +++ b/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs @@ -0,0 +1,18 @@ +using System.Text.Json; + +namespace Blazored.SessionStorage.StorageOptions +{ + public class SessionStorageOptions + { + public JsonSerializerOptions JsonSerializerOptions { get; } = new JsonSerializerOptions + { + DictionaryKeyPolicy = JsonNamingPolicy.CamelCase, + IgnoreNullValues = true, + IgnoreReadOnlyProperties = true, + PropertyNameCaseInsensitive = true, + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + ReadCommentHandling = JsonCommentHandling.Skip, + WriteIndented = false + }; + } +} From e4ef5c0e2402748f3661db84168442b1171fc3f8 Mon Sep 17 00:00:00 2001 From: Jan Johansson Date: Thu, 21 May 2020 19:53:14 +0200 Subject: [PATCH 03/20] Fixed typo in documentation --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 8a08178..eeaece1 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Blazored SessionStorage -A library to provide access to local storage in Blazor applications +A library to provide access to session storage in Blazor applications [![Build Status](https://dev.azure.com/blazored/SessionStorage/_apis/build/status/Blazored.SessionStorage?branchName=master)](https://dev.azure.com/blazored/SessionStorage/_build/latest?definitionId=1&branchName=master) -[![Nuget](https://img.shields.io/nuget/v/blazored.localstorage.svg)](https://www.nuget.org/packages/Blazored.SessionStorage/) +[![Nuget](https://img.shields.io/nuget/v/blazored.sessionstorage.svg)](https://www.nuget.org/packages/Blazored.SessionStorage/) ### Installing @@ -15,7 +15,7 @@ Or via the Visual Studio package manager. ### Setup -You will need to register the local storage services with the service collection in your _Startup.cs_ file in Blazor Server. +You will need to register the session storage services with the service collection in your _Startup.cs_ file in Blazor Server. ```c# public void ConfigureServices(IServiceCollection services) @@ -40,7 +40,7 @@ public static async Task Main(string[] args) ### Configuration -The local storage provides options that can be modified by you at registration in your _Startup.cs_ file in Blazor Server. +The session storage provides options that can be modified by you at registration in your _Startup.cs_ file in Blazor Server. ```c# @@ -69,14 +69,14 @@ public static async Task Main(string[] args) To use Blazored.SessionStorage in Blazor WebAssembly, inject the `ISessionStorageService` per the example below. ```c# -@inject Blazored.SessionStorage.ISessionStorageService localStorage +@inject Blazored.SessionStorage.ISessionStorageService sessionStorage @code { protected override async Task OnInitializedAsync() { - await localStorage.SetItemAsync("name", "John Smith"); - var name = await localStorage.GetItemAsync("name"); + await sessionStorage.SetItemAsync("name", "John Smith"); + var name = await sessionStorage.GetItemAsync("name"); } } @@ -85,14 +85,14 @@ To use Blazored.SessionStorage in Blazor WebAssembly, inject the `ISessionStorag With Blazor WebAssembly you also have the option of a synchronous API, if your use case requires it. You can swap the `ISessionStorageService` for `ISyncStorageService` which allows you to avoid use of `async`/`await`. For either interface, the method names are the same. ```c# -@inject Blazored.SessionStorage.ISyncStorageService localStorage +@inject Blazored.SessionStorage.ISyncStorageService sessionStorage @code { protected override void OnInitialized() { - localStorage.SetItem("name", "John Smith"); - var name = localStorage.GetItem("name"); + sessionStorage.SetItem("name", "John Smith"); + var name = sessionStorage.GetItem("name"); } } @@ -103,14 +103,14 @@ With Blazor WebAssembly you also have the option of a synchronous API, if your u **NOTE:** Due to pre-rendering in Blazor Server you can't perform any JS interop until the `OnAfterRender` lifecycle method. ```c# -@inject Blazored.SessionStorage.ISessionStorageService localStorage +@inject Blazored.SessionStorage.ISessionStorageService sessionStorage @code { protected override async Task OnAfterRenderAsync(bool firstRender) { - await localStorage.SetItemAsync("name", "John Smith"); - var name = await localStorage.GetItemAsync("name"); + await sessionStorage.SetItemAsync("name", "John Smith"); + var name = await sessionStorage.GetItemAsync("name"); } } From c39b8068c765168e236d8c144c8ba56d0accd358 Mon Sep 17 00:00:00 2001 From: Jan Johansson Date: Thu, 21 May 2020 19:56:15 +0200 Subject: [PATCH 04/20] Fixed another typo in documentation --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index eeaece1..fa8fafb 100644 --- a/README.md +++ b/README.md @@ -82,10 +82,10 @@ To use Blazored.SessionStorage in Blazor WebAssembly, inject the `ISessionStorag } ``` -With Blazor WebAssembly you also have the option of a synchronous API, if your use case requires it. You can swap the `ISessionStorageService` for `ISyncStorageService` which allows you to avoid use of `async`/`await`. For either interface, the method names are the same. +With Blazor WebAssembly you also have the option of a synchronous API, if your use case requires it. You can swap the `ISessionStorageService` for `ISyncSessionStorageService` which allows you to avoid use of `async`/`await`. For either interface, the method names are the same. ```c# -@inject Blazored.SessionStorage.ISyncStorageService sessionStorage +@inject Blazored.SessionStorage.ISyncSessionStorageService sessionStorage @code { @@ -127,7 +127,7 @@ The APIs available are: - KeyAsync() - ContainsKeyAsync() -- synchronous via `ISyncStorageService` (Synchronous methods are **only** available in Blazor WebAssembly): +- synchronous via `ISyncSessionStorageService` (Synchronous methods are **only** available in Blazor WebAssembly): - SetItem() - GetItem() - RemoveItem() From 9e9f4fc2f44fabd0845ecc1468e16f3592a02496 Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Fri, 22 May 2020 23:31:04 +0100 Subject: [PATCH 05/20] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 19b3826..c7e2638 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,16 +2,18 @@ trigger: - master pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-latest' variables: buildConfiguration: 'Release' steps: -- task: DotNetCoreInstaller@0 - displayName: 'Installing .NET Core SDK...' +- task: UseDotNet@2 + displayName: 'Use .NET Core sdk' inputs: - version: 3.0.100-rc1-014190 + packageType: sdk + version: 3.1.300 + installationPath: $(Agent.ToolsDirectory)/dotnet - task: NuGetToolInstaller@0 displayName: 'Installing Nuget Tools...' From 4dfecb7fd67d89236ba066abcbb9acb47c75b9f6 Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Fri, 22 May 2020 23:36:53 +0100 Subject: [PATCH 06/20] Bumped version number --- src/Blazored.SessionStorage/Blazored.SessionStorage.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj index c6c6963..5c59c0d 100644 --- a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj +++ b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj @@ -6,7 +6,7 @@ Blazored.SessionStorage Blazored.SessionStorage - 1.0.11 + 1.0.12 Chris Sainty A library to provide access to session storage in Blazor applications Copyright 2018 (c) Chris Sainty. All rights reserved. From bcdc6673819ada1e6d6c4559f84fa7cc53946b69 Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Wed, 22 Jul 2020 13:32:08 +0100 Subject: [PATCH 07/20] Update to GH Actions --- .github/workflows/ci-main.yml | 110 ++++++++++++++++++ .github/workflows/ci-pr.yml | 30 +++++ .github/workflows/release-drafter.yml | 2 +- Blazored.SessionStorage.sln | 2 +- azure-pipelines.yml | 36 ------ samples/BlazorClientSide/App.razor | 14 --- .../BlazorClientSide/BlazorClientSide.csproj | 23 ---- samples/BlazorClientSide/Pages/_Imports.razor | 1 - samples/BlazorClientSide/Program.cs | 16 --- samples/BlazorClientSide/Startup.cs | 19 --- samples/BlazorClientSide/wwwroot/index.html | 16 --- samples/BlazorWebAssembly/App.razor | 10 ++ .../BlazorWebAssembly.csproj | 19 +++ .../Pages/Index.razor | 0 .../Pages/Sync.razor | 0 samples/BlazorWebAssembly/Program.cs | 18 +++ .../Shared/MainLayout.razor | 0 .../Shared/NavMenu.razor | 4 +- .../_Imports.razor | 5 +- samples/BlazorWebAssembly/wwwroot/.nojekyll | 1 + samples/BlazorWebAssembly/wwwroot/404.html | 38 ++++++ .../wwwroot/css/bootstrap/bootstrap.min.css | 0 .../css/bootstrap/bootstrap.min.css.map | 0 .../wwwroot/css/open-iconic/FONT-LICENSE | 0 .../wwwroot/css/open-iconic/ICON-LICENSE | 0 .../wwwroot/css/open-iconic/README.md | 0 .../font/css/open-iconic-bootstrap.min.css | 0 .../open-iconic/font/fonts/open-iconic.eot | Bin .../open-iconic/font/fonts/open-iconic.otf | Bin .../open-iconic/font/fonts/open-iconic.svg | 0 .../open-iconic/font/fonts/open-iconic.ttf | Bin .../open-iconic/font/fonts/open-iconic.woff | Bin .../wwwroot/css/site.css | 0 samples/BlazorWebAssembly/wwwroot/favicon.ico | Bin 0 -> 32038 bytes samples/BlazorWebAssembly/wwwroot/index.html | 79 +++++++++++++ .../BlazorWebAssembly/wwwroot/js/decode.js | 1 + .../Blazored.SessionStorage.csproj | 34 ++++-- src/Blazored.SessionStorage/icon.png | Bin 0 -> 44398 bytes 38 files changed, 336 insertions(+), 142 deletions(-) create mode 100644 .github/workflows/ci-main.yml create mode 100644 .github/workflows/ci-pr.yml delete mode 100644 azure-pipelines.yml delete mode 100644 samples/BlazorClientSide/App.razor delete mode 100644 samples/BlazorClientSide/BlazorClientSide.csproj delete mode 100644 samples/BlazorClientSide/Pages/_Imports.razor delete mode 100644 samples/BlazorClientSide/Program.cs delete mode 100644 samples/BlazorClientSide/Startup.cs delete mode 100644 samples/BlazorClientSide/wwwroot/index.html create mode 100644 samples/BlazorWebAssembly/App.razor create mode 100644 samples/BlazorWebAssembly/BlazorWebAssembly.csproj rename samples/{BlazorClientSide => BlazorWebAssembly}/Pages/Index.razor (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/Pages/Sync.razor (100%) create mode 100644 samples/BlazorWebAssembly/Program.cs rename samples/{BlazorClientSide => BlazorWebAssembly}/Shared/MainLayout.razor (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/Shared/NavMenu.razor (86%) rename samples/{BlazorClientSide => BlazorWebAssembly}/_Imports.razor (62%) create mode 100644 samples/BlazorWebAssembly/wwwroot/.nojekyll create mode 100644 samples/BlazorWebAssembly/wwwroot/404.html rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/bootstrap/bootstrap.min.css (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/bootstrap/bootstrap.min.css.map (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/FONT-LICENSE (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/ICON-LICENSE (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/README.md (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/font/fonts/open-iconic.eot (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/font/fonts/open-iconic.otf (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/font/fonts/open-iconic.svg (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/open-iconic/font/fonts/open-iconic.woff (100%) rename samples/{BlazorClientSide => BlazorWebAssembly}/wwwroot/css/site.css (100%) create mode 100644 samples/BlazorWebAssembly/wwwroot/favicon.ico create mode 100644 samples/BlazorWebAssembly/wwwroot/index.html create mode 100644 samples/BlazorWebAssembly/wwwroot/js/decode.js create mode 100644 src/Blazored.SessionStorage/icon.png diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml new file mode 100644 index 0000000..b827250 --- /dev/null +++ b/.github/workflows/ci-main.yml @@ -0,0 +1,110 @@ +name: Build & Test Main + +on: + push: + branches: [ main ] + release: + types: [ published ] + +env: + NETCORE_VERSION: '3.1.301' + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: true + PROJECT_NAME: SessionStorage + GITHUB_FEED: https://nuget.pkg.github.com/Blazored/ + GITHUB_USER: chrissainty + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NUGET_FEED: https://api.nuget.org/v3/index.json + NUGET_KEY: ${{ secrets.NUGET_KEY }} + +jobs: + build: + name: Build, test and pack + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup .NET Core ${{ env.NETCORE_VERSION }} + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.NETCORE_VERSION }} + env: + NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + + - name: Restore + run: dotnet restore + + - name: Build + run: dotnet build -c Release --no-restore src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.csproj + + - name: Test + run: dotnet test -c Release + + - name: Pack + run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.*proj + + - name: Publish Sample Site + run: dotnet publish -c Release samples/BlazorWebAssembly/BlazorWebAssembly.csproj + + - name: Rewrite base href + uses: SteveSandersonMS/ghaction-rewrite-base-href@v1 + with: + html_path: samples/BlazorWebAssembly/bin/Release/netstandard2.1/publish/wwwroot/index.html + base_href: /${{ env.PROJECT_NAME }}/ + + - name: Deploy to Github Pages + uses: JamesIves/github-pages-deploy-action@releases/v3 + with: + ACCESS_TOKEN: $GITHUB_TOKEN + BASE_BRANCH: main # The branch the action should deploy from. + BRANCH: gh-pages # The branch the action should deploy to. + FOLDER: samples/BlazorWebAssembly/bin/Release/netstandard2.1/publish/wwwroot # The folder the action should deploy. + SINGLE_COMMIT: true + + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: nupkg + path: ./src/Blazored.${{ env.PROJECT_NAME }}/bin/Release/*.nupkg + prerelease: + needs: build + if: github.event_name != 'release' + runs-on: ubuntu-latest + steps: + - name: Download Artifact + uses: actions/download-artifact@v1 + with: + name: nupkg + - name: Push to GitHub Feed + run: | + for f in ./nupkg/*.nupkg + do + curl -vX PUT -u "$GITHUB_USER:$GITHUB_TOKEN" -F package=@$f $GITHUB_FEED + done + deploy: + needs: build + if: github.event_name == 'release' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.NETCORE_VERSION }} + - name: Create Release NuGet package + run: | + arrTag=(${GITHUB_REF//\// }) + VERSION="${arrTag[2]}" + echo Version: $VERSION + VERSION="${VERSION//v}" + echo Clean Version: $VERSION + dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.*proj + - name: Push to GitHub Feed + run: | + for f in ./nupkg/*.nupkg + do + curl -vX PUT -u "$GITHUB_USER:$GITHUB_TOKEN" -F package=@$f $GITHUB_FEED + done + - name: Push to NuGet Feed + run: dotnet nuget push ./nupkg/*.nupkg --source $NUGET_FEED --skip-duplicate --api-key $NUGET_KEY diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml new file mode 100644 index 0000000..bdc0578 --- /dev/null +++ b/.github/workflows/ci-pr.yml @@ -0,0 +1,30 @@ +name: Build & Test PR + +on: + pull_request: + branches: [ main ] + +env: + PROJECT_NAME: SessionStorage + NETCORE_VERSION: '3.1.301' + +jobs: + build: + name: Build and test + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Setting up .NET Core SDK ${{ env.NETCORE_VERSION }}... + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.NETCORE_VERSION }} + + - name: Restoring packages... + run: dotnet restore + + - name: Building project... + run: dotnet build --configuration Release --no-restore src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.csproj + + - name: Testing... + run: dotnet test --no-restore --verbosity normal \ No newline at end of file diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 3fb8ef3..d706705 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - master + - main jobs: update_release_draft: diff --git a/Blazored.SessionStorage.sln b/Blazored.SessionStorage.sln index 02b5d7e..126452d 100644 --- a/Blazored.SessionStorage.sln +++ b/Blazored.SessionStorage.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.SessionStorage", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F20B2AAB-FB71-4A1C-82FE-F1750B922BF6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorClientSide", "samples\BlazorClientSide\BlazorClientSide.csproj", "{D6953CE0-6AD5-434C-99AA-7FF1E26724D4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebAssembly", "samples\BlazorWebAssembly\BlazorWebAssembly.csproj", "{D6953CE0-6AD5-434C-99AA-7FF1E26724D4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerSide", "samples\BlazorServerSide\BlazorServerSide.csproj", "{767D657A-5410-4714-9477-99929D3FF709}" EndProject diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index c7e2638..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,36 +0,0 @@ -trigger: -- master - -pool: - vmImage: 'windows-latest' - -variables: - buildConfiguration: 'Release' - -steps: -- task: UseDotNet@2 - displayName: 'Use .NET Core sdk' - inputs: - packageType: sdk - version: 3.1.300 - installationPath: $(Agent.ToolsDirectory)/dotnet - -- task: NuGetToolInstaller@0 - displayName: 'Installing Nuget Tools...' - inputs: - versionSpec: '4.9.2' - -- script: dotnet build --configuration $(buildConfiguration) src/Blazored.SessionStorage/Blazored.SessionStorage.csproj - displayName: 'Building $(buildConfiguration)...' - -- task: DotNetCoreCLI@2 - displayName: 'Generating Nuget Package... ' - inputs: - command: pack - - arguments: --no-build - packagesToPack: src/Blazored.SessionStorage/Blazored.SessionStorage.csproj - configuration: $(buildConfiguration) - -- task: PublishBuildArtifacts@1 - displayName: 'Publishing Build Artifacts...' diff --git a/samples/BlazorClientSide/App.razor b/samples/BlazorClientSide/App.razor deleted file mode 100644 index 39b52f6..0000000 --- a/samples/BlazorClientSide/App.razor +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - -

Sorry, there's nothing at this address.

- - - \ No newline at end of file diff --git a/samples/BlazorClientSide/BlazorClientSide.csproj b/samples/BlazorClientSide/BlazorClientSide.csproj deleted file mode 100644 index 85df72f..0000000 --- a/samples/BlazorClientSide/BlazorClientSide.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netstandard2.0 - - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; - - 7.3 - 3.0 - - - - - - - - - - - - - diff --git a/samples/BlazorClientSide/Pages/_Imports.razor b/samples/BlazorClientSide/Pages/_Imports.razor deleted file mode 100644 index 0f24eda..0000000 --- a/samples/BlazorClientSide/Pages/_Imports.razor +++ /dev/null @@ -1 +0,0 @@ -@layout MainLayout diff --git a/samples/BlazorClientSide/Program.cs b/samples/BlazorClientSide/Program.cs deleted file mode 100644 index 755f692..0000000 --- a/samples/BlazorClientSide/Program.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Microsoft.AspNetCore.Blazor.Hosting; - -namespace BlazorClientSide -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) => - BlazorWebAssemblyHost.CreateDefaultBuilder() - .UseBlazorStartup(); - } -} diff --git a/samples/BlazorClientSide/Startup.cs b/samples/BlazorClientSide/Startup.cs deleted file mode 100644 index fb812ae..0000000 --- a/samples/BlazorClientSide/Startup.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Blazored.SessionStorage; -using Microsoft.AspNetCore.Components.Builder; -using Microsoft.Extensions.DependencyInjection; - -namespace BlazorClientSide -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddBlazoredSessionStorage(); - } - - public void Configure(IComponentsApplicationBuilder app) - { - app.AddComponent("app"); - } - } -} diff --git a/samples/BlazorClientSide/wwwroot/index.html b/samples/BlazorClientSide/wwwroot/index.html deleted file mode 100644 index 3ea544f..0000000 --- a/samples/BlazorClientSide/wwwroot/index.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Blazored SessionStorage - - - - - - Loading... - - - - diff --git a/samples/BlazorWebAssembly/App.razor b/samples/BlazorWebAssembly/App.razor new file mode 100644 index 0000000..9f62581 --- /dev/null +++ b/samples/BlazorWebAssembly/App.razor @@ -0,0 +1,10 @@ + + + + + + +

Sorry, but there's nothing here!

+ + + \ No newline at end of file diff --git a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj new file mode 100644 index 0000000..144cb19 --- /dev/null +++ b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj @@ -0,0 +1,19 @@ + + + + netstandard2.1 + 3.0 + + + + + + + + + + + + + + diff --git a/samples/BlazorClientSide/Pages/Index.razor b/samples/BlazorWebAssembly/Pages/Index.razor similarity index 100% rename from samples/BlazorClientSide/Pages/Index.razor rename to samples/BlazorWebAssembly/Pages/Index.razor diff --git a/samples/BlazorClientSide/Pages/Sync.razor b/samples/BlazorWebAssembly/Pages/Sync.razor similarity index 100% rename from samples/BlazorClientSide/Pages/Sync.razor rename to samples/BlazorWebAssembly/Pages/Sync.razor diff --git a/samples/BlazorWebAssembly/Program.cs b/samples/BlazorWebAssembly/Program.cs new file mode 100644 index 0000000..3bf7221 --- /dev/null +++ b/samples/BlazorWebAssembly/Program.cs @@ -0,0 +1,18 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using Blazored.SessionStorage; + +namespace BlazorWebAssembly +{ + public class Program + { + public static async Task Main(string[] args) + { + var builder = WebAssemblyHostBuilder.CreateDefault(args); + builder.RootComponents.Add("app"); + builder.Services.AddBlazoredSessionStorage(); + + await builder.Build().RunAsync(); + } + } +} diff --git a/samples/BlazorClientSide/Shared/MainLayout.razor b/samples/BlazorWebAssembly/Shared/MainLayout.razor similarity index 100% rename from samples/BlazorClientSide/Shared/MainLayout.razor rename to samples/BlazorWebAssembly/Shared/MainLayout.razor diff --git a/samples/BlazorClientSide/Shared/NavMenu.razor b/samples/BlazorWebAssembly/Shared/NavMenu.razor similarity index 86% rename from samples/BlazorClientSide/Shared/NavMenu.razor rename to samples/BlazorWebAssembly/Shared/NavMenu.razor index 4eca3b8..2a22094 100644 --- a/samples/BlazorClientSide/Shared/NavMenu.razor +++ b/samples/BlazorWebAssembly/Shared/NavMenu.razor @@ -1,5 +1,5 @@ 
- Blazored SessionStorage + Blazor Wasm @@ -11,7 +11,7 @@ Home - + Non Async diff --git a/samples/BlazorClientSide/_Imports.razor b/samples/BlazorWebAssembly/_Imports.razor similarity index 62% rename from samples/BlazorClientSide/_Imports.razor rename to samples/BlazorWebAssembly/_Imports.razor index 5c718e7..07e96c3 100644 --- a/samples/BlazorClientSide/_Imports.razor +++ b/samples/BlazorWebAssembly/_Imports.razor @@ -1,8 +1,9 @@ @using System.Net.Http @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web +@using Microsoft.AspNetCore.Components.Forms @using Microsoft.JSInterop -@using BlazorClientSide -@using BlazorClientSide.Shared +@using BlazorWebAssembly +@using BlazorWebAssembly.Shared @using Blazored.SessionStorage diff --git a/samples/BlazorWebAssembly/wwwroot/.nojekyll b/samples/BlazorWebAssembly/wwwroot/.nojekyll new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/samples/BlazorWebAssembly/wwwroot/.nojekyll @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/samples/BlazorWebAssembly/wwwroot/404.html b/samples/BlazorWebAssembly/wwwroot/404.html new file mode 100644 index 0000000..b4bc086 --- /dev/null +++ b/samples/BlazorWebAssembly/wwwroot/404.html @@ -0,0 +1,38 @@ + + + + + Single Page Apps for GitHub Pages + + + + + \ No newline at end of file diff --git a/samples/BlazorClientSide/wwwroot/css/bootstrap/bootstrap.min.css b/samples/BlazorWebAssembly/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/bootstrap/bootstrap.min.css rename to samples/BlazorWebAssembly/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/samples/BlazorClientSide/wwwroot/css/bootstrap/bootstrap.min.css.map b/samples/BlazorWebAssembly/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/bootstrap/bootstrap.min.css.map rename to samples/BlazorWebAssembly/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/FONT-LICENSE b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/FONT-LICENSE rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/ICON-LICENSE b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/ICON-LICENSE rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/README.md b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/README.md similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/README.md rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/README.md diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to samples/BlazorWebAssembly/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/samples/BlazorClientSide/wwwroot/css/site.css b/samples/BlazorWebAssembly/wwwroot/css/site.css similarity index 100% rename from samples/BlazorClientSide/wwwroot/css/site.css rename to samples/BlazorWebAssembly/wwwroot/css/site.css diff --git a/samples/BlazorWebAssembly/wwwroot/favicon.ico b/samples/BlazorWebAssembly/wwwroot/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a3a799985c43bc7309d701b2cad129023377dc71 GIT binary patch literal 32038 zcmeHwX>eTEbtY7aYbrGrkNjgie?1jXjZ#zP%3n{}GObKv$BxI7Sl;Bwl5E+Qtj&t8 z*p|m4DO#HoJC-FyvNnp8NP<{Na0LMnTtO21(rBP}?EAiNjWgeO?z`{3ZoURUQlV2d zY1Pqv{m|X_oO91|?^z!6@@~od!@OH>&BN;>c@O+yUfy5w>LccTKJJ&`-k<%M^Zvi( z<$dKp=jCnNX5Qa+M_%6g|IEv~4R84q9|7E=|Ho(Wz3f-0wPjaRL;W*N^>q%^KGRr7 zxbjSORb_c&eO;oV_DZ7ua!sPH=0c+W;`vzJ#j~-x3uj};50#vqo*0w4!LUqs*UCh9 zvy2S%$#8$K4EOa&e@~aBS65_hc~Mpu=454VT2^KzWqEpBA=ME|O;1cn?8p<+{MKJf zbK#@1wzL44m$k(?85=Obido7=C|xWKe%66$z)NrzRwR>?hK?_bbwT z@Da?lBrBL}Zemo1@!9pYRau&!ld17h{f+UV0sY(R{ET$PBB|-=Nr@l-nY6w8HEAw* zRMIQU`24Jl_IFEPcS=_HdrOP5yf81z_?@M>83Vv65$QFr9nPg(wr`Ke8 zaY4ogdnMA*F7a4Q1_uXadTLUpCk;$ZPRRJ^sMOch;rlbvUGc1R9=u;dr9YANbQ<4Z z#P|Cp9BP$FXNPolgyr1XGt$^lFPF}rmBF5rj1Kh5%dforrP8W}_qJL$2qMBS-#%-|s#BPZBSETsn_EBYcr(W5dq( z@f%}C|iN7)YN`^)h7R?Cg}Do*w-!zwZb9=BMp%Wsh@nb22hA zA{`wa8Q;yz6S)zfo%sl08^GF`9csI9BlGnEy#0^Y3b);M+n<(}6jziM7nhe57a1rj zC@(2ISYBL^UtWChKzVWgf%4LW2Tqg_^7jMw`C$KvU+mcakFjV(BGAW9g%CzSyM;Df z143=mq0oxaK-H;o>F3~zJ<(3-j&?|QBn)WJfP#JR zRuA;`N?L83wQt78QIA$(Z)lGQY9r^SFal;LB^qi`8%8@y+mwcGsf~nv)bBy2S7z~9 z=;X@Gglk)^jpbNz?1;`!J3QUfAOp4U$Uxm5>92iT`mek#$>s`)M>;e4{#%HAAcb^8_Ax%ersk|}# z0bd;ZPu|2}18KtvmIo8`1@H~@2ejwo(5rFS`Z4&O{$$+ch2hC0=06Jh`@p+p8LZzY z&2M~8T6X^*X?yQ$3N5EzRv$(FtSxhW>>ABUyp!{484f8(%C1_y)3D%Qgfl_!sz`LTXOjR&L!zPA0qH_iNS!tY{!^2WfD%uT}P zI<~&?@&))5&hPPHVRl9);TPO>@UI2d!^ksb!$9T96V(F){puTsn(}qt_WXNw4VvHj zf;6A_XCvE`Z@}E-IOaG0rs>K>^=Sr&OgT_p;F@v0VCN0Y$r|Lw1?Wjt`AKK~RT*kJ z2>QPuVgLNcF+XKno;WBv$yj@d_WFJbl*#*V_Cwzo@%3n5%z4g21G*PVZ)wM5$A{klYozmGlB zT@u2+s}=f}25%IA!yNcXUr!!1)z(Nqbhojg0lv@7@0UlvUMT)*r;M$d0-t)Z?B1@qQk()o!4fqvfr_I0r7 zy1(NdkHEj#Yu{K>T#We#b#FD=c1XhS{hdTh9+8gy-vkcdkk*QS@y(xxEMb1w6z<^~ zYcETGfB#ibR#ql0EiD;PR$L&Vrh2uRv5t_$;NxC;>7_S5_OXxsi8udY3BUUdi55Sk zcyKM+PQ9YMA%D1kH1q48OFG(Gbl=FmV;yk8o>k%0$rJ8%-IYsHclnYuTskkaiCGkUlkMY~mx&K}XRlKIW;odWIeuKjtbc^8bBOTqK zjj(ot`_j?A6y_h%vxE9o*ntx#PGrnK7AljD_r58ylE*oy@{IY%+mA^!|2vW_`>`aC{#3`#3;D_$^S^cM zRcF+uTO2sICledvFgNMU@A%M)%8JbSLq{dD|2|2Sg8vvh_uV6*Q?F&rKaV{v_qz&y z`f;stIb?Cb2!Cg7CG91Bhu@D@RaIrq-+o+T2fwFu#|j>lD6ZS9-t^5cx>p|?flqUA z;Cgs#V)O#`Aw4$Kr)L5?|7f4izl!;n0jux}tEW$&&YBXz9o{+~HhoiYDJ`w5BVTl&ARya=M7zdy$FEe}iGBur8XE>rhLj&_yDk5D4n2GJZ07u7%zyAfNtOLn;)M?h*Py-Xtql5aJOtL4U8e|!t? z((sc6&OJXrPdVef^wZV&x=Z&~uA7^ix8rly^rEj?#d&~pQ{HN8Yq|fZ#*bXn-26P^ z5!)xRzYO9{u6vx5@q_{FE4#7BipS#{&J7*>y}lTyV94}dfE%Yk>@@pDe&F7J09(-0|wuI|$of-MRfK51#t@t2+U|*s=W; z!Y&t{dS%!4VEEi$efA!#<<7&04?kB}Soprd8*jYv;-Qj~h~4v>{XX~kjF+@Z7<t?^|i z#>_ag2i-CRAM8Ret^rZt*^K?`G|o>1o(mLkewxyA)38k93`<~4VFI?5VB!kBh%NNU zxb8K(^-MU1ImWQxG~nFB-Un;6n{lQz_FfsW9^H$Xcn{;+W^ZcG$0qLM#eNV=vGE@# z1~k&!h4@T|IiI<47@pS|i?Qcl=XZJL#$JKve;booMqDUYY{(xcdj6STDE=n?;fsS1 ze`h~Q{CT$K{+{t+#*I1=&&-UU8M&}AwAxD-rMa=e!{0gQXP@6azBq9(ji11uJF%@5 zCvV`#*?;ZguQ7o|nH%bm*s&jLej#@B35gy32ZAE0`Pz@#j6R&kN5w{O4~1rhDoU zEBdU)%Nl?8zi|DR((u|gg~r$aLYmGMyK%FO*qLvwxK5+cn*`;O`16c!&&XT{$j~5k zXb^fbh1GT-CI*Nj{-?r7HNg=e3E{6rxuluPXY z5Nm8ktc$o4-^SO0|Es_sp!A$8GVwOX+%)cH<;=u#R#nz;7QsHl;J@a{5NUAmAHq4D zIU5@jT!h?kUp|g~iN*!>jM6K!W5ar0v~fWrSHK@})@6Lh#h)C6F6@)&-+C3(zO! z8+kV|B7LctM3DpI*~EYo>vCj>_?x&H;>y0*vKwE0?vi$CLt zfSJB##P|M2dEUDBPKW=9cY-F;L;h3Fs4E2ERdN#NSL7ctAC z?-}_a{*L@GA7JHJudxtDVA{K5Yh*k(%#x4W7w+^ zcb-+ofbT5ieG+@QG2lx&7!MyE2JWDP@$k`M;0`*d+oQmJ2A^de!3c53HFcfW_Wtv< zKghQ;*FifmI}kE4dc@1y-u;@qs|V75Z^|Q0l0?teobTE8tGl@EB?k#q_wUjypJ*R zyEI=DJ^Z+d*&}B_xoWvs27LtH7972qqMxVFcX9}c&JbeNCXUZM0`nQIkf&C}&skSt z^9fw@b^Hb)!^hE2IJq~~GktG#ZWwWG<`@V&ckVR&r=JAO4YniJewVcG`HF;59}=bf zLyz0uxf6MhuSyH#-^!ZbHxYl^mmBVrx) zyrb8sQ*qBd_WXm9c~Of$&ZP$b^)<~0%nt#7y$1Jg$e}WCK>TeUB{P>|b1FAB?%K7>;XiOfd}JQ`|IP#Vf%kVy zXa4;XFZ+>n;F>uX&3|4zqWK2u3c<>q;tzjsb1;d{u;L$-hq3qe@82(ob<3qom#%`+ z;vzYAs7TIMl_O75BXu|r`Qhc4UT*vN$3Oo0kAC!{f2#HexDy|qUpgTF;k{o6|L>7l z=?`=*LXaow1o;oNNLXsGTrvC)$R&{m=94Tf+2iTT3Y_Or z-!;^0a{kyWtO4vksG_3cyc7HQ0~detf0+2+qxq(e1NS251N}w5iTSrM)`0p8rem!j zZ56hGD=pHI*B+dd)2B`%|9f0goozCSeXPw3 z+58k~sI02Yz#lOneJzYcG)EB0|F+ggC6D|B`6}d0khAK-gz7U3EGT|M_9$ZINqZjwf>P zJCZ=ogSoE`=yV5YXrcTQZx@Un(64*AlLiyxWnCJ9I<5Nc*eK6eV1Mk}ci0*NrJ=t| zCXuJG`#7GBbPceFtFEpl{(lTm`LX=B_!H+& z>$*Hf}}y zkt@nLXFG9%v**s{z&{H4e?aqp%&l#oU8lxUxk2o%K+?aAe6jLojA& z_|J0<-%u^<;NT*%4)n2-OdqfctSl6iCHE?W_Q2zpJken#_xUJlidzs249H=b#g z?}L4-Tnp6)t_5X?_$v)vz`s9@^BME2X@w<>sKZ3=B{%*B$T5Nj%6!-Hr;I!Scj`lH z&2dHFlOISwWJ&S2vf~@I4i~(0*T%OFiuX|eD*nd2utS4$1_JM?zmp>a#CsVy6Er^z zeNNZZDE?R3pM?>~e?H_N`C`hy%m4jb;6L#8=a7l>3eJS2LGgEUxsau-Yh9l~o7=Yh z2mYg3`m5*3Ik|lKQf~euzZlCWzaN&=vHuHtOwK!2@W6)hqq$Zm|7`Nmu%9^F6UH?+ z@2ii+=iJ;ZzhiUKu$QB()nKk3FooI>Jr_IjzY6=qxYy;&mvi7BlQ?t4kRjIhb|2q? zd^K~{-^cxjVSj?!Xs=Da5IHmFzRj!Kzh~b!?`P7c&T9s77VLYB?8_?F zauM^)p;qFG!9PHLfIsnt43UnmV?Wn?Ki7aXSosgq;f?MYUuSIYwOn(5vWhb{f%$pn z4ySN-z}_%7|B);A@PA5k*7kkdr4xZ@s{e9j+9w;*RFm;XPDQwx%~;8iBzSKTIGKO z{53ZZU*OLr@S5=k;?CM^i#zkxs3Sj%z0U`L%q`qM+tP zX$aL;*^g$7UyM2Go+_4A+f)IQcy^G$h2E zb?nT$XlgTEFJI8GN6NQf%-eVn9mPilRqUbT$pN-|;FEjq@Ao&TxpZg=mEgBHB zU@grU;&sfmqlO=6|G3sU;7t8rbK$?X0y_v9$^{X`m4jZ_BR|B|@?ZCLSPPEzz`w1n zP5nA;4(kQFKm%$enjkkBxM%Y}2si&d|62L)U(dCzCGn56HN+i#6|nV-TGIo0;W;`( zW-y=1KF4dp$$mC_|6}pbb>IHoKQeZajXQB>jVR?u`R>%l1o54?6NnS*arpVopdEF; zeC5J3*M0p`*8lif;!irrcjC?(uExejsi~>4wKYwstGY^N@KY}TujLx`S=Cu+T=!dx zKWlPm->I**E{A*q-Z^FFT5$G%7Ij0_*Mo4-y6~RmyTzUB&lfae(WZfO>um}mnsDXPEbau-!13!!xd!qh*{C)6&bz0j1I{>y$D-S)b*)JMCPk!=~KL&6Ngin0p6MCOxF2L_R9t8N!$2Wpced<#`y!F;w zKTi5V_kX&X09wAIJ#anfg9Dhn0s7(C6Nj3S-mVn(i|C6ZAVq0$hE)874co};g z^hR7pe4lU$P;*ggYc4o&UTQC%liCXooIfkI3TNaBV%t~FRr}yHu7kjQ2J*3;e%;iW zvDVCh8=G80KAeyhCuY2LjrC!Od1rvF7h}zszxGV)&!)6ChP5WAjv-zQAMNJIG!JHS zwl?pLxC-V5II#(hQ`l)ZAp&M0xd4%cxmco*MIk?{BD=BK`1vpc}D39|XlV z{c&0oGdDa~TL2FT4lh=~1NL5O-P~0?V2#ie`v^CnANfGUM!b4F=JkCwd7Q`c8Na2q zJGQQk^?6w}Vg9-{|2047((lAV84uN%sK!N2?V(!_1{{v6rdgZl56f0zDMQ+q)jKzzu^ztsVken;=DjAh6G`Cw`Q4G+BjS+n*=KI~^K{W=%t zbD-rN)O4|*Q~@<#@1Vx$E!0W9`B~IZeFn87sHMXD>$M%|Bh93rdGf1lKoX3K651t&nhsl= zXxG|%@8}Bbrlp_u#t*DZX<}_0Yb{A9*1Pd_)LtqNwy6xT4pZrOY{s?N4)pPwT(i#y zT%`lRi8U#Ken4fw>H+N`{f#FF?ZxFlLZg7z7#cr4X>id z{9kUD`d2=w_Zlb{^c`5IOxWCZ1k<0T1D1Z31IU0Q2edsZ1K0xv$pQVYq2KEp&#v#Z z?{m@Lin;*Str(C2sfF^L>{R3cjY`~#)m>Wm$Y|1fzeS0-$(Q^z@} zEO*vlb-^XK9>w&Ef^=Zzo-1AFSP#9zb~X5_+){$(eB4K z8gtW+nl{q+CTh+>v(gWrsP^DB*ge(~Q$AGxJ-eYc1isti%$%nM<_&Ev?%|??PK`$p z{f-PM{Ym8k<$$)(F9)tqzFJ?h&Dk@D?Dt{4CHKJWLs8$zy6+(R)pr@0ur)xY{=uXFFzH_> z-F^tN1y(2hG8V)GpDg%wW0Px_ep~nIjD~*HCSxDi0y`H!`V*~RHs^uQsb1*bK1qGpmd zB1m`Cjw0`nLBF2|umz+a#2X$c?Lj;M?Lj;MUp*d>7j~ayNAyj@SLpeH`)BgRH}byy zyQSat!;U{@O(<<2fp&oQkIy$z`_CQ-)O@RN;QD9T4y|wIJ^%U#(BF%=`i49}j!D-) zkOwPSJaG03SMkE~BzW}b_v>LA&y)EEYO6sbdnTX*$>UF|JhZ&^MSb4}Tgbne_4n+C zwI8U4i~PI>7a3{kVa8|))*%C0|K+bIbmV~a`|G#+`TU#g zXW;bWIcWsQi9c4X*RUDpIfyoPY)2bI-r9)xulm1CJDkQd6u+f)_N=w1ElgEBjprPF z3o?Ly0RVeY_{3~fPVckRMxe2lM8hj!B8F)JO z!`AP6>u>5Y&3o9t0QxBpNE=lJx#NyIbp1gD zzUYBIPYHIv9ngk-Zt~<)62^1Zs1LLYMh@_tP^I7EX-9)Ed0^@y{k65Gp0KRcTmMWw zU|+)qx{#q0SL+4q?Q`i0>COIIF8a0Cf&C`hbMj?LmG9K&iW-?PJt*u)38tTXAP>@R zZL6uH^!RYNq$p>PKz7f-zvg>OKXcZ8h!%Vo@{VUZp|+iUD_xb(N~G|6c#oQK^nHZU zKg#F6<)+`rf~k*Xjjye+syV{bwU2glMMMs-^ss4`bYaVroXzn`YQUd__UlZL_mLs z(vO}k!~(mi|L+(5&;>r<;|OHnbXBE78LruP;{yBxZ6y7K3)nMo-{6PCI7gQi6+rF_ zkPod!Z8n}q46ykrlQS|hVB(}(2Kf7BCZ>Vc;V>ccbk2~NGaf6wGQH@W9&?Zt3v(h*P4xDrN>ex7+jH*+Qg z%^jH$&+*!v{sQ!xkWN4+>|b}qGvEd6ANzgqoVy5Qfws}ef2QqF{iiR5{pT}PS&yjo z>lron#va-p=v;m>WB+XVz|o;UJFdjo5_!RRD|6W{4}A2a#bZv)gS_`b|KsSH)Sd_JIr%<%n06TX&t{&!H#{)?4W9hlJ`R1>FyugOh3=D_{einr zu(Wf`qTkvED+gEULO0I*Hs%f;&=`=X4;N8Ovf28x$A*11`dmfy2=$+PNqX>XcG`h% zJY&A6@&)*WT^rC(Caj}2+|X|6cICm5h0OK0cGB_!wEKFZJU)OQ+TZ1q2bTx9hxnq& z$9ee|f9|0M^)#E&Pr4)f?o&DMM4w>Ksb{hF(0|wh+5_{vPow{V%TFzU2za&gjttNi zIyR9qA56dX52Qbv2aY^g`U7R43-p`#sO1A=KS2aKgfR+Yu^bQ*i-qu z%0mP;Ap)B~zZgO9lG^`325gOf?iUHF{~7jyGC)3L(eL(SQ70VzR~wLN18tnx(Cz2~ zctBl1kI)wAe+cxWHw*NW-d;=pd+>+wd$a@GBju*wFvabSaPtHiT!o#QFC+wBVwYo3s=y;z1jM+M=Fj!FZM>UzpL-eZzOT( zhmZmEfWa=%KE#V3-ZK5#v!Hzd{zc^{ctF~- z>DT-U`}5!fk$aj24`#uGdB7r`>oX5tU|d*b|N3V1lXmv%MGrvE(dXG)^-J*LA>$LE z7kut4`zE)v{@Op|(|@i#c>tM!12FQh?}PfA0`Bp%=%*RiXVzLDXnXtE@4B)5uR}a> zbNU}q+712pIrM`k^odG8dKtG$zwHmQI^c}tfjx5?egx3!e%JRm_64e+>`Ra1IRfLb z1KQ`SxmH{cZfyVS5m(&`{V}Y4j6J{b17`h6KWqZ&hfc(oR zxM%w!$F(mKy05kY&lco3%zvLCxBW+t*rxO+i=qGMvobx0-<7`VUu)ka`){=ew+Ovt zg%52_{&UbkUA8aJPWsk)gYWV4`dnxI%s?7^fGpq{ZQuu=VH{-t7w~K%_E<8`zS;V- zKTho*>;UQQul^1GT^HCt@I-q?)&4!QDgBndn?3sNKYKCQFU4LGKJ$n@Je$&w9@E$X z^p@iJ(v&`1(tq~1zc>0Vow-KR&vm!GUzT?Eqgnc)leZ9p)-Z*C!zqb=-$XG0 z^!8RfuQs5s>Q~qcz92(a_Q+KH?C*vCTr~UdTiR`JGuNH8v(J|FTiSEcPrBpmHRtmd zI2Jng0J=bXK);YY^rM?jzn?~X-Pe`GbAy{D)Y6D&1GY-EBcy%Bq?bKh?A>DD9DD!p z?{q02wno2sraGUkZv5dx+J8)&K$)No43Zr(*S`FEdL!4C)}WE}vJd%{S6-3VUw>Wp z?Aasv`T0^%P$2vE?L+Qhj~qB~K%eW)xH(=b_jU}TLD&BP*Pc9hz@Z=e0nkpLkWl}> z_5J^i(9Z7$(XG9~I3sY)`OGZ#_L06+Dy4E>UstcP-rU@xJ$&rxvo!n1Ao`P~KLU-8 z{zDgN4-&A6N!kPSYbQ&7sLufi`YtE2uN$S?e&5n>Y4(q#|KP!cc1j)T^QrUXMPFaP z_SoYO8S8G}Z$?AL4`;pE?7J5K8yWqy23>cCT2{=-)+A$X^-I9=e!@J@A&-;Ufc)`H}c(VI&;0x zrrGv()5mjP%jXzS{^|29?bLNXS0bC%p!YXI!;O457rjCEEzMkGf~B3$T}dXBO23tP z+Ci>;5UoM?C@bU@f9G1^X3=ly&ZeFH<@|RnOG--A&)fd)AUgjw?%izq{p(KJ`EP0v z2mU)P!+3t@X14DA=E2RR-|p${GZ9ETX=d+kJRZL$nSa0daI@&oUUxnZg0xd_xu>Vz lzF#z5%kSKX?YLH3ll^(hI(_`L*t#Iva2Ede*Z;>H_ + + + + + + Blazored SessionStorage + + + + + + + + + + + Loading... + +
+ An unhandled error has occurred. + Reload + 🗙 +
+ + + + + + + \ No newline at end of file diff --git a/samples/BlazorWebAssembly/wwwroot/js/decode.js b/samples/BlazorWebAssembly/wwwroot/js/decode.js new file mode 100644 index 0000000..9743172 --- /dev/null +++ b/samples/BlazorWebAssembly/wwwroot/js/decode.js @@ -0,0 +1 @@ +function BrotliDecodeClosure() { "use strict"; var z = new Int8Array(0); function c(e) { this.data = e, this.offset = 0 } var $ = Int32Array.from([1, 2, 3, 4, 0, 5, 17, 6, 16, 7, 8, 9, 10, 11, 12, 13, 14, 15]), D = Int32Array.from([3, 2, 1, 0, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2]), F = Int32Array.from([0, 0, 0, 0, -1, 1, -2, 2, -3, 3, -1, 1, -2, 2, -3, 3]), b = Int32Array.from([131072, 131076, 131075, 196610, 131072, 131076, 131075, 262145, 131072, 131076, 131075, 196610, 131072, 131076, 131075, 262149]), N = Int32Array.from([0, 0, 0, 0, 0, 4096, 9216, 21504, 35840, 44032, 53248, 63488, 74752, 87040, 93696, 100864, 104704, 106752, 108928, 113536, 115968, 118528, 119872, 121280, 122016]), B = Int32Array.from([0, 0, 0, 0, 10, 10, 11, 11, 10, 10, 10, 10, 10, 9, 9, 8, 7, 7, 8, 7, 7, 6, 6, 5, 5]), o = Int32Array.from([1, 5, 9, 13, 17, 25, 33, 41, 49, 65, 81, 97, 113, 145, 177, 209, 241, 305, 369, 497, 753, 1265, 2289, 4337, 8433, 16625]), r = Int32Array.from([2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8, 9, 10, 11, 12, 13, 24]), M = Int32Array.from([0, 1, 2, 3, 4, 5, 6, 8, 10, 14, 18, 26, 34, 50, 66, 98, 130, 194, 322, 578, 1090, 2114, 6210, 22594]), U = Int32Array.from([0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10, 12, 14, 24]), H = Int32Array.from([2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 18, 22, 30, 38, 54, 70, 102, 134, 198, 326, 582, 1094, 2118]), R = Int32Array.from([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10, 24]), O = Int32Array.from([0, 0, 8, 8, 0, 16, 8, 16, 16]), L = Int32Array.from([0, 8, 0, 8, 16, 0, 16, 8, 16]); function d(e, t) { if (0 != e.t) throw "State MUST be uninitialized"; var i; e.i = new Int32Array(6480), e.input = t, (i = e).o = new Int8Array(4160), i.s = 0, i.l = new Int16Array(2080), i.h = 32, i.p = 2048, i.u = 0, a(i); var n = function (e) { if (16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), 0 == ne(e, 1)) return 16; var t = ne(e, 3); return 0 != t ? 17 + t : 0 != (t = ne(e, 3)) ? 8 + t : 17 }(e); if (9 == n) throw "Invalid 'windowBits' code"; e.m = 1 << n, e.g = e.m - 16, e.t = 1 } function h(e) { if (16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), 0 == ne(e, 1)) return 0; var t = ne(e, 3); return 0 == t ? 1 : ne(e, t) + (1 << t) } function W(e, t, i) { var n = i.s >>> i.h, a = e[t += 255 & n] >> 16, o = 65535 & e[t]; return a <= 8 ? (i.h += a, o) : (t += o, t += (n & (1 << a) - 1) >>> 8, i.h += 8 + (e[t] >> 16), 65535 & e[t]) } function s(e, t, i) { 16 <= i.h && (i.s = i.l[i.p++] << 16 | i.s >>> 16, i.h -= 16); var n = W(e, t, i), a = r[n]; return 16 <= i.h && (i.s = i.l[i.p++] << 16 | i.s >>> 16, i.h -= 16), o[n] + (a <= 16 ? ne(i, a) : ae(i, a)) } function f(e, t) { for (var i = e[t]; 0 < t; t--)e[t] = e[t - 1]; e[0] = i } function p(e, t, i, n) { var a, o = 1; 2030 < n.p && te(n); var r = new Int32Array(e); if (16 <= n.h && (n.s = n.l[n.p++] << 16 | n.s >>> 16, n.h -= 16), 1 == (a = ne(n, 2))) { for (var s = e - 1, l = 0, c = new Int32Array(4), d = ne(n, 2) + 1; 0 != s;)s >>= 1, l++; for (var h = 0; h < d; h++)16 <= n.h && (n.s = n.l[n.p++] << 16 | n.s >>> 16, n.h -= 16), c[h] = ne(n, l) % e, r[c[h]] = 2; switch (r[c[0]] = 1, d) { case 2: r[c[1]] = 1; break; case 4: 1 == ne(n, 1) ? (r[c[2]] = 3, r[c[3]] = 3) : r[c[0]] = 2 }o = function (e, t) { for (var i = 0; i < t - 1; ++i)for (var n = i + 1; n < t; ++n)if (e[i] == e[n]) return 0; return 1 }(c, d) } else { var f = new Int32Array(18), p = 32, u = 0; for (h = a; h < 18 && 0 < p; h++) { var m = $[h]; 16 <= n.h && (n.s = n.l[n.p++] << 16 | n.s >>> 16, n.h -= 16); var g = n.s >>> n.h & 15; n.h += b[g] >> 16; var P = 65535 & b[g]; 0 != (f[m] = P) && (p -= 32 >> P, u++) } 0 != p && 1 != u && (o = 0), function (e, t, i, n) { var a = 0, o = 8, r = 0, s = 0, l = 32768, c = new Int32Array(32); for (Q(c, 0, 5, e, 18); a < t && 0 < l;) { 2030 < n.p && te(n), 16 <= n.h && (n.s = n.l[n.p++] << 16 | n.s >>> 16, n.h -= 16); var d = n.s >>> n.h & 31; n.h += c[d] >> 16; var h = 65535 & c[d]; if (h < 16) (r = 0) != (i[a++] = h) && (l -= 32768 >> (o = h)); else { var f = h - 14, p = 0; 16 == h && (p = o), s != p && (r = 0, s = p); var u = r; 0 < r && (r -= 2, r <<= f), 16 <= n.h && (n.s = n.l[n.p++] << 16 | n.s >>> 16, n.h -= 16); var m = (r += ne(n, f) + 3) - u; if (t < a + m) throw "symbol + repeatDelta > numSymbols"; for (var g = 0; g < m; g++)i[a++] = s; 0 != s && (l -= m << 15 - s) } } if (0 != l) throw "Unused space"; i.fill(0, a, t) }(f, e, r, n) } if (0 == o) throw "Can't readHuffmanCode"; Q(t, i, 8, r, e) } function l(e, t, i) { 2030 < i.p && te(i); var n = h(i) + 1; if (1 == n) return t.fill(0, 0, e), n; 16 <= i.h && (i.s = i.l[i.p++] << 16 | i.s >>> 16, i.h -= 16); var a = 0; 0 != ne(i, 1) && (a = ne(i, 4) + 1); var o = new Int32Array(1080); p(n + a, o, 0, i); for (var r = 0; r < e;) { 2030 < i.p && te(i), 16 <= i.h && (i.s = i.l[i.p++] << 16 | i.s >>> 16, i.h -= 16); var s = W(o, 0, i); if (0 == s) t[r] = 0, r++; else if (s <= a) { 16 <= i.h && (i.s = i.l[i.p++] << 16 | i.s >>> 16, i.h -= 16); for (var l = (1 << s) + ne(i, s); 0 != l;) { if (e <= r) throw "Corrupted context map"; t[r] = 0, r++, l-- } } else t[r] = s - a, r++ } return 16 <= i.h && (i.s = i.l[i.p++] << 16 | i.s >>> 16, i.h -= 16), 1 == ne(i, 1) && function (e, t) { for (var i = new Int32Array(256), n = 0; n < 256; n++)i[n] = n; for (n = 0; n < t; n++) { var a = 255 & e[n]; e[n] = i[a], 0 != a && f(i, a) } }(t, e), n } function _(e, t, i) { var n = e.P, a = 4 + 2 * t; 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16); var o = W(e.i, 1080 * t, e), r = s(e.i, 1080 * (t + 3), e); return 1 == o ? o = n[a + 1] + 1 : 0 == o ? o = n[a] : o -= 2, i <= o && (o -= i), n[a] = n[a + 1], n[a + 1] = o, r } function G(e) { e.$ = _(e, 0, e.v); var t = e.P[5]; e.X = t << 6, e.Y = 255 & e.k[e.X], e.C = e.j[e.Y]; var i = e.A[t]; e.q = i << 9, e.I = e.q + 256 } function J(e) { if (0 != e.T) return e.S = 9, void (e.t = 11); e.j = new Int32Array(0), e.D = new Int32Array(0), e.F = new Int32Array(0), 2030 < e.p && te(e), function (e) { if (16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), e.T = ne(e, 1), e.N = 0, e.B = 0, (e.M = 0) == e.T || 0 == ne(e, 1)) { var t = ne(e, 2) + 4; if (7 == t) { if (e.M = 1, 0 != ne(e, 1)) throw "Corrupted reserved bit"; var i = ne(e, 2); if (0 == i) return; for (var n = 0; n < i; n++) { if (16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), 0 == (a = ne(e, 8)) && n + 1 == i && 1 < i) throw "Exuberant nibble"; e.N |= a << 8 * n } } else for (n = 0; n < t; n++) { var a; if (16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), 0 == (a = ne(e, 4)) && n + 1 == t && 4 < t) throw "Exuberant nibble"; e.N |= a << 4 * n } e.N++, 0 == e.T && (e.B = ne(e, 1)) } }(e), 0 == e.N && 0 == e.M || (0 != e.B || 0 != e.M ? (oe(e), e.t = 0 != e.M ? 4 : 5) : e.t = 2, 0 == e.M && (e.U += e.N, e.U > 1 << 30 && (e.U = 1 << 30), e.H < e.m && function (e) { var t = e.m; if (t > e.U) { for (var i = e.U; i < t >> 1;)t >>= 1; 0 == e.T && t < 16384 && 16384 <= e.m && (t = 16384) } if (!(t <= e.H)) { var n = new Int8Array(t + 37); 0 != e.R.length && n.set(e.R.subarray(0, 0 + e.H), 0), e.R = n, e.H = t } }(e))) } function u(e, t, i) { return i <= 1 ? 1 << 28 : (p(i + 2, e.i, 1080 * t, e), p(26, e.i, 1080 * (t + 3), e), s(e.i, 1080 * (t + 3), e)) } function V(e) { e.v = h(e) + 1, e.$ = u(e, 0, e.v), e.O = h(e) + 1, e.L = u(e, 1, e.O), e.W = h(e) + 1, e._ = u(e, 2, e.W), 2030 < e.p && te(e), 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), e.G = ne(e, 2), e.J = 16 + (ne(e, 4) << e.G), e.V = (1 << e.G) - 1; var t = e.J + (48 << e.G); e.A = new Int8Array(e.v); for (var i = 0; i < e.v;) { for (var n = se(i + 96, e.v); i < n; ++i)16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), e.A[i] = ne(e, 2); 2030 < e.p && te(e) } e.k = new Int8Array(e.v << 6); var a = l(e.v << 6, e.k, e); e.K = 1; for (var o = 0; o < e.v << 6; o++)if (e.k[o] != o >> 6) { e.K = 0; break } e.Z = new Int8Array(e.W << 2); var r = l(e.W << 2, e.Z, e); e.j = m(256, a, e), e.D = m(704, e.O, e), e.F = m(t, r, e), e.X = 0, e.ee = 0, e.q = e.A[0] << 9, e.I = e.q + 256, e.Y = 0, e.C = e.j[0], e.te = e.D[0], e.P[4] = 1, e.P[5] = 0, e.P[6] = 1, e.P[7] = 0, e.P[8] = 1, e.P[9] = 0 } function K(e) { var t = e.R; if (e.N <= 0) return n(e), void (e.t = 1); var i = se(e.H - e.ie, e.N); if (function (e, t, i, n) { if (0 != (7 & e.h)) throw "Unaligned copyBytes"; for (; 32 != e.h && 0 != n;)t[i++] = e.s >>> e.h, e.h += 8, n--; if (0 == n) return; var a = se(k(e), n >> 1); if (0 < a) { var o = e.p << 1, r = a << 1; t.set(e.o.subarray(o, o + r), i), i += r, n -= r, e.p += a } if (0 == n) return; if (0 < k(e)) { for (16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16); 0 != n;)t[i++] = e.s >>> e.h, e.h += 8, n--; return ie(e, 0) } for (; 0 < n;) { var s = C(e.input, t, i, n); if (-1 == s) throw "Unexpected end of input"; i += s, n -= s } }(e, t, e.ie, i), e.N -= i, e.ie += i, e.ie == e.H) return e.S = 5, void (e.t = 11); n(e), e.t = 1 } function m(e, t, i) { for (var n = new Int32Array(t + 1080 * t), a = t, o = 0; o < t; o++)n[o] = a, p(e, n, a, i), a += 1080; return n } function Z(e) { var t = e.H; return 0 != e.ne && (t = se(t, e.ae + e.oe - e.re)), t } function g(e) { if (0 == e.t) throw "Can't decompress until initialized"; if (10 == e.t) throw "Can't decompress after close"; for (var t, i, n, a, o, r, s, l = Z(e), c = e.H - 1, d = e.R; 9 != e.t;)switch (e.t) { case 1: if (e.N < 0) throw "Invalid metablock length"; J(e), l = Z(e), c = e.H - 1, d = e.R; continue; case 2: V(e), e.t = 3; case 3: if (e.N <= 0) { e.t = 1; continue } 2030 < e.p && te(e), 0 == e.L && ((s = e).L = _(s, 1, s.O), s.te = s.D[s.P[7]]), e.L--, 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16); var h = W(e.D, e.te, e), f = h >>> 6; e.se = 0, 2 <= f && (f -= 2, e.se = -1); var p = O[f] + (h >>> 3 & 7); 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16); var u = U[p], m = u <= 16 ? ne(e, u) : ae(e, u); e.le = M[p] + m; var g = L[f] + (7 & h); 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16); var P = R[g], $ = P <= 16 ? ne(e, P) : ae(e, P); e.ce = H[g] + $, e.de = 0, e.t = 6; case 6: if (0 != e.K) { for (; e.de < e.le;)if (2030 < e.p && te(e), 0 == e.$ && G(e), e.$--, 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), d[e.ie] = W(e.j, e.C, e), e.ie++, e.de++, e.ie >= l) { e.S = 6, e.t = 11; break } } else for (var b = 255 & d[e.ie - 1 & c], v = 255 & d[e.ie - 2 & c]; e.de < e.le;) { 2030 < e.p && te(e), 0 == e.$ && G(e); var y = 255 & e.k[e.X + (re[e.q + b] | re[e.I + v])]; if (e.$--, v = b, 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), b = W(e.j, e.j[y], e), d[e.ie] = b, e.ie++, e.de++, e.ie >= l) { e.S = 6, e.t = 11; break } } if (6 != e.t) continue; if (e.N -= e.le, e.N <= 0) { e.t = 3; continue } if (e.se < 0 && (2030 < e.p && te(e), 0 == e._ && ((r = e)._ = _(r, 2, r.W), r.ee = r.P[9] << 2), e._--, 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), e.se = W(e.F, e.F[255 & e.Z[e.ee + (4 < e.ce ? 3 : e.ce - 2)]], e), e.se >= e.J)) { e.se -= e.J; var X = e.se & e.V; e.se >>>= e.G; var w = 1 + (e.se >>> 1), Y = (2 + (1 & e.se) << w) - 4; 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16); var Q = w <= 16 ? ne(e, w) : ae(e, w); e.se = e.J + X + (Y + Q << e.G) } if (e.he = (n = e.se, a = e.P, o = e.fe, n < 16 ? (o += D[n], a[o &= 3] + F[n]) : n - 16 + 1), e.he < 0) throw "Negative distance"; if (e.maxDistance != e.g && e.ie < e.g ? e.maxDistance = e.ie : e.maxDistance = e.g, e.he > e.maxDistance) { e.t = 8; continue } if (0 < e.se && (e.P[3 & e.fe] = e.he, e.fe++), e.ce > e.N) throw "Invalid backward reference"; e.de = 0, e.t = 7; case 7: var k = e.ie - e.he & c, x = e.ie, C = e.ce - e.de, j = k + C, A = x + C; if (j < c && A < c) { if (C < 12 || x < j && k < A) for (var q = 0; q < C; q += 4)d[x++] = d[k++], d[x++] = d[k++], d[x++] = d[k++], d[x++] = d[k++]; else d.copyWithin(x, k, j); e.de += C, e.N -= C, e.ie += C } else for (; e.de < e.ce;)if (d[e.ie] = d[e.ie - e.he & c], e.N--, e.ie++, e.de++, e.ie >= l) { e.S = 7, e.t = 11; break } 7 == e.t && (e.t = 3); continue; case 8: if (!(4 <= e.ce && e.ce <= 24)) throw "Invalid backward reference"; Y = N[e.ce]; var I = e.he - e.maxDistance - 1, T = B[e.ce], S = I >>> T; if (Y += (I & (1 << T) - 1) * e.ce, !(S < 121)) throw "Invalid backward reference"; var E = ee(d, e.ie, z, Y, e.ce, S); if (e.ie += E, e.N -= E, e.ie >= l) { e.S = 3, e.t = 11; continue } e.t = 3; continue; case 4: for (; 0 < e.N;)2030 < e.p && te(e), 16 <= e.h && (e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16), ne(e, 8), e.N--; e.t = 1; continue; case 5: K(e); continue; case 11: e.pe = se(e.ie, e.H), e.t = 12; case 12: if (0 == (void 0, 0 != (i = se((t = e).oe - t.re, t.pe - t.ae)) && (t.ue.set(t.R.subarray(t.ae, t.ae + i), t.me + t.re), t.re += i, t.ae += i), t.re < t.oe ? 1 : 0)) return; e.ie >= e.g && (e.maxDistance = e.g), e.ie >= e.H && (e.ie > e.H && d.copyWithin(0, e.H, e.ie), e.ie &= c, e.ae = 0), e.t = e.S; continue; default: throw "Unexpected state " + e.t }if (9 == e.t) { if (e.N < 0) throw "Invalid metablock length"; oe(e), ie(e, 1) } } var P = new Int32Array(363), v = new Int8Array(217), y = new Int32Array(51); function ee(e, t, i, n, a, o) { for (var r = t, s = 3 * o, l = y[P[s]], c = P[s + 1], d = y[P[s + 2]]; 0 != v[l];)e[r++] = v[l++]; var h = 12 <= c ? c - 11 : 0; a < h && (h = a), n += h, a -= h; for (var f = a -= c <= 9 ? c : 0; 0 < f;)e[r++] = i[n++], f--; if (11 == c || 10 == c) { var p = r - a; for (10 == c && (a = 1); 0 < a;) { var u = 255 & e[p]; u < 192 ? (97 <= u && u <= 122 && (e[p] ^= 32), p += 1, a -= 1) : u < 224 ? (e[p + 1] ^= 32, p += 2, a -= 2) : (e[p + 2] ^= 5, p += 3, a -= 3) } } for (; 0 != v[d];)e[r++] = v[d++]; return r - t } function X(e, t) { for (var i = 1 << t - 1; 0 != (e & i);)i >>= 1; return (e & i - 1) + i } function w(e, t, i, n, a) { for (; e[t + (n -= i)] = a, 0 < n;); } function Y(e, t, i) { for (var n = 1 << t - i; t < 15 && !((n -= e[t]) <= 0);)t++, n <<= 1; return t - i } function Q(e, t, i, n, a) { var o, r, s = new Int32Array(a), l = new Int32Array(16), c = new Int32Array(16); for (r = 0; r < a; r++)l[n[r]]++; c[1] = 0; for (var d = 1; d < 15; d++)c[d + 1] = c[d] + l[d]; for (r = 0; r < a; r++)0 != n[r] && (s[c[n[r]]++] = r); var h = i, f = 1 << h, p = f; if (1 != c[15]) { r = o = 0; d = 1; for (var u = 2; d <= i; d++, u <<= 1)for (; 0 < l[d]; l[d]--)w(e, t + o, u, f, d << 16 | s[r++]), o = X(o, d); var m = p - 1, g = -1, P = t; for (d = i + 1, u = 2; d <= 15; d++, u <<= 1)for (; 0 < l[d]; l[d]--)(o & m) != g && (P += f, p += f = 1 << (h = Y(l, d, i)), e[t + (g = o & m)] = h + i << 16 | P - t - g), w(e, P + (o >> i), u, f, d - i << 16 | s[r++]), o = X(o, d) } else for (o = 0; o < p; o++)e[t + o] = s[0] } function te(e) { if (0 != e.u) { if (-2 <= k(e)) return; throw "No more input" } var t = e.p << 1, i = 4096 - t; for (e.o.copyWithin(0, t, 4096), e.p = 0; i < 4096;) { var n = 4096 - i, a = C(e.input, e.o, i, n); if (a <= 0) { e.u = 1, e.ge = i, i += 1; break } i += a } !function (e, t) { for (var i = e.o, n = t >> 1, a = e.l, o = 0; o < n; ++o)a[o] = 255 & i[2 * o] | (255 & i[2 * o + 1]) << 8 }(e, i) } function ie(e, t) { if (0 != e.u) { var i = (e.p << 1) + (e.h + 7 >> 3) - 4; if (i > e.ge) throw "Read after end"; if (0 != t && i != e.ge) throw "Unused bytes after end" } } function ne(e, t) { var i = e.s >>> e.h & (1 << t) - 1; return e.h += t, i } function ae(e, t) { var i = ne(e, 16); return e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16, i | ne(e, t - 16) << 16 } function a(e) { 2030 < e.p && te(e), ie(e, 0), e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16, e.s = e.l[e.p++] << 16 | e.s >>> 16, e.h -= 16 } function n(e) { 32 == e.h && a(e) } function oe(e) { var t = 32 - e.h & 7; if (0 != t && 0 != ne(e, t)) throw "Corrupted padding bits" } function k(e) { var t = 2048; return 0 != e.u && (t = e.ge + 1 >> 1), t - e.p } !function (e, t, i, n, a) { for (var o = n.length, r = 1, s = 0; s < o; ++s) { var l = n.charCodeAt(s); 35 == (e[s] = l) && (t[r++] = s + 1, e[s] = 0) } for (s = 0; s < 363; ++s)i[s] = a.charCodeAt(s) - 32 }(v, y, P, '# #s #, #e #.# the #.com/#\xc2\xa0# of # and # in # to #"#">#\n#]# for # a # that #. # with #\'# from # by #. The # on # as # is #ing #\n\t#:#ed #(# at #ly #="# of the #. This #,# not #er #al #=\'#ful #ive #less #est #ize #ous #', " !! ! , *! &! \" ! ) * * - ! # ! #!*! + ,$ ! - % . / # 0 1 . \" 2 3!* 4% ! # / 5 6 7 8 0 1 & $ 9 + : ; < ' != > ?! 4 @ 4 2 & A *# ( B C& ) % ) !*# *-% A +! *. D! %' & E *6 F G% ! *A *% H! D I!+! J!+ K +- *4! A L!*4 M N +6 O!*% +.! K *G P +%( ! G *D +D Q +# *K!*G!+D!+# +G +A +4!+% +K!+4!*D!+K!*K"); var re = new Int32Array(2048); function x() { this.R = new Int8Array(0), this.A = new Int8Array(0), this.k = new Int8Array(0), this.Z = new Int8Array(0), this.ue = new Int8Array(0), this.o = new Int8Array(0), this.l = new Int16Array(0), this.Pe = new Int32Array(0), this.P = new Int32Array(0), this.i = new Int32Array(0), this.j = new Int32Array(0), this.D = new Int32Array(0), this.F = new Int32Array(0), this.t = 0, this.S = 0, this.s = 0, this.h = 0, this.p = 0, this.ge = 0, this.u = 0, this.N = 0, this.T = 0, this.B = 0, this.M = 0, this.$ = 0, this.v = 0, this.L = 0, this.O = 0, this._ = 0, this.W = 0, this.ie = 0, this.maxDistance = 0, this.fe = 0, this.K = 0, this.Y = 0, this.C = 0, this.de = 0, this.le = 0, this.X = 0, this.ee = 0, this.q = 0, this.I = 0, this.te = 0, this.se = 0, this.J = 0, this.V = 0, this.G = 0, this.he = 0, this.ce = 0, this.g = 0, this.m = 0, this.H = 0, this.U = 0, this.me = 0, this.oe = 0, this.re = 0, this.ae = 0, this.pe = 0, this.ne = 0, this.input = null, this.R = new Int8Array(0), this.P = new Int32Array(10), this.P[0] = 16, this.P[1] = 15, this.P[2] = 11, this.P[3] = 4 } !function (e, t, i) { for (var n = 0; n < 256; ++n)e[n] = 63 & n, e[512 + n] = n >> 2, e[1792 + n] = 2 + (n >> 6); for (n = 0; n < 128; ++n)e[1024 + n] = 4 * (t.charCodeAt(n) - 32); for (n = 0; n < 64; ++n)e[1152 + n] = 1 & n, e[1216 + n] = 2 + (1 & n); for (var a = 1280, o = 0; o < 19; ++o) { var r = 3 & o, s = i.charCodeAt(o) - 32; for (n = 0; n < s; ++n)e[a++] = r } for (n = 0; n < 16; ++n)e[1792 + n] = 1, e[2032 + n] = 6; for (e[1792] = 0, e[2047] = 7, n = 0; n < 256; ++n)e[1536 + n] = e[1792 + n] << 3 }(re, " !! ! \"#$##%#$&'##(#)#++++++++++((&*'##,---,---,-----,-----,-----&#'###.///.///./////./////./////&#'# ", "A/* ': & : $ \x81 @"); var e = new Int8Array(122784); function se(e, t) { return e <= t ? e : t } function C(e, t, i, n) { if (null == e) return -1; var a = se(e.offset + n, e.data.length), o = a - e.offset; return t.set(e.data.subarray(e.offset, a), i), e.offset += o, o } return function (e, t, i, n) { var a = function (e) { for (var t = e.length, i = new Int8Array(t), n = 0; n < t; ++n)i[n] = e.charCodeAt(n); return i }(t + i); if (a.length != e.length) throw "Corrupted brotli dictionary"; for (var o = 0, r = n.length, s = 0; s < r; s += 2) { var l = n.charCodeAt(s) - 36, c = n.charCodeAt(s + 1) - 36; o += l; for (var d = 0; d < c; ++d)a[o] |= 128, o++ } e.set(a) }(e, 'timedownlifeleftbackcodedatashowonlysitecityopenjustlikefreeworktextyearoverbodyloveformbookplaylivelinehelphomesidemorewordlongthemviewfindpagedaysfullheadtermeachareafromtruemarkableuponhighdatelandnewsevennextcasebothpostusedmadehandherewhatnameLinkblogsizebaseheldmakemainuser\') +holdendswithNewsreadweresigntakehavegameseencallpathwellplusmenufilmpartjointhislistgoodneedwayswestjobsmindalsologorichuseslastteamarmyfoodkingwilleastwardbestfirePageknowaway.pngmovethanloadgiveselfnotemuchfeedmanyrockicononcelookhidediedHomerulehostajaxinfoclublawslesshalfsomesuchzone100%onescareTimeracebluefourweekfacehopegavehardlostwhenparkkeptpassshiproomHTMLplanTypedonesavekeepflaglinksoldfivetookratetownjumpthusdarkcardfilefearstaykillthatfallautoever.comtalkshopvotedeepmoderestturnbornbandfellroseurl(skinrolecomeactsagesmeetgold.jpgitemvaryfeltthensenddropViewcopy1.0"stopelseliestourpack.gifpastcss?graymean>rideshotlatesaidroadvar feeljohnrickportfast\'UA-deadpoorbilltypeU.S.woodmust2px;Inforankwidewantwalllead[0];paulwavesure$(\'#waitmassarmsgoesgainlangpaid!-- lockunitrootwalkfirmwifexml"songtest20pxkindrowstoolfontmailsafestarmapscorerainflowbabyspansays4px;6px;artsfootrealwikiheatsteptriporg/lakeweaktoldFormcastfansbankveryrunsjulytask1px;goalgrewslowedgeid="sets5px;.js?40pxif (soonseatnonetubezerosentreedfactintogiftharm18pxcamehillboldzoomvoideasyringfillpeakinitcost3px;jacktagsbitsrolleditknewnear\x3c!--growJSONdutyNamesaleyou lotspainjazzcoldeyesfishwww.risktabsprev10pxrise25pxBlueding300,ballfordearnwildbox.fairlackverspairjunetechif(!pickevil$("#warmlorddoespull,000ideadrawhugespotfundburnhrefcellkeystickhourlossfuel12pxsuitdealRSS"agedgreyGET"easeaimsgirlaids8px;navygridtips#999warsladycars); }php?helltallwhomzh:e*/\r\n 100hall.\n\nA7px;pushchat0px;crew*/ericmostguidbelldeschairmathatom/imgRluckcent000;tinygonehtmlselldrugFREEnodenick?id=losenullvastwindRSS wearrelybeensamedukenasacapewishgulfT23:hitsslotgatekickblurthey15px\'\'););">msiewinsbirdsortbetaseekT18:ordstreemall60pxfarmb\0\x19sboys[0].\');"POSTbearkids);}}marytend(UK)quadzh:f-siz----prop\');\rliftT19:viceandydebt>RSSpoolneckblowT16:doorevalT17:letsfailoralpollnovacolsgene b\0\x14softrometillross

pourfadepinkmini)|!(minezh:hbarshear00);milk --\x3eironfreddiskwentsoilputs/js/holyT22:ISBNT20:adamsees

json\', \'contT21: RSSloopasiamoon

soulLINEfortcartT14:

80px!--<9px;T04:mike:46ZniceinchYorkricezh:d\'));puremageparatonebond:37Z_of_\']);000,zh:gtankyardbowlbush:56ZJava30px\n|}\n%C3%:34ZjeffEXPIcashvisagolfsnowzh:iquer.csssickmeatmin.binddellhirepicsrent:36ZHTTP-201fotowolfEND xbox:54ZBODYdick;\n}\nexit:35Zvarsbeat\'});diet999;anne}}sonyguysfuckpipe|-\n!002)ndow[1];[];\nLog salt\r\n\t\tbangtrimbath){\r\n00px\n});ko:lfeesad>\rs:// [];tollplug(){\n{\r\n .js\'200pdualboat.JPG);\n}quot);\n\n\');\n\r\n}\r201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037201320122011201020092008200720062005200420032002200120001999199819971996199519941993199219911990198919881987198619851984198319821981198019791978197719761975197419731972197119701969196819671966196519641963196219611960195919581957195619551954195319521951195010001024139400009999comomC!sesteestaperotodohacecadaaC1obiendC-aasC-vidacasootroforosolootracualdijosidograntipotemadebealgoquC)estonadatrespococasabajotodasinoaguapuesunosantediceluisellamayozonaamorpisoobraclicellodioshoracasiP7P0P=P0P>PP>Q\x02P8P7P=P>P4P>Q\x02P>P6P5P>P=P8Q\x05P\x1dP0P5P5P1Q\vPP2Q\vP2P>P\x1dP>P>P1P\x1fP>P;P8P=P8P P$P\x1dP5P\x1cQ\vQ\x02Q\vP\x1eP=P8Pthing.org/multiheardPowerstandtokensolid(thisbringshipsstafftriedcallsfullyfactsagentThis //--\x3eadminegyptEvent15px;Emailtrue"crossspentblogsbox">notedleavechinasizesguest

robotheavytrue,sevengrandcrimesignsawaredancephase>\x3c!--en_US'200px_namelatinenjoyajax.ationsmithU.S. holdspeterindianav">chainscorecomesdoingpriorShare1990sromanlistsjapanfallstrialowneragreeabusealertopera"-//WcardshillsteamsPhototruthclean.php?saintmetallouismeantproofbriefrow">genretrucklooksValueFrame.net/--\x3e\n\n\x3c!--POST"ocean
floorspeakdepth sizebankscatchchart20px;aligndealswould50px;url="parksmouseMost ...drugs\x3c!-- aprilidealallenexactforthcodeslogicView seemsblankports (200saved_linkgoalsgrantgreekhomesringsrated30px;whoseparse();" Blocklinuxjonespixel\');">);if(-leftdavidhorseFocusraiseboxesTrackementbar">.src=toweralt="cablehenry24px;setupitalysharpminortastewantsthis.resetwheelgirls/css/100%;clubsstuffbiblevotes 1000korea});\r\nbandsqueue= {};80px;cking{\r\n\t\taheadclockirishlike ratiostatsForm"yahoo)[0];AboutfindsdebugtasksURL =cells})();12px;primetellsturns0x600.jpg"spainbeachtaxesmicroangel--\x3e\r\nname=diegopage swiss--\x3e\n\n#fff;">Log.com"treatsheet) && 14px;sleepntentfiledja:c\x03id="cName"worseshots-box-delta\n<bears:48Z spendbakershops= "";php">ction13px;brianhellosize=o=%2F joinmaybe, fjsimg" ")[0]MTopBType"newlyDanskczechtrailknowsfaq">zh-cn10);\n-1");type=bluestrulydavis.js\';>\r\n\r\nform jesus100% menu.\r\n\t\r\nwalesrisksumentddingb-likteachgif" vegasdanskeestishqipsuomisobredesdeentretodospuedeaC1osestC!tienehastaotrospartedondenuevohacerformamismomejormundoaquC-dC-assC3loayudafechatodastantomenosdatosotrassitiomuchoahoralugarmayorestoshorastenerantesfotosestaspaC-snuevasaludforosmedioquienmesespoderchileserC!vecesdecirjosC)estarventagrupohechoellostengoamigocosasnivelgentemismaairesjuliotemashaciafavorjuniolibrepuntobuenoautorabrilbuenatextomarzosaberlistaluegocC3moenerojuegoperC:haberestoynuncamujervalorfueralibrogustaigualvotoscasosguC-apuedosomosavisousteddebennochebuscafaltaeurosseriedichocursoclavecasasleC3nplazolargoobrasvistaapoyojuntotratavistocrearcampohemoscincocargopisosordenhacenC!readiscopedrocercapuedapapelmenorC:tilclarojorgecalleponertardenadiemarcasigueellassiglocochemotosmadreclaserestoniC1oquedapasarbancohijosviajepabloC)stevienereinodejarfondocanalnorteletracausatomarmanoslunesautosvillavendopesartipostengamarcollevapadreunidovamoszonasambosbandamariaabusomuchasubirriojavivirgradochicaallC-jovendichaestantalessalirsuelopesosfinesllamabuscoC)stalleganegroplazahumorpagarjuntadobleislasbolsabaC1ohablaluchaC\x01readicenjugarnotasvalleallC!cargadolorabajoestC)gustomentemariofirmacostofichaplatahogarartesleyesaquelmuseobasespocosmitadcielochicomiedoganarsantoetapadebesplayaredessietecortecoreadudasdeseoviejodeseaaguas"domaincommonstatuseventsmastersystemactionbannerremovescrollupdateglobalmediumfilternumberchangeresultpublicscreenchoosenormaltravelissuessourcetargetspringmodulemobileswitchphotosborderregionitselfsocialactivecolumnrecordfollowtitle>eitherlengthfamilyfriendlayoutauthorcreatereviewsummerserverplayedplayerexpandpolicyformatdoublepointsseriespersonlivingdesignmonthsforcesuniqueweightpeopleenergynaturesearchfigurehavingcustomoffsetletterwindowsubmitrendergroupsuploadhealthmethodvideosschoolfutureshadowdebatevaluesObjectothersrightsleaguechromesimplenoticesharedendingseasonreportonlinesquarebuttonimagesenablemovinglatestwinterFranceperiodstrongrepeatLondondetailformeddemandsecurepassedtoggleplacesdevicestaticcitiesstreamyellowattackstreetflighthiddeninfo">openedusefulvalleycausesleadersecretseconddamagesportsexceptratingsignedthingseffectfieldsstatesofficevisualeditorvolumeReportmuseummoviesparentaccessmostlymother" id="marketgroundchancesurveybeforesymbolmomentspeechmotioninsidematterCenterobjectexistsmiddleEuropegrowthlegacymannerenoughcareeransweroriginportalclientselectrandomclosedtopicscomingfatheroptionsimplyraisedescapechosenchurchdefinereasoncorneroutputmemoryiframepolicemodelsNumberduringoffersstyleskilledlistedcalledsilvermargindeletebetterbrowselimitsGlobalsinglewidgetcenterbudgetnowrapcreditclaimsenginesafetychoicespirit-stylespreadmakingneededrussiapleaseextentScriptbrokenallowschargedividefactormember-basedtheoryconfigaroundworkedhelpedChurchimpactshouldalwayslogo" bottomlist">){var prefixorangeHeader.push(couplegardenbridgelaunchReviewtakingvisionlittledatingButtonbeautythemesforgotSearchanchoralmostloadedChangereturnstringreloadMobileincomesupplySourceordersviewed courseAbout islandPhilipawardshandleimportOfficeregardskillsnationSportsdegreeweekly (e.g.behinddoctorloggedunitedbeyond-scaleacceptservedmarineFootercamera\n_form"leavesstress" />\r\n.gif" onloadloaderOxfordsistersurvivlistenfemaleDesignsize="appealtext">levelsthankshigherforcedanimalanyoneAfricaagreedrecentPeople
wonderpricesturned|| {};main">inlinesundaywrap">failedcensusminutebeaconquotes150px|estateremoteemail"linkedright;signalformal1.htmlsignupprincefloat:.png" forum.AccesspaperssoundsextendHeightsliderUTF-8"& Before. WithstudioownersmanageprofitjQueryannualparamsboughtfamousgooglelongeri++) {israelsayingdecidehome">headerensurebranchpiecesblock;statedtop">boston.test(avatartested_countforumsschemaindex,filledsharesreaderalert(appearSubmitline">body">\n* TheThoughseeingjerseyNews\nSystem DavidcancertablesprovedApril reallydriveritem">more">boardscolorscampusfirst || [];media.guitarfinishwidth:showedOther .php" assumelayerswilsonstoresreliefswedenCustomeasily your String\n\nWhiltaylorclear:resortfrenchthough") + "buyingbrandsMembername">oppingsector5px;">vspacepostermajor coffeemartinmaturehappenkansaslink">Images=falsewhile hspace0& \n\nIn powerPolski-colorjordanBottomStart -count2.htmlnews">01.jpgOnline-rightmillerseniorISBN 00,000 guidesvalue)ectionrepair.xml" rights.html-blockregExp:hoverwithinvirginphones\rusing \n\tvar >\');\n\t\n\nbahasabrasilgalegomagyarpolskisrpskiX1X/Y\bd8-f\x16\x07g.\0d=\x13g9\x01i+\x14d?!f\x01/d8-e\x1b=f\b\x11d;,d8\0d8*e\x05,e\x0f8g.!g\x10\x06h.:e\x1d\x1be\x0f/d;%f\x1c\re\n!f\x176i\x174d8*d::d:\'e\x13\x01h\x07*e71d<\x01d8\x1af\x1f%g\x1c\ve7%d=\x1ch\x01\x14g3;f2!f\x1c\tg=\x11g+\x19f\t\0f\x1c\th/\x04h.:d8-e?\x03f\x16\x07g+ g\x14(f\b7i&\x16i!5d=\x1ch\0\x05f\n\0f\x1c/i\x17.i"\x18g\x1b8e\x053d8\vh==f\x10\x1cg4"d=?g\x14(h=/d;6e\x1c(g:?d8;i"\x18h5\x04f\x16\x19h\'\x06i"\x11e\x1b\x1ee$\rf3(e\x06\fg=\x11g;\x1cf\x146h\x17\x0fe\x06\x05e.9f\x0e(h\r\x10e8\x02e\x1c:f6\bf\x01/g):i\x174e\x0f\x11e8\x03d;\0d9\be%=e\x0f\vg\x14\x1ff4;e\x1b>g\t\x07e\x0f\x11e1\x15e&\x02f\x1e\x1cf\t\vf\x1c:f\x160i\x17;f\x1c\0f\x160f\x169e<\x0fe\f\x17d:,f\x0f\x10d>\x1be\x053d:\x0ef\x1b4e$\x1ah?\x19d8*g3;g;\x1fg\x1f%i\x01\x13f88f\b\x0fe9?e\x11\ne\x056d;\x16e\x0f\x11h!(e.\te\x05(g,,d8\0d<\x1ae\x11\x18h?\x1bh!\fg\x029e\x07;g\t\bf\x1d\x03g\x145e-\x10d8\x16g\x15\fh.>h.!e\x05\rh49f\x15\x19h\x022e\n e\x05%f4;e\n(d;\x16d;,e\x15\x06e\x13\x01e\r\x1ae."g\x0e0e\x1c(d8\nf57e&\x02d=\x15e72g;\x0fg\x15\x19h(\0h/&g;\x06g$>e\f:g\x19;e=\x15f\x1c,g+\x19i\x1c\0h&\x01d;7f f\x0e%e\x1b=e.6e;:h.>f\x1c\ve\x0f\vi\x18\x05h/;f3\x15e>\vd=\rg=.g;\x0ff5\x0ei\0\tf\v)h?\x19f 7e=\x13e\t\re\b\x06g1;f\x0e\x12h!\fe\x1b d8:d:$f\x18\x13f\x1c\0e\x10\x0ei\x1f3d9\x10d8\rh\x03=i\0\x1ah?\x07h!\fd8\x1ag\'\x11f\n\0e\x0f/h\x03=h.>e$\x07e\x10\bd=\x1ce$\'e.6g$>d<\x1ag \x14g)6d8\x13d8\x1ae\x05(i\x03(i!9g\x1b.h?\x19i\x07\fh?\x18f\x18/e<\0e\'\vf\x03\x05e\x065g\x145h\x04\x11f\x16\x07d;6e\x13\x01g\t\fe8.e\n)f\x16\x07e\f\x16h5\x04f:\x10e$\'e-&e-&d9 e\x1c0e\x1d\0f5\x0fh\'\bf\n\x15h5\x04e7%g(\vh&\x01f1\x02f\0\x0ed9\bf\x176e\0\x19e\n\x1fh\x03=d8;h&\x01g\x1b.e\t\rh5\x04h./e\x1f\x0ee8\x02f\x169f3\x15g\x145e=1f\v\x1bh\x01\x18e#0f\x18\x0ed;;d=\x15e\x01%e:7f\x150f\r.g>\x0ee\x1b=f1=h=&d;\vg;\rd=\x06f\x18/d:$f5\x01g\x14\x1fd:\'f\t\0d;%g\x145h/\x1df\x18>g$:d8\0d:\x1be\r\x15d=\rd::e\x11\x18e\b\x06f\x1e\x10e\x1c0e\x1b>f\x17\x05f88e7%e\x057e-&g\x14\x1fg3;e\b\x17g=\x11e\x0f\ve8\x16e-\x10e/\x06g \x01i"\x11i\x01\x13f\x0e\'e\b6e\x1c0e\f:e\x1f:f\x1c,e\x05(e\x1b=g=\x11d8\ni\x07\rh&\x01g,,d:\fe\x16\x1cf,"h?\x1be\x05%e\x0f\vf\x03\x05h?\x19d:\x1bh\0\x03h/\x15e\x0f\x11g\x0e0e\x1f9h.-d;%d8\nf\x14?e:\x1cf\b\x10d8:g\x0e/e"\x03i&\x19f8/e\x10\ff\x176e(1d9\x10e\x0f\x11i\0\x01d8\0e.\x1ae<\0e\x0f\x11d=\x1ce\x13\x01f \x07e\x07\x06f,"h?\x0eh\'#e\x063e\x1c0f\x169d8\0d8\vd;%e\x0f\nh4#d;;f\b\x16h\0\x05e."f\b7d;#h!(g\'/e\b\x06e%3d::f\x150g \x01i\x14\0e\x14.e\x07:g\x0e0g&;g:?e:\x14g\x14(e\b\x17h!(d8\re\x10\fg<\x16h>\x11g;\x1fh.!f\x1f%h/"d8\rh&\x01f\x1c\te\x053f\x1c:f\x1e\x04e>\be$\x1af\x12-f\x14>g;\x04g;\x07f\x14?g-\x16g\x1b4f\x0e%h\x03=e\n\x1bf\x1d%f:\x10f\x19\x02i\x16\x13g\x1c\ve\b0g\x03-i\x17(e\x053i\x14.d8\x13e\f:i\x1d\x1ee88h\v1h/-g\x19>e:&e8\ff\x1c\x1bg>\x0ee%3f/\x14h>\x03g\x1f%h/\x06h\'\x04e.\x1ae;:h..i\x03(i\x17(f\x04\x0fh\'\x01g2>e=)f\x17%f\x1c,f\x0f\x10i+\x18e\x0f\x11h(\0f\x169i\x1d"e\x1f:i\x07\x11e$\x04g\x10\x06f\x1d\x03i\x19\x10e=1g\t\x07i\x136h!\fh?\x18f\x1c\te\b\x06d:+g\t)e\x13\x01g;\x0fh\x10%f7;e\n d8\x13e.6h?\x19g\'\rh/\x1di"\x18h57f\x1d%d8\x1ae\n!e\x05,e\x11\nh.0e=\x15g.\0d;\vh4(i\x07\x0fg\x147d::e=1e\x13\re<\x15g\x14(f\n%e\x11\ni\x03(e\b\x06e?+i\0\x1fe\x12(h/"f\x176e0\x1af3(f\x04\x0fg\x143h/7e-&f !e:\x14h/%e\x0e\x06e\x0f2e\x0f*f\x18/h?\x14e\x1b\x1eh4-d90e\x10\rg\'0d8:d:\x06f\b\x10e\n\x1fh/4f\x18\x0ed>\x1be:\x14e-)e-\x10d8\x13i"\x18g(\ve:\x0fd8\0h\b,f\x1c\x03e\x13!e\x0f*f\x1c\te\x056e.\x03d?\x1df\n$h\0\fd8\x14d;\ne$)g*\x17e\x0f#e\n(f\0\x01g\n6f\0\x01g\t9e\b+h.$d8:e?\x05i!;f\x1b4f\x160e0\x0fh/4f\b\x11e\0\x11d=\x1cd8:e*\x12d=\x13e\f\x05f\v,i\x02#d9\bd8\0f 7e\x1b=e\x06\x05f\x18/e\x10&f 9f\r.g\x145h\'\x06e-&i\x19"e\x057f\x1c\th?\x07g(\vg\x141d:\x0ed::f\t\re\x07:f\x1d%d8\rh?\x07f-#e\x1c(f\x18\x0ef\x18\x1ff\x15\x05d:\ve\x053g3;f \x07i"\x18e\x15\x06e\n!h>\x13e\x05%d8\0g\x1b4e\x1f:g!\0f\x15\x19e-&d:\x06h\'#e;:g-\x11g;\x13f\x1e\x1ce\x05(g\x10\x03i\0\x1ag\x1f%h.!e\b\x12e/9d:\x0eh\t:f\x1c/g\x1b8e\x06\fe\x0f\x11g\x14\x1fg\x1c\x1fg\x1a\x04e;:g+\vg-\tg:\'g1;e\x1e\vg;\x0fi*\fe.\x1eg\x0e0e\b6d=\x1cf\x1d%h\x07*f \x07g->d;%d8\ve\x0e\x1fe\b\x1bf\x17 f3\x15e\x056d8-e\0\vd::d8\0e\b\x07f\f\x07e\r\x17e\x053i\x17-i\x1b\x06e\x1b"g,,d8\te\x053f3(e\x1b f-$g\x05\'g\t\x07f71e\x1c3e\x15\x06d8\x1ae9?e7\x1ef\x17%f\x1c\x1fi+\x18g:\'f\x1c\0h?\x11g;\x11h!\fd8:d:$i\0\x1ah/\x04d;7h\'\te>\x17g2>e\r\x0ee.6e:-e.\ff\b\x10f\x04\x1fh\'\te.\th#\x05e>\x17e\b0i\x02.d;6e\b6e:&i#\x1fe\x13\x01h\x19=g\x046h=,h==f\n%d;7h.0h\0\x05f\x169f!\bh!\ff\x14?d::f0\x11g\x14(e\x13\x01d8\x1ch%?f\x0f\x10e\x07:i\x05\x12e:\x17g\x046e\x10\x0ed;\x18f,>g\x03-g\x029d;%e\t\re.\fe\x05(e\x0f\x11e8\x16h.>g=.i"\x06e/g%\x1eh\x0e7e>\x17e\b)g\x14(g;\'g;-d= d;,h?\x19d9\bf(!e<\x0fh/-h(\0h\x03=e$\x1fi\x1b\x05h\x19\x0ef\x13\rd=\x1ci#\x0ef d9&f\x1c\tf\x15\bf5\vh/\x15g\';e\n(f\t\rh\x03=e\x063e.\x1ah\x02!g%(d8\rf\x16-i\x1c\0f1\x02d8\re>\x17e\n\x1ef3\x15d9\vi\x174i\x07\x07g\x14(h\x10%i\x14\0f\n\x15h/\tg\x1b.f \x07g\b1f\x03\x05f\x11\x04e=1f\x1c\td:\x1bh$\x07h#=f\x16\x07e-&f\x1c:d<\x1af\x150e-\x17h#\x05d?.h4-g\t)e\x06\x1cf\x1d\x11e\x05(i\x1d"g2>e\x13\x01e\x056e.\x1ed:\vf\x03\x05f04e93f\x0f\x10g$:d8\ne8\x02h0"h0"f\x19.i\0\x1af\x15\x19e8\bd8\nd< g1;e\b+f-\ff\x1b2f\v%f\x1c\te\b\x1bf\x160i\x05\rd;6e\x0f*h&\x01f\x176d;#h3\x07h(\nh>>e\b0d::g\x14\x1fh."i\x18\x05h\0\x01e8\be1\x15g$:e?\x03g\x10\x06h44e-\x10g62g+\x19d8;i!\fh\x07*g\x046g:\'e\b+g.\0e\r\x15f\x149i\x1d)i\x02#d:\x1bf\x1d%h/4f\t\x13e<\0d;#g \x01e\b i\x19$h/\x01e\b8h\n\x02g\x1b.i\x07\rg\x029f,!f\x158e$\x1ae0\x11h\'\x04e\b\x12h5\x04i\x07\x11f\t>e\b0d;%e\x10\x0ee$\'e\x05(d8;i!5f\x1c\0d=3e\x1b\x1eg-\x14e$)d8\vd?\x1di\x1a\x1cg\x0e0d;#f#\0f\x1f%f\n\x15g%(e0\x0ff\x176f2\x12f\x1c\tf-#e88g\x14\x1ah\x073d;#g\x10\x06g\x1b.e=\x15e\x05,e<\0e$\re\b6i\x07\x11h\x1e\re98g&\x0fg\t\bf\x1c,e="f\b\x10e\x07\x06e$\x07h!\ff\x03\x05e\x1b\x1ee\b0f\0\x1df\x033f\0\x0ef 7e\r\x0fh..h.$h/\x01f\x1c\0e%=d:\'g\x14\x1ff\f\tg\x05\'f\x1c\rh#\x05e9?d8\x1ce\n(f<+i\x07\x07h4-f\x160f\t\vg;\x04e\x1b>i\x1d"f\x1d?e\x0f\x02h\0\x03f\x14?f2;e.9f\x18\x13e$)e\x1c0e\n*e\n\x1bd::d;,e\r\x07g:\'i\0\x1fe:&d::g\t)h0\x03f\x154f5\x01h!\fi\0 f\b\x10f\x16\x07e-\x17i\x1f)e\x1b=h48f\x18\x13e<\0e1\x15g\x1b8i\x17\x1ch!(g\x0e0e=1h\'\x06e&\x02f-$g>\x0ee.9e$\'e0\x0ff\n%i\x01\x13f\x1d!f,>e?\x03f\x03\x05h.8e$\x1af3\x15h\'\x04e.6e1\x05d9&e:\x17h?\x1ef\x0e%g+\ve\r3d8>f\n%f\n\0e7\'e%%h?\x10g\x19;e\x05%d;%f\x1d%g\x10\x06h.:d:\vd;6h\x07*g\x141d8-e\r\x0ee\n\x1ee\x05,e&\be&\bg\x1c\x1ff-#d8\ri\x14\x19e\x05(f\x16\x07e\x10\be\x10\fd;7e\0e7&e\x0f3h\x02!d;=g-\x14f!\be.\x1ei\x19\x05g\x145d?!g;\x0fg\x10\x06g\x14\x1fe\x11=e.#d< d;;e\n!f-#e<\x0fg\t9h\t2d8\vf\x1d%e\r\x0fd<\x1ae\x0f*h\x03=e=\x13g\x046i\x07\rf\x160e\x05\'e.9f\f\x07e/g(\ve\f;g\x16\x17g;\x0fh?\x07h?\x07e\x0e;d9\ve\t\rf\x146e\x05%e94e:&f\x1d\x02e?\x17g>\x0ed8=f\x1c\0i+\x18g\x19;i\x19\x06f\x1c*f\x1d%e\n e7%e\x05\rh4#f\x15\x19g(\vg\t\be\x1d\x17h:+d=\x13i\x07\re:\x06e\x07:e\x14.f\b\x10f\x1c,e="e<\x0fe\x1c\x1fh1\x06e\x07:e\x039d8\x1cf\x169i\x02.g.1e\r\x17d:,f1\x02h\x01\fe\x0f\x16e>\x17h\x01\fd=\rg\x1b8d?!i!5i\x1d"e\b\x06i\x12\x1fg=\x11i!5g!.e.\x1ae\x1b>d>\vg=\x11e\x1d\0g\'/f\x1e\x01i\x14\x19h//g\x1b.g\x1a\x04e.\x1dh4\x1df\x1c:e\x053i#\x0ei\x19)f\x0e\bf\x1d\x03g\x17\x05f/\x12e. g\t)i\x19$d:\x06h)\x15h+\x16g\x16>g\x17\x05e\x0f\nf\x176f1\x02h4-g+\x19g\x029e\x04?g+%f/\x0fe$)d8-e$.h.$h/\x06f/\x0fd8*e$)f4%e-\x17d=\x13e\x0f0g\x01#g;4f\n$f\x1c,i!5d8*f\0\'e.\x18f\x169e88h\'\x01g\x1b8f\x1c:f\b\x18g\x15%e:\x14e=\x13e>\ve8\bf\x169d>?f !e\x1b-h\x02!e8\x02f\b?e1\vf \x0fg\x1b.e\x11\x18e7%e/\x0ee\x05\x03e<\x15h57f\x149e\x0f\x18g,,e\x1b\x1bd<\x1ah.!h**f\x18\x0ei\x1a\x10g\'\x01e.\x1de.\x1dh\'\x04h\f\x03f6\bh49e\x051e\x10\fe?\x18h.0d=\x13g3;e8&f\x1d%e\x10\re-\x17g\x19e\n g\x1b\x1fe\x0f\x17e\b0d:\ff\t\ve$\'i\x07\x0ff\b\x10d::f\x150i\x07\x0fe\x051d:+e\f:e\x1f\x1fe%3e-)e\x0e\x1fe\b\x19f\t\0e\x1c(g;\x13f\x1d\x1fi\0\x1ad?!h6\x05g:\'i\x05\rg=.e=\x13f\x176d<\x18g\'\0f\0\'f\x04\x1ff\b?d:\'i\x01\nf\b2e\x07:e\x0f#f\x0f\x10d:$e01d8\x1ad?\x1de\x01%g(\ve:&e\x0f\x02f\x150d:\vd8\x1af\x154d8*e11d8\x1cf\x03\x05f\x04\x1fg\t9f.\ne\b\x06i!\x1ef\x10\x1ce0\ve1\x1ed:\x0ei\x17(f\b7h4"e\n!e#0i\x1f3e\x0f\ne\x056h4"g;\x0fe\x1d\x1af\f\x01e92i\x03(f\b\x10g+\ve\b)g\x1b\nh\0\x03h\x19\x11f\b\x10i\x03=e\f\x05h#\x05g\x14(f\b6f/\x14h5\x1bf\x16\x07f\x18\x0ef\v\x1be\x15\x06e.\ff\x154g\x1c\x1ff\x18/g\x1ce/\x06g"\x0ei#\x1fg;?h\t2g(3e.\x1ag;\bd:\x0eg\x14\x1fg\t)d>\x1bf1\x02f\x10\x1cg\v\x10e\n\x1bi\x07\x0fd8%i\x07\rf08h?\x1ce\x06\x19g\x1c\x1ff\x1c\ti\x19\x10g+\x1ed:\te/9h1!h49g\x14(d8\re%=g;\x1de/9e\r\x01e\b\x06d?\x03h?\x1bg\x029h/\x04e=1i\x1f3d<\x18e\n?d8\re0\x11f,#h5\x0fe96d8\x14f\x1c\tg\x029f\x169e\x10\x11e\x05(f\x160d?!g\x14(h.>f\x16=e="h1!h5\x04f \x0ee\x15\x06e\x1f\x0eg;\x1fd8\0e\x07:g\t\bf\t\x13i\0 g\x14"e\x13\x01f&\x02e\x065g\x14(d:\x0ed?\x1dg\x15\x19e\x1b g4 d8-e\x1c\ve-\x18e\x02(h44e\x1b>f\x1c\0f\x04\x1bi\x15?f\x1c\x1fe\x0f#d;7g\x10\x06h4"e\x1f:e\x1c0e.\tf\x0e\x12f-&f1\ti\x07\fi\x1d"e\b\x1be;:e$)g):i&\x16e\x05\be.\fe\x16\x04i)1e\n(d8\vi\x1d"d8\re\x06\rh/\x1ad?!f\x04\x0fd9\ti\x183e\x05\th\v1e\x1b=f<\x02d:.e\x06\x1bd:\vg\x0e)e.6g>$d<\x17e\x06\x1cf0\x11e\r3e\x0f/e\x10\rg(1e.6e\x057e\n(g\x14;f\x033e\b0f3(f\x18\x0ee0\x0fe-&f\0\'h\x03=h\0\x03g \x14g!,d;6h\'\x02g\x1c\vf8\x05f%\x1af\x10\x1eg,\x11i&\x16i \x01i;\x04i\x07\x11i\0\x02g\x14(f1\x1fh\v\x0fg\x1c\x1fe.\x1ed8;g.!i\x186f.5h(;e\x06\ng?;h/\x11f\x1d\x03e\b)e\x01\x1ae%=d<P:P0P:P8P;P8Q\rQ\x02P>P2Q\x01P5P5P3P>P?Q\0P8Q\x02P0P:P5Q\tP5Q\x03P6P5P\x1aP0P:P1P5P7P1Q\vP;P>P=P8P\x12Q\x01P5P?P>P4P-Q\x02P>Q\x02P>PP=P0P3P4P5PP3P>P4P2P>Q\x02Q\x02P0PP2P0Q\x01P2P0PQ\x02Q\x03Q\x02P=P0P4P4P=Q\x0fP\x12P>Q\x02Q\x02Q\0P8P=P5P9P\x12P0Q\x01P=P8PQ\x02Q\0Q\x03P1P\x1eP=P8PPP9P4P2P5P>P=P>Q\x01Q\x03P4`$\x15`%\x07`$9`%\b`$\x15`%\0`$8`%\x07`$\x15`$>`$\x15`%\v`$\x14`$0`$*`$0`$(`%\x07`$\x0f`$\x15`$\x15`$?`$-`%\0`$\x07`$8`$\x15`$0`$$`%\v`$9`%\v`$\x06`$*`$9`%\0`$/`$9`$/`$>`$$`$\x15`$%`$>jagran`$\x06`$\x1c`$\x1c`%\v`$\x05`$,`$&`%\v`$\x17`$\b`$\x1c`$>`$\x17`$\x0f`$9`$.`$\x07`$(`$5`$9`$/`%\x07`$%`%\x07`$%`%\0`$\x18`$0`$\x1c`$,`$&`%\0`$\x15`$\b`$\x1c`%\0`$5`%\x07`$(`$\b`$(`$\x0f`$9`$0`$\t`$8`$.`%\x07`$\x15`$.`$5`%\v`$2`%\x07`$8`$,`$.`$\b`$&`%\x07`$\x13`$0`$\x06`$.`$,`$8`$-`$0`$,`$(`$\x1a`$2`$.`$(`$\x06`$\x17`$8`%\0`$2`%\0X9Y\x04Y\tX%Y\x04Y\tY\x07X0X\'X"X.X1X9X/X/X\'Y\x04Y\tY\x07X0Y\x07X5Y\bX1X:Y\nX1Y\x03X\'Y\x06Y\bY\x04X\'X(Y\nY\x06X9X1X6X0Y\x04Y\x03Y\x07Y\x06X\'Y\nY\bY\x05Y\x02X\'Y\x04X9Y\x04Y\nX\'Y\x06X\'Y\x04Y\x03Y\x06X-X*Y\tY\x02X(Y\x04Y\bX-X)X\'X.X1Y\x01Y\x02X7X9X(X/X1Y\x03Y\x06X%X0X\'Y\x03Y\x05X\'X\'X-X/X%Y\x04X\'Y\x01Y\nY\x07X(X9X6Y\x03Y\nY\x01X(X-X+Y\bY\x05Y\x06Y\bY\x07Y\bX#Y\x06X\'X,X/X\'Y\x04Y\x07X\'X3Y\x04Y\x05X9Y\x06X/Y\x04Y\nX3X9X(X1X5Y\x04Y\tY\x05Y\x06X0X(Y\x07X\'X#Y\x06Y\x07Y\x05X+Y\x04Y\x03Y\x06X*X\'Y\x04X\'X-Y\nX+Y\x05X5X1X4X1X-X-Y\bY\x04Y\bY\x01Y\nX\'X0X\'Y\x04Y\x03Y\x04Y\x05X1X)X\'Y\x06X*X\'Y\x04Y\x01X#X(Y\bX.X\'X5X#Y\x06X*X\'Y\x06Y\x07X\'Y\x04Y\nX9X6Y\bY\bY\x02X/X\'X(Y\x06X.Y\nX1X(Y\x06X*Y\x04Y\x03Y\x05X4X\'X!Y\bY\x07Y\nX\'X(Y\bY\x02X5X5Y\bY\x05X\'X1Y\x02Y\x05X#X-X/Y\x06X-Y\x06X9X/Y\x05X1X#Y\nX\'X-X)Y\x03X*X(X/Y\bY\x06Y\nX,X(Y\x05Y\x06Y\x07X*X-X*X,Y\x07X)X3Y\x06X)Y\nX*Y\x05Y\x03X1X)X:X2X)Y\x06Y\x01X3X(Y\nX*Y\x04Y\x04Y\x07Y\x04Y\x06X\'X*Y\x04Y\x03Y\x02Y\x04X(Y\x04Y\x05X\'X9Y\x06Y\x07X#Y\bY\x04X4Y\nX!Y\x06Y\bX1X#Y\x05X\'Y\x01Y\nY\x03X(Y\x03Y\x04X0X\'X*X1X*X(X(X#Y\x06Y\x07Y\x05X3X\'Y\x06Y\x03X(Y\nX9Y\x01Y\x02X/X-X3Y\x06Y\x04Y\x07Y\x05X4X9X1X#Y\x07Y\x04X4Y\x07X1Y\x02X7X1X7Y\x04X(profileservicedefaulthimselfdetailscontentsupportstartedmessagesuccessfashioncountryaccountcreatedstoriesresultsrunningprocesswritingobjectsvisiblewelcomearticleunknownnetworkcompanydynamicbrowserprivacyproblemServicerespectdisplayrequestreservewebsitehistoryfriendsoptionsworkingversionmillionchannelwindow.addressvisitedweathercorrectproductedirectforwardyou canremovedsubjectcontrolarchivecurrentreadinglibrarylimitedmanagerfurthersummarymachineminutesprivatecontextprogramsocietynumberswrittenenabledtriggersourcesloadingelementpartnerfinallyperfectmeaningsystemskeepingculture",journalprojectsurfaces"expiresreviewsbalanceEnglishContentthroughPlease opinioncontactaverageprimaryvillageSpanishgallerydeclinemeetingmissionpopularqualitymeasuregeneralspeciessessionsectionwriterscounterinitialreportsfiguresmembersholdingdisputeearlierexpressdigitalpictureAnothermarriedtrafficleadingchangedcentralvictoryimages/reasonsstudiesfeaturelistingmust beschoolsVersionusuallyepisodeplayinggrowingobviousoverlaypresentactions</ul>\r\nwrapperalreadycertainrealitystorageanotherdesktopofferedpatternunusualDigitalcapitalWebsitefailureconnectreducedAndroiddecadesregular & animalsreleaseAutomatgettingmethodsnothingPopularcaptionletterscapturesciencelicensechangesEngland=1&History = new CentralupdatedSpecialNetworkrequirecommentwarningCollegetoolbarremainsbecauseelectedDeutschfinanceworkersquicklybetweenexactlysettingdiseaseSocietyweaponsexhibit<!--Controlclassescoveredoutlineattacksdevices(windowpurposetitle="Mobile killingshowingItaliandroppedheavilyeffects-1\']);\nconfirmCurrentadvancesharingopeningdrawingbillionorderedGermanyrelated</form>includewhetherdefinedSciencecatalogArticlebuttonslargestuniformjourneysidebarChicagoholidayGeneralpassage,"animatefeelingarrivedpassingnaturalroughly.\n\nThe but notdensityBritainChineselack oftributeIreland" data-factorsreceivethat isLibraryhusbandin factaffairsCharlesradicalbroughtfindinglanding:lang="return leadersplannedpremiumpackageAmericaEdition]"Messageneed tovalue="complexlookingstationbelievesmaller-mobilerecordswant tokind ofFirefoxyou aresimilarstudiedmaximumheadingrapidlyclimatekingdomemergedamountsfoundedpioneerformuladynastyhow to SupportrevenueeconomyResultsbrothersoldierlargelycalling."AccountEdward segmentRobert effortsPacificlearnedup withheight:we haveAngelesnations_searchappliedacquiremassivegranted: falsetreatedbiggestbenefitdrivingStudiesminimumperhapsmorningsellingis usedreversevariant role="missingachievepromotestudentsomeoneextremerestorebottom:evolvedall thesitemapenglishway to AugustsymbolsCompanymattersmusicalagainstserving})();\r\npaymenttroubleconceptcompareparentsplayersregionsmonitor \'\'The winningexploreadaptedGalleryproduceabilityenhancecareers). The collectSearch ancientexistedfooter handlerprintedconsoleEasternexportswindowsChannelillegalneutralsuggest_headersigning.html">settledwesterncausing-webkitclaimedJusticechaptervictimsThomas mozillapromisepartieseditionoutside:false,hundredOlympic_buttonauthorsreachedchronicdemandssecondsprotectadoptedprepareneithergreatlygreateroverallimprovecommandspecialsearch.worshipfundingthoughthighestinsteadutilityquarterCulturetestingclearlyexposedBrowserliberal} catchProjectexamplehide();FloridaanswersallowedEmperordefenseseriousfreedomSeveral-buttonFurtherout of != nulltrainedDenmarkvoid(0)/all.jspreventRequestStephen\n\nWhen observe</h2>\r\nModern provide" alt="borders.\n\nFor \n\nMany artistspoweredperformfictiontype ofmedicalticketsopposedCouncilwitnessjusticeGeorge Belgium...</a>twitternotablywaitingwarfare Other rankingphrasesmentionsurvivescholar</p>\r\n Countryignoredloss ofjust asGeorgiastrange<head><stopped1\']);\r\nislandsnotableborder:list ofcarried100,000</h3>\n severalbecomesselect wedding00.htmlmonarchoff theteacherhighly biologylife ofor evenrise of»plusonehunting(thoughDouglasjoiningcirclesFor theAncientVietnamvehiclesuch ascrystalvalue =Windowsenjoyeda smallassumed<a id="foreign All rihow theDisplayretiredhoweverhidden;battlesseekingcabinetwas notlook atconductget theJanuaryhappensturninga:hoverOnline French lackingtypicalextractenemieseven ifgeneratdecidedare not/searchbeliefs-image:locatedstatic.login">convertviolententeredfirst">circuitFinlandchemistshe was10px;">as suchdivided</span>will beline ofa greatmystery/index.fallingdue to railwaycollegemonsterdescentit withnuclearJewish protestBritishflowerspredictreformsbutton who waslectureinstantsuicidegenericperiodsmarketsSocial fishingcombinegraphicwinners<br /><by the NaturalPrivacycookiesoutcomeresolveSwedishbrieflyPersianso muchCenturydepictscolumnshousingscriptsnext tobearingmappingrevisedjQuery(-width:title">tooltipSectiondesignsTurkishyounger.match(})();\n\nburningoperatedegreessource=Richardcloselyplasticentries</tr>\r\ncolor:#ul id="possessrollingphysicsfailingexecutecontestlink toDefault<br />\n: true,chartertourismclassicproceedexplain</h1>\r\nonline.?xml vehelpingdiamonduse theairlineend --\x3e).attr(readershosting#ffffffrealizeVincentsignals src="/ProductdespitediversetellingPublic held inJoseph theatreaffects<style>a largedoesn\'tlater, ElementfaviconcreatorHungaryAirportsee theso thatMichaelSystemsPrograms, and width=e"tradingleft">\npersonsGolden Affairsgrammarformingdestroyidea ofcase ofoldest this is.src = cartoonregistrCommonsMuslimsWhat isin manymarkingrevealsIndeed,equally/show_aoutdoorescape(Austriageneticsystem,In the sittingHe alsoIslandsAcademy\n\t\t\x3c!--Daniel bindingblock">imposedutilizeAbraham(except{width:putting).html(|| [];\nDATA[ *kitchenmountedactual dialectmainly _blank\'installexpertsif(typeIt also© ">Termsborn inOptionseasterntalkingconcerngained ongoingjustifycriticsfactoryits ownassaultinvitedlastinghis ownhref="/" rel="developconcertdiagramdollarsclusterphp?id=alcohol);})();using a><span>vesselsrevivalAddressamateurandroidallegedillnesswalkingcentersqualifymatchesunifiedextinctDefensedied in\n\t\x3c!-- customslinkingLittle Book ofeveningmin.js?are thekontakttoday\'s.html" target=wearingAll Rig;\n})();raising Also, crucialabout">declare--\x3e\n<scfirefoxas muchappliesindex, s, but type = \n\r\n\x3c!--towardsRecordsPrivateForeignPremierchoicesVirtualreturnsCommentPoweredinline;povertychamberLiving volumesAnthonylogin" RelatedEconomyreachescuttinggravitylife inChapter-shadowNotable</td>\r\n returnstadiumwidgetsvaryingtravelsheld bywho arework infacultyangularwho hadairporttown of\n\nSome \'click\'chargeskeywordit willcity of(this);Andrew unique checkedor more300px; return;rsion="pluginswithin herselfStationFederalventurepublishsent totensionactresscome tofingersDuke ofpeople,exploitwhat isharmonya major":"httpin his menu">\nmonthlyofficercouncilgainingeven inSummarydate ofloyaltyfitnessand wasemperorsupremeSecond hearingRussianlongestAlbertalateralset of small">.appenddo withfederalbank ofbeneathDespiteCapitalgrounds), and percentit fromclosingcontainInsteadfifteenas well.yahoo.respondfighterobscurereflectorganic= Math.editingonline paddinga wholeonerroryear ofend of barrierwhen itheader home ofresumedrenamedstrong>heatingretainscloudfrway of March 1knowingin partBetweenlessonsclosestvirtuallinks">crossedEND --\x3efamous awardedLicenseHealth fairly wealthyminimalAfricancompetelabel">singingfarmersBrasil)discussreplaceGregoryfont copursuedappearsmake uproundedboth ofblockedsaw theofficescoloursif(docuwhen heenforcepush(fuAugust UTF-8">Fantasyin mostinjuredUsuallyfarmingclosureobject defenceuse of Medical<body>\nevidentbe usedkeyCodesixteenIslamic#000000entire widely active (typeofone cancolor =speakerextendsPhysicsterrain<tbody>funeralviewingmiddle cricketprophetshifteddoctorsRussell targetcompactalgebrasocial-bulk ofman and</td>\n he left).val()false);logicalbankinghome tonaming Arizonacredits);\n});\nfounderin turnCollinsbefore But thechargedTitle">CaptainspelledgoddessTag --\x3eAdding:but wasRecent patientback in=false&Lincolnwe knowCounterJudaismscript altered\']);\n has theunclearEvent\',both innot all\n\n\x3c!-- placinghard to centersort ofclientsstreetsBernardassertstend tofantasydown inharbourFreedomjewelry/about..searchlegendsis mademodern only ononly toimage" linear painterand notrarely acronymdelivershorter00&as manywidth="/* <![Ctitle =of the lowest picked escapeduses ofpeoples PublicMatthewtacticsdamagedway forlaws ofeasy to windowstrong simple}catch(seventhinfoboxwent topaintedcitizenI don\'tretreat. Some ww.");\nbombingmailto:made in. Many carries||{};wiwork ofsynonymdefeatsfavoredopticalpageTraunless sendingleft"><comScorAll thejQuery.touristClassicfalse" Wilhelmsuburbsgenuinebishops.split(global followsbody ofnominalContactsecularleft tochiefly-hidden-banner</li>\n\n. When in bothdismissExplorealways via thespaC1olwelfareruling arrangecaptainhis sonrule ofhe tookitself,=0&(calledsamplesto makecom/pagMartin Kennedyacceptsfull ofhandledBesides//--\x3e</able totargetsessencehim to its by common.mineralto takeways tos.org/ladvisedpenaltysimple:if theyLettersa shortHerbertstrikes groups.lengthflightsoverlapslowly lesser social </p>\n\t\tit intoranked rate oful>\r\n attemptpair ofmake itKontaktAntoniohaving ratings activestreamstrapped").css(hostilelead tolittle groups,Picture--\x3e\r\n\r\n rows=" objectinverse<footerCustomV><\\/scrsolvingChamberslaverywoundedwhereas!= \'undfor allpartly -right:Arabianbacked centuryunit ofmobile-Europe,is homerisk ofdesiredClintoncost ofage of become none ofp"Middle ead\')[0Criticsstudios>©group">assemblmaking pressedwidget.ps:" ? rebuiltby someFormer editorsdelayedCanonichad thepushingclass="but arepartialBabylonbottom carrierCommandits useAs withcoursesa thirddenotesalso inHouston20px;">accuseddouble goal ofFamous ).bind(priests Onlinein Julyst + "gconsultdecimalhelpfulrevivedis veryr\'+\'iptlosing femalesis alsostringsdays ofarrivalfuture <objectforcingString(" />\n\t\there isencoded. The balloondone by/commonbgcolorlaw of Indianaavoidedbut the2px 3pxjquery.after apolicy.men andfooter-= true;for usescreen.Indian image =family,http://  driverseternalsame asnoticedviewers})();\n is moreseasonsformer the newis justconsent Searchwas thewhy theshippedbr><br>width: height=made ofcuisineis thata very Admiral fixed;normal MissionPress, ontariocharsettry to invaded="true"spacingis mosta more totallyfall of});\r\n immensetime inset outsatisfyto finddown tolot of Playersin Junequantumnot thetime todistantFinnishsrc = (single help ofGerman law andlabeledforestscookingspace">header-well asStanleybridges/globalCroatia About [0];\n it, andgroupedbeing a){throwhe madelighterethicalFFFFFF"bottom"like a employslive inas seenprintermost ofub-linkrejectsand useimage">succeedfeedingNuclearinformato helpWomen\'sNeitherMexicanprotein<table by manyhealthylawsuitdevised.push({sellerssimply Through.cookie Image(older">us.js"> Since universlarger open to!-- endlies in\']);\r\n marketwho is ("DOMComanagedone fortypeof Kingdomprofitsproposeto showcenter;made itdressedwere inmixtureprecisearisingsrc = \'make a securedBaptistvoting \n\t\tvar March 2grew upClimate.removeskilledway the</head>face ofacting right">to workreduceshas haderectedshow();action=book ofan area== "htt<header\n<html>conformfacing cookie.rely onhosted .customhe wentbut forspread Family a meansout theforums.footage">MobilClements" id="as highintense--\x3e\x3c!--female is seenimpliedset thea stateand hisfastestbesidesbutton_bounded"><img Infoboxevents,a youngand areNative cheaperTimeoutand hasengineswon the(mostlyright: find a -bottomPrince area ofmore ofsearch_nature,legallyperiod,land ofor withinducedprovingmissilelocallyAgainstthe wayk"px;">\r\npushed abandonnumeralCertainIn thismore inor somename isand, incrownedISBN 0-createsOctobermay notcenter late inDefenceenactedwish tobroadlycoolingonload=it. TherecoverMembersheight assumes<html>\npeople.in one =windowfooter_a good reklamaothers,to this_cookiepanel">London,definescrushedbaptismcoastalstatus title" move tolost inbetter impliesrivalryservers SystemPerhapses and contendflowinglasted rise inGenesisview ofrising seem tobut in backinghe willgiven agiving cities.flow of Later all butHighwayonly bysign ofhe doesdiffersbattery&lasinglesthreatsintegertake onrefusedcalled =US&See thenativesby thissystem.head of:hover,lesbiansurnameand allcommon/header__paramsHarvard/pixel.removalso longrole ofjointlyskyscraUnicodebr />\r\nAtlantanucleusCounty,purely count">easily build aonclicka givenpointerh"events else {\nditionsnow the, with man whoorg/Webone andcavalryHe diedseattle00,000 {windowhave toif(windand itssolely m"renewedDetroitamongsteither them inSenatorUs</a><King ofFrancis-produche usedart andhim andused byscoringat hometo haverelatesibilityfactionBuffalolink"><what hefree toCity ofcome insectorscountedone daynervoussquare };if(goin whatimg" alis onlysearch/tuesdaylooselySolomonsexual - <a hrmedium"DO NOT France,with a war andsecond take a >\r\n\r\n\r\nmarket.highwaydone inctivity"last">obligedrise to"undefimade to Early praisedin its for hisathleteJupiterYahoo! termed so manyreally s. The a woman?value=direct right" bicycleacing="day andstatingRather,higher Office are nowtimes, when a pay foron this-link">;borderaround annual the Newput the.com" takin toa brief(in thegroups.; widthenzymessimple in late{returntherapya pointbanninginks">\n();" rea place\\u003Caabout atr>\r\n\t\tccount gives a<SCRIPTRailwaythemes/toolboxById("xhumans,watchesin some if (wicoming formats Under but hashanded made bythan infear ofdenoted/iframeleft involtagein eacha"base ofIn manyundergoregimesaction </p>\r\n<ustomVa;></importsor thatmostly &re size="</a></ha classpassiveHost = WhetherfertileVarious=[];(fucameras/></td>acts asIn some>\r\n\r\n<!organis <br />BeijingcatalC deutscheuropeueuskaragaeilgesvenskaespaC1amensajeusuariotrabajomC)xicopC!ginasiempresistemaoctubreduranteaC1adirempresamomentonuestroprimeratravC)sgraciasnuestraprocesoestadoscalidadpersonanC:meroacuerdomC:sicamiembroofertasalgunospaC-sesejemploderechoademC!sprivadoagregarenlacesposiblehotelessevillaprimeroC:ltimoeventosarchivoculturamujeresentradaanuncioembargomercadograndesestudiomejoresfebrerodiseC1oturismocC3digoportadaespaciofamiliaantoniopermiteguardaralgunaspreciosalguiensentidovisitastC-tuloconocersegundoconsejofranciaminutossegundatenemosefectosmC!lagasesiC3nrevistagranadacompraringresogarcC-aacciC3necuadorquienesinclusodeberC!materiahombresmuestrapodrC-amaC1anaC:ltimaestamosoficialtambienningC:nsaludospodemosmejorarpositionbusinesshomepagesecuritylanguagestandardcampaignfeaturescategoryexternalchildrenreservedresearchexchangefavoritetemplatemilitaryindustryservicesmaterialproductsz-index:commentssoftwarecompletecalendarplatformarticlesrequiredmovementquestionbuildingpoliticspossiblereligionphysicalfeedbackregisterpicturesdisabledprotocolaudiencesettingsactivityelementslearninganythingabstractprogressoverviewmagazineeconomictrainingpressurevarious <strong>propertyshoppingtogetheradvancedbehaviordownloadfeaturedfootballselectedLanguagedistanceremembertrackingpasswordmodifiedstudentsdirectlyfightingnortherndatabasefestivalbreakinglocationinternetdropdownpracticeevidencefunctionmarriageresponseproblemsnegativeprogramsanalysisreleasedbanner">purchasepoliciesregionalcreativeargumentbookmarkreferrerchemicaldivisioncallbackseparateprojectsconflicthardwareinterestdeliverymountainobtained= false;for(var acceptedcapacitycomputeridentityaircraftemployedproposeddomesticincludesprovidedhospitalverticalcollapseapproachpartnerslogo"><adaughterauthor" culturalfamilies/images/assemblypowerfulteachingfinisheddistrictcriticalcgi-bin/purposesrequireselectionbecomingprovidesacademicexerciseactuallymedicineconstantaccidentMagazinedocumentstartingbottom">observed: "extendedpreviousSoftwarecustomerdecisionstrengthdetailedslightlyplanningtextareacurrencyeveryonestraighttransferpositiveproducedheritageshippingabsolutereceivedrelevantbutton" violenceanywherebenefitslaunchedrecentlyalliancefollowedmultiplebulletinincludedoccurredinternal$(this).republic><tr><tdcongressrecordedultimatesolution<ul id="discoverHome</a>websitesnetworksalthoughentirelymemorialmessagescontinueactive">somewhatvictoriaWestern title="LocationcontractvisitorsDownloadwithout right">\nmeasureswidth = variableinvolvedvirginianormallyhappenedaccountsstandingnationalRegisterpreparedcontrolsaccuratebirthdaystrategyofficialgraphicscriminalpossiblyconsumerPersonalspeakingvalidateachieved.jpg" />machines</h2>\n keywordsfriendlybrotherscombinedoriginalcomposedexpectedadequatepakistanfollow" valuable</label>relativebringingincreasegovernorplugins/List of Header">" name=" ("graduate</head>\ncommercemalaysiadirectormaintain;height:schedulechangingback to catholicpatternscolor: #greatestsuppliesreliable</ul>\n\t\t<select citizensclothingwatching<li id="specificcarryingsentence<center>contrastthinkingcatch(e)southernMichael merchantcarouselpadding:interior.split("lizationOctober ){returnimproved-->\n\ncoveragechairman.png" />subjectsRichard whateverprobablyrecoverybaseballjudgmentconnect..css" /> websitereporteddefault"/></a>\r\nelectricscotlandcreationquantity. ISBN 0did not instance-search-" lang="speakersComputercontainsarchivesministerreactiondiscountItalianocriteriastrongly: \'http:\'script\'coveringofferingappearedBritish identifyFacebooknumerousvehiclesconcernsAmericanhandlingdiv id="William provider_contentaccuracysection andersonflexibleCategorylawrence<script>layout="approved maximumheader"></table>Serviceshamiltoncurrent canadianchannels/themes//articleoptionalportugalvalue=""intervalwirelessentitledagenciesSearch" measuredthousandspending…new Date" size="pageNamemiddle" " /></a>hidden">sequencepersonaloverflowopinionsillinoislinks">\n\t<title>versionssaturdayterminalitempropengineersectionsdesignerproposal="false"EspaC1olreleasessubmit" er"additionsymptomsorientedresourceright"><pleasurestationshistory.leaving border=contentscenter">.\n\nSome directedsuitablebulgaria.show();designedGeneral conceptsExampleswilliamsOriginal"><span>search">operatorrequestsa "allowingDocumentrevision. \n\nThe yourselfContact michiganEnglish columbiapriorityprintingdrinkingfacilityreturnedContent officersRussian generate-8859-1"indicatefamiliar qualitymargin:0 contentviewportcontacts-title">portable.length eligibleinvolvesatlanticonload="default.suppliedpaymentsglossary\n\nAfter guidance</td><tdencodingmiddle">came to displaysscottishjonathanmajoritywidgets.clinicalthailandteachers<head>\n\taffectedsupportspointer;toString</small>oklahomawill be investor0" alt="holidaysResourcelicensed (which . After considervisitingexplorerprimary search" android"quickly meetingsestimate;return ;color:# height=approval, " checked.min.js"magnetic></a></hforecast. While thursdaydvertiseéhasClassevaluateorderingexistingpatients Online coloradoOptions"campbell\x3c!-- end</span><<br />\r\n_popups|sciences," quality Windows assignedheight: <b classle" value=" Companyexamples<iframe believespresentsmarshallpart of properly).\n\nThe taxonomymuch of </span>\n" data-srtuguC*sscrollTo project<head>\r\nattorneyemphasissponsorsfancyboxworld\'s wildlifechecked=sessionsprogrammpx;font- Projectjournalsbelievedvacationthompsonlightingand the special border=0checking</tbody><button Completeclearfix\n<head>\narticle <sectionfindingsrole in popular Octoberwebsite exposureused to changesoperatedclickingenteringcommandsinformed numbers </div>creatingonSubmitmarylandcollegesanalyticlistingscontact.loggedInadvisorysiblingscontent"s")s. This packagescheckboxsuggestspregnanttomorrowspacing=icon.pngjapanesecodebasebutton">gamblingsuch as , while </span> missourisportingtop:1px .</span>tensionswidth="2lazyloadnovemberused in height="cript">\n </<tr><td height:2/productcountry include footer" <!-- title"></jquery.</form>\n(g.\0d=\x13)(g9\x01i+\x14)hrvatskiitalianoromC"nD\x03tC<rkC\'eX\'X1X/Y\btambiC)nnoticiasmensajespersonasderechosnacionalserviciocontactousuariosprogramagobiernoempresasanunciosvalenciacolombiadespuC)sdeportesproyectoproductopC:bliconosotroshistoriapresentemillonesmediantepreguntaanteriorrecursosproblemasantiagonuestrosopiniC3nimprimirmientrasamC)ricavendedorsociedadrespectorealizarregistropalabrasinterC)sentoncesespecialmiembrosrealidadcC3rdobazaragozapC!ginassocialesbloqueargestiC3nalquilersistemascienciascompletoversiC3ncompletaestudiospC:blicaobjetivoalicantebuscadorcantidadentradasaccionesarchivossuperiormayorC-aalemaniafunciC3nC:ltimoshaciendoaquellosediciC3nfernandoambientefacebooknuestrasclientesprocesosbastantepresentareportarcongresopublicarcomerciocontratojC3venesdistritotC)cnicaconjuntoenergC-atrabajarasturiasrecienteutilizarboletC-nsalvadorcorrectatrabajosprimerosnegocioslibertaddetallespantallaprC3ximoalmerC-aanimalesquiC)nescorazC3nsecciC3nbuscandoopcionesexteriorconceptotodavC-agalerC-aescribirmedicinalicenciaconsultaaspectoscrC-ticadC3laresjusticiadeberC!nperC-odonecesitamantenerpequeC1orecibidatribunaltenerifecanciC3ncanariasdescargadiversosmallorcarequieretC)cnicodeberC-aviviendafinanzasadelantefuncionaconsejosdifC-cilciudadesantiguasavanzadatC)rminounidadessC!nchezcampaC1asoftonicrevistascontienesectoresmomentosfacultadcrC)ditodiversassupuestofactoressegundospequeC1aP3P>P4P0P5Q\x01P;P8P5Q\x01Q\x02Q\fP1Q\vP;P>P1Q\vQ\x02Q\fQ\rQ\x02P>P<P\x15Q\x01P;P8Q\x02P>P3P>P<P5P=Q\x0fP2Q\x01P5Q\x05Q\rQ\x02P>P9P4P0P6P5P1Q\vP;P8P3P>P4Q\x03P4P5P=Q\fQ\rQ\x02P>Q\x02P1Q\vP;P0Q\x01P5P1Q\x0fP>P4P8P=Q\x01P5P1P5P=P0P4P>Q\x01P0P9Q\x02Q\x04P>Q\x02P>P=P5P3P>Q\x01P2P>P8Q\x01P2P>P9P8P3Q\0Q\vQ\x02P>P6P5P2Q\x01P5P<Q\x01P2P>Q\x0eP;P8Q\bQ\fQ\rQ\x02P8Q\x05P?P>P:P0P4P=P5P9P4P>P<P0P<P8Q\0P0P;P8P1P>Q\x02P5P<Q\x03Q\x05P>Q\x02Q\x0fP4P2Q\x03Q\x05Q\x01P5Q\x02P8P;Q\x0eP4P8P4P5P;P>P<P8Q\0P5Q\x02P5P1Q\x0fQ\x01P2P>P5P2P8P4P5Q\x07P5P3P>Q\rQ\x02P8P<Q\x01Q\x07P5Q\x02Q\x02P5P<Q\vQ\x06P5P=Q\vQ\x01Q\x02P0P;P2P5P4Q\fQ\x02P5P<P5P2P>P4Q\vQ\x02P5P1P5P2Q\vQ\bP5P=P0P<P8Q\x02P8P?P0Q\x02P>P<Q\x03P?Q\0P0P2P;P8Q\x06P0P>P4P=P0P3P>P4Q\vP7P=P0Q\x0eP<P>P3Q\x03P4Q\0Q\x03P3P2Q\x01P5P9P8P4P5Q\x02P:P8P=P>P>P4P=P>P4P5P;P0P4P5P;P5Q\x01Q\0P>P:P8Q\x0eP=Q\x0fP2P5Q\x01Q\fP\x15Q\x01Q\x02Q\fQ\0P0P7P0P=P0Q\bP8X\'Y\x04Y\x04Y\x07X\'Y\x04X*Y\nX,Y\x05Y\nX9X.X\'X5X)X\'Y\x04X0Y\nX9Y\x04Y\nY\x07X,X/Y\nX/X\'Y\x04X"Y\x06X\'Y\x04X1X/X*X-Y\x03Y\x05X5Y\x01X-X)Y\x03X\'Y\x06X*X\'Y\x04Y\x04Y\nY\nY\x03Y\bY\x06X4X(Y\x03X)Y\x01Y\nY\x07X\'X(Y\x06X\'X*X-Y\bX\'X!X#Y\x03X+X1X.Y\x04X\'Y\x04X\'Y\x04X-X(X/Y\x04Y\nY\x04X/X1Y\bX3X\'X6X:X7X*Y\x03Y\bY\x06Y\x07Y\x06X\'Y\x03X3X\'X-X)Y\x06X\'X/Y\nX\'Y\x04X7X(X9Y\x04Y\nY\x03X4Y\x03X1X\'Y\nY\x05Y\x03Y\x06Y\x05Y\x06Y\x07X\'X4X1Y\x03X)X1X&Y\nX3Y\x06X4Y\nX7Y\x05X\'X0X\'X\'Y\x04Y\x01Y\x06X4X(X\'X(X*X9X(X1X1X-Y\x05X)Y\x03X\'Y\x01X)Y\nY\x02Y\bY\x04Y\x05X1Y\x03X2Y\x03Y\x04Y\x05X)X#X-Y\x05X/Y\x02Y\x04X(Y\nY\nX9Y\x06Y\nX5Y\bX1X)X7X1Y\nY\x02X4X\'X1Y\x03X,Y\bX\'Y\x04X#X.X1Y\tY\x05X9Y\x06X\'X\'X(X-X+X9X1Y\bX6X(X4Y\x03Y\x04Y\x05X3X,Y\x04X(Y\x06X\'Y\x06X.X\'Y\x04X/Y\x03X*X\'X(Y\x03Y\x04Y\nX)X(X/Y\bY\x06X#Y\nX6X\'Y\nY\bX,X/Y\x01X1Y\nY\x02Y\x03X*X(X*X#Y\x01X6Y\x04Y\x05X7X(X.X\'Y\x03X+X1X(X\'X1Y\x03X\'Y\x01X6Y\x04X\'X-Y\x04Y\tY\x06Y\x01X3Y\x07X#Y\nX\'Y\x05X1X/Y\bX/X#Y\x06Y\x07X\'X/Y\nY\x06X\'X\'Y\x04X\'Y\x06Y\x05X9X1X6X*X9Y\x04Y\x05X/X\'X.Y\x04Y\x05Y\x05Y\x03Y\x06\0\0\0\0\0\0\0\0\x01\0\x01\0\x01\0\x01\0\x02\0\x02\0\x02\0\x02\0\x04\0\x04\0\x04\0\x04\0\0\x01\x02\x03\x04\x05\x06\x07\x07\x06\x05\x04\x03\x02\x01\0\b\t\n\v\f\r\x0e\x0f\x0f\x0e\r\f\v\n\t\b\x10\x11\x12\x13\x14\x15\x16\x17\x17\x16\x15\x14\x13\x12\x11\x10\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x1f\x1e\x1d\x1c\x1b\x1a\x19\x18\x7f\x7f\x7f\x7f\0\0\0\0\0\0\0\0\x7f\x7f\x7f\x7f\x01\0\0\0\x02\0\0\0\x02\0\0\0\x01\0\0\0\x01\0\0\0\x03\0\0\0\x7f\x7f\0\x01\0\0\0\x01\0\0\x7f\x7f\0\x01\0\0\0\b\0\b\0\b\0\b\0\0\0\x01\0\x02\0\x03\0\x04\0\x05\0\x06\0\x07resourcescountriesquestionsequipmentcommunityavailablehighlightDTD/xhtmlmarketingknowledgesomethingcontainerdirectionsubscribeadvertisecharacter" value="</select>Australia" class="situationauthorityfollowingprimarilyoperationchallengedevelopedanonymousfunction functionscompaniesstructureagreement" title="potentialeducationargumentssecondarycopyrightlanguagesexclusivecondition</form>\r\nstatementattentionBiography} else {\nsolutionswhen the Analyticstemplatesdangeroussatellitedocumentspublisherimportantprototypeinfluence»</effectivegenerallytransformbeautifultransportorganizedpublishedprominentuntil thethumbnailNational .focus();over the migrationannouncedfooter">\nexceptionless thanexpensiveformationframeworkterritoryndicationcurrentlyclassNamecriticismtraditionelsewhereAlexanderappointedmaterialsbroadcastmentionedaffiliate</option>treatmentdifferent/default.Presidentonclick="biographyotherwisepermanentFranC\'aisHollywoodexpansionstandards</style>\nreductionDecember preferredCambridgeopponentsBusiness confusion>\n<title>presentedexplaineddoes not worldwideinterfacepositionsnewspaper</table>\nmountainslike the essentialfinancialselectionaction="/abandonedEducationparseInt(stabilityunable to\nrelationsNote thatefficientperformedtwo yearsSince thethereforewrapper">alternateincreasedBattle ofperceivedtrying tonecessaryportrayedelectionsElizabethdiscoveryinsurances.length;legendaryGeographycandidatecorporatesometimesservices.inheritedCommunityreligiouslocationsCommitteebuildingsthe worldno longerbeginningreferencecannot befrequencytypicallyinto the relative;recordingpresidentinitiallytechniquethe otherit can beexistenceunderlinethis timetelephoneitemscopepracticesadvantage);return For otherprovidingdemocracyboth the extensivesufferingsupportedcomputers functionpracticalsaid thatit may beEnglish\nsuspectedmargin: 0spiritual\n\nmicrosoftgraduallydiscussedhe becameexecutivejquery.jshouseholdconfirmedpurchasedliterallydestroyedup to thevariationremainingit is notcenturiesJapanese among thecompletedalgorithminterestsrebellionundefinedencourageresizableinvolvingsensitiveuniversalprovision(althoughfeaturingconducted), which continued-header">February numerous overflow:componentfragmentsexcellentcolspan="technicalnear the Advanced source ofexpressedHong Kong Facebookmultiple mechanismelevationoffensive\n\tsponsoreddocument.or "there arethose whomovementsprocessesdifficultsubmittedrecommendconvincedpromoting" width=".replace(classicalcoalitionhis firstdecisionsassistantindicatedevolution-wrapper"enough toalong thedelivered--\x3e\r\n\x3c!--American protectedNovember substanceautomaticaspect ofAmong theconnectedestimatesAir Forcesystem ofobjectiveimmediatemaking itpaintingsconqueredare stillproceduregrowth ofheaded byEuropean divisionsmoleculesfranchiseintentionattractedchildhoodalso useddedicatedsingaporedegree offather ofconflicts

\ncame fromwere usednote thatreceivingExecutiveeven moreaccess tocommanderPoliticalmusiciansdeliciousprisonersadvent ofUTF-8" />ContactSouthern bgcolor="series of. It was in Europepermittedvalidate.appearingofficialsseriously-languageinitiatedextendinglong-terminflationsuch thatgetCookiemarked byimplementbut it isincreasesdown the requiringdependent--\x3e\n\x3c!-- interviewWith the copies ofconsensuswas builtVenezuela(formerlythe statepersonnelstrategicfavour ofinventionWikipediacontinentvirtuallywhich wasprincipleComplete identicalshow thatprimitiveaway frommolecularpreciselydissolvedUnder theversion="> span id="sought tobelow thesurviving}his deathas in thecaused bypartiallyexisting using thewas givena list oflevels ofnotion ofOfficial dismissedscientistresemblesduplicateexplosiverecoveredall othergalleries{padding:people ofregion ofaddressesassociateimg alt="in modernshould bemethod ofreportingtimestampneeded tothe Greatregardingseemed toviewed asimpact onidea thatthe Worldheight ofexpandingThese arecurrent">carefullymaintainscharge ofClassicaladdressedpredictedownership\ndepend onsearch">\npieces ofcompetingReferencetennesseewhich has version= <gives thehistorianvalue="">padding:0view thattogether,the most was foundsubset ofattack onchildren,points ofpersonal position:allegedlyClevelandwas laterand afterare givenwas stillscrollingdesign ofmakes themuch lessAmericans.\n\nAfter , but theMuseum oflouisiana(from theminnesotaparticlesa processDominicanvolume ofreturningdefensive00px|righmade frommouseover" style="states of(which iscontinuesFranciscobuilding without awith somewho woulda form ofa part ofbefore itknown as Serviceslocation and oftenmeasuringand it ispaperbackvalues of\r\n= window.determineer" played byand early</center>from thisthe threepower andof "innerHTML<a href="y:inline;Church ofthe eventvery highofficial -height: content="/cgi-bin/to createafrikaansesperantofranC\'aislatvieE!ulietuviE3D\feE!tinaD\reE!tina`9\x04`8\x17`8"f\x17%f\x1c,h*\x1eg.\0d=\x13e-\x17g9\x01i+\x14e-\x17m\x15\x1cj5-l\x164d8:d;\0d9\bh.!g.\x17f\x1c:g,\x14h.0f\x1c,h(\x0eh+\x16e\r\0f\x1c\re\n!e\x19(d:\x12h\x01\x14g=\x11f\b?e\x1c0d:\'d?1d9\x10i\x03(e\x07:g\t\bg$>f\x0e\x12h!\ff&\x1ci\x03(h\x10=f <h?\x1bd8\0f-%f\x14/d;\x18e.\x1di*\fh/\x01g \x01e\'\x14e\x11\x18d<\x1af\x150f\r.e:\x13f6\bh49h\0\x05e\n\x1ee\x05,e.$h.(h.:e\f:f71e\x1c3e8\x02f\x12-f\x14>e\x19(e\f\x17d:,e8\x02e$\'e-&g\x14\x1fh6\nf\x1d%h6\ng.!g\x10\x06e\x11\x18d?!f\x01/g=\x11serviciosartC-culoargentinabarcelonacualquierpublicadoproductospolC-ticarespuestawikipediasiguientebC:squedacomunidadseguridadprincipalpreguntascontenidorespondervenezuelaproblemasdiciembrerelaciC3nnoviembresimilaresproyectosprogramasinstitutoactividadencuentraeconomC-aimC!genescontactardescargarnecesarioatenciC3ntelC)fonocomisiC3ncancionescapacidadencontraranC!lisisfavoritostC)rminosprovinciaetiquetaselementosfuncionesresultadocarC!cterpropiedadprincipionecesidadmunicipalcreaciC3ndescargaspresenciacomercialopinionesejercicioeditorialsalamancagonzC!lezdocumentopelC-cularecientesgeneralestarragonaprC!cticanovedadespropuestapacientestC)cnicasobjetivoscontactos`$.`%\x07`$\x02`$2`$?`$\x0f`$9`%\b`$\x02`$\x17`$/`$>`$8`$>`$%`$\x0f`$5`$\x02`$0`$9`%\x07`$\x15`%\v`$\b`$\x15`%\x01`$\x1b`$0`$9`$>`$,`$>`$&`$\x15`$9`$>`$8`$-`%\0`$9`%\x01`$\x0f`$0`$9`%\0`$.`%\b`$\x02`$&`$?`$(`$,`$>`$$diplodocs`$8`$.`$/`$0`%\x02`$*`$(`$>`$.`$*`$$`$>`$+`$?`$0`$\x14`$8`$$`$$`$0`$9`$2`%\v`$\x17`$9`%\x01`$\x06`$,`$>`$0`$&`%\x07`$6`$9`%\x01`$\b`$\x16`%\x07`$2`$/`$&`$?`$\x15`$>`$.`$5`%\x07`$,`$$`%\0`$(`$,`%\0`$\x1a`$.`%\f`$$`$8`$>`$2`$2`%\x07`$\x16`$\x1c`%\t`$,`$.`$&`$&`$$`$%`$>`$(`$9`%\0`$6`$9`$0`$\x05`$2`$\x17`$\x15`$-`%\0`$(`$\x17`$0`$*`$>`$8`$0`$>`$$`$\x15`$?`$\x0f`$\t`$8`%\x07`$\x17`$/`%\0`$9`%\x02`$\x01`$\x06`$\x17`%\x07`$\x1f`%\0`$.`$\x16`%\v`$\x1c`$\x15`$>`$0`$\x05`$-`%\0`$\x17`$/`%\x07`$$`%\x01`$.`$5`%\v`$\x1f`$&`%\x07`$\x02`$\x05`$\x17`$0`$\x10`$8`%\x07`$.`%\x07`$2`$2`$\x17`$>`$9`$>`$2`$\n`$*`$0`$\x1a`$>`$0`$\x10`$8`$>`$&`%\x07`$0`$\x1c`$?`$8`$&`$?`$2`$,`$\x02`$&`$,`$(`$>`$9`%\x02`$\x02`$2`$>`$\x16`$\x1c`%\0`$$`$,`$\x1f`$(`$.`$?`$2`$\x07`$8`%\x07`$\x06`$(`%\x07`$(`$/`$>`$\x15`%\x01`$2`$2`%\t`$\x17`$-`$>`$\x17`$0`%\x07`$2`$\x1c`$\x17`$9`$0`$>`$.`$2`$\x17`%\x07`$*`%\x07`$\x1c`$9`$>`$%`$\x07`$8`%\0`$8`$9`%\0`$\x15`$2`$>`$ `%\0`$\x15`$9`$>`$\x01`$&`%\x02`$0`$$`$9`$$`$8`$>`$$`$/`$>`$&`$\x06`$/`$>`$*`$>`$\x15`$\x15`%\f`$(`$6`$>`$.`$&`%\x07`$\x16`$/`$9`%\0`$0`$>`$/`$\x16`%\x01`$&`$2`$\x17`%\0categoriesexperience\r\nCopyright javascriptconditionseverything

\nmembershiplinguisticpx;paddingphilosophyassistanceuniversityfacilitiesrecognizedpreferenceif (typeofmaintainedvocabularyhypothesis.submit();&nbsp;annotationbehind theFoundationpublisher"assumptionintroducedcorruptionscientistsexplicitlyinstead ofdimensions onClick="considereddepartmentoccupationsoon afterinvestmentpronouncedidentifiedexperimentManagementgeographic" height="link rel=".replace(/depressionconferencepunishmenteliminatedresistanceadaptationoppositionwell knownsupplementdeterminedh1 class="0px;marginmechanicalstatisticscelebratedGovernment\n\nDuring tdevelopersartificialequivalentoriginatedCommissionattachment\r\nabsolute; supportingextremely mainstream popularityemployment\r\n colspan="\n conversionabout the

integrated" lang="enPortuguesesubstituteindividualimpossiblemultimediaalmost allpx solid #apart fromsubject toin Englishcriticizedexcept forguidelinesoriginallyremarkablethe secondh2 class="collection\r\nfunctionvisibilitythe use ofvolunteersattractionunder the threatened*\nevaluationemphasizedaccessiblesuccessionalong withMeanwhile,industries
has becomeaspects ofTelevisionsufficientbasketballboth sidescontinuingan articleadventureshis mothermanchesterprinciplesparticularcommentaryeffects ofdecided topublishersJournal ofdifficultyfacilitateacceptablestyle.css"\tfunction innovation>Copyrightsituationswould havebusinessesDictionarystatementsoften usedpersistentin Januarycomprising\n\tdiplomaticcontainingperformingextensionsmay not beconcept of onclick="It is alsofinancial making theLuxembourgadditionalare calledengaged in"script");but it waselectroniconsubmit="\n\x3c!-- End electricalofficiallysuggestiontop of theunlike theAustralianOriginallyreferences\n\r\nrecognisedinitializelimited toAlexandriaretirementAdventuresfour years\n\n<!-- increasingdecorationh3 class="origins ofobligationregulationclassified(function(advantagesbeing the historiansthe publicmany yearswhich wereover time,synonymouscontent">\npresumablyhis familyuserAgent.unexpectedincluding challengeda minorityundefined"belongs totaken fromin Octoberposition: said to bereligious Federation rowspan="only a fewmeant thatled to the--\x3e\r\n
Archbishop class="nobeing usedapproachesprivilegesnoscript>\nresults inmay be theEaster eggmechanismsreasonablePopulationCollectionselected">noscript>\r/index.phparrival of-jssdk\'));managed toincompletecasualtiescompletionChristiansSeptember arithmeticproceduresmight haveProductionit appearsPhilosophyfriendshipleading togiving thetoward theguaranteeddocumentedcolor:#000video gamecommissionreflectingchange theassociatedsans-serifonkeypress; padding:He was theunderlyingtypically , and the srcElementsuccessivesince the should be networkingaccountinguse of thelower thanshows that\n\t\tcomplaintscontinuousquantitiesastronomerhe did notdue to itsapplied toan averageefforts tothe futureattempt toTherefore,capabilityRepublicanwas formedElectronickilometerschallengespublishingthe formerindigenousdirectionssubsidiaryconspiracydetails ofand in theaffordablesubstancesreason forconventionitemtype="absolutelysupposedlyremained aattractivetravellingseparatelyfocuses onelementaryapplicablefound thatstylesheetmanuscriptstands for no-repeat(sometimesCommercialin Americaundertakenquarter ofan examplepersonallyindex.php?\npercentagebest-knowncreating a" dir="ltrLieutenant\n
is said tostructuralreferendummost oftena separate->\n
\r + + diff --git a/samples/BlazorServerSide/Program.cs b/samples/BlazorServer/Program.cs similarity index 66% rename from samples/BlazorServerSide/Program.cs rename to samples/BlazorServer/Program.cs index 23a8797..1f2b71a 100644 --- a/samples/BlazorServerSide/Program.cs +++ b/samples/BlazorServer/Program.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -namespace BlazorServerSide +namespace BlazorServer { public class Program { diff --git a/samples/BlazorServer/Shared/MainLayout.razor b/samples/BlazorServer/Shared/MainLayout.razor new file mode 100644 index 0000000..2281c4f --- /dev/null +++ b/samples/BlazorServer/Shared/MainLayout.razor @@ -0,0 +1,17 @@ +@inherits LayoutComponentBase + +
+
+ +
+ +
+
+ About +
+ +
+ @Body +
+
+
diff --git a/samples/BlazorServer/Shared/MainLayout.razor.css b/samples/BlazorServer/Shared/MainLayout.razor.css new file mode 100644 index 0000000..4ad9519 --- /dev/null +++ b/samples/BlazorServer/Shared/MainLayout.razor.css @@ -0,0 +1,70 @@ +.page { + position: relative; + display: flex; + flex-direction: column; +} + +.main { + flex: 1; +} + +.sidebar { + background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); +} + +.top-row { + background-color: #f7f7f7; + border-bottom: 1px solid #d6d5d5; + justify-content: flex-end; + height: 3.5rem; + display: flex; + align-items: center; +} + + .top-row ::deep a, .top-row .btn-link { + white-space: nowrap; + margin-left: 1.5rem; + } + + .top-row a:first-child { + overflow: hidden; + text-overflow: ellipsis; + } + +@media (max-width: 640.98px) { + .top-row:not(.auth) { + display: none; + } + + .top-row.auth { + justify-content: space-between; + } + + .top-row a, .top-row .btn-link { + margin-left: 0; + } +} + +@media (min-width: 641px) { + .page { + flex-direction: row; + } + + .sidebar { + width: 250px; + height: 100vh; + position: sticky; + top: 0; + } + + .top-row { + position: sticky; + top: 0; + z-index: 1; + } + + .main > div { + padding-left: 2rem !important; + padding-right: 1.5rem !important; + } +} diff --git a/samples/BlazorServerSide/Shared/NavMenu.razor b/samples/BlazorServer/Shared/NavMenu.razor similarity index 100% rename from samples/BlazorServerSide/Shared/NavMenu.razor rename to samples/BlazorServer/Shared/NavMenu.razor diff --git a/samples/BlazorServer/Shared/NavMenu.razor.css b/samples/BlazorServer/Shared/NavMenu.razor.css new file mode 100644 index 0000000..f7f4dbe --- /dev/null +++ b/samples/BlazorServer/Shared/NavMenu.razor.css @@ -0,0 +1,62 @@ +.navbar-toggler { + background-color: rgba(255, 255, 255, 0.1); +} + +.top-row { + height: 3.5rem; + background-color: rgba(0,0,0,0.4); +} + +.navbar-brand { + font-size: 1.1rem; +} + +.oi { + width: 2rem; + font-size: 1.1rem; + vertical-align: text-top; + top: -2px; +} + +.nav-item { + font-size: 0.9rem; + padding-bottom: 0.5rem; +} + + .nav-item:first-of-type { + padding-top: 1rem; + } + + .nav-item:last-of-type { + padding-bottom: 1rem; + } + + .nav-item ::deep a { + color: #d7d7d7; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; + } + + .nav-item ::deep a.active { + background-color: rgba(255,255,255,0.25); + color: white; + } + + .nav-item ::deep a:hover { + background-color: rgba(255,255,255,0.1); + color: white; + } + +@media (min-width: 641px) { + .navbar-toggler { + display: none; + } + + .collapse { + /* Never collapse the sidebar for wide screens */ + display: block; + } +} diff --git a/samples/BlazorServerSide/Startup.cs b/samples/BlazorServer/Startup.cs similarity index 62% rename from samples/BlazorServerSide/Startup.cs rename to samples/BlazorServer/Startup.cs index 64fb58b..afb1033 100644 --- a/samples/BlazorServerSide/Startup.cs +++ b/samples/BlazorServer/Startup.cs @@ -3,18 +3,31 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Blazored.SessionStorage; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Blazored.SessionStorage.Serialization; +using Newtonsoft.Json; +using System; -namespace BlazorServerSide +namespace BlazorServer { public class Startup { + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + // This method gets called by the runtime. Use this method to add services to the container. // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { services.AddRazorPages(); - services.AddServerSideBlazor(); + services.AddServerSideBlazor(config => config.DetailedErrors = true); services.AddBlazoredSessionStorage(); + services.Replace(ServiceDescriptor.Scoped()); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -26,12 +39,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) } else { + app.UseExceptionHandler("/Error"); // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. app.UseHsts(); } app.UseHttpsRedirection(); - app.UseStaticFiles(); app.UseRouting(); @@ -43,4 +56,13 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) }); } } + + public class NewtonSoftJsonSerializer : IJsonSerializer + { + public T Deserialize(string text) + =>JsonConvert.DeserializeObject(text); + + public string Serialize(T obj) + => JsonConvert.SerializeObject(obj); + } } diff --git a/samples/BlazorServerSide/_Imports.razor b/samples/BlazorServer/_Imports.razor similarity index 51% rename from samples/BlazorServerSide/_Imports.razor rename to samples/BlazorServer/_Imports.razor index 020af93..f71dbdc 100644 --- a/samples/BlazorServerSide/_Imports.razor +++ b/samples/BlazorServer/_Imports.razor @@ -1,8 +1,12 @@ @using System.Net.Http +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Components.Authorization @using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web +@using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using BlazorServerSide.Shared +@using BlazorServer +@using BlazorServer.Shared @using Blazored.SessionStorage diff --git a/samples/BlazorServerSide/appsettings.Development.json b/samples/BlazorServer/appsettings.Development.json similarity index 100% rename from samples/BlazorServerSide/appsettings.Development.json rename to samples/BlazorServer/appsettings.Development.json diff --git a/samples/BlazorServerSide/appsettings.json b/samples/BlazorServer/appsettings.json similarity index 100% rename from samples/BlazorServerSide/appsettings.json rename to samples/BlazorServer/appsettings.json diff --git a/samples/BlazorServerSide/wwwroot/css/bootstrap/bootstrap.min.css b/samples/BlazorServer/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/bootstrap/bootstrap.min.css rename to samples/BlazorServer/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/samples/BlazorServerSide/wwwroot/css/bootstrap/bootstrap.min.css.map b/samples/BlazorServer/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/bootstrap/bootstrap.min.css.map rename to samples/BlazorServer/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/FONT-LICENSE b/samples/BlazorServer/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/FONT-LICENSE rename to samples/BlazorServer/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/ICON-LICENSE b/samples/BlazorServer/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/ICON-LICENSE rename to samples/BlazorServer/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/README.md b/samples/BlazorServer/wwwroot/css/open-iconic/README.md similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/README.md rename to samples/BlazorServer/wwwroot/css/open-iconic/README.md diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/samples/BlazorServer/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to samples/BlazorServer/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from samples/BlazorServerSide/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to samples/BlazorServer/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/samples/BlazorServer/wwwroot/css/site.css b/samples/BlazorServer/wwwroot/css/site.css new file mode 100644 index 0000000..caebf2a --- /dev/null +++ b/samples/BlazorServer/wwwroot/css/site.css @@ -0,0 +1,50 @@ +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); + +html, body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +a, .btn-link { + color: #0366d6; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.content { + padding-top: 1.1rem; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid red; +} + +.validation-message { + color: red; +} + +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } diff --git a/samples/BlazorServerSide/wwwroot/favicon.ico b/samples/BlazorServer/wwwroot/favicon.ico similarity index 100% rename from samples/BlazorServerSide/wwwroot/favicon.ico rename to samples/BlazorServer/wwwroot/favicon.ico diff --git a/samples/BlazorServerSide/Pages/_Host.cshtml b/samples/BlazorServerSide/Pages/_Host.cshtml deleted file mode 100644 index 469597c..0000000 --- a/samples/BlazorServerSide/Pages/_Host.cshtml +++ /dev/null @@ -1,29 +0,0 @@ -@page "/" -@namespace BlazorServerSide.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - - - - - - - Blazored LocalStorage - Server-Side - - - - - - - - - - - @(await Html.RenderComponentAsync(RenderMode.Server)) - - - - diff --git a/samples/BlazorServerSide/Pages/_Imports.razor b/samples/BlazorServerSide/Pages/_Imports.razor deleted file mode 100644 index 0f24eda..0000000 --- a/samples/BlazorServerSide/Pages/_Imports.razor +++ /dev/null @@ -1 +0,0 @@ -@layout MainLayout diff --git a/samples/BlazorServerSide/Shared/MainLayout.razor b/samples/BlazorServerSide/Shared/MainLayout.razor deleted file mode 100644 index 97e764d..0000000 --- a/samples/BlazorServerSide/Shared/MainLayout.razor +++ /dev/null @@ -1,15 +0,0 @@ -@inherits LayoutComponentBase - -
- -
- -
-
- About -
- -
- @Body -
-
diff --git a/samples/BlazorServerSide/wwwroot/css/site.css b/samples/BlazorServerSide/wwwroot/css/site.css deleted file mode 100644 index 8b2f196..0000000 --- a/samples/BlazorServerSide/wwwroot/css/site.css +++ /dev/null @@ -1,154 +0,0 @@ -@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); - -html, body { - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; -} - -app { - position: relative; - display: flex; - flex-direction: column; -} - -.top-row { - height: 3.5rem; - display: flex; - align-items: center; -} - -.main { - flex: 1; -} - - .main .top-row { - background-color: #e6e6e6; - border-bottom: 1px solid #d6d5d5; - } - -.sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); -} - - .sidebar .top-row { - background-color: rgba(0,0,0,0.4); - } - - .sidebar .navbar-brand { - font-size: 1.1rem; - } - - .sidebar .oi { - width: 2rem; - font-size: 1.1rem; - vertical-align: text-top; - top: -2px; - } - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item a { - color: #d7d7d7; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - } - - .nav-item a.active { - background-color: rgba(255,255,255,0.25); - color: white; - } - - .nav-item a:hover { - background-color: rgba(255,255,255,0.1); - color: white; - } - -.content { - padding-top: 1.1rem; -} - -.navbar-toggler { - background-color: rgba(255, 255, 255, 0.1); -} - -.valid.modified:not([type=checkbox]) { - outline: 1px solid #26b050; -} - -.invalid { - outline: 1px solid red; -} - -.validation-message { - color: red; -} - -#blazor-error-ui { - background: lightyellow; - bottom: 0; - box-shadow: 0 -1px 2px rgba(83, 64, 64, 0.2); - display: none; - left: 0; - padding: 0.6rem 1.25rem 0.7rem 1.25rem; - position: fixed; - width: 100%; - z-index: 1000; -} - - #blazor-error-ui .dismiss { - cursor: pointer; - position: absolute; - right: 0.75rem; - top: 0.5rem; - } - -@media (max-width: 767.98px) { - .main .top-row { - display: none; - } -} - -@media (min-width: 768px) { - app { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - } - - .main .top-row { - position: sticky; - top: 0; - } - - .main > div { - padding-left: 2rem !important; - padding-right: 1.5rem !important; - } - - .navbar-toggler { - display: none; - } - - .sidebar .collapse { - /* Never collapse the sidebar for wide screens */ - display: block; - } -} diff --git a/samples/BlazorWebAssembly/App.razor b/samples/BlazorWebAssembly/App.razor index 9f62581..b941644 100644 --- a/samples/BlazorWebAssembly/App.razor +++ b/samples/BlazorWebAssembly/App.razor @@ -1,10 +1,10 @@ - + - + - -

Sorry, but there's nothing here!

+ +

Sorry, there's nothing at this address.

 - \ No newline at end of file + diff --git a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj index 144cb19..7011596 100644 --- a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj +++ b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj @@ -1,15 +1,13 @@ - + - netstandard2.1 - 3.0 + net5.0 - - - - + + + diff --git a/samples/BlazorWebAssembly/Pages/Index.razor b/samples/BlazorWebAssembly/Pages/Index.razor index b94913b..31293dc 100644 --- a/samples/BlazorWebAssembly/Pages/Index.razor +++ b/samples/BlazorWebAssembly/Pages/Index.razor @@ -10,9 +10,9 @@
Add Item to session storage
- +
- +
@@ -28,7 +28,7 @@
-
+
Value Read from session storage
@@ -39,17 +39,32 @@
Items in session storage
@ItemsInSessionStorage
+ +
+
Item exist in session storage
@(ItemExist) +
+
+ +
+ +
+
String Read from session storage
+ @StringFromSessionStorage +
@code { string NameFromSessionStorage { get; set; } + string StringFromSessionStorage { get; set; } int ItemsInSessionStorage { get; set; } string Name { get; set; } + bool ItemExist { get; set; } protected override async Task OnInitializedAsync() { await GetNameFromSessionStorage(); + await GetStringFromSessionStorage(); await GetSessionStorageLength(); sessionStorage.Changed += (sender, e) => @@ -62,6 +77,7 @@ { await sessionStorage.SetItemAsync("name", Name); await GetNameFromSessionStorage(); + await GetStringFromSessionStorage(); await GetSessionStorageLength(); Name = ""; @@ -69,11 +85,29 @@ async Task GetNameFromSessionStorage() { - NameFromSessionStorage = await sessionStorage.GetItemAsync("name"); + try + { + NameFromSessionStorage = await sessionStorage.GetItemAsync("name"); + + if (string.IsNullOrEmpty(NameFromSessionStorage)) + { + NameFromSessionStorage = "Nothing Saved"; + } + } + catch(Exception) + { + Console.WriteLine("error reading 'name'"); + } + } + + + async Task GetStringFromSessionStorage() + { + StringFromSessionStorage = await sessionStorage.GetItemAsStringAsync("name"); - if (string.IsNullOrEmpty(NameFromSessionStorage)) + if (string.IsNullOrEmpty(StringFromSessionStorage)) { - NameFromSessionStorage = "Nothing Saved"; + StringFromSessionStorage = "Nothing Saved"; } } @@ -81,6 +115,7 @@ { await sessionStorage.RemoveItemAsync("name"); await GetNameFromSessionStorage(); + await GetStringFromSessionStorage(); await GetSessionStorageLength(); } @@ -90,6 +125,7 @@ await sessionStorage.ClearAsync(); Console.WriteLine("Getting name from session storage..."); await GetNameFromSessionStorage(); + await GetStringFromSessionStorage(); Console.WriteLine("Calling Get Length..."); await GetSessionStorageLength(); } @@ -98,6 +134,7 @@ { Console.WriteLine(await sessionStorage.LengthAsync()); ItemsInSessionStorage = await sessionStorage.LengthAsync(); + ItemExist = await sessionStorage.ContainKeyAsync("name"); } } diff --git a/samples/BlazorWebAssembly/Pages/Sync.razor b/samples/BlazorWebAssembly/Pages/Sync.razor index d625680..59a5f03 100644 --- a/samples/BlazorWebAssembly/Pages/Sync.razor +++ b/samples/BlazorWebAssembly/Pages/Sync.razor @@ -37,17 +37,31 @@
Items in session storage
@ItemsInSessionStorage
+
+
Item exist in session storage
@(ItemExist) +
+
+ +
+ +
+
String Read from session storage
+ @StringFromSessionStorage +
@code { string NameFromSessionStorage { get; set; } + string StringFromSessionStorage { get; set; } int ItemsInSessionStorage { get; set; } string Name { get; set; } + bool ItemExist { get; set; } protected override void OnInitialized() { GetNameFromSessionStorage(); + GetStringFromSessionStorage(); GetSessionStorageLength(); sessionStorage.Changed += (sender, e) => @@ -58,8 +72,10 @@ void SaveName() { + Console.WriteLine(Name); sessionStorage.SetItem("name", Name); GetNameFromSessionStorage(); + GetStringFromSessionStorage(); GetSessionStorageLength(); Name = ""; @@ -67,11 +83,28 @@ void GetNameFromSessionStorage() { - NameFromSessionStorage = sessionStorage.GetItem("name"); + try + { + NameFromSessionStorage = sessionStorage.GetItem("name"); + + if (string.IsNullOrEmpty(NameFromSessionStorage)) + { + NameFromSessionStorage = "Nothing Saved"; + } + } + catch (Exception) + { + Console.WriteLine("error reading 'name'"); + } + } + + void GetStringFromSessionStorage() + { + StringFromSessionStorage = sessionStorage.GetItemAsString("name"); - if (string.IsNullOrEmpty(NameFromSessionStorage)) + if (string.IsNullOrEmpty(StringFromSessionStorage)) { - NameFromSessionStorage = "Nothing Saved"; + StringFromSessionStorage = "Nothing Saved"; } } @@ -79,6 +112,7 @@ { sessionStorage.RemoveItem("name"); GetNameFromSessionStorage(); + GetStringFromSessionStorage(); GetSessionStorageLength(); } @@ -88,6 +122,7 @@ sessionStorage.Clear(); Console.WriteLine("Getting name from session storage..."); GetNameFromSessionStorage(); + GetStringFromSessionStorage(); Console.WriteLine("Calling Get Length..."); GetSessionStorageLength(); } @@ -96,6 +131,7 @@ { Console.WriteLine(sessionStorage.Length()); ItemsInSessionStorage = sessionStorage.Length(); + ItemExist = sessionStorage.ContainKey("name"); } } diff --git a/samples/BlazorWebAssembly/Program.cs b/samples/BlazorWebAssembly/Program.cs index 3bf7221..0fff24f 100644 --- a/samples/BlazorWebAssembly/Program.cs +++ b/samples/BlazorWebAssembly/Program.cs @@ -1,6 +1,6 @@ -using System.Threading.Tasks; +using Blazored.SessionStorage; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; -using Blazored.SessionStorage; +using System.Threading.Tasks; namespace BlazorWebAssembly { @@ -9,7 +9,8 @@ public class Program public static async Task Main(string[] args) { var builder = WebAssemblyHostBuilder.CreateDefault(args); - builder.RootComponents.Add("app"); + builder.RootComponents.Add("#app"); + builder.Services.AddBlazoredSessionStorage(); await builder.Build().RunAsync(); diff --git a/samples/BlazorWebAssembly/Shared/MainLayout.razor b/samples/BlazorWebAssembly/Shared/MainLayout.razor index 902e3ed..a76e097 100644 --- a/samples/BlazorWebAssembly/Shared/MainLayout.razor +++ b/samples/BlazorWebAssembly/Shared/MainLayout.razor @@ -1,15 +1,17 @@ @inherits LayoutComponentBase -
- -
- -
-
- About +
+
+
-
- @Body +
+
+ About +
+ +
+ @Body +
diff --git a/samples/BlazorWebAssembly/Shared/MainLayout.razor.css b/samples/BlazorWebAssembly/Shared/MainLayout.razor.css new file mode 100644 index 0000000..4ad9519 --- /dev/null +++ b/samples/BlazorWebAssembly/Shared/MainLayout.razor.css @@ -0,0 +1,70 @@ +.page { + position: relative; + display: flex; + flex-direction: column; +} + +.main { + flex: 1; +} + +.sidebar { + background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); +} + +.top-row { + background-color: #f7f7f7; + border-bottom: 1px solid #d6d5d5; + justify-content: flex-end; + height: 3.5rem; + display: flex; + align-items: center; +} + + .top-row ::deep a, .top-row .btn-link { + white-space: nowrap; + margin-left: 1.5rem; + } + + .top-row a:first-child { + overflow: hidden; + text-overflow: ellipsis; + } + +@media (max-width: 640.98px) { + .top-row:not(.auth) { + display: none; + } + + .top-row.auth { + justify-content: space-between; + } + + .top-row a, .top-row .btn-link { + margin-left: 0; + } +} + +@media (min-width: 641px) { + .page { + flex-direction: row; + } + + .sidebar { + width: 250px; + height: 100vh; + position: sticky; + top: 0; + } + + .top-row { + position: sticky; + top: 0; + z-index: 1; + } + + .main > div { + padding-left: 2rem !important; + padding-right: 1.5rem !important; + } +} diff --git a/samples/BlazorWebAssembly/Shared/NavMenu.razor b/samples/BlazorWebAssembly/Shared/NavMenu.razor index 2a22094..4869261 100644 --- a/samples/BlazorWebAssembly/Shared/NavMenu.razor +++ b/samples/BlazorWebAssembly/Shared/NavMenu.razor @@ -5,7 +5,7 @@
-
+
  • @@ -19,9 +19,11 @@
@code { - bool collapseNavMenu = true; + private bool collapseNavMenu = true; - void ToggleNavMenu() + private string NavMenuCssClass => collapseNavMenu ? "collapse" : null; + + private void ToggleNavMenu() { collapseNavMenu = !collapseNavMenu; } diff --git a/samples/BlazorWebAssembly/Shared/NavMenu.razor.css b/samples/BlazorWebAssembly/Shared/NavMenu.razor.css new file mode 100644 index 0000000..f7f4dbe --- /dev/null +++ b/samples/BlazorWebAssembly/Shared/NavMenu.razor.css @@ -0,0 +1,62 @@ +.navbar-toggler { + background-color: rgba(255, 255, 255, 0.1); +} + +.top-row { + height: 3.5rem; + background-color: rgba(0,0,0,0.4); +} + +.navbar-brand { + font-size: 1.1rem; +} + +.oi { + width: 2rem; + font-size: 1.1rem; + vertical-align: text-top; + top: -2px; +} + +.nav-item { + font-size: 0.9rem; + padding-bottom: 0.5rem; +} + + .nav-item:first-of-type { + padding-top: 1rem; + } + + .nav-item:last-of-type { + padding-bottom: 1rem; + } + + .nav-item ::deep a { + color: #d7d7d7; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; + } + + .nav-item ::deep a.active { + background-color: rgba(255,255,255,0.25); + color: white; + } + + .nav-item ::deep a:hover { + background-color: rgba(255,255,255,0.1); + color: white; + } + +@media (min-width: 641px) { + .navbar-toggler { + display: none; + } + + .collapse { + /* Never collapse the sidebar for wide screens */ + display: block; + } +} diff --git a/samples/BlazorWebAssembly/_Imports.razor b/samples/BlazorWebAssembly/_Imports.razor index 07e96c3..baf3f18 100644 --- a/samples/BlazorWebAssembly/_Imports.razor +++ b/samples/BlazorWebAssembly/_Imports.razor @@ -1,7 +1,10 @@ @using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web -@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop @using BlazorWebAssembly @using BlazorWebAssembly.Shared diff --git a/samples/BlazorWebAssembly/wwwroot/css/app.css b/samples/BlazorWebAssembly/wwwroot/css/app.css new file mode 100644 index 0000000..82fc22a --- /dev/null +++ b/samples/BlazorWebAssembly/wwwroot/css/app.css @@ -0,0 +1,50 @@ +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); + +html, body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +a, .btn-link { + color: #0366d6; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.content { + padding-top: 1.1rem; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid red; +} + +.validation-message { + color: red; +} + +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } diff --git a/samples/BlazorWebAssembly/wwwroot/css/site.css b/samples/BlazorWebAssembly/wwwroot/css/site.css deleted file mode 100644 index 7338534..0000000 --- a/samples/BlazorWebAssembly/wwwroot/css/site.css +++ /dev/null @@ -1,123 +0,0 @@ -@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); - -html, body { - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; -} - -app { - position: relative; - display: flex; - flex-direction: column; -} - -.top-row { - height: 3.5rem; - display: flex; - align-items: center; -} - -.main { - flex: 1; -} - - .main .top-row { - background-color: #e6e6e6; - border-bottom: 1px solid #d6d5d5; - } - -.sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); -} - - .sidebar .top-row { - background-color: rgba(0,0,0,0.4); - } - - .sidebar .navbar-brand { - font-size: 1.1rem; - } - - .sidebar .oi { - width: 2rem; - font-size: 1.1rem; - vertical-align: text-top; - top: -2px; - } - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item a { - color: #d7d7d7; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - } - - .nav-item a.active { - background-color: rgba(255,255,255,0.25); - color: white; - } - - .nav-item a:hover { - background-color: rgba(255,255,255,0.1); - color: white; - } - -.content { - padding-top: 1.1rem; -} - -.navbar-toggler { - background-color: rgba(255, 255, 255, 0.1); -} - -@media (max-width: 767.98px) { - .main .top-row { - display: none; - } -} - -@media (min-width: 768px) { - app { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - } - - .main .top-row { - position: sticky; - top: 0; - } - - .main > div { - padding-left: 2rem !important; - padding-right: 1.5rem !important; - } - - .navbar-toggler { - display: none; - } - - .sidebar .collapse { - /* Never collapse the sidebar for wide screens */ - display: block; - } -} diff --git a/samples/BlazorWebAssembly/wwwroot/index.html b/samples/BlazorWebAssembly/wwwroot/index.html index bc8f750..980817a 100644 --- a/samples/BlazorWebAssembly/wwwroot/index.html +++ b/samples/BlazorWebAssembly/wwwroot/index.html @@ -1,13 +1,14 @@  - - Blazored SessionStorage + Blazored SessionStorage (Wasm) + - + + - - Loading... +
Loading...
An unhandled error has occurred. @@ -75,5 +75,4 @@ }); - - \ No newline at end of file + diff --git a/samples/bUnitExample/Counter.razor b/samples/bUnitExample/Counter.razor new file mode 100644 index 0000000..cb6f9e1 --- /dev/null +++ b/samples/bUnitExample/Counter.razor @@ -0,0 +1,16 @@ +

Counter

+ +

+ Current count: @currentCount +

+ + + +@code { + int currentCount = 0; + + void IncrementCount() + { + currentCount++; + } +} diff --git a/samples/bUnitExample/IndexPageTests.cs b/samples/bUnitExample/IndexPageTests.cs new file mode 100644 index 0000000..31c1492 --- /dev/null +++ b/samples/bUnitExample/IndexPageTests.cs @@ -0,0 +1,27 @@ +using System.Threading.Tasks; +using Bunit; +using Xunit; + +namespace bUnitExample +{ + public class IndexPageTests : TestContext + { + [Fact] + public async Task SavesNameToSessionStorage() + { + // Arrange + const string inputName = "John Smith"; + var sessionStorage = this.AddBlazoredSessionStorage(); + var cut = RenderComponent(); + + // Act + cut.Find("#Name").Change(inputName); + cut.Find("#NameButton").Click(); + + // Assert + var name = await sessionStorage.GetItemAsync("name"); + + Assert.Equal(inputName, name); + } + } +} diff --git a/samples/bUnitExample/_Imports.razor b/samples/bUnitExample/_Imports.razor new file mode 100644 index 0000000..5703c20 --- /dev/null +++ b/samples/bUnitExample/_Imports.razor @@ -0,0 +1,6 @@ +@using Microsoft.AspNetCore.Components.Web +@using Microsoft.JSInterop +@using Microsoft.Extensions.DependencyInjection +@using Bunit +@using Bunit.TestDoubles +@using Xunit diff --git a/samples/bUnitExample/bUnitExample.csproj b/samples/bUnitExample/bUnitExample.csproj new file mode 100644 index 0000000..6d5685c --- /dev/null +++ b/samples/bUnitExample/bUnitExample.csproj @@ -0,0 +1,26 @@ + + + + net5.0 + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + \ No newline at end of file diff --git a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj index 3226b58..8191ad3 100644 --- a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj +++ b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj @@ -1,20 +1,18 @@  - netstandard2.0 - 3.0 + netstandard2.1;net5.0 Chris Sainty - Copyright 2020 (c) Chris Sainty. All rights reserved. - + Copyright 2020 (c) Chris Sainty. All rights reserved. A library to provide access to session storage in Blazor applications true snupkg Blazored.SessionStorage - Blazored;Blazor;Razor;Components;Session Storage;Browser Storage;ASP.NET Core;CSharp;Web + Blazored;Blazor;Razor;Components;SessionStorage;Session Storage;ASP.NET Core;CSharp;Web MIT https://github.com/Blazored/SessionStorage icon.png @@ -24,15 +22,34 @@ true true + true + Blazored.SessionStorage.snk - - - + + 3.0 + + + + + + + + + + + + + + - + + + + + diff --git a/src/Blazored.SessionStorage/Blazored.SessionStorage.snk b/src/Blazored.SessionStorage/Blazored.SessionStorage.snk new file mode 100644 index 0000000000000000000000000000000000000000..18e2ce3056b7ac1a4950e9cd2874f423e197e0d5 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097XC*dN@Hrx}&m8A4Ld@ZB)F|O2B?J$u* zz||sRGCn2POYeW}+>6qj{zmL&A%@Ek;92h4zc26rxp$&BYGFOh`w1=P!b9MQjkLyU z2tg#W!Fik7OS>;{{?Irt!OPnEZNT)p%-k&QRU=P|TGwVp!xd6L?o(3P@DMiSixcDb zt^>MkhmWu1(SrN*jcP{D4WaB3D-(A8AKI~^zhV#M#A~w*7qq&wAOA6UeNlJhxKgAu zI8cBn8@Q-Z#xCpg#j=cSld0UJAY7goaqnPnr!=w^e{qWGCOwx&HfbyKeTdH$p|_yH zN-#qZauNGh)Nh`fyON*fg0*M}6)pFHu!((3ShrkRuHQP;K55xA`PX@pXHwQi0nj+i zIT;V@@*i`vm(K~7Eg$Tyq)NpfY_d&$KO3WWIW>+77?wD zJMvLM69^UTy``CbNS>DAT}1Oc$H7PDHz4CWiVre`iH8-F1^Q!gb=b%UTovXOt4ws` zq4dX5E5ZohBuXYBMNT33s|$?;3OblFAQgz+LgMM|1Y>$S{LVUk;(}2ZXjdSiUjch3 zTiH!n<98=1rZr`~17ue9?<0Nf|7=Y$fp5av;aWUYr)CX3o1aJG)4pDcE%R@g4vL~L z@2Ej)ZtUCuI+i)bH&4N1TfMxYE _jSRuntime.InvokeVoidAsync("sessionStorage.clear"); + + public ValueTask GetItemAsync(string key) + => _jSRuntime.InvokeAsync("sessionStorage.getItem", key); + + public ValueTask KeyAsync(int index) + => _jSRuntime.InvokeAsync("sessionStorage.key", index); + + public ValueTask ContainKeyAsync(string key) + => _jSRuntime.InvokeAsync("sessionStorage.hasOwnProperty", key); + + public ValueTask LengthAsync() + => _jSRuntime.InvokeAsync("eval", "sessionStorage.length"); + + public ValueTask RemoveItemAsync(string key) + => _jSRuntime.InvokeVoidAsync("sessionStorage.removeItem", key); + + public ValueTask SetItemAsync(string key, string data) + => _jSRuntime.InvokeVoidAsync("sessionStorage.setItem", key, data); + + public void Clear() + { + CheckForInProcessRuntime(); + _jSInProcessRuntime.InvokeVoid("sessionStorage.clear"); + } + + public string GetItem(string key) + { + CheckForInProcessRuntime(); + return _jSInProcessRuntime.Invoke("sessionStorage.getItem", key); + } + + public string Key(int index) + { + CheckForInProcessRuntime(); + return _jSInProcessRuntime.Invoke("sessionStorage.key", index); + } + + public bool ContainKey(string key) + { + CheckForInProcessRuntime(); + return _jSInProcessRuntime.Invoke("sessionStorage.hasOwnProperty", key); + } + + public int Length() + { + CheckForInProcessRuntime(); + return _jSInProcessRuntime.Invoke("eval", "sessionStorage.length"); + } + + public void RemoveItem(string key) + { + CheckForInProcessRuntime(); + _jSInProcessRuntime.InvokeVoidAsync("sessionStorage.removeItem", key); + } + + public void SetItem(string key, string data) + { + CheckForInProcessRuntime(); + _jSInProcessRuntime.InvokeVoid("sessionStorage.setItem", key, data); + } + + private void CheckForInProcessRuntime() + { + if (_jSInProcessRuntime == null) + throw new InvalidOperationException("IJSInProcessRuntime not available"); + } + } +} diff --git a/src/Blazored.SessionStorage/ChangedEventArgs.cs b/src/Blazored.SessionStorage/ChangedEventArgs.cs index 818909c..fae2781 100644 --- a/src/Blazored.SessionStorage/ChangedEventArgs.cs +++ b/src/Blazored.SessionStorage/ChangedEventArgs.cs @@ -1,5 +1,8 @@ -namespace Blazored.SessionStorage +using System.Diagnostics.CodeAnalysis; + +namespace Blazored.SessionStorage { + [ExcludeFromCodeCoverage] public class ChangedEventArgs { public string Key { get; set; } diff --git a/src/Blazored.SessionStorage/ChangingEventArgs.cs b/src/Blazored.SessionStorage/ChangingEventArgs.cs index 2a38e76..047a3e3 100644 --- a/src/Blazored.SessionStorage/ChangingEventArgs.cs +++ b/src/Blazored.SessionStorage/ChangingEventArgs.cs @@ -1,7 +1,9 @@ using System; +using System.Diagnostics.CodeAnalysis; namespace Blazored.SessionStorage { + [ExcludeFromCodeCoverage] public class ChangingEventArgs : ChangedEventArgs { public bool Cancel { get; set; } diff --git a/src/Blazored.SessionStorage/ISessionStorageService.cs b/src/Blazored.SessionStorage/ISessionStorageService.cs index 0be8e7e..476435f 100644 --- a/src/Blazored.SessionStorage/ISessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISessionStorageService.cs @@ -5,27 +5,62 @@ namespace Blazored.SessionStorage { public interface ISessionStorageService { - Task ClearAsync(); + /// + /// Clears all data from session storage. + /// + /// A representing the completion of the operation. + ValueTask ClearAsync(); + + /// + /// Retrieve the specified data from session storage and deseralise it to the specfied type. + /// + /// A value specifying the name of the session storage slot to use + /// A representing the completion of the operation. + ValueTask GetItemAsync(string key); - Task GetItemAsync(string key); + /// + /// Retrieve the specified data from session storage as a . + /// + /// A value specifying the name of the storage slot to use + /// A representing the completion of the operation. + ValueTask GetItemAsStringAsync(string key); - Task KeyAsync(int index); + /// + /// Return the name of the key at the specified . + /// + /// + /// A representing the completion of the operation. + ValueTask KeyAsync(int index); /// - /// Checks if the key exists in Session Storage but does not check the value. + /// Checks if the exists in session storage, but does not check its value. /// - /// name of the key - /// True if the key exist, false otherwise - Task ContainKeyAsync(string key); + /// A value specifying the name of the storage slot to use + /// A representing the completion of the operation. + ValueTask ContainKeyAsync(string key); - Task LengthAsync(); + /// + /// The number of items stored in session storage. + /// + /// A representing the completion of the operation. + ValueTask LengthAsync(); - Task RemoveItemAsync(string key); + /// + /// Remove the data with the specified . + /// + /// A value specifying the name of the storage slot to use + /// A representing the completion of the operation. + ValueTask RemoveItemAsync(string key); - Task SetItemAsync(string key, T data); + /// + /// Sets or updates the in session storage with the specified . + /// + /// A value specifying the name of the storage slot to use + /// The data to be saved + /// A representing the completion of the operation. + ValueTask SetItemAsync(string key, T data); event EventHandler Changing; - event EventHandler Changed; } -} \ No newline at end of file +} diff --git a/src/Blazored.SessionStorage/IStorageProvider.cs b/src/Blazored.SessionStorage/IStorageProvider.cs new file mode 100644 index 0000000..a45f204 --- /dev/null +++ b/src/Blazored.SessionStorage/IStorageProvider.cs @@ -0,0 +1,22 @@ +using System.Threading.Tasks; + +namespace Blazored.SessionStorage +{ + internal interface IStorageProvider + { + void Clear(); + ValueTask ClearAsync(); + bool ContainKey(string key); + ValueTask ContainKeyAsync(string key); + string GetItem(string key); + ValueTask GetItemAsync(string key); + string Key(int index); + ValueTask KeyAsync(int index); + int Length(); + ValueTask LengthAsync(); + void RemoveItem(string key); + ValueTask RemoveItemAsync(string key); + void SetItem(string key, string data); + ValueTask SetItemAsync(string key, string data); + } +} \ No newline at end of file diff --git a/src/Blazored.SessionStorage/ISyncSessionStorageService.cs b/src/Blazored.SessionStorage/ISyncSessionStorageService.cs index 1bdad3b..f1efb32 100644 --- a/src/Blazored.SessionStorage/ISyncSessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISyncSessionStorageService.cs @@ -4,27 +4,59 @@ namespace Blazored.SessionStorage { public interface ISyncSessionStorageService { + /// + /// Clears all data from session storage. + /// void Clear(); + /// + /// Retrieve the specified data from session storage as a . + /// + /// A value specifying the name of the session storage slot to use + /// The data from the specified as a T GetItem(string key); + /// + /// Retrieve the specified data from session storage as a . + /// + /// A value specifying the name of the storage slot to use + /// The data associated with the specified as a + string GetItemAsString(string key); + + /// + /// Return the name of the key at the specified . + /// + /// + /// The name of the key at the specified string Key(int index); /// - /// Checks if the key exists in Session Storage but does not check the value. + /// Checks if the exists in session storage, but does not check its value. /// - /// name of the key - /// True if the key exist, false otherwise + /// A value specifying the name of the storage slot to use + /// Boolean indicating if the specified exists bool ContainKey(string key); + /// + /// The number of items stored in session storage. + /// + /// The number of items stored in session storage int Length(); + /// + /// Remove the data with the specified . + /// + /// A value specifying the name of the storage slot to use void RemoveItem(string key); + /// + /// Sets or updates the in session storage with the specified . + /// + /// A value specifying the name of the storage slot to use + /// The data to be saved void SetItem(string key, T data); event EventHandler Changing; - event EventHandler Changed; } -} \ No newline at end of file +} diff --git a/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs b/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs index f2436e3..b67e0a8 100644 --- a/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs +++ b/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Text; using System.Text.Json; using System.Text.Json.Serialization; using System.Text.RegularExpressions; @@ -23,18 +25,13 @@ public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, Jso { return TimeSpan.Zero; } - else + + if (!TimeSpan.TryParseExact(s, TimeSpanFormatString, null, out var parsedTimeSpan)) { - TimeSpan parsedTimeSpan; - if (!TimeSpan.TryParseExact(s, TimeSpanFormatString, null, out parsedTimeSpan)) - { - throw new FormatException($"Input timespan is not in an expected format : expected {Regex.Unescape(TimeSpanFormatString)}. Please retrieve this key as a string and parse manually."); - } - else - { - return parsedTimeSpan; - } + throw new FormatException($"Input timespan is not in an expected format : expected {Regex.Unescape(TimeSpanFormatString)}. Please retrieve this key as a string and parse manually."); } + + return parsedTimeSpan; } public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options) diff --git a/src/Blazored.SessionStorage/PublicKey.snk b/src/Blazored.SessionStorage/PublicKey.snk new file mode 100644 index 0000000000000000000000000000000000000000..031abef3d62315bb6368ee49f2f9f59da8f6df16 GIT binary patch literal 160 zcmV;R0AK$ABme*efB*oL000060ssI2Bme+XQ$aBR1ONa50097XC*dN@Hrx}&m8A4L zd@ZB)F|O2B?J$u*z||sRGCn2POYeW}+>6qj{zmL&A%@Ek;92h4zc26rxp$&BYGFOh z`w1=P!b9MQjkLyU2tg#W!Fik7OS>;{{?Irt!OPnEZNT)p%-k&QRU=P|TGwVp!xd6L O?o(3P@DMiSixcC{1xJVg literal 0 HcmV?d00001 diff --git a/src/Blazored.SessionStorage/PublicKey.txt b/src/Blazored.SessionStorage/PublicKey.txt new file mode 100644 index 0000000..0a9702e --- /dev/null +++ b/src/Blazored.SessionStorage/PublicKey.txt @@ -0,0 +1,5 @@ + +Microsoft (R) .NET Framework Strong Name Utility Version 4.0.30319.0 +Copyright (c) Microsoft Corporation. All rights reserved. + +Public key token is 6f8d36f00e4891c3 diff --git a/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs b/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs new file mode 100644 index 0000000..9bccf18 --- /dev/null +++ b/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs @@ -0,0 +1,8 @@ +namespace Blazored.SessionStorage.Serialization +{ + public interface IJsonSerializer + { + string Serialize(T obj); + T Deserialize(string text); + } +} diff --git a/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs b/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs new file mode 100644 index 0000000..8100bab --- /dev/null +++ b/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs @@ -0,0 +1,29 @@ +using Blazored.SessionStorage.StorageOptions; +using Microsoft.Extensions.Options; +using System.Runtime.CompilerServices; +using System.Text.Json; + +[assembly: InternalsVisibleTo("Blazored.SessionStorage.Tests, PublicKey=" + +"00240000048000009400000006020000002400005253413100040000010001007527e122cc36dc" + +"13c695a4f43b7c2da3f631aed456ed309140c0d52262323e25d84bef7feddc8bd29cfe46ec6521" + +"86cb10e059eedabf2ff000b977a2376a613dccfb092de6c243e0888db4c66a084124b2c1799bda" + +"4bbb2f70fed0382fc1cbdafa6dc0f4baccdc2cee55234f8a5ad76645c315523fee5352d9f01036" + +"e48b13e3")] +namespace Blazored.SessionStorage.Serialization +{ + internal class SystemTextJsonSerializer : IJsonSerializer + { + private readonly JsonSerializerOptions _options; + + public SystemTextJsonSerializer(IOptions options) + { + _options = options.Value.JsonSerializerOptions; + } + + public T Deserialize(string data) + => JsonSerializer.Deserialize(data, _options); + + public string Serialize(T data) + => JsonSerializer.Serialize(data, _options); + } +} diff --git a/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs b/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs index 4bb05e7..9b1e2bf 100644 --- a/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs +++ b/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs @@ -1,33 +1,30 @@ using System; +using System.Diagnostics.CodeAnalysis; using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Microsoft.Extensions.DependencyInjection; - -namespace Blazored.SessionStorage -{ - public static class ServiceCollectionExtensions - { - public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollection services) - { - return services - .AddScoped() - .AddScoped() - .Configure(configureOptions => - { - configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); - }); - } +using Microsoft.Extensions.DependencyInjection; + +namespace Blazored.SessionStorage +{ + [ExcludeFromCodeCoverage] + public static class ServiceCollectionExtensions + { + public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollection services) + => AddBlazoredSessionStorage(services, null); public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollection services, Action configure) { return services - .AddScoped() - .AddScoped() + .AddScoped() + .AddScoped() + .AddScoped() + .AddScoped() .Configure(configureOptions => { configure?.Invoke(configureOptions); configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); }); } - } -} + } +} diff --git a/src/Blazored.SessionStorage/SessionStorageService.cs b/src/Blazored.SessionStorage/SessionStorageService.cs index fbbe878..8bdd847 100644 --- a/src/Blazored.SessionStorage/SessionStorageService.cs +++ b/src/Blazored.SessionStorage/SessionStorageService.cs @@ -1,160 +1,160 @@ -using Blazored.SessionStorage.StorageOptions; -using Microsoft.Extensions.Options; -using Microsoft.JSInterop; -using System; +using System; using System.Text.Json; using System.Threading.Tasks; +using Blazored.SessionStorage.Serialization; namespace Blazored.SessionStorage { - public class SessionStorageService : ISessionStorageService, ISyncSessionStorageService + internal class SessionStorageService : ISessionStorageService, ISyncSessionStorageService { - private readonly IJSRuntime _jSRuntime; - private readonly IJSInProcessRuntime _jSInProcessRuntime; - private readonly JsonSerializerOptions _jsonOptions; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; - public event EventHandler Changing; - - public event EventHandler Changed; - - public SessionStorageService(IJSRuntime jSRuntime, IOptions options) + public SessionStorageService(IStorageProvider storageProvider, IJsonSerializer serializer) { - _jSRuntime = jSRuntime; - _jsonOptions = options.Value.JsonSerializerOptions; - _jSInProcessRuntime = jSRuntime as IJSInProcessRuntime; + _storageProvider = storageProvider; + _serializer = serializer; } - public async Task SetItemAsync(string key, T data) + public async ValueTask SetItemAsync(string key, T data) { - if (string.IsNullOrEmpty(key)) + if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - var e = await RaiseOnChangingAsync(key, data); + var e = await RaiseOnChangingAsync(key, data).ConfigureAwait(false); if (e.Cancel) return; - var serialisedData = JsonSerializer.Serialize(data, _jsonOptions); - - await _jSRuntime.InvokeVoidAsync("sessionStorage.setItem", key, serialisedData); + var serialisedData = _serializer.Serialize(data); + await _storageProvider.SetItemAsync(key, serialisedData).ConfigureAwait(false); RaiseOnChanged(key, e.OldValue, data); } - public async Task GetItemAsync(string key) + public async ValueTask GetItemAsync(string key) { - if (string.IsNullOrEmpty(key)) + if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - var serialisedData = await _jSRuntime.InvokeAsync("sessionStorage.getItem", key); + var serialisedData = await _storageProvider.GetItemAsync(key).ConfigureAwait(false); - if (serialisedData == null) + if (string.IsNullOrWhiteSpace(serialisedData)) return default; - return JsonSerializer.Deserialize(serialisedData, _jsonOptions); + try + { + return _serializer.Deserialize(serialisedData); + } + catch (JsonException e) when (e.Path == "$" && typeof(T) == typeof(string)) + { + // For backward compatibility return the plain string. + // On the next save a correct value will be stored and this Exception will not happen again, for this 'key' + return (T)(object)serialisedData; + } + } + + public ValueTask GetItemAsStringAsync(string key) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); + + return _storageProvider.GetItemAsync(key); } - public async Task RemoveItemAsync(string key) + public ValueTask RemoveItemAsync(string key) { - if (string.IsNullOrEmpty(key)) + if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - await _jSRuntime.InvokeAsync("sessionStorage.removeItem", key); + return _storageProvider.RemoveItemAsync(key); } - public async Task ClearAsync() => await _jSRuntime.InvokeAsync("sessionStorage.clear"); + public ValueTask ClearAsync() + => _storageProvider.ClearAsync(); - public async Task LengthAsync() => await _jSRuntime.InvokeAsync("eval", "sessionStorage.length"); + public ValueTask LengthAsync() + => _storageProvider.LengthAsync(); - public async Task KeyAsync(int index) => await _jSRuntime.InvokeAsync("sessionStorage.key", index); + public ValueTask KeyAsync(int index) + => _storageProvider.KeyAsync(index); - public async Task ContainKeyAsync(string key) => await _jSRuntime.InvokeAsync("sessionStorage.hasOwnProperty", key); + public ValueTask ContainKeyAsync(string key) + => _storageProvider.ContainKeyAsync(key); public void SetItem(string key, T data) { - if (string.IsNullOrEmpty(key)) + if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - if (_jSInProcessRuntime == null) - throw new InvalidOperationException("IJSInProcessRuntime not available"); - var e = RaiseOnChangingSync(key, data); if (e.Cancel) return; - var serialisedData = JsonSerializer.Serialize(data, _jsonOptions); - - _jSInProcessRuntime.InvokeVoid("sessionStorage.setItem", key, serialisedData); + var serialisedData = _serializer.Serialize(data); + _storageProvider.SetItem(key, serialisedData); RaiseOnChanged(key, e.OldValue, data); } public T GetItem(string key) { - if (string.IsNullOrEmpty(key)) + if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - if (_jSInProcessRuntime == null) - throw new InvalidOperationException("IJSInProcessRuntime not available"); - - var serialisedData = _jSInProcessRuntime.Invoke("sessionStorage.getItem", key); + var serialisedData = _storageProvider.GetItem(key); - if (serialisedData == null) + if (string.IsNullOrWhiteSpace(serialisedData)) return default; - return JsonSerializer.Deserialize(serialisedData, _jsonOptions); + try + { + return _serializer.Deserialize(serialisedData); + } + catch (JsonException e) when (e.Path == "$" && typeof(T) == typeof(string)) + { + // For backward compatibility return the plain string. + // On the next save a correct value will be stored and this Exception will not happen again, for this 'key' + return (T)(object)serialisedData; + } } - public void RemoveItem(string key) + public string GetItemAsString(string key) { - if (string.IsNullOrEmpty(key)) + if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - if (_jSInProcessRuntime == null) - throw new InvalidOperationException("IJSInProcessRuntime not available"); - - _jSInProcessRuntime.InvokeVoid("sessionStorage.removeItem", key); + return _storageProvider.GetItem(key); } - public void Clear() + public void RemoveItem(string key) { - if (_jSInProcessRuntime == null) - throw new InvalidOperationException("IJSInProcessRuntime not available"); + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - _jSInProcessRuntime.InvokeVoid("sessionStorage.clear"); + _storageProvider.RemoveItem(key); } - public int Length() - { - if (_jSInProcessRuntime == null) - throw new InvalidOperationException("IJSInProcessRuntime not available"); + public void Clear() + => _storageProvider.Clear(); - return _jSInProcessRuntime.Invoke("eval", "sessionStorage.length"); - } + public int Length() + => _storageProvider.Length(); public string Key(int index) - { - if (_jSInProcessRuntime == null) - throw new InvalidOperationException("IJSInProcessRuntime not available"); - - return _jSInProcessRuntime.Invoke("sessionStorage.key", index); - } + => _storageProvider.Key(index); public bool ContainKey(string key) - { - if (_jSInProcessRuntime == null) - throw new InvalidOperationException("IJSInProcessRuntime not available"); - - return _jSInProcessRuntime.Invoke("sessionStorage.hasOwnProperty", key); - } + => _storageProvider.ContainKey(key); + public event EventHandler Changing; private async Task RaiseOnChangingAsync(string key, object data) { var e = new ChangingEventArgs { Key = key, - OldValue = await GetItemAsync(key), + OldValue = await GetItemInternalAsync(key).ConfigureAwait(false), NewValue = data }; @@ -168,7 +168,7 @@ private ChangingEventArgs RaiseOnChangingSync(string key, object data) var e = new ChangingEventArgs { Key = key, - OldValue = ((ISyncSessionStorageService)this).GetItem(key), + OldValue = GetItemInternal(key), NewValue = data }; @@ -177,6 +177,46 @@ private ChangingEventArgs RaiseOnChangingSync(string key, object data) return e; } + private async Task GetItemInternalAsync(string key) + { + if (string.IsNullOrEmpty(key)) + throw new ArgumentNullException(nameof(key)); + + var serialisedData = await _storageProvider.GetItemAsync(key).ConfigureAwait(false); + + if (string.IsNullOrWhiteSpace(serialisedData)) + return default; + try + { + return _serializer.Deserialize(serialisedData); + } + catch (JsonException) + { + return (T)(object)serialisedData; + } + } + + private object GetItemInternal(string key) + { + if (string.IsNullOrEmpty(key)) + throw new ArgumentNullException(nameof(key)); + + var serialisedData = _storageProvider.GetItem(key); + + if (string.IsNullOrWhiteSpace(serialisedData)) + return default; + + try + { + return _serializer.Deserialize(serialisedData); + } + catch (JsonException) + { + return serialisedData; + } + } + + public event EventHandler Changed; private void RaiseOnChanged(string key, object oldValue, object data) { var e = new ChangedEventArgs @@ -189,4 +229,4 @@ private void RaiseOnChanged(string key, object oldValue, object data) Changed?.Invoke(this, e); } } -} \ No newline at end of file +} diff --git a/src/Blazored.SessionStorage/StorageOptions/LocalStorageOptions.cs b/src/Blazored.SessionStorage/StorageOptions/LocalStorageOptions.cs new file mode 100644 index 0000000..509f1f0 --- /dev/null +++ b/src/Blazored.SessionStorage/StorageOptions/LocalStorageOptions.cs @@ -0,0 +1,9 @@ +using System.Text.Json; + +namespace Blazored.SessionStorage.StorageOptions +{ + public class SessionStorageOptions + { + public JsonSerializerOptions JsonSerializerOptions { get; } = new JsonSerializerOptions(); + } +} diff --git a/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs b/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs deleted file mode 100644 index b005f1a..0000000 --- a/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Text.Json; - -namespace Blazored.SessionStorage.StorageOptions -{ - public class SessionStorageOptions - { - public JsonSerializerOptions JsonSerializerOptions { get; } = new JsonSerializerOptions - { - DictionaryKeyPolicy = JsonNamingPolicy.CamelCase, - IgnoreNullValues = true, - IgnoreReadOnlyProperties = true, - PropertyNameCaseInsensitive = true, - PropertyNamingPolicy = JsonNamingPolicy.CamelCase, - ReadCommentHandling = JsonCommentHandling.Skip, - WriteIndented = false - }; - } -} diff --git a/src/Blazored.SessionStorage/Testing/BUnitLocalStorageTestExtensions.cs b/src/Blazored.SessionStorage/Testing/BUnitLocalStorageTestExtensions.cs new file mode 100644 index 0000000..efaadcf --- /dev/null +++ b/src/Blazored.SessionStorage/Testing/BUnitLocalStorageTestExtensions.cs @@ -0,0 +1,37 @@ +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Diagnostics.CodeAnalysis; +using Blazored.SessionStorage; +using Blazored.SessionStorage.Testing; + +namespace Bunit +{ + [ExcludeFromCodeCoverage] + public static class BUnitSessionStorageTestExtensions + { + public static ISessionStorageService AddBlazoredSessionStorage(this TestContextBase context) + => AddBlazoredSessionStorage(context, null); + + public static ISessionStorageService AddBlazoredSessionStorage(this TestContextBase context, Action configure) + { + if (context is null) + throw new ArgumentNullException(nameof(context)); + + context.Services + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .Configure(configureOptions => + { + configure?.Invoke(configureOptions); + configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); + }); + + return context.Services.GetService(); + } + } +} diff --git a/src/Blazored.SessionStorage/Testing/InMemoryStorageProvider.cs b/src/Blazored.SessionStorage/Testing/InMemoryStorageProvider.cs new file mode 100644 index 0000000..1298766 --- /dev/null +++ b/src/Blazored.SessionStorage/Testing/InMemoryStorageProvider.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Blazored.SessionStorage.Testing +{ + internal class InMemoryStorageProvider : IStorageProvider + { + private readonly Dictionary _dataStore = new Dictionary(); + + public void Clear() + => _dataStore.Clear(); + + public ValueTask ClearAsync() + { + _dataStore.Clear(); + return new ValueTask(Task.CompletedTask); + } + + public bool ContainKey(string key) + => _dataStore.ContainsKey(key); + + public ValueTask ContainKeyAsync(string key) + => new ValueTask(ContainKey(key)); + + public string GetItem(string key) + => _dataStore.ContainsKey(key) ? _dataStore[key] : default; + + public ValueTask GetItemAsync(string key) + => new ValueTask(GetItem(key)); + + public string Key(int index) + => index > _dataStore.Count - 1 ? default : _dataStore.ElementAt(index).Key; + + public ValueTask KeyAsync(int index) + => new ValueTask(Key(index)); + + public int Length() + => _dataStore.Count; + + public ValueTask LengthAsync() + => new ValueTask(Length()); + + public void RemoveItem(string key) + => _dataStore.Remove(key); + + public ValueTask RemoveItemAsync(string key) + { + RemoveItem(key); + return new ValueTask(Task.CompletedTask); + } + + public void SetItem(string key, string data) + { + if (_dataStore.ContainsKey(key)) + { + _dataStore[key] = data; + } + else + { + _dataStore.Add(key, data); + } + } + + public ValueTask SetItemAsync(string key, string data) + { + SetItem(key, data); + return new ValueTask(Task.CompletedTask); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj b/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj new file mode 100644 index 0000000..01c5fd1 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj @@ -0,0 +1,39 @@ + + + + net5.0 + + false + + ..\..\src\Blazored.SessionStorage\Blazored.SessionStorage.snk + + true + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + Blazored.SessionStorage.snk + + + + diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs new file mode 100644 index 0000000..c29f9f3 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs @@ -0,0 +1,58 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class Clear + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + + public Clear() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, serializer); + } + + [Fact] + public void ClearsAnyItemsInTheStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + + _sut.SetItem("Item1", item1); + _sut.SetItem("Item2", item2); + + // Act + _sut.Clear(); + + // Assert + Assert.Equal(0, _storageProvider.Length()); + } + + [Fact] + public void DoesNothingWhenStoreIsEmpty() + { + // Act + _sut.Clear(); + + // Assert + Assert.Equal(0, _storageProvider.Length()); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs new file mode 100644 index 0000000..159894c --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs @@ -0,0 +1,58 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class ClearAsync + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + + public ClearAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, serializer); + } + + [Fact] + public async Task ClearsAnyItemsInTheStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + + await _sut.SetItemAsync("Item1", item1); + await _sut.SetItemAsync("Item2", item2); + + // Act + await _sut.ClearAsync(); + + // Assert + Assert.Equal(0, await _storageProvider.LengthAsync()); + } + + [Fact] + public async Task DoesNothingWhenItemDoesNotExistInStore() + { + // Act + await _sut.ClearAsync(); + + // Assert + Assert.Equal(0, await _storageProvider.LengthAsync()); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs new file mode 100644 index 0000000..d56f77a --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs @@ -0,0 +1,58 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class ContainsKey + { + private readonly SessionStorageService _sut; + + public ContainsKey() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public void ReturnsTrue_When_KeyExistsInStore() + { + // Arrange + const string key = "TestKey"; + var item1 = new TestObject(1, "Jane Smith"); + _sut.SetItem(key, item1); + + // Act + var containsKey = _sut.ContainKey(key); + + // Assert + Assert.True(containsKey); + } + + [Fact] + public void ReturnsFalse_When_KeyDoesNotExistsInStore() + { + // Arrange + const string key = "TestKey"; + + // Act + var containsKey = _sut.ContainKey(key); + + // Assert + Assert.False(containsKey); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs new file mode 100644 index 0000000..9fb4474 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs @@ -0,0 +1,58 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class ContainsKeyAsync + { + private readonly SessionStorageService _sut; + + public ContainsKeyAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public async Task ReturnsTrue_When_KeyExistsInStore() + { + // Arrange + const string key = "TestKey"; + var item1 = new TestObject(1, "Jane Smith"); + await _sut.SetItemAsync(key, item1); + + // Act + var containsKey = await _sut.ContainKeyAsync(key); + + // Assert + Assert.True(containsKey); + } + + [Fact] + public async Task ReturnsFalse_When_KeyDoesNotExistsInStore() + { + // Arrange + const string key = "TestKey"; + + // Act + var containsKey = await _sut.ContainKeyAsync(key); + + // Assert + Assert.False(containsKey); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs new file mode 100644 index 0000000..850c041 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs @@ -0,0 +1,106 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class GetItem + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public GetItem() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Action(() => _sut.GetItem(key)); + + // assert + Assert.Throws(action); + } + + [Theory] + [InlineData("Item1", "stringTest")] + [InlineData("Item2", 11)] + [InlineData("Item3", 11.11)] + public void ReturnsDeserializedDataFromStore(string key, T data) + { + // Arrange + _sut.SetItem(key, data); + + // Act + var result = _sut.GetItem(key); + + // Assert + Assert.Equal(data, result); + } + + [Fact] + public void ReturnsComplexObjectFromStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + _sut.SetItem(Key, objectToSave); + + // Act + var result = _sut.GetItem(Key); + + // Assert + Assert.Equal(objectToSave.Id, result.Id); + Assert.Equal(objectToSave.Name, result.Name); + } + + [Fact] + public void ReturnsNullFromStore_When_NullValueSaved() + { + // Arrange + var valueToSave = (string)null; + _sut.SetItem(Key, valueToSave); + + // Act + var result = _sut.GetItem(Key); + + // Assert + Assert.Null(result); + } + + [Fact] + public void ReturnsStringFromStore_When_JsonExceptionIsThrown() + { + // Arrange + var jsonData = "[{ id: 5, name: \"Jane Smith\"}]"; + _storageProvider.SetItem(Key, jsonData); + + // Act + var result = _sut.GetItem(Key); + + // Assert + Assert.Equal(jsonData, result); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs new file mode 100644 index 0000000..b3efe67 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs @@ -0,0 +1,79 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class GetItemAsString + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public GetItemAsString() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Action(() => _sut.GetItemAsString(key)); + + // assert + Assert.Throws(action); + } + + [Theory] + [InlineData("Item1", "stringTest")] + [InlineData("Item2", 11)] + [InlineData("Item3", 11.11)] + public void ReturnsDeserializedDataFromStore(string key, T data) + { + // Arrange + _sut.SetItem(key, data); + + // Act + var result = _sut.GetItemAsString(key); + + // Assert + var serializedData = _serializer.Serialize(data); + Assert.Equal(serializedData, result); + } + + [Fact] + public void ReturnsComplexObjectFromStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + _sut.SetItem(Key, objectToSave); + + // Act + var result = _sut.GetItemAsString(Key); + + // Assert + var serializedData = _serializer.Serialize(objectToSave); + Assert.Equal(serializedData, result); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs new file mode 100644 index 0000000..c024edc --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs @@ -0,0 +1,79 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class GetItemAsStringAsync + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public GetItemAsStringAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Func(async () => await _sut.GetItemAsStringAsync(key)); + + // assert + Assert.ThrowsAsync(action); + } + + [Theory] + [InlineData("Item1", "stringTest")] + [InlineData("Item2", 11)] + [InlineData("Item3", 11.11)] + public async Task ReturnsDeserializedDataFromStore(string key, T data) + { + // Arrange + await _sut.SetItemAsync(key, data); + + // Act + var result = await _sut.GetItemAsStringAsync(key); + + // Assert + var serializedData = _serializer.Serialize(data); + Assert.Equal(serializedData, result); + } + + [Fact] + public async Task ReturnsComplexObjectFromStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + await _sut.SetItemAsync(Key, objectToSave); + + // Act + var result = await _sut.GetItemAsStringAsync(Key); + + // Assert + var serializedData = _serializer.Serialize(objectToSave); + Assert.Equal(serializedData, result); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs new file mode 100644 index 0000000..73bbe87 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs @@ -0,0 +1,106 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class GetItemAsync + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public GetItemAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Func(async () => await _sut.GetItemAsync(key)); + + // assert + Assert.ThrowsAsync(action); + } + + [Theory] + [InlineData("Item1", "stringTest")] + [InlineData("Item2", 11)] + [InlineData("Item3", 11.11)] + public async Task ReturnsDeserializedDataFromStore(string key, T data) + { + // Arrange + await _sut.SetItemAsync(key, data); + + // Act + var result = await _sut.GetItemAsync(key); + + // Assert + Assert.Equal(data, result); + } + + [Fact] + public async Task ReturnsComplexObjectFromStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + await _sut.SetItemAsync(Key, objectToSave); + + // Act + var result = await _sut.GetItemAsync(Key); + + // Assert + Assert.Equal(objectToSave.Id, result.Id); + Assert.Equal(objectToSave.Name, result.Name); + } + + [Fact] + public async Task ReturnsNullFromStore_When_NullValueSaved() + { + // Arrange + var valueToSave = (string)null; + await _sut.SetItemAsync(Key, valueToSave); + + // Act + var result = await _sut.GetItemAsync(Key); + + // Assert + Assert.Null(result); + } + + [Fact] + public async Task ReturnsStringFromStore_When_JsonExceptionIsThrown() + { + // Arrange + var valueToSave = "[{ id: 5, name: \"Jane Smith\"}]"; + await _storageProvider.SetItemAsync(Key, valueToSave); + + // Act + var result = await _sut.GetItemAsync(Key); + + // Assert + Assert.Equal(valueToSave, result); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs new file mode 100644 index 0000000..5413869 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs @@ -0,0 +1,64 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class Key + { + private readonly SessionStorageService _sut; + + public Key() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public void ReturnsNameOfKeyAtIndex_When_KeyExistsInStore() + { + // Arrange + const string key1 = "TestKey1"; + const string key2 = "TestKey2"; + + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + + _sut.SetItem(key1, item1); + _sut.SetItem(key2, item2); + + // Act + var keyName = _sut.Key(1); + + // Assert + Assert.Equal(key2, keyName); + } + + [Fact] + public void ReturnsNull_When_KeyDoesNotExistInStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + _sut.SetItem("TestKey1", item1); + + // Act + var keyName = _sut.Key(1); + + // Assert + Assert.Null(keyName); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs new file mode 100644 index 0000000..b1ca855 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs @@ -0,0 +1,64 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class KeyAsync + { + private readonly SessionStorageService _sut; + + public KeyAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public async Task ReturnsNameOfKeyAtIndex_When_KeyExistsInStore() + { + // Arrange + const string key1 = "TestKey1"; + const string key2 = "TestKey2"; + + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + + await _sut.SetItemAsync(key1, item1); + await _sut.SetItemAsync(key2, item2); + + // Act + var keyName = await _sut.KeyAsync(1); + + // Assert + Assert.Equal(key2, keyName); + } + + [Fact] + public async Task ReturnsNull_When_KeyDoesNotExistInStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + await _sut.SetItemAsync("TestKey1", item1); + + // Act + var keyName = await _sut.KeyAsync(1); + + // Assert + Assert.Null(keyName); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs new file mode 100644 index 0000000..dbb4664 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs @@ -0,0 +1,57 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class Length + { + private readonly SessionStorageService _sut; + + public Length() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public void ReturnsZeroWhenStoreIsEmpty() + { + // Act + var itemCount = _sut.Length(); + + // Assert + Assert.Equal(0, itemCount); + } + + [Fact] + public void ReturnsNumberOfItemsInStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + + _sut.SetItem("Item1", item1); + _sut.SetItem("Item2", item2); + + // Act + var itemCount = _sut.Length(); + + // Assert + Assert.Equal(2, itemCount); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs new file mode 100644 index 0000000..0944abe --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs @@ -0,0 +1,57 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class LengthAsync + { + private readonly SessionStorageService _sut; + + public LengthAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public async Task ReturnsZeroWhenStoreIsEmpty() + { + // Act + var itemCount = await _sut.LengthAsync(); + + // Assert + Assert.Equal(0, itemCount); + } + + [Fact] + public async Task ReturnsNumberOfItemsInStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + + await _sut.SetItemAsync("Item1", item1); + await _sut.SetItemAsync("Item2", item2); + + // Act + var itemCount = await _sut.LengthAsync(); + + // Assert + Assert.Equal(2, itemCount); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs new file mode 100644 index 0000000..dd29831 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs @@ -0,0 +1,70 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class RemoveItem + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + + private const string Key = "testKey"; + + public RemoveItem() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Action(() => _sut.RemoveItem(key)); + + // assert + Assert.Throws(action); + } + + [Fact] + public void RemovesItemFromStoreIfExists() + { + // Arrange + var data = new TestObject(2, "Jane Smith"); + _sut.SetItem(Key, data); + + // Act + _sut.RemoveItem(Key); + + // Assert + Assert.Equal(0, _storageProvider.Length()); + } + + [Fact] + public void DoesNothingWhenItemDoesNotExistInStore() + { + // Act + _sut.RemoveItem(Key); + + // Assert + Assert.Equal(0, _storageProvider.Length()); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs new file mode 100644 index 0000000..50b5db3 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs @@ -0,0 +1,70 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class RemoveItemAsync + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + + private const string Key = "testKey"; + + public RemoveItemAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Func(async () => await _sut.RemoveItemAsync(key)); + + // assert + Assert.ThrowsAsync(action); + } + + [Fact] + public async Task RemovesItemFromStoreIfExists() + { + // Arrange + var data = new TestObject(2, "Jane Smith"); + await _sut.SetItemAsync(Key, data); + + // Act + await _sut.RemoveItemAsync(Key); + + // Assert + Assert.Equal(0, await _storageProvider.LengthAsync()); + } + + [Fact] + public async Task DoesNothingWhenItemDoesNotExistInStore() + { + // Act + await _sut.RemoveItemAsync(Key); + + // Assert + Assert.Equal(0, await _storageProvider.LengthAsync()); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs new file mode 100644 index 0000000..3cda711 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs @@ -0,0 +1,235 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class SetItem + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public SetItem() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + const string data = "Data"; + var action = new Action(() => _sut.SetItem(key, data)); + + // assert + Assert.Throws(action); + } + + [Fact] + public void RaisesOnChangingEvent_When_SavingNewData() + { + // arrange + var onChangingCalled = false; + _sut.Changing += (_, _) => onChangingCalled = true; + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.True(onChangingCalled); + } + + [Fact] + public void OnChangingEventContainsEmptyOldValue_When_SavingData() + { + // arrange + var oldValue = ""; + _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } + + [Fact] + public void OnChangingEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); + + // act + _sut.SetItemAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } + + [Fact] + public void OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() + { + // arrange + _sut.Changing += (_, args) => args.Cancel = true; + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.Equal(0, _storageProvider.Length()); + } + + [Theory] + [InlineData("stringTest")] + [InlineData(11)] + [InlineData(11.11)] + public void SavesDataAsJsonToStore(T valueToSave) + { + // Act + _sut.SetItem(Key, valueToSave); + + // Assert + var serializedValue = _storageProvider.GetItem(Key); + var valueFromStore = _serializer.Deserialize(serializedValue); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Equal(valueToSave, valueFromStore); + } + + [Fact] + public void SavesComplexObjectAsJsonToStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + + // Act + _sut.SetItem(Key, objectToSave); + + // Assert + var serializedObject = _storageProvider.GetItem(Key); + var objectFromStore = _serializer.Deserialize(serializedObject); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Equal(objectToSave.Id, objectFromStore.Id); + Assert.Equal(objectToSave.Name, objectFromStore.Name); + } + + [Fact] + public void SavesNullIntoStore_When_NullValueProvided() + { + // Arrange + var valueToSave = (string)null; + + // Act + _sut.SetItem(Key, valueToSave); + + // Assert + var serializedValue = _storageProvider.GetItem(Key); + var valueFromStore = _serializer.Deserialize(serializedValue); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Null(valueFromStore); + } + + [Fact] + public void OverwriteExistingValueInStore_When_UsingTheSameKey() + { + // Arrange + const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; + const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; + + var serializedValue = _serializer.Serialize(existingValue); + _storageProvider.SetItem(Key, serializedValue); + + // Act + _sut.SetItem(Key, newValue); + + // Assert + var serializedUpdatedValue = _storageProvider.GetItem(Key); + var updatedValue = _serializer.Deserialize(serializedUpdatedValue); + + Assert.Equal(newValue, updatedValue); + } + + [Fact] + public void RaisesOnChangedEvent_When_SavingData() + { + // arrange + var onChangedCalled = false; + _sut.Changed += (_, _) => onChangedCalled = true; + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.True(onChangedCalled); + } + + [Fact] + public void OnChangedEventContainsEmptyOldValue_When_SavingNewData() + { + // arrange + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } + + [Fact] + public void OnChangedEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); + + // act + _sut.SetItem("Key", data); + + // assert + Assert.Equal(data, newValue); + } + + [Fact] + public void OnChangedEventContainsOldValue_When_UpdatingExistingData() + { + // arrange + var existingValue = "Foo"; + _storageProvider.SetItem("Key", existingValue); + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.Equal(existingValue, oldValue); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs new file mode 100644 index 0000000..8150bfc --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs @@ -0,0 +1,235 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class SetItemAsync + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public SetItemAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + const string data = "Data"; + var action = new Func(async () => await _sut.SetItemAsync(key, data)); + + // assert + Assert.ThrowsAsync(action); + } + + [Fact] + public async Task RaisesOnChangingEvent_When_SavingNewData() + { + // arrange + var onChangingCalled = false; + _sut.Changing += (sender, args) => onChangingCalled = true; + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.True(onChangingCalled); + } + + [Fact] + public async Task OnChangingEventContainsEmptyOldValue_When_SavingData() + { + // arrange + var oldValue = ""; + _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } + + [Fact] + public async Task OnChangingEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); + + // act + await _sut.SetItemAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } + + [Fact] + public async Task OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() + { + // arrange + _sut.Changing += (_, args) => args.Cancel = true; + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.Equal(0, await _storageProvider.LengthAsync()); + } + + [Theory] + [InlineData("stringTest")] + [InlineData(11)] + [InlineData(11.11)] + public async Task SavesDataAsJsonToStore(T valueToSave) + { + // Act + await _sut.SetItemAsync(Key, valueToSave); + + // Assert + var serializedValue = await _storageProvider.GetItemAsync(Key); + var valueFromStore = _serializer.Deserialize(serializedValue); + + Assert.Equal(1, await _storageProvider.LengthAsync()); + Assert.Equal(valueToSave, valueFromStore); + } + + [Fact] + public async Task SavesComplexObjectAsJsonToStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + + // Act + await _sut.SetItemAsync(Key, objectToSave); + + // Assert + var serializedObject = await _storageProvider.GetItemAsync(Key); + var objectFromStore = _serializer.Deserialize(serializedObject); + + Assert.Equal(1, await _storageProvider.LengthAsync()); + Assert.Equal(objectToSave.Id, objectFromStore.Id); + Assert.Equal(objectToSave.Name, objectFromStore.Name); + } + + [Fact] + public async Task SavesNullIntoStore_When_NullValueProvided() + { + // Arrange + var valueToSave = (string)null; + + // Act + await _sut.SetItemAsync(Key, valueToSave); + + // Assert + var serializedValue = await _storageProvider.GetItemAsync(Key); + var valueFromStore = _serializer.Deserialize(serializedValue); + + Assert.Equal(1, await _storageProvider.LengthAsync()); + Assert.Null(valueFromStore); + } + + [Fact] + public async Task OverwriteExistingValueInStore_When_UsingTheSameKey() + { + // Arrange + const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; + const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; + + var serializedValue = _serializer.Serialize(existingValue); + await _storageProvider.SetItemAsync(Key, serializedValue); + + // Act + await _sut.SetItemAsync(Key, newValue); + + // Assert + var serializedUpdatedValue = await _storageProvider.GetItemAsync(Key); + var updatedValue = _serializer.Deserialize(serializedUpdatedValue); + + Assert.Equal(newValue, updatedValue); + } + + [Fact] + public async Task RaisesOnChangedEvent_When_SavingData() + { + // arrange + var onChangedCalled = false; + _sut.Changed += (sender, args) => onChangedCalled = true; + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.True(onChangedCalled); + } + + [Fact] + public async Task OnChangedEventContainsEmptyOldValue_When_SavingNewData() + { + // arrange + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } + + [Fact] + public async Task OnChangedEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); + + // act + await _sut.SetItemAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } + + [Fact] + public async Task OnChangedEventContainsOldValue_When_UpdatingExistingData() + { + // arrange + var existingValue = "Foo"; + await _storageProvider.SetItemAsync("Key", existingValue); + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.Equal(existingValue, oldValue); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/TestAssets/TestObject.cs b/tests/Blazored.SessionStorage.Tests/TestAssets/TestObject.cs new file mode 100644 index 0000000..126a9f1 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/TestAssets/TestObject.cs @@ -0,0 +1,15 @@ +namespace Blazored.SessionStorage.Tests.TestAssets +{ + public class TestObject + { + public int Id { get; set; } + public string Name { get; set; } + + public TestObject() { } + public TestObject(int id, string name) + { + Id = id; + Name = name; + } + } +} From bf135fe179cb8e763297f5846bb1b637b807afda Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Sat, 8 May 2021 13:59:55 +0100 Subject: [PATCH 11/20] Updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 58e162d..17e9034 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # Blazored SessionStorage Blazored SessionStorage is a library that provides access to the browsers session storage APIs for Blazor applications. An additional benefit of using this library is that it will handle serializing and deserializing values when saving or retrieving them. -## Breaking Change (v3 > v4): JsonSerializerOptions +## Breaking Change (v1 > v2): JsonSerializerOptions From v4 onwards we use the default the `JsonSerializerOptions` for `System.Text.Json` instead of using custom ones. This will cause values saved to session storage with v3 to break things. To retain the old settings use the following configuration when adding Blazored SessionStorage to the DI container: From 6ecbc31fd21924142f4ea064f3b0eea7c052f864 Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Sat, 8 May 2021 14:07:50 +0100 Subject: [PATCH 12/20] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 17e9034..b3ec8f8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Nuget version](https://img.shields.io/nuget/v/blazored.localstorage.svg?logo=nuget)](https://www.nuget.org/packages/Blazored.SessionStorage/) +[![Nuget version](https://img.shields.io/nuget/v/Blazored.SessionStorage.svg?logo=nuget)](https://www.nuget.org/packages/Blazored.SessionStorage/) [![Nuget downloads](https://img.shields.io/nuget/dt/Blazored.SessionStorage?logo=nuget)](https://www.nuget.org/packages/Blazored.SessionStorage/) ![Build & Test Main](https://github.com/Blazored/SessionStorage/workflows/Build%20&%20Test%20Main/badge.svg) @@ -192,4 +192,4 @@ public class IndexPageTests : TestContext Assert.Equal(inputName, name); } } -``` \ No newline at end of file +``` From da46b32a1cfefc4ce6c8c37233c6dcd7ce4fc0c9 Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Sat, 15 May 2021 14:54:55 +0100 Subject: [PATCH 13/20] Added SetItemAsString methods --- README.md | 10 +- .../ISessionStorageService.cs | 10 +- .../ISyncSessionStorageService.cs | 10 +- .../SessionStorageService.cs | 38 +++- .../SetItemAsString.cs | 204 +++++++++++++++++ .../SetItemAsStringAsync.cs | 205 ++++++++++++++++++ 6 files changed, 473 insertions(+), 4 deletions(-) create mode 100644 tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs create mode 100644 tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs diff --git a/README.md b/README.md index b3ec8f8..e0f165b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,9 @@ # Blazored SessionStorage Blazored SessionStorage is a library that provides access to the browsers session storage APIs for Blazor applications. An additional benefit of using this library is that it will handle serializing and deserializing values when saving or retrieving them. -## Breaking Change (v1 > v2): JsonSerializerOptions +## Breaking Change (v1 > v2) + +### JsonSerializerOptions From v4 onwards we use the default the `JsonSerializerOptions` for `System.Text.Json` instead of using custom ones. This will cause values saved to session storage with v3 to break things. To retain the old settings use the following configuration when adding Blazored SessionStorage to the DI container: @@ -21,6 +23,10 @@ builder.Services.AddBlazoredSessionStorage(config => ); ``` +### SetItem[Async] method now serializes string values +Prior to v2 we bypassed the serialization of string values as it seemed a pointless as string can be stored directly. However, this led to some edge cases where nullable strings were being saved as the string `"null"`. Then when retrieved, instead of being null the value was `"null"`. By serializing strings this issue is taken care of. +For those who wish to save raw string values, a new method `SetValueAsString[Async]` is available. This will save a string value without attempting to serialize it and will throw an exception if a null string is attempted to be saved. + ## Installing To install the package add the following line to you csproj file replacing x.x.x with the latest version number (found at the top of this file): @@ -117,6 +123,7 @@ The APIs available are: - asynchronous via `ISessionStorageService`: - SetItemAsync() + - SetItemAsStringAsync() - GetItemAsync() - GetItemAsStringAsync() - RemoveItemAsync() @@ -127,6 +134,7 @@ The APIs available are: - synchronous via `ISyncSessionStorageService` (Synchronous methods are **only** available in Blazor WebAssembly): - SetItem() + - SetItemAsString() - GetItem() - GetItemAsString() - RemoveItem() diff --git a/src/Blazored.SessionStorage/ISessionStorageService.cs b/src/Blazored.SessionStorage/ISessionStorageService.cs index 476435f..f9d7a3f 100644 --- a/src/Blazored.SessionStorage/ISessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISessionStorageService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; namespace Blazored.SessionStorage @@ -60,6 +60,14 @@ public interface ISessionStorageService /// A representing the completion of the operation. ValueTask SetItemAsync(string key, T data); + /// + /// Sets or updates the in session storage with the specified . Does not serialize the value before storing. + /// + /// A value specifying the name of the storage slot to use + /// The string to be saved + /// + ValueTask SetItemAsStringAsync(string key, string data); + event EventHandler Changing; event EventHandler Changed; } diff --git a/src/Blazored.SessionStorage/ISyncSessionStorageService.cs b/src/Blazored.SessionStorage/ISyncSessionStorageService.cs index f1efb32..0017e89 100644 --- a/src/Blazored.SessionStorage/ISyncSessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISyncSessionStorageService.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace Blazored.SessionStorage { @@ -56,6 +56,14 @@ public interface ISyncSessionStorageService /// The data to be saved void SetItem(string key, T data); + /// + /// Sets or updates the in session storage with the specified . Does not serialize the value before storing. + /// + /// A value specifying the name of the storage slot to use + /// The string to be saved + /// + void SetItemAsString(string key, string data); + event EventHandler Changing; event EventHandler Changed; } diff --git a/src/Blazored.SessionStorage/SessionStorageService.cs b/src/Blazored.SessionStorage/SessionStorageService.cs index 8bdd847..64434c3 100644 --- a/src/Blazored.SessionStorage/SessionStorageService.cs +++ b/src/Blazored.SessionStorage/SessionStorageService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.Serialization; @@ -32,6 +32,24 @@ public async ValueTask SetItemAsync(string key, T data) RaiseOnChanged(key, e.OldValue, data); } + public async ValueTask SetItemAsStringAsync(string key, string data) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); + + if (data is null) + throw new ArgumentNullException(nameof(data)); + + var e = await RaiseOnChangingAsync(key, data).ConfigureAwait(false); + + if (e.Cancel) + return; + + await _storageProvider.SetItemAsync(key, data).ConfigureAwait(false); + + RaiseOnChanged(key, e.OldValue, data); + } + public async ValueTask GetItemAsync(string key) { if (string.IsNullOrWhiteSpace(key)) @@ -98,6 +116,24 @@ public void SetItem(string key, T data) RaiseOnChanged(key, e.OldValue, data); } + public void SetItemAsString(string key, string data) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); + + if (data is null) + throw new ArgumentNullException(nameof(data)); + + var e = RaiseOnChangingSync(key, data); + + if (e.Cancel) + return; + + _storageProvider.SetItem(key, data); + + RaiseOnChanged(key, e.OldValue, data); + } + public T GetItem(string key) { if (string.IsNullOrWhiteSpace(key)) diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs new file mode 100644 index 0000000..a00c9d4 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs @@ -0,0 +1,204 @@ +using System; +using System.Text.Json; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class SetItemAsString + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public SetItemAsString() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + const string data = "Data"; + var action = new Action(() => _sut.SetItemAsString(key, data)); + + // assert + Assert.Throws(action); + } + + [Fact] + public void ThrowsArgumentNullException_When_DataIsNull() + { + // arrange / act + var data = (string)null; + var action = new Action(() => _sut.SetItemAsString("MyValue", data)); + + // assert + Assert.Throws(action); + } + + [Fact] + public void RaisesOnChangingEvent_When_SavingNewData() + { + // arrange + var onChangingCalled = false; + _sut.Changing += (_, _) => onChangingCalled = true; + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.True(onChangingCalled); + } + + [Fact] + public void OnChangingEventContainsEmptyOldValue_When_SavingData() + { + // arrange + var oldValue = ""; + _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } + + [Fact] + public void OnChangingEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); + + // act + _sut.SetItemAsString("Key", data); + + // assert + Assert.Equal(data, newValue); + } + + [Fact] + public void OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() + { + // arrange + _sut.Changing += (_, args) => args.Cancel = true; + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.Equal(0, _storageProvider.Length()); + } + + [Fact] + public void SavesDataToStore() + { + // Act + var valueToSave = "StringValue"; + _sut.SetItemAsString(Key, valueToSave); + + // Assert + var valueFromStore = _storageProvider.GetItem(Key); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Equal(valueToSave, valueFromStore); + } + + [Fact] + public void OverwriteExistingValueInStore_When_UsingTheSameKey() + { + // Arrange + const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; + const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; + + _storageProvider.SetItem(Key, existingValue); + + // Act + _sut.SetItemAsString(Key, newValue); + + // Assert + var updatedValue = _storageProvider.GetItem(Key); + + Assert.Equal(newValue, updatedValue); + } + + [Fact] + public void RaisesOnChangedEvent_When_SavingData() + { + // arrange + var onChangedCalled = false; + _sut.Changed += (_, _) => onChangedCalled = true; + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.True(onChangedCalled); + } + + [Fact] + public void OnChangedEventContainsEmptyOldValue_When_SavingNewData() + { + // arrange + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } + + [Fact] + public void OnChangedEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); + + // act + _sut.SetItemAsString("Key", data); + + // assert + Assert.Equal(data, newValue); + } + + [Fact] + public void OnChangedEventContainsOldValue_When_UpdatingExistingData() + { + // arrange + var existingValue = "Foo"; + _storageProvider.SetItem("Key", existingValue); + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.Equal(existingValue, oldValue); + } + } +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs new file mode 100644 index 0000000..7a82c1a --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs @@ -0,0 +1,205 @@ +using System; +using System.Text.Json; +using System.Threading.Tasks; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.Testing; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +{ + public class SetItemAsStringAsync + { + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public SetItemAsStringAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + const string data = "Data"; + var action = new Func(async () => await _sut.SetItemAsStringAsync(key, data)); + + // assert + Assert.ThrowsAsync(action); + } + + [Fact] + public void ThrowsArgumentNullException_When_DataIsNull() + { + // arrange / act + var data = (string)null; + var action = new Func(async () => await _sut.SetItemAsStringAsync("MyValue", data)); + + // assert + Assert.ThrowsAsync(action); + } + + [Fact] + public async Task RaisesOnChangingEvent_When_SavingNewData() + { + // arrange + var onChangingCalled = false; + _sut.Changing += (_, _) => onChangingCalled = true; + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.True(onChangingCalled); + } + + [Fact] + public async Task OnChangingEventContainsEmptyOldValue_When_SavingData() + { + // arrange + var oldValue = ""; + _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } + + [Fact] + public async Task OnChangingEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } + + [Fact] + public async Task OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() + { + // arrange + _sut.Changing += (_, args) => args.Cancel = true; + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.Equal(0, _storageProvider.Length()); + } + + [Fact] + public async Task SavesDataToStore() + { + // Act + var valueToSave = "StringValue"; + await _sut.SetItemAsStringAsync(Key, valueToSave); + + // Assert + var valueFromStore = _storageProvider.GetItem(Key); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Equal(valueToSave, valueFromStore); + } + + [Fact] + public async Task OverwriteExistingValueInStore_When_UsingTheSameKey() + { + // Arrange + const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; + const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; + + _storageProvider.SetItem(Key, existingValue); + + // Act + await _sut.SetItemAsStringAsync(Key, newValue); + + // Assert + var updatedValue = _storageProvider.GetItem(Key); + + Assert.Equal(newValue, updatedValue); + } + + [Fact] + public async Task RaisesOnChangedEvent_When_SavingData() + { + // arrange + var onChangedCalled = false; + _sut.Changed += (_, _) => onChangedCalled = true; + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.True(onChangedCalled); + } + + [Fact] + public async Task OnChangedEventContainsEmptyOldValue_When_SavingNewData() + { + // arrange + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } + + [Fact] + public async Task OnChangedEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } + + [Fact] + public async Task OnChangedEventContainsOldValue_When_UpdatingExistingData() + { + // arrange + var existingValue = "Foo"; + _storageProvider.SetItem("Key", existingValue); + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.Equal(existingValue, oldValue); + } + } +} From 27cac1df6fb87f564c9c320c44596eceb448490c Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Fri, 8 Oct 2021 22:14:40 +0100 Subject: [PATCH 14/20] Moved test extensions to seperate project as per local storage --- .github/workflows/ci-main.yml | 78 ++++++------------ .github/workflows/ci-pr.yml | 9 +- .gitignore | 2 + Blazored.SessionStorage.sln | 21 ++++- samples/bUnitExample/bUnitExample.csproj | 4 +- .../BUnitSessionStorageTestExtensions.cs} | 29 +++---- ...zored.SessionStorage.TestExtensions.csproj | 53 ++++++++++++ .../Blazored.SessionStorage.snk | Bin 0 -> 596 bytes .../InMemoryStorageProvider.cs | 20 ++--- .../Blazored.SessionStorage.csproj | 16 +++- .../BrowserStorageProvider.cs | 17 ++-- .../IStorageProvider.cs | 19 +++-- src/Blazored.SessionStorage/PublicKey.snk | Bin 160 -> 0 bytes src/Blazored.SessionStorage/PublicKey.txt | 5 -- .../Serialization/SystemTextJsonSerializer.cs | 12 ++- .../Blazored.SessionStorage.Tests.csproj | 1 + .../SessionStorageServiceTests/Clear.cs | 4 +- .../SessionStorageServiceTests/ClearAsync.cs | 3 +- .../SessionStorageServiceTests/ContainsKey.cs | 4 +- .../ContainsKeyAsync.cs | 3 +- .../SessionStorageServiceTests/GetItem.cs | 5 +- .../GetItemAsString.cs | 5 +- .../GetItemAsStringAsync.cs | 4 +- .../GetItemAsync.cs | 4 +- .../SessionStorageServiceTests/Key.cs | 4 +- .../SessionStorageServiceTests/KeyAsync.cs | 3 +- .../SessionStorageServiceTests/Length.cs | 4 +- .../SessionStorageServiceTests/LengthAsync.cs | 3 +- .../SessionStorageServiceTests/RemoveItem.cs | 5 +- .../RemoveItemAsync.cs | 4 +- .../SessionStorageServiceTests/SetItem.cs | 5 +- .../SetItemAsString.cs | 2 +- .../SetItemAsStringAsync.cs | 2 +- .../SetItemAsync.cs | 4 +- 34 files changed, 195 insertions(+), 159 deletions(-) rename src/{Blazored.SessionStorage/Testing/BUnitLocalStorageTestExtensions.cs => Blazored.SessionStorage.TestExtensions/BUnitSessionStorageTestExtensions.cs} (52%) create mode 100644 src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj create mode 100644 src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.snk rename src/{Blazored.SessionStorage/Testing => Blazored.SessionStorage.TestExtensions}/InMemoryStorageProvider.cs (66%) delete mode 100644 src/Blazored.SessionStorage/PublicKey.snk delete mode 100644 src/Blazored.SessionStorage/PublicKey.txt diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 3f35b26..2287183 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -11,8 +11,6 @@ env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true PROJECT_NAME: SessionStorage - GITHUB_FEED: https://nuget.pkg.github.com/Blazored/ - GITHUB_USER: chrissainty GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NUGET_FEED: https://api.nuget.org/v3/index.json NUGET_KEY: ${{ secrets.NUGET_KEY }} @@ -38,60 +36,24 @@ jobs: - name: Build run: dotnet build -c Release --no-restore src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.csproj - - name: Test - run: dotnet test -c Release + - name: Build Test Extensions + run: dotnet build -c Release --no-restore src/Blazored.$PROJECT_NAME.TestExtensions/Blazored.$PROJECT_NAME.TestExtensions.csproj - - name: Pack - run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.*proj + - name: Test Local Storage + run: dotnet test -c Release --no-restore --verbosity normal tests/Blazored.$PROJECT_NAME.Tests - - name: Publish Sample Site - run: dotnet publish -c Release samples/BlazorWebAssembly/BlazorWebAssembly.csproj - - - name: Rewrite base href - uses: SteveSandersonMS/ghaction-rewrite-base-href@v1 - with: - html_path: samples/BlazorWebAssembly/bin/Release/net5.0/publish/wwwroot/index.html - base_href: /${{ env.PROJECT_NAME }}/ - - - name: Deploy to Github Pages - uses: JamesIves/github-pages-deploy-action@releases/v3 - with: - ACCESS_TOKEN: $GITHUB_TOKEN - BASE_BRANCH: main # The branch the action should deploy from. - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: samples/BlazorWebAssembly/bin/Release/net5.0/publish/wwwroot # The folder the action should deploy. - SINGLE_COMMIT: true - - - name: Upload Artifact - uses: actions/upload-artifact@v2 - with: - name: nupkg - path: ./src/Blazored.${{ env.PROJECT_NAME }}/bin/Release/*.nupkg - prerelease: - needs: build - if: github.event_name != 'release' - runs-on: ubuntu-latest - steps: - - name: Download Artifact - uses: actions/download-artifact@v1 - with: - name: nupkg - - name: Push to GitHub Feed - run: | - for f in ./nupkg/*.nupkg - do - curl -vX PUT -u "$GITHUB_USER:$GITHUB_TOKEN" -F package=@$f $GITHUB_FEED - done deploy: needs: build if: github.event_name == 'release' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ env.NETCORE_VERSION }} + - name: Create Release NuGet package run: | arrTag=(${GITHUB_REF//\// }) @@ -100,11 +62,25 @@ jobs: VERSION="${VERSION//v}" echo Clean Version: $VERSION dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.*proj - - name: Push to GitHub Feed - run: | - for f in ./nupkg/*.nupkg - do - curl -vX PUT -u "$GITHUB_USER:$GITHUB_TOKEN" -F package=@$f $GITHUB_FEED - done + dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg src/Blazored.$PROJECT_NAME.TestExtensions/Blazored.$PROJECT_NAME.TestExtensions.csproj + - name: Push to NuGet Feed - run: dotnet nuget push ./nupkg/*.nupkg --source $NUGET_FEED --skip-duplicate --api-key $NUGET_KEY + run: dotnet nuget push ./nupkg/*.nupkg --source $NUGET_FEED --api-key $NUGET_KEY --skip-duplicate + + - name: Publish Sample Site + run: dotnet publish -c Release samples/BlazorWebAssembly/BlazorWebAssembly.csproj + + - name: Rewrite base href + uses: SteveSandersonMS/ghaction-rewrite-base-href@v1 + with: + html_path: samples/BlazorWebAssembly/bin/Release/net5.0/publish/wwwroot/index.html + base_href: /${{ env.PROJECT_NAME }}/ + + - name: Deploy to Github Pages + uses: JamesIves/github-pages-deploy-action@releases/v3 + with: + ACCESS_TOKEN: $GITHUB_TOKEN + BASE_BRANCH: main # The branch the action should deploy from. + BRANCH: gh-pages # The branch the action should deploy to. + FOLDER: samples/BlazorWebAssembly/bin/Release/net5.0/publish/wwwroot # The folder the action should deploy. + SINGLE_COMMIT: true diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 7d718cc..63c70fd 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -5,7 +5,7 @@ on: branches: [ main ] env: - NETCORE_VERSION: '5.0.202' + NETCORE_VERSION: '5.0.x' PROJECT_NAME: Blazored.SessionStorage jobs: @@ -23,8 +23,11 @@ jobs: - name: Restoring packages... run: dotnet restore - - name: Building project... + - name: Building Session Storage... run: dotnet build --configuration Release --no-restore src/$PROJECT_NAME/$PROJECT_NAME.csproj + - name: Build Session Storage Test Extensions + run: dotnet build -c Release --no-restore src/$PROJECT_NAME.TestExtensions/$PROJECT_NAME.TestExtensions.csproj + - name: Testing... - run: dotnet test --no-restore --verbosity normal \ No newline at end of file + run: dotnet test -c Release --no-restore --verbosity normal tests/$PROJECT_NAME.Tests \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3e759b7..d2d12b1 100644 --- a/.gitignore +++ b/.gitignore @@ -179,6 +179,8 @@ PublishScripts/ # NuGet Packages *.nupkg +*.snupkg + # The packages folder can be ignored because of Package Restore **/[Pp]ackages/* # except build/, which is used as an MSBuild target. diff --git a/Blazored.SessionStorage.sln b/Blazored.SessionStorage.sln index e084bba..4e05906 100644 --- a/Blazored.SessionStorage.sln +++ b/Blazored.SessionStorage.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28531.58 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31717.71 MinimumVisualStudioVersion = 15.0.26124.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.SessionStorage", "src\Blazored.SessionStorage\Blazored.SessionStorage.csproj", "{EFA12DC3-35DE-449C-88F2-2BD7576CAF2C}" EndProject @@ -13,6 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "samples\Bla EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9170D7A9-70CE-48E3-88A3-F11D2983103E}" ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore .github\workflows\ci-main.yml = .github\workflows\ci-main.yml .github\workflows\ci-pr.yml = .github\workflows\ci-pr.yml README.md = README.md @@ -23,7 +24,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B82A5126 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.SessionStorage.Tests", "tests\Blazored.SessionStorage.Tests\Blazored.SessionStorage.Tests.csproj", "{5A6A013E-325D-4A5F-B2FA-659B4FD2BDBC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bUnitExample", "samples\bUnitExample\bUnitExample.csproj", "{10F6FB83-3135-4B73-B0EB-D008A31AE8FA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bUnitExample", "samples\bUnitExample\bUnitExample.csproj", "{10F6FB83-3135-4B73-B0EB-D008A31AE8FA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.SessionStorage.TestExtensions", "src\Blazored.SessionStorage.TestExtensions\Blazored.SessionStorage.TestExtensions.csproj", "{528AE63D-0043-4A63-9151-92107397EE02}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -95,6 +98,18 @@ Global {10F6FB83-3135-4B73-B0EB-D008A31AE8FA}.Release|x64.Build.0 = Release|Any CPU {10F6FB83-3135-4B73-B0EB-D008A31AE8FA}.Release|x86.ActiveCfg = Release|Any CPU {10F6FB83-3135-4B73-B0EB-D008A31AE8FA}.Release|x86.Build.0 = Release|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Debug|Any CPU.Build.0 = Debug|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Debug|x64.ActiveCfg = Debug|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Debug|x64.Build.0 = Debug|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Debug|x86.ActiveCfg = Debug|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Debug|x86.Build.0 = Debug|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Release|Any CPU.ActiveCfg = Release|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Release|Any CPU.Build.0 = Release|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Release|x64.ActiveCfg = Release|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Release|x64.Build.0 = Release|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Release|x86.ActiveCfg = Release|Any CPU + {528AE63D-0043-4A63-9151-92107397EE02}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/bUnitExample/bUnitExample.csproj b/samples/bUnitExample/bUnitExample.csproj index 6d5685c..2d94f8e 100644 --- a/samples/bUnitExample/bUnitExample.csproj +++ b/samples/bUnitExample/bUnitExample.csproj @@ -5,8 +5,7 @@ - - + @@ -20,6 +19,7 @@ + diff --git a/src/Blazored.SessionStorage/Testing/BUnitLocalStorageTestExtensions.cs b/src/Blazored.SessionStorage.TestExtensions/BUnitSessionStorageTestExtensions.cs similarity index 52% rename from src/Blazored.SessionStorage/Testing/BUnitLocalStorageTestExtensions.cs rename to src/Blazored.SessionStorage.TestExtensions/BUnitSessionStorageTestExtensions.cs index efaadcf..4de3433 100644 --- a/src/Blazored.SessionStorage/Testing/BUnitLocalStorageTestExtensions.cs +++ b/src/Blazored.SessionStorage.TestExtensions/BUnitSessionStorageTestExtensions.cs @@ -1,16 +1,17 @@ +using System; +using System.Diagnostics.CodeAnalysis; +using Blazored.SessionStorage; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.TestExtensions; using Microsoft.Extensions.DependencyInjection; -using System; -using System.Diagnostics.CodeAnalysis; -using Blazored.SessionStorage; -using Blazored.SessionStorage.Testing; namespace Bunit { [ExcludeFromCodeCoverage] public static class BUnitSessionStorageTestExtensions + { public static ISessionStorageService AddBlazoredSessionStorage(this TestContextBase context) => AddBlazoredSessionStorage(context, null); @@ -18,20 +19,16 @@ public static ISessionStorageService AddBlazoredSessionStorage(this TestContextB public static ISessionStorageService AddBlazoredSessionStorage(this TestContextBase context, Action configure) { if (context is null) - throw new ArgumentNullException(nameof(context)); + throw new ArgumentNullException(nameof(context)); + + var sessionStorageOptions = new SessionStorageOptions(); + configure?.Invoke(sessionStorageOptions); + sessionStorageOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); - context.Services - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .Configure(configureOptions => - { - configure?.Invoke(configureOptions); - configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); - }); + var localStorageService = new SessionStorageService(new InMemoryStorageProvider(), new SystemTextJsonSerializer(sessionStorageOptions)); + context.Services.AddSingleton(localStorageService); - return context.Services.GetService(); + return localStorageService; } } } diff --git a/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj b/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj new file mode 100644 index 0000000..f064f63 --- /dev/null +++ b/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj @@ -0,0 +1,53 @@ + + + + netstandard2.1;net5.0 + + Chris Sainty + + Copyright 2020 (c) Chris Sainty. All rights reserved. + A testing library to provide helper extensions for Blazored.SessionStorage + true + snupkg + + + Blazored.SessionStorage.TestExtensions + Blazored;Blazor;Razor;Components;SessionStorage;Session Storage;ASP.NET Core;CSharp;Web + MIT + https://github.com/Blazored/SessionStorage + icon.png + git + https://github.com/Blazored/SessionStorage + + + true + true + true + Blazored.SessionStorage.snk + + + + + + + + + + + + + + + + + <_Parameter1> + Blazored.SessionStorage.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007527e122cc36dc13c695a4f43b7c2da3f631aed456ed309140c0d52262323e25d84bef7feddc8bd29cfe46ec652186cb10e059eedabf2ff000b977a2376a613dccfb092de6c243e0888db4c66a084124b2c1799bda4bbb2f70fed0382fc1cbdafa6dc0f4baccdc2cee55234f8a5ad76645c315523fee5352d9f01036e48b13e3 + + + + + + + + + diff --git a/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.snk b/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.snk new file mode 100644 index 0000000000000000000000000000000000000000..18e2ce3056b7ac1a4950e9cd2874f423e197e0d5 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097XC*dN@Hrx}&m8A4Ld@ZB)F|O2B?J$u* zz||sRGCn2POYeW}+>6qj{zmL&A%@Ek;92h4zc26rxp$&BYGFOh`w1=P!b9MQjkLyU z2tg#W!Fik7OS>;{{?Irt!OPnEZNT)p%-k&QRU=P|TGwVp!xd6L?o(3P@DMiSixcDb zt^>MkhmWu1(SrN*jcP{D4WaB3D-(A8AKI~^zhV#M#A~w*7qq&wAOA6UeNlJhxKgAu zI8cBn8@Q-Z#xCpg#j=cSld0UJAY7goaqnPnr!=w^e{qWGCOwx&HfbyKeTdH$p|_yH zN-#qZauNGh)Nh`fyON*fg0*M}6)pFHu!((3ShrkRuHQP;K55xA`PX@pXHwQi0nj+i zIT;V@@*i`vm(K~7Eg$Tyq)NpfY_d&$KO3WWIW>+77?wD zJMvLM69^UTy``CbNS>DAT}1Oc$H7PDHz4CWiVre`iH8-F1^Q!gb=b%UTovXOt4ws` zq4dX5E5ZohBuXYBMNT33s|$?;3OblFAQgz+LgMM|1Y>$S{LVUk;(}2ZXjdSiUjch3 zTiH!n<98=1rZr`~17ue9?<0Nf|7=Y$fp5av;aWUYr)CX3o1aJG)4pDcE%R@g4vL~L z@2Ej)ZtUCuI+i)bH&4N1TfMxYE _dataStore.Clear(); - public ValueTask ClearAsync() + public ValueTask ClearAsync(CancellationToken? cancellationToken = null) { _dataStore.Clear(); return new ValueTask(Task.CompletedTask); @@ -21,31 +21,31 @@ public ValueTask ClearAsync() public bool ContainKey(string key) => _dataStore.ContainsKey(key); - public ValueTask ContainKeyAsync(string key) + public ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null) => new ValueTask(ContainKey(key)); - public string GetItem(string key) + public string GetItem(string key) => _dataStore.ContainsKey(key) ? _dataStore[key] : default; - public ValueTask GetItemAsync(string key) + public ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null) => new ValueTask(GetItem(key)); public string Key(int index) => index > _dataStore.Count - 1 ? default : _dataStore.ElementAt(index).Key; - public ValueTask KeyAsync(int index) + public ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null) => new ValueTask(Key(index)); public int Length() => _dataStore.Count; - public ValueTask LengthAsync() + public ValueTask LengthAsync(CancellationToken? cancellationToken = null) => new ValueTask(Length()); public void RemoveItem(string key) => _dataStore.Remove(key); - public ValueTask RemoveItemAsync(string key) + public ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null) { RemoveItem(key); return new ValueTask(Task.CompletedTask); @@ -63,7 +63,7 @@ public void SetItem(string key, string data) } } - public ValueTask SetItemAsync(string key, string data) + public ValueTask SetItemAsync(string key, string data, CancellationToken? cancellationToken = null) { SetItem(key, data); return new ValueTask(Task.CompletedTask); diff --git a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj index 8191ad3..194b03e 100644 --- a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj +++ b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj @@ -35,12 +35,10 @@ - - @@ -49,7 +47,19 @@ - + + <_Parameter1> + Blazored.SessionStorage.TestExtensions, PublicKey=00240000048000009400000006020000002400005253413100040000010001007527e122cc36dc13c695a4f43b7c2da3f631aed456ed309140c0d52262323e25d84bef7feddc8bd29cfe46ec652186cb10e059eedabf2ff000b977a2376a613dccfb092de6c243e0888db4c66a084124b2c1799bda4bbb2f70fed0382fc1cbdafa6dc0f4baccdc2cee55234f8a5ad76645c315523fee5352d9f01036e48b13e3 + + + + + + + <_Parameter1> + Blazored.SessionStorage.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007527e122cc36dc13c695a4f43b7c2da3f631aed456ed309140c0d52262323e25d84bef7feddc8bd29cfe46ec652186cb10e059eedabf2ff000b977a2376a613dccfb092de6c243e0888db4c66a084124b2c1799bda4bbb2f70fed0382fc1cbdafa6dc0f4baccdc2cee55234f8a5ad76645c315523fee5352d9f01036e48b13e3 + + diff --git a/src/Blazored.SessionStorage/BrowserStorageProvider.cs b/src/Blazored.SessionStorage/BrowserStorageProvider.cs index 7f68520..626f9a7 100644 --- a/src/Blazored.SessionStorage/BrowserStorageProvider.cs +++ b/src/Blazored.SessionStorage/BrowserStorageProvider.cs @@ -1,5 +1,6 @@ -using Microsoft.JSInterop; +using Microsoft.JSInterop; using System; +using System.Threading; using System.Threading.Tasks; namespace Blazored.SessionStorage @@ -15,25 +16,25 @@ public BrowserStorageProvider(IJSRuntime jSRuntime) _jSInProcessRuntime = jSRuntime as IJSInProcessRuntime; } - public ValueTask ClearAsync() + public ValueTask ClearAsync(CancellationToken? cancellationToken = null) => _jSRuntime.InvokeVoidAsync("sessionStorage.clear"); - public ValueTask GetItemAsync(string key) + public ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null) => _jSRuntime.InvokeAsync("sessionStorage.getItem", key); - public ValueTask KeyAsync(int index) + public ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null) => _jSRuntime.InvokeAsync("sessionStorage.key", index); - public ValueTask ContainKeyAsync(string key) + public ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null) => _jSRuntime.InvokeAsync("sessionStorage.hasOwnProperty", key); - public ValueTask LengthAsync() + public ValueTask LengthAsync(CancellationToken? cancellationToken = null) => _jSRuntime.InvokeAsync("eval", "sessionStorage.length"); - public ValueTask RemoveItemAsync(string key) + public ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null) => _jSRuntime.InvokeVoidAsync("sessionStorage.removeItem", key); - public ValueTask SetItemAsync(string key, string data) + public ValueTask SetItemAsync(string key, string data, CancellationToken? cancellationToken = null) => _jSRuntime.InvokeVoidAsync("sessionStorage.setItem", key, data); public void Clear() diff --git a/src/Blazored.SessionStorage/IStorageProvider.cs b/src/Blazored.SessionStorage/IStorageProvider.cs index a45f204..df476de 100644 --- a/src/Blazored.SessionStorage/IStorageProvider.cs +++ b/src/Blazored.SessionStorage/IStorageProvider.cs @@ -1,22 +1,23 @@ -using System.Threading.Tasks; +using System.Threading; +using System.Threading.Tasks; namespace Blazored.SessionStorage { internal interface IStorageProvider { void Clear(); - ValueTask ClearAsync(); + ValueTask ClearAsync(CancellationToken? cancellationToken = null); bool ContainKey(string key); - ValueTask ContainKeyAsync(string key); + ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null); string GetItem(string key); - ValueTask GetItemAsync(string key); + ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null); string Key(int index); - ValueTask KeyAsync(int index); + ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null); int Length(); - ValueTask LengthAsync(); + ValueTask LengthAsync(CancellationToken? cancellationToken = null); void RemoveItem(string key); - ValueTask RemoveItemAsync(string key); + ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null); void SetItem(string key, string data); - ValueTask SetItemAsync(string key, string data); + ValueTask SetItemAsync(string key, string data, CancellationToken? cancellationToken = null); } -} \ No newline at end of file +} diff --git a/src/Blazored.SessionStorage/PublicKey.snk b/src/Blazored.SessionStorage/PublicKey.snk deleted file mode 100644 index 031abef3d62315bb6368ee49f2f9f59da8f6df16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK$ABme*efB*oL000060ssI2Bme+XQ$aBR1ONa50097XC*dN@Hrx}&m8A4L zd@ZB)F|O2B?J$u*z||sRGCn2POYeW}+>6qj{zmL&A%@Ek;92h4zc26rxp$&BYGFOh z`w1=P!b9MQjkLyU2tg#W!Fik7OS>;{{?Irt!OPnEZNT)p%-k&QRU=P|TGwVp!xd6L O?o(3P@DMiSixcC{1xJVg diff --git a/src/Blazored.SessionStorage/PublicKey.txt b/src/Blazored.SessionStorage/PublicKey.txt deleted file mode 100644 index 0a9702e..0000000 --- a/src/Blazored.SessionStorage/PublicKey.txt +++ /dev/null @@ -1,5 +0,0 @@ - -Microsoft (R) .NET Framework Strong Name Utility Version 4.0.30319.0 -Copyright (c) Microsoft Corporation. All rights reserved. - -Public key token is 6f8d36f00e4891c3 diff --git a/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs b/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs index 8100bab..5ce56c0 100644 --- a/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs +++ b/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs @@ -1,14 +1,7 @@ using Blazored.SessionStorage.StorageOptions; using Microsoft.Extensions.Options; -using System.Runtime.CompilerServices; using System.Text.Json; -[assembly: InternalsVisibleTo("Blazored.SessionStorage.Tests, PublicKey=" + -"00240000048000009400000006020000002400005253413100040000010001007527e122cc36dc" + -"13c695a4f43b7c2da3f631aed456ed309140c0d52262323e25d84bef7feddc8bd29cfe46ec6521" + -"86cb10e059eedabf2ff000b977a2376a613dccfb092de6c243e0888db4c66a084124b2c1799bda" + -"4bbb2f70fed0382fc1cbdafa6dc0f4baccdc2cee55234f8a5ad76645c315523fee5352d9f01036" + -"e48b13e3")] namespace Blazored.SessionStorage.Serialization { internal class SystemTextJsonSerializer : IJsonSerializer @@ -20,6 +13,11 @@ public SystemTextJsonSerializer(IOptions options) _options = options.Value.JsonSerializerOptions; } + public SystemTextJsonSerializer(SessionStorageOptions sessionStorageOptions) + { + _options = sessionStorageOptions.JsonSerializerOptions; + } + public T Deserialize(string data) => JsonSerializer.Deserialize(data, _options); diff --git a/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj b/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj index 01c5fd1..085b1c3 100644 --- a/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj +++ b/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj @@ -27,6 +27,7 @@ + diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs index c29f9f3..a7c8331 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs @@ -1,10 +1,8 @@ -using System; using System.Text.Json; -using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs index 159894c..69a71e4 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs @@ -1,10 +1,9 @@ -using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs index d56f77a..b09f482 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs @@ -1,10 +1,8 @@ -using System; using System.Text.Json; -using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs index 9fb4474..c2a9cc4 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs @@ -1,10 +1,9 @@ -using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs index 850c041..6052294 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs @@ -1,10 +1,9 @@ -using System; +using System; using System.Text.Json; -using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs index b3efe67..253ed78 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs @@ -1,10 +1,9 @@ -using System; +using System; using System.Text.Json; -using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs index c024edc..9a7b3d7 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs index 73bbe87..cba032e 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs index 5413869..5082df1 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs @@ -1,10 +1,8 @@ -using System; using System.Text.Json; -using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs index b1ca855..86dec29 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs @@ -1,10 +1,9 @@ -using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs index dbb4664..94d189d 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs @@ -1,10 +1,8 @@ -using System; using System.Text.Json; -using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs index 0944abe..6cc547e 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs @@ -1,10 +1,9 @@ -using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs index dd29831..bc088d4 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs @@ -1,10 +1,9 @@ -using System; +using System; using System.Text.Json; -using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs index 50b5db3..56f27c4 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs index 3cda711..f722851 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs @@ -1,10 +1,9 @@ -using System; +using System; using System.Text.Json; -using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs index a00c9d4..24ec2fd 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs @@ -3,7 +3,7 @@ using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Microsoft.Extensions.Options; using Moq; using Xunit; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs index 7a82c1a..4a5d0a2 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs @@ -4,7 +4,7 @@ using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Microsoft.Extensions.Options; using Moq; using Xunit; diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs index 8150bfc..df49036 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Text.Json; using System.Threading.Tasks; using Blazored.SessionStorage.JsonConverters; using Blazored.SessionStorage.Serialization; using Blazored.SessionStorage.StorageOptions; -using Blazored.SessionStorage.Testing; +using Blazored.SessionStorage.TestExtensions; using Blazored.SessionStorage.Tests.TestAssets; using Microsoft.Extensions.Options; using Moq; From fbc31d4c29fa09fc2728e53c123d8f6e40d6b559 Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Fri, 8 Oct 2021 23:05:24 +0100 Subject: [PATCH 15/20] Added missing cancellation token support --- .../BrowserStorageProvider.cs | 14 +++---- .../ISessionStorageService.cs | 19 +++++----- .../SessionStorageService.cs | 37 ++++++++++--------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/Blazored.SessionStorage/BrowserStorageProvider.cs b/src/Blazored.SessionStorage/BrowserStorageProvider.cs index 626f9a7..6c1e398 100644 --- a/src/Blazored.SessionStorage/BrowserStorageProvider.cs +++ b/src/Blazored.SessionStorage/BrowserStorageProvider.cs @@ -17,25 +17,25 @@ public BrowserStorageProvider(IJSRuntime jSRuntime) } public ValueTask ClearAsync(CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeVoidAsync("sessionStorage.clear"); + => _jSRuntime.InvokeVoidAsync("sessionStorage.clear", cancellationToken ?? CancellationToken.None); public ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeAsync("sessionStorage.getItem", key); + => _jSRuntime.InvokeAsync("sessionStorage.getItem", cancellationToken ?? CancellationToken.None, key); public ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeAsync("sessionStorage.key", index); + => _jSRuntime.InvokeAsync("sessionStorage.key", cancellationToken ?? CancellationToken.None, index); public ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeAsync("sessionStorage.hasOwnProperty", key); + => _jSRuntime.InvokeAsync("sessionStorage.hasOwnProperty", cancellationToken ?? CancellationToken.None, key); public ValueTask LengthAsync(CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeAsync("eval", "sessionStorage.length"); + => _jSRuntime.InvokeAsync("eval", cancellationToken ?? CancellationToken.None, "sessionStorage.length"); public ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeVoidAsync("sessionStorage.removeItem", key); + => _jSRuntime.InvokeVoidAsync("sessionStorage.removeItem", cancellationToken ?? CancellationToken.None, key); public ValueTask SetItemAsync(string key, string data, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeVoidAsync("sessionStorage.setItem", key, data); + => _jSRuntime.InvokeVoidAsync("sessionStorage.setItem", cancellationToken ?? CancellationToken.None, key, data); public void Clear() { diff --git a/src/Blazored.SessionStorage/ISessionStorageService.cs b/src/Blazored.SessionStorage/ISessionStorageService.cs index f9d7a3f..c61c98c 100644 --- a/src/Blazored.SessionStorage/ISessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISessionStorageService.cs @@ -1,4 +1,5 @@ using System; +using System.Threading; using System.Threading.Tasks; namespace Blazored.SessionStorage @@ -9,48 +10,48 @@ public interface ISessionStorageService /// Clears all data from session storage. /// /// A representing the completion of the operation. - ValueTask ClearAsync(); + ValueTask ClearAsync(CancellationToken? cancellationToken = null); /// /// Retrieve the specified data from session storage and deseralise it to the specfied type. /// /// A value specifying the name of the session storage slot to use /// A representing the completion of the operation. - ValueTask GetItemAsync(string key); + ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null); /// /// Retrieve the specified data from session storage as a . /// /// A value specifying the name of the storage slot to use /// A representing the completion of the operation. - ValueTask GetItemAsStringAsync(string key); + ValueTask GetItemAsStringAsync(string key, CancellationToken? cancellationToken = null); /// /// Return the name of the key at the specified . /// /// /// A representing the completion of the operation. - ValueTask KeyAsync(int index); + ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null); /// /// Checks if the exists in session storage, but does not check its value. /// /// A value specifying the name of the storage slot to use /// A representing the completion of the operation. - ValueTask ContainKeyAsync(string key); + ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null); /// /// The number of items stored in session storage. /// /// A representing the completion of the operation. - ValueTask LengthAsync(); + ValueTask LengthAsync(CancellationToken? cancellationToken = null); /// /// Remove the data with the specified . /// /// A value specifying the name of the storage slot to use /// A representing the completion of the operation. - ValueTask RemoveItemAsync(string key); + ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null); /// /// Sets or updates the in session storage with the specified . @@ -58,7 +59,7 @@ public interface ISessionStorageService /// A value specifying the name of the storage slot to use /// The data to be saved /// A representing the completion of the operation. - ValueTask SetItemAsync(string key, T data); + ValueTask SetItemAsync(string key, T data, CancellationToken? cancellationToken = null); /// /// Sets or updates the in session storage with the specified . Does not serialize the value before storing. @@ -66,7 +67,7 @@ public interface ISessionStorageService /// A value specifying the name of the storage slot to use /// The string to be saved /// - ValueTask SetItemAsStringAsync(string key, string data); + ValueTask SetItemAsStringAsync(string key, string data, CancellationToken? cancellationToken = null); event EventHandler Changing; event EventHandler Changed; diff --git a/src/Blazored.SessionStorage/SessionStorageService.cs b/src/Blazored.SessionStorage/SessionStorageService.cs index 64434c3..d020994 100644 --- a/src/Blazored.SessionStorage/SessionStorageService.cs +++ b/src/Blazored.SessionStorage/SessionStorageService.cs @@ -1,5 +1,6 @@ using System; using System.Text.Json; +using System.Threading; using System.Threading.Tasks; using Blazored.SessionStorage.Serialization; @@ -16,7 +17,7 @@ public SessionStorageService(IStorageProvider storageProvider, IJsonSerializer s _serializer = serializer; } - public async ValueTask SetItemAsync(string key, T data) + public async ValueTask SetItemAsync(string key, T data, CancellationToken? cancellationToken = null) { if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); @@ -27,12 +28,12 @@ public async ValueTask SetItemAsync(string key, T data) return; var serialisedData = _serializer.Serialize(data); - await _storageProvider.SetItemAsync(key, serialisedData).ConfigureAwait(false); + await _storageProvider.SetItemAsync(key, serialisedData, cancellationToken).ConfigureAwait(false); RaiseOnChanged(key, e.OldValue, data); } - public async ValueTask SetItemAsStringAsync(string key, string data) + public async ValueTask SetItemAsStringAsync(string key, string data, CancellationToken? cancellationToken = null) { if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); @@ -45,17 +46,17 @@ public async ValueTask SetItemAsStringAsync(string key, string data) if (e.Cancel) return; - await _storageProvider.SetItemAsync(key, data).ConfigureAwait(false); + await _storageProvider.SetItemAsync(key, data, cancellationToken).ConfigureAwait(false); RaiseOnChanged(key, e.OldValue, data); } - public async ValueTask GetItemAsync(string key) + public async ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null) { if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - var serialisedData = await _storageProvider.GetItemAsync(key).ConfigureAwait(false); + var serialisedData = await _storageProvider.GetItemAsync(key, cancellationToken).ConfigureAwait(false); if (string.IsNullOrWhiteSpace(serialisedData)) return default; @@ -72,33 +73,33 @@ public async ValueTask GetItemAsync(string key) } } - public ValueTask GetItemAsStringAsync(string key) + public ValueTask GetItemAsStringAsync(string key, CancellationToken? cancellationToken = null) { if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - return _storageProvider.GetItemAsync(key); + return _storageProvider.GetItemAsync(key, cancellationToken); } - public ValueTask RemoveItemAsync(string key) + public ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null) { if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key)); - return _storageProvider.RemoveItemAsync(key); + return _storageProvider.RemoveItemAsync(key, cancellationToken); } - public ValueTask ClearAsync() - => _storageProvider.ClearAsync(); + public ValueTask ClearAsync(CancellationToken? cancellationToken = null) + => _storageProvider.ClearAsync(cancellationToken); - public ValueTask LengthAsync() - => _storageProvider.LengthAsync(); + public ValueTask LengthAsync(CancellationToken? cancellationToken = null) + => _storageProvider.LengthAsync(cancellationToken); - public ValueTask KeyAsync(int index) - => _storageProvider.KeyAsync(index); + public ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null) + => _storageProvider.KeyAsync(index, cancellationToken); - public ValueTask ContainKeyAsync(string key) - => _storageProvider.ContainKeyAsync(key); + public ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null) + => _storageProvider.ContainKeyAsync(key, cancellationToken); public void SetItem(string key, T data) { From 4c1a6c3b26b68a864669b1d3a9bf6b503eceb553 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 23 Nov 2022 15:28:18 -0500 Subject: [PATCH 16/20] - fixes code snippet missing curly braces --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e0f165b..703cebf 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,15 @@ From v4 onwards we use the default the `JsonSerializerOptions` for `System.Text. To retain the old settings use the following configuration when adding Blazored SessionStorage to the DI container: ```csharp -builder.Services.AddBlazoredSessionStorage(config => - config.JsonSerializerOptions.DictionaryKeyPolicy = JsonNamingPolicy.CamelCase; - config.JsonSerializerOptions.IgnoreNullValues = true; - config.JsonSerializerOptions.IgnoreReadOnlyProperties = true; - config.JsonSerializerOptions.PropertyNameCaseInsensitive = true; - config.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase; - config.JsonSerializerOptions.ReadCommentHandling = JsonCommentHandling.Skip; - config.JsonSerializerOptions.WriteIndented = false; +builder.Services.AddBlazoredSessionStorage(config => { + config.JsonSerializerOptions.DictionaryKeyPolicy = JsonNamingPolicy.CamelCase; + config.JsonSerializerOptions.IgnoreNullValues = true; + config.JsonSerializerOptions.IgnoreReadOnlyProperties = true; + config.JsonSerializerOptions.PropertyNameCaseInsensitive = true; + config.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase; + config.JsonSerializerOptions.ReadCommentHandling = JsonCommentHandling.Skip; + config.JsonSerializerOptions.WriteIndented = false; + } ); ``` From e7fe151a74da273c9120b17d5e40742b71723229 Mon Sep 17 00:00:00 2001 From: Q-Sharp <8755388+Q-Sharp@users.noreply.github.com> Date: Wed, 7 Dec 2022 04:50:00 +0100 Subject: [PATCH 17/20] update to dotnet7 + update nuget packages --- .github/workflows/ci-main.yml | 6 +++--- .github/workflows/ci-pr.yml | 2 +- samples/BlazorServer/BlazorServer.csproj | 4 ++-- .../BlazorWebAssembly/BlazorWebAssembly.csproj | 8 ++++---- samples/bUnitExample/bUnitExample.csproj | 12 ++++++------ ...Blazored.SessionStorage.TestExtensions.csproj | 4 ++-- .../Blazored.SessionStorage.csproj | 10 +++++----- .../Blazored.SessionStorage.Tests.csproj | 16 ++++++++-------- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 2287183..b7c42a5 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -7,7 +7,7 @@ on: types: [ published ] env: - NETCORE_VERSION: '5.0.202' + NETCORE_VERSION: '7.0.x' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true PROJECT_NAME: SessionStorage @@ -73,7 +73,7 @@ jobs: - name: Rewrite base href uses: SteveSandersonMS/ghaction-rewrite-base-href@v1 with: - html_path: samples/BlazorWebAssembly/bin/Release/net5.0/publish/wwwroot/index.html + html_path: samples/BlazorWebAssembly/bin/Release/net7.0/publish/wwwroot/index.html base_href: /${{ env.PROJECT_NAME }}/ - name: Deploy to Github Pages @@ -82,5 +82,5 @@ jobs: ACCESS_TOKEN: $GITHUB_TOKEN BASE_BRANCH: main # The branch the action should deploy from. BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: samples/BlazorWebAssembly/bin/Release/net5.0/publish/wwwroot # The folder the action should deploy. + FOLDER: samples/BlazorWebAssembly/bin/Release/net7.0/publish/wwwroot # The folder the action should deploy. SINGLE_COMMIT: true diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 63c70fd..1584fc7 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -5,7 +5,7 @@ on: branches: [ main ] env: - NETCORE_VERSION: '5.0.x' + NETCORE_VERSION: '7.0.x' PROJECT_NAME: Blazored.SessionStorage jobs: diff --git a/samples/BlazorServer/BlazorServer.csproj b/samples/BlazorServer/BlazorServer.csproj index e6ebf48..98d95a3 100644 --- a/samples/BlazorServer/BlazorServer.csproj +++ b/samples/BlazorServer/BlazorServer.csproj @@ -1,11 +1,11 @@  - net5.0 + net7.0 - + diff --git a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj index 7011596..f1d4e0d 100644 --- a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj +++ b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj @@ -1,13 +1,13 @@  - net5.0 + net7.0 - - - + + + diff --git a/samples/bUnitExample/bUnitExample.csproj b/samples/bUnitExample/bUnitExample.csproj index 2d94f8e..5d0efb7 100644 --- a/samples/bUnitExample/bUnitExample.csproj +++ b/samples/bUnitExample/bUnitExample.csproj @@ -1,18 +1,18 @@ - net5.0 + net7.0 - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj b/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj index f064f63..f75b71b 100644 --- a/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj +++ b/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5.0 + netstandard2.1;net7.0 Chris Sainty @@ -31,7 +31,7 @@ - + diff --git a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj index 194b03e..2ff8b60 100644 --- a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj +++ b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5.0 + netstandard2.1;net7.0 Chris Sainty @@ -30,16 +30,16 @@ 3.0 - + - + - - + + diff --git a/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj b/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj index 085b1c3..00c5d20 100644 --- a/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj +++ b/tests/Blazored.SessionStorage.Tests/Blazored.SessionStorage.Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net7.0 false @@ -11,16 +11,16 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 91b9436ea662e5390ccff3427ecdba17904e51cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 15:24:04 +0000 Subject: [PATCH 18/20] Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /samples/BlazorServer Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- samples/BlazorServer/BlazorServer.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/BlazorServer/BlazorServer.csproj b/samples/BlazorServer/BlazorServer.csproj index e6ebf48..d3d3719 100644 --- a/samples/BlazorServer/BlazorServer.csproj +++ b/samples/BlazorServer/BlazorServer.csproj @@ -5,7 +5,7 @@ - + From d69ee73ffff6a9e3870d1dedd723ba9085116312 Mon Sep 17 00:00:00 2001 From: Chris Sainty Date: Sun, 1 Jan 2023 14:29:28 +0000 Subject: [PATCH 19/20] Updated features to match local storage package --- Directory.Build.props | 4 +- README.md | 37 +- ...zored.SessionStorage.TestExtensions.csproj | 8 +- .../InMemoryStorageProvider.cs | 47 +- .../Blazored.SessionStorage.csproj | 18 +- .../BrowserStorageProvider.cs | 344 +++++++++++++-- .../ChangedEventArgs.cs | 15 +- .../ChangingEventArgs.cs | 13 +- .../BrowserStorageDisabledException.cs | 18 + .../ISessionStorageService.cs | 144 +++--- .../IStorageProvider.cs | 39 +- .../ISyncSessionStorageService.cs | 126 +++--- .../JsonConverters/TimespanJsonConverter.cs | 49 +-- .../Serialization/IJsonSerializer.cs | 11 +- .../Serialization/SystemTextJsonSerializer.cs | 35 +- .../ServiceCollectionExtensions.cs | 66 ++- .../SessionStorageService.cs | 412 +++++++++--------- .../StorageOptions/LocalStorageOptions.cs | 9 - .../StorageOptions/SessionStorageOptions.cs | 8 + .../SessionStorageServiceTests/Clear.cs | 73 ++-- .../SessionStorageServiceTests/ClearAsync.cs | 73 ++-- .../SessionStorageServiceTests/ContainsKey.cs | 73 ++-- .../ContainsKeyAsync.cs | 73 ++-- .../SessionStorageServiceTests/GetItem.cs | 151 ++++--- .../GetItemAsString.cs | 109 +++-- .../GetItemAsStringAsync.cs | 109 +++-- .../GetItemAsync.cs | 151 ++++--- .../SessionStorageServiceTests/Key.cs | 81 ++-- .../SessionStorageServiceTests/KeyAsync.cs | 81 ++-- .../SessionStorageServiceTests/Keys.cs | 153 +++++++ .../SessionStorageServiceTests/Length.cs | 77 ++-- .../SessionStorageServiceTests/LengthAsync.cs | 77 ++-- .../SessionStorageServiceTests/RemoveItem.cs | 93 ++-- .../RemoveItemAsync.cs | 93 ++-- .../SessionStorageServiceTests/SetItem.cs | 411 +++++++++-------- .../SetItemAsString.cs | 353 ++++++++------- .../SetItemAsStringAsync.cs | 353 ++++++++------- .../SetItemAsync.cs | 411 +++++++++-------- .../TestAssets/TestObject.cs | 23 +- 39 files changed, 2486 insertions(+), 1935 deletions(-) create mode 100644 src/Blazored.SessionStorage/Exceptions/BrowserStorageDisabledException.cs delete mode 100644 src/Blazored.SessionStorage/StorageOptions/LocalStorageOptions.cs create mode 100644 src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs create mode 100644 tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Keys.cs diff --git a/Directory.Build.props b/Directory.Build.props index 28acef2..8f1e9e9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,8 +2,8 @@ - 3.1.14 - 5.0.5 + 6.0.12 + 7.0.1 \ No newline at end of file diff --git a/README.md b/README.md index 703cebf..3d1e274 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ builder.Services.AddBlazoredSessionStorage(config => { ``` ### SetItem[Async] method now serializes string values -Prior to v2 we bypassed the serialization of string values as it seemed a pointless as string can be stored directly. However, this led to some edge cases where nullable strings were being saved as the string `"null"`. Then when retrieved, instead of being null the value was `"null"`. By serializing strings this issue is taken care of. +Prior to v2 we bypassed the serialization of string values as it seemed pointless as string can be stored directly. However, this led to some edge cases where nullable strings were being saved as the string `"null"`. Then when retrieved, instead of being null the value was `"null"`. By serializing strings this issue is taken care of. For those who wish to save raw string values, a new method `SetValueAsString[Async]` is available. This will save a string value without attempting to serialize it and will throw an exception if a null string is attempted to be saved. ## Installing @@ -42,7 +42,7 @@ You can also install via the .NET CLI with the following command: dotnet add package Blazored.SessionStorage ``` -If you're using Visual Studio you can also install via the built in NuGet package manager. +If you're using Jetbrains Rider or Visual Studio you can also install via the built in NuGet package manager. ## Setup @@ -69,6 +69,17 @@ public static async Task Main(string[] args) } ``` +### Registering services as Singleton - Blazor WebAssembly **ONLY** +99% of developers will want to register Blazored SessionStorage using the method described above. However, in some very specific scenarios, +developers may have a need to register services as Singleton as apposed to Scoped. This is possible by using the following method: + +```csharp +builder.Services.AddBlazoredSessionStorageAsSingleton(); +``` + +**This method will not work with Blazor Server applications as Blazor's JS interop services are registered as Scoped and cannot be injected into Singletons.** + + ## Usage (Blazor WebAssembly) To use Blazored.SessionStorage in Blazor WebAssembly, inject the `ISessionStorageService` per the example below. @@ -128,9 +139,11 @@ The APIs available are: - GetItemAsync() - GetItemAsStringAsync() - RemoveItemAsync() + - RemoveItemsAsync() - ClearAsync() - LengthAsync() - KeyAsync() + - KeysAsync() - ContainKeyAsync() - synchronous via `ISyncSessionStorageService` (Synchronous methods are **only** available in Blazor WebAssembly): @@ -139,9 +152,11 @@ The APIs available are: - GetItem() - GetItemAsString() - RemoveItem() + - RemovesItem() - Clear() - Length() - Key() + - Keys() - ContainKey() **Note:** Blazored.SessionStorage methods will handle the serialisation and de-serialisation of the data for you, the exception is the `GetItemAsString[Async]` method which will return the raw string value from session storage. @@ -178,6 +193,24 @@ You can find an example of this in the Blazor Server sample project. The standar ## Testing with bUnit This library provides test extensions for use with the [bUnit testing library](https://bunit.dev/). Using these test extensions will provide an in memory implementation which mimics session storage allowing more realistic testing of your components. +### Installing + +To install the package add the following line to you csproj file replacing x.x.x with the latest version number (found at the top of this file): + +``` + +``` + +You can also install via the .NET CLI with the following command: + +``` +dotnet add package Blazored.SessionStorage.TestExtensions +``` + +If you're using Jetbrains Rider or Visual Studio you can also install via the built in NuGet package manager. + +### Usage example + Below is an example test which uses these extensions. You can find an example project which shows this code in action in the samples folder. ```c# diff --git a/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj b/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj index f75b71b..40800be 100644 --- a/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj +++ b/src/Blazored.SessionStorage.TestExtensions/Blazored.SessionStorage.TestExtensions.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net7.0 + net6.0;net7.0 Chris Sainty @@ -26,12 +26,16 @@ Blazored.SessionStorage.snk + + + + - + diff --git a/src/Blazored.SessionStorage.TestExtensions/InMemoryStorageProvider.cs b/src/Blazored.SessionStorage.TestExtensions/InMemoryStorageProvider.cs index 268d1e3..36615c0 100644 --- a/src/Blazored.SessionStorage.TestExtensions/InMemoryStorageProvider.cs +++ b/src/Blazored.SessionStorage.TestExtensions/InMemoryStorageProvider.cs @@ -7,12 +7,12 @@ namespace Blazored.SessionStorage.TestExtensions { internal class InMemoryStorageProvider : IStorageProvider { - private readonly Dictionary _dataStore = new Dictionary(); + private readonly Dictionary _dataStore = new(); public void Clear() => _dataStore.Clear(); - public ValueTask ClearAsync(CancellationToken? cancellationToken = null) + public ValueTask ClearAsync(CancellationToken cancellationToken = default) { _dataStore.Clear(); return new ValueTask(Task.CompletedTask); @@ -21,35 +21,56 @@ public ValueTask ClearAsync(CancellationToken? cancellationToken = null) public bool ContainKey(string key) => _dataStore.ContainsKey(key); - public ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null) - => new ValueTask(ContainKey(key)); + public ValueTask ContainKeyAsync(string key, CancellationToken cancellationToken = default) + => new(ContainKey(key)); public string GetItem(string key) - => _dataStore.ContainsKey(key) ? _dataStore[key] : default; + => _dataStore.TryGetValue(key, out var value) ? value : default; - public ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null) - => new ValueTask(GetItem(key)); + public ValueTask GetItemAsync(string key, CancellationToken cancellationToken = default) + => new(GetItem(key)); public string Key(int index) => index > _dataStore.Count - 1 ? default : _dataStore.ElementAt(index).Key; - public ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null) - => new ValueTask(Key(index)); + public IEnumerable Keys() + => _dataStore.Keys.ToList(); + + public ValueTask KeyAsync(int index, CancellationToken cancellationToken = default) + => new(Key(index)); + + public ValueTask> KeysAsync(CancellationToken cancellationToken = default) + => new(_dataStore.Keys.ToList()); public int Length() => _dataStore.Count; - public ValueTask LengthAsync(CancellationToken? cancellationToken = null) - => new ValueTask(Length()); + public ValueTask LengthAsync(CancellationToken cancellationToken = default) + => new(Length()); public void RemoveItem(string key) => _dataStore.Remove(key); - public ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null) + public ValueTask RemoveItemAsync(string key, CancellationToken cancellationToken = default) { RemoveItem(key); return new ValueTask(Task.CompletedTask); } + + public void RemoveItems(IEnumerable keys) + { + foreach (var key in keys) + { + _dataStore.Remove(key); + } + } + + public ValueTask RemoveItemsAsync(IEnumerable keys, CancellationToken cancellationToken = default) + { + RemoveItems(keys); + + return new ValueTask(Task.CompletedTask); + } public void SetItem(string key, string data) { @@ -63,7 +84,7 @@ public void SetItem(string key, string data) } } - public ValueTask SetItemAsync(string key, string data, CancellationToken? cancellationToken = null) + public ValueTask SetItemAsync(string key, string data, CancellationToken cancellationToken = default) { SetItem(key, data); return new ValueTask(Task.CompletedTask); diff --git a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj index 2ff8b60..07ebd5d 100644 --- a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj +++ b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net7.0 + net6.0;net7.0 Chris Sainty @@ -26,20 +26,16 @@ Blazored.SessionStorage.snk - - 3.0 - - - + - - + + - + - + @@ -62,4 +58,4 @@ - + \ No newline at end of file diff --git a/src/Blazored.SessionStorage/BrowserStorageProvider.cs b/src/Blazored.SessionStorage/BrowserStorageProvider.cs index 6c1e398..883c4bb 100644 --- a/src/Blazored.SessionStorage/BrowserStorageProvider.cs +++ b/src/Blazored.SessionStorage/BrowserStorageProvider.cs @@ -1,88 +1,352 @@ using Microsoft.JSInterop; using System; +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Blazored.SessionStorage.Exceptions; -namespace Blazored.SessionStorage +namespace Blazored.SessionStorage; + +internal class BrowserStorageProvider : IStorageProvider { - internal class BrowserStorageProvider : IStorageProvider + private const string StorageNotAvailableMessage = "Unable to access the browser storage. This is most likely due to the browser settings."; + + private readonly IJSRuntime _jSRuntime; + private readonly IJSInProcessRuntime _jSInProcessRuntime; + + public BrowserStorageProvider(IJSRuntime jSRuntime) + { + _jSRuntime = jSRuntime; + _jSInProcessRuntime = jSRuntime as IJSInProcessRuntime; + } + + public async ValueTask ClearAsync(CancellationToken cancellationToken = default) + { + try + { + await _jSRuntime.InvokeVoidAsync("sessionStorage.clear", cancellationToken); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; + } + } + + public async ValueTask GetItemAsync(string key, CancellationToken cancellationToken = default) + { + try + { + return await _jSRuntime.InvokeAsync("sessionStorage.getItem", cancellationToken, key); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; + } + } + + public async ValueTask KeyAsync(int index, CancellationToken cancellationToken = default) + { + try + { + return await _jSRuntime.InvokeAsync("sessionStorage.key", cancellationToken, index); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; + } + } + + public async ValueTask> KeysAsync(CancellationToken cancellationToken = default) { - private readonly IJSRuntime _jSRuntime; - private readonly IJSInProcessRuntime _jSInProcessRuntime; + try + { + return await _jSRuntime.InvokeAsync>("eval", cancellationToken, "Object.keys(sessionStorage)"); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; + } + } - public BrowserStorageProvider(IJSRuntime jSRuntime) + public async ValueTask ContainKeyAsync(string key, CancellationToken cancellationToken = default) + { + try { - _jSRuntime = jSRuntime; - _jSInProcessRuntime = jSRuntime as IJSInProcessRuntime; + return await _jSRuntime.InvokeAsync("sessionStorage.hasOwnProperty", cancellationToken, key); } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } - public ValueTask ClearAsync(CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeVoidAsync("sessionStorage.clear", cancellationToken ?? CancellationToken.None); + throw; + } + } - public ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeAsync("sessionStorage.getItem", cancellationToken ?? CancellationToken.None, key); + public async ValueTask LengthAsync(CancellationToken cancellationToken = default) + { + try + { + return await _jSRuntime.InvokeAsync("eval", cancellationToken, "sessionStorage.length"); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } - public ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeAsync("sessionStorage.key", cancellationToken ?? CancellationToken.None, index); + throw; + } + } - public ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeAsync("sessionStorage.hasOwnProperty", cancellationToken ?? CancellationToken.None, key); + public async ValueTask RemoveItemAsync(string key, CancellationToken cancellationToken = default) + { + try + { + await _jSRuntime.InvokeVoidAsync("sessionStorage.removeItem", cancellationToken, key); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } - public ValueTask LengthAsync(CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeAsync("eval", cancellationToken ?? CancellationToken.None, "sessionStorage.length"); + throw; + } + } - public ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeVoidAsync("sessionStorage.removeItem", cancellationToken ?? CancellationToken.None, key); + public async ValueTask RemoveItemsAsync(IEnumerable keys, CancellationToken cancellationToken = default) + { + try + { + foreach (var key in keys) + { + await _jSRuntime.InvokeVoidAsync("sessionStorage.removeItem", cancellationToken, key); + } + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } - public ValueTask SetItemAsync(string key, string data, CancellationToken? cancellationToken = null) - => _jSRuntime.InvokeVoidAsync("sessionStorage.setItem", cancellationToken ?? CancellationToken.None, key, data); + throw; + } + } - public void Clear() + public async ValueTask SetItemAsync(string key, string data, CancellationToken cancellationToken = default) + { + try + { + await _jSRuntime.InvokeVoidAsync("sessionStorage.setItem", cancellationToken, key, data); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; + } + } + + public void Clear() + { + CheckForInProcessRuntime(); + try { - CheckForInProcessRuntime(); _jSInProcessRuntime.InvokeVoid("sessionStorage.clear"); } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; + } + } - public string GetItem(string key) + public string GetItem(string key) + { + CheckForInProcessRuntime(); + try { - CheckForInProcessRuntime(); return _jSInProcessRuntime.Invoke("sessionStorage.getItem", key); } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } - public string Key(int index) + throw; + } + } + + public string Key(int index) + { + CheckForInProcessRuntime(); + try { - CheckForInProcessRuntime(); return _jSInProcessRuntime.Invoke("sessionStorage.key", index); } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } - public bool ContainKey(string key) + throw; + } + } + + public IEnumerable Keys() + { + CheckForInProcessRuntime(); + try + { + return _jSInProcessRuntime.Invoke>("eval", "Object.keys(sessionStorage)"); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; + } + } + + public bool ContainKey(string key) + { + CheckForInProcessRuntime(); + try { - CheckForInProcessRuntime(); return _jSInProcessRuntime.Invoke("sessionStorage.hasOwnProperty", key); } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } - public int Length() + throw; + } + } + + public int Length() + { + CheckForInProcessRuntime(); + try { - CheckForInProcessRuntime(); return _jSInProcessRuntime.Invoke("eval", "sessionStorage.length"); } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; + } + } + + public void RemoveItem(string key) + { + CheckForInProcessRuntime(); + try + { + _jSInProcessRuntime.InvokeVoid("sessionStorage.removeItem", key); + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } - public void RemoveItem(string key) + throw; + } + } + + public void RemoveItems(IEnumerable keys) + { + CheckForInProcessRuntime(); + try { - CheckForInProcessRuntime(); - _jSInProcessRuntime.InvokeVoidAsync("sessionStorage.removeItem", key); + foreach (var key in keys) + { + _jSInProcessRuntime.InvokeVoid("sessionStorage.removeItem", key); + } + } + catch (Exception exception) + { + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; } + } - public void SetItem(string key, string data) + public void SetItem(string key, string data) + { + CheckForInProcessRuntime(); + try { - CheckForInProcessRuntime(); _jSInProcessRuntime.InvokeVoid("sessionStorage.setItem", key, data); } - - private void CheckForInProcessRuntime() + catch (Exception exception) { - if (_jSInProcessRuntime == null) - throw new InvalidOperationException("IJSInProcessRuntime not available"); + if (IsStorageDisabledException(exception)) + { + throw new BrowserStorageDisabledException(StorageNotAvailableMessage, exception); + } + + throw; } } + + private void CheckForInProcessRuntime() + { + if (_jSInProcessRuntime == null) + throw new InvalidOperationException("IJSInProcessRuntime not available"); + } + + private static bool IsStorageDisabledException(Exception exception) + => exception.Message.Contains("Failed to read the 'sessionStorage' property from 'Window'"); } diff --git a/src/Blazored.SessionStorage/ChangedEventArgs.cs b/src/Blazored.SessionStorage/ChangedEventArgs.cs index fae2781..f20fba4 100644 --- a/src/Blazored.SessionStorage/ChangedEventArgs.cs +++ b/src/Blazored.SessionStorage/ChangedEventArgs.cs @@ -1,12 +1,11 @@ using System.Diagnostics.CodeAnalysis; -namespace Blazored.SessionStorage +namespace Blazored.SessionStorage; + +[ExcludeFromCodeCoverage] +public class ChangedEventArgs { - [ExcludeFromCodeCoverage] - public class ChangedEventArgs - { - public string Key { get; set; } - public object OldValue { get; set; } - public object NewValue { get; set; } - } + public string Key { get; set; } + public object OldValue { get; set; } + public object NewValue { get; set; } } \ No newline at end of file diff --git a/src/Blazored.SessionStorage/ChangingEventArgs.cs b/src/Blazored.SessionStorage/ChangingEventArgs.cs index 047a3e3..032c9e4 100644 --- a/src/Blazored.SessionStorage/ChangingEventArgs.cs +++ b/src/Blazored.SessionStorage/ChangingEventArgs.cs @@ -1,11 +1,10 @@ using System; using System.Diagnostics.CodeAnalysis; -namespace Blazored.SessionStorage +namespace Blazored.SessionStorage; + +[ExcludeFromCodeCoverage] +public class ChangingEventArgs : ChangedEventArgs { - [ExcludeFromCodeCoverage] - public class ChangingEventArgs : ChangedEventArgs - { - public bool Cancel { get; set; } - } -} + public bool Cancel { get; set; } +} \ No newline at end of file diff --git a/src/Blazored.SessionStorage/Exceptions/BrowserStorageDisabledException.cs b/src/Blazored.SessionStorage/Exceptions/BrowserStorageDisabledException.cs new file mode 100644 index 0000000..212a658 --- /dev/null +++ b/src/Blazored.SessionStorage/Exceptions/BrowserStorageDisabledException.cs @@ -0,0 +1,18 @@ +using System; + +namespace Blazored.SessionStorage.Exceptions; + +public class BrowserStorageDisabledException : Exception +{ + public BrowserStorageDisabledException() + { + } + + public BrowserStorageDisabledException(string message) : base(message) + { + } + + public BrowserStorageDisabledException(string message, Exception inner) : base(message, inner) + { + } +} diff --git a/src/Blazored.SessionStorage/ISessionStorageService.cs b/src/Blazored.SessionStorage/ISessionStorageService.cs index c61c98c..e35d989 100644 --- a/src/Blazored.SessionStorage/ISessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISessionStorageService.cs @@ -1,75 +1,99 @@ using System; +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Microsoft.JSInterop; -namespace Blazored.SessionStorage +namespace Blazored.SessionStorage; + +public interface ISessionStorageService { - public interface ISessionStorageService - { - /// - /// Clears all data from session storage. - /// - /// A representing the completion of the operation. - ValueTask ClearAsync(CancellationToken? cancellationToken = null); + /// + /// Clears all data from session storage. + /// + /// A representing the completion of the operation. + ValueTask ClearAsync(CancellationToken cancellationToken = default); - /// - /// Retrieve the specified data from session storage and deseralise it to the specfied type. - /// - /// A value specifying the name of the session storage slot to use - /// A representing the completion of the operation. - ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null); + /// + /// Retrieve the specified data from session storage and deseralise it to the specfied type. + /// + /// A value specifying the name of the session storage slot to use + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask GetItemAsync(string key, CancellationToken cancellationToken = default); - /// - /// Retrieve the specified data from session storage as a . - /// - /// A value specifying the name of the storage slot to use - /// A representing the completion of the operation. - ValueTask GetItemAsStringAsync(string key, CancellationToken? cancellationToken = null); + /// + /// Retrieve the specified data from session storage as a . + /// + /// A value specifying the name of the storage slot to use + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask GetItemAsStringAsync(string key, CancellationToken cancellationToken = default); - /// - /// Return the name of the key at the specified . - /// - /// - /// A representing the completion of the operation. - ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null); + /// + /// Return the name of the key at the specified . + /// + /// + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask KeyAsync(int index, CancellationToken cancellationToken = default); + + /// + /// Returns a collection of strings representing the names of the keys in the Session storage. + /// + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask> KeysAsync(CancellationToken cancellationToken = default); - /// - /// Checks if the exists in session storage, but does not check its value. - /// - /// A value specifying the name of the storage slot to use - /// A representing the completion of the operation. - ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null); + /// + /// Checks if the exists in session storage, but does not check its value. + /// + /// A value specifying the name of the storage slot to use + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask ContainKeyAsync(string key, CancellationToken cancellationToken = default); - /// - /// The number of items stored in session storage. - /// - /// A representing the completion of the operation. - ValueTask LengthAsync(CancellationToken? cancellationToken = null); + /// + /// The number of items stored in session storage. + /// + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask LengthAsync(CancellationToken cancellationToken = default); - /// - /// Remove the data with the specified . - /// - /// A value specifying the name of the storage slot to use - /// A representing the completion of the operation. - ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null); + /// + /// Remove the data with the specified . + /// + /// A value specifying the name of the storage slot to use + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask RemoveItemAsync(string key, CancellationToken cancellationToken = default); + + /// + /// Removes a collection of . + /// + /// A IEnumerable collection of strings specifying the name of the storage slot to remove + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask RemoveItemsAsync(IEnumerable keys, CancellationToken cancellationToken = default); - /// - /// Sets or updates the in session storage with the specified . - /// - /// A value specifying the name of the storage slot to use - /// The data to be saved - /// A representing the completion of the operation. - ValueTask SetItemAsync(string key, T data, CancellationToken? cancellationToken = null); + /// + /// Sets or updates the in session storage with the specified . + /// + /// A value specifying the name of the storage slot to use + /// The data to be saved + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask SetItemAsync(string key, T data, CancellationToken cancellationToken = default); - /// - /// Sets or updates the in session storage with the specified . Does not serialize the value before storing. - /// - /// A value specifying the name of the storage slot to use - /// The string to be saved - /// - ValueTask SetItemAsStringAsync(string key, string data, CancellationToken? cancellationToken = null); + /// + /// Sets or updates the in session storage with the specified . Does not serialize the value before storing. + /// + /// A value specifying the name of the storage slot to use + /// The string to be saved + /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts () from being applied. + /// A representing the completion of the operation. + ValueTask SetItemAsStringAsync(string key, string data, CancellationToken cancellationToken = default); - event EventHandler Changing; - event EventHandler Changed; - } + event EventHandler Changing; + event EventHandler Changed; } diff --git a/src/Blazored.SessionStorage/IStorageProvider.cs b/src/Blazored.SessionStorage/IStorageProvider.cs index df476de..0bd2c7f 100644 --- a/src/Blazored.SessionStorage/IStorageProvider.cs +++ b/src/Blazored.SessionStorage/IStorageProvider.cs @@ -1,23 +1,26 @@ +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -namespace Blazored.SessionStorage +namespace Blazored.SessionStorage; + +internal interface IStorageProvider { - internal interface IStorageProvider - { - void Clear(); - ValueTask ClearAsync(CancellationToken? cancellationToken = null); - bool ContainKey(string key); - ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null); - string GetItem(string key); - ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null); - string Key(int index); - ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null); - int Length(); - ValueTask LengthAsync(CancellationToken? cancellationToken = null); - void RemoveItem(string key); - ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null); - void SetItem(string key, string data); - ValueTask SetItemAsync(string key, string data, CancellationToken? cancellationToken = null); - } + void Clear(); + ValueTask ClearAsync(CancellationToken cancellationToken = default); + bool ContainKey(string key); + ValueTask ContainKeyAsync(string key, CancellationToken cancellationToken = default); + string GetItem(string key); + ValueTask GetItemAsync(string key, CancellationToken cancellationToken = default); + string Key(int index); + ValueTask KeyAsync(int index, CancellationToken cancellationToken = default); + IEnumerable Keys(); + ValueTask> KeysAsync(CancellationToken cancellationToken = default); + int Length(); + ValueTask LengthAsync(CancellationToken cancellationToken = default); + void RemoveItem(string key); + ValueTask RemoveItemAsync(string key, CancellationToken cancellationToken = default); + ValueTask RemoveItemsAsync(IEnumerable keys, CancellationToken cancellationToken = default); + void SetItem(string key, string data); + ValueTask SetItemAsync(string key, string data, CancellationToken cancellationToken = default); } diff --git a/src/Blazored.SessionStorage/ISyncSessionStorageService.cs b/src/Blazored.SessionStorage/ISyncSessionStorageService.cs index 0017e89..d972a1a 100644 --- a/src/Blazored.SessionStorage/ISyncSessionStorageService.cs +++ b/src/Blazored.SessionStorage/ISyncSessionStorageService.cs @@ -1,70 +1,82 @@ using System; +using System.Collections.Generic; -namespace Blazored.SessionStorage +namespace Blazored.SessionStorage; + +public interface ISyncSessionStorageService { - public interface ISyncSessionStorageService - { - /// - /// Clears all data from session storage. - /// - void Clear(); + /// + /// Clears all data from session storage. + /// + void Clear(); - /// - /// Retrieve the specified data from session storage as a . - /// - /// A value specifying the name of the session storage slot to use - /// The data from the specified as a - T GetItem(string key); + /// + /// Retrieve the specified data from session storage as a . + /// + /// A value specifying the name of the session storage slot to use + /// The data from the specified as a + T GetItem(string key); - /// - /// Retrieve the specified data from session storage as a . - /// - /// A value specifying the name of the storage slot to use - /// The data associated with the specified as a - string GetItemAsString(string key); + /// + /// Retrieve the specified data from session storage as a . + /// + /// A value specifying the name of the storage slot to use + /// The data associated with the specified as a + string GetItemAsString(string key); - /// - /// Return the name of the key at the specified . - /// - /// - /// The name of the key at the specified - string Key(int index); + /// + /// Return the name of the key at the specified . + /// + /// + /// The name of the key at the specified + string Key(int index); + + /// + /// Get the keys of all items stored in session storage. + /// + /// The keys of all items stored in session storage + IEnumerable Keys(); - /// - /// Checks if the exists in session storage, but does not check its value. - /// - /// A value specifying the name of the storage slot to use - /// Boolean indicating if the specified exists - bool ContainKey(string key); + /// + /// Checks if the exists in session storage, but does not check its value. + /// + /// A value specifying the name of the storage slot to use + /// Boolean indicating if the specified exists + bool ContainKey(string key); - /// - /// The number of items stored in session storage. - /// - /// The number of items stored in session storage - int Length(); + /// + /// The number of items stored in session storage. + /// + /// The number of items stored in session storage + int Length(); - /// - /// Remove the data with the specified . - /// - /// A value specifying the name of the storage slot to use - void RemoveItem(string key); + /// + /// Remove the data with the specified . + /// + /// A value specifying the name of the storage slot to use + void RemoveItem(string key); + + /// + /// Removes a collection of . + /// + /// A IEnumerable collection of strings specifying the name of the storage slot to remove + void RemoveItems(IEnumerable keys); - /// - /// Sets or updates the in session storage with the specified . - /// - /// A value specifying the name of the storage slot to use - /// The data to be saved - void SetItem(string key, T data); + /// + /// Sets or updates the in session storage with the specified . + /// + /// A value specifying the name of the storage slot to use + /// The data to be saved + void SetItem(string key, T data); - /// - /// Sets or updates the in session storage with the specified . Does not serialize the value before storing. - /// - /// A value specifying the name of the storage slot to use - /// The string to be saved - /// - void SetItemAsString(string key, string data); + /// + /// Sets or updates the in session storage with the specified . Does not serialize the value before storing. + /// + /// A value specifying the name of the storage slot to use + /// The string to be saved + /// + void SetItemAsString(string key, string data); - event EventHandler Changing; - event EventHandler Changed; - } + event EventHandler Changing; + event EventHandler Changed; } diff --git a/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs b/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs index b67e0a8..2a81538 100644 --- a/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs +++ b/src/Blazored.SessionStorage/JsonConverters/TimespanJsonConverter.cs @@ -5,39 +5,38 @@ using System.Text.Json.Serialization; using System.Text.RegularExpressions; -namespace Blazored.SessionStorage.JsonConverters +namespace Blazored.SessionStorage.JsonConverters; + +/// +/// The new Json.NET doesn't support Timespan at this time +/// https://github.com/dotnet/corefx/issues/38641 +/// +public class TimespanJsonConverter : JsonConverter { /// - /// The new Json.NET doesn't support Timespan at this time - /// https://github.com/dotnet/corefx/issues/38641 + /// Format: Days.Hours:Minutes:Seconds:Milliseconds /// - public class TimespanJsonConverter : JsonConverter - { - /// - /// Format: Days.Hours:Minutes:Seconds:Milliseconds - /// - public const string TimeSpanFormatString = @"d\.hh\:mm\:ss\:FFF"; + public const string TimeSpanFormatString = @"d\.hh\:mm\:ss\:FFF"; - public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + var s = reader.GetString(); + if (string.IsNullOrWhiteSpace(s)) { - var s = reader.GetString(); - if (string.IsNullOrWhiteSpace(s)) - { - return TimeSpan.Zero; - } - - if (!TimeSpan.TryParseExact(s, TimeSpanFormatString, null, out var parsedTimeSpan)) - { - throw new FormatException($"Input timespan is not in an expected format : expected {Regex.Unescape(TimeSpanFormatString)}. Please retrieve this key as a string and parse manually."); - } - - return parsedTimeSpan; + return TimeSpan.Zero; } - public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options) + if (!TimeSpan.TryParseExact(s, TimeSpanFormatString, null, out var parsedTimeSpan)) { - var timespanFormatted = $"{value.ToString(TimeSpanFormatString)}"; - writer.WriteStringValue(timespanFormatted); + throw new FormatException($"Input timespan is not in an expected format : expected {Regex.Unescape(TimeSpanFormatString)}. Please retrieve this key as a string and parse manually."); } + + return parsedTimeSpan; + } + + public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options) + { + var timespanFormatted = $"{value.ToString(TimeSpanFormatString)}"; + writer.WriteStringValue(timespanFormatted); } } diff --git a/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs b/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs index 9bccf18..e1a99c5 100644 --- a/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs +++ b/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs @@ -1,8 +1,7 @@ -namespace Blazored.SessionStorage.Serialization +namespace Blazored.SessionStorage.Serialization; + +public interface IJsonSerializer { - public interface IJsonSerializer - { - string Serialize(T obj); - T Deserialize(string text); - } + string Serialize(T obj); + T Deserialize(string text); } diff --git a/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs b/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs index 5ce56c0..a4b893f 100644 --- a/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs +++ b/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs @@ -2,26 +2,25 @@ using Microsoft.Extensions.Options; using System.Text.Json; -namespace Blazored.SessionStorage.Serialization +namespace Blazored.SessionStorage.Serialization; + +internal class SystemTextJsonSerializer : IJsonSerializer { - internal class SystemTextJsonSerializer : IJsonSerializer - { - private readonly JsonSerializerOptions _options; + private readonly JsonSerializerOptions _options; - public SystemTextJsonSerializer(IOptions options) - { - _options = options.Value.JsonSerializerOptions; - } + public SystemTextJsonSerializer(IOptions options) + { + _options = options.Value.JsonSerializerOptions; + } - public SystemTextJsonSerializer(SessionStorageOptions sessionStorageOptions) - { - _options = sessionStorageOptions.JsonSerializerOptions; - } + public SystemTextJsonSerializer(SessionStorageOptions sessionStorageOptions) + { + _options = sessionStorageOptions.JsonSerializerOptions; + } - public T Deserialize(string data) - => JsonSerializer.Deserialize(data, _options); + public T Deserialize(string data) + => JsonSerializer.Deserialize(data, _options); - public string Serialize(T data) - => JsonSerializer.Serialize(data, _options); - } -} + public string Serialize(T data) + => JsonSerializer.Serialize(data, _options); +} \ No newline at end of file diff --git a/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs b/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs index 9b1e2bf..795a92c 100644 --- a/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs +++ b/src/Blazored.SessionStorage/ServiceCollectionExtensions.cs @@ -5,26 +5,54 @@ using Blazored.SessionStorage.StorageOptions; using Microsoft.Extensions.DependencyInjection; -namespace Blazored.SessionStorage +namespace Blazored.SessionStorage; + +[ExcludeFromCodeCoverage] +public static class ServiceCollectionExtensions { - [ExcludeFromCodeCoverage] - public static class ServiceCollectionExtensions - { - public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollection services) - => AddBlazoredSessionStorage(services, null); + public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollection services) + => AddBlazoredSessionStorage(services, null); - public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollection services, Action configure) - { - return services - .AddScoped() - .AddScoped() - .AddScoped() - .AddScoped() - .Configure(configureOptions => - { - configure?.Invoke(configureOptions); - configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); - }); - } + public static IServiceCollection AddBlazoredSessionStorage(this IServiceCollection services, Action configure) + { + return services + .AddScoped() + .AddScoped() + .AddScoped() + .AddScoped() + .Configure(configureOptions => + { + configure?.Invoke(configureOptions); + configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); + }); + } + + /// + /// Registers the Blazored SessionStorage services as singletons. This should only be used in Blazor WebAssembly applications. + /// Using this in Blazor Server applications will cause unexpected and potentially dangerous behaviour. + /// + /// + public static IServiceCollection AddBlazoredSessionStorageAsSingleton(this IServiceCollection services) + => AddBlazoredSessionStorageAsSingleton(services, null); + + /// + /// Registers the Blazored SessionStorage services as singletons. This should only be used in Blazor WebAssembly applications. + /// Using this in Blazor Server applications will cause unexpected and potentially dangerous behaviour. + /// + /// + /// + /// + public static IServiceCollection AddBlazoredSessionStorageAsSingleton(this IServiceCollection services, Action configure) + { + return services + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .Configure(configureOptions => + { + configure?.Invoke(configureOptions); + configureOptions.JsonSerializerOptions.Converters.Add(new TimespanJsonConverter()); + }); } } diff --git a/src/Blazored.SessionStorage/SessionStorageService.cs b/src/Blazored.SessionStorage/SessionStorageService.cs index d020994..c9b429d 100644 --- a/src/Blazored.SessionStorage/SessionStorageService.cs +++ b/src/Blazored.SessionStorage/SessionStorageService.cs @@ -1,269 +1,289 @@ using System; +using System.Collections.Generic; using System.Text.Json; using System.Threading; using System.Threading.Tasks; using Blazored.SessionStorage.Serialization; -namespace Blazored.SessionStorage +namespace Blazored.SessionStorage; + +internal class SessionStorageService : ISessionStorageService, ISyncSessionStorageService { - internal class SessionStorageService : ISessionStorageService, ISyncSessionStorageService + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + public SessionStorageService(IStorageProvider storageProvider, IJsonSerializer serializer) { - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; + _storageProvider = storageProvider; + _serializer = serializer; + } - public SessionStorageService(IStorageProvider storageProvider, IJsonSerializer serializer) - { - _storageProvider = storageProvider; - _serializer = serializer; - } + public ValueTask RemoveItemsAsync(IEnumerable keys, CancellationToken cancellationToken = default) + => _storageProvider.RemoveItemsAsync(keys, cancellationToken); - public async ValueTask SetItemAsync(string key, T data, CancellationToken? cancellationToken = null) - { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); + public async ValueTask SetItemAsync(string key, T data, CancellationToken cancellationToken = default) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - var e = await RaiseOnChangingAsync(key, data).ConfigureAwait(false); + var e = await RaiseOnChangingAsync(key, data).ConfigureAwait(false); - if (e.Cancel) - return; + if (e.Cancel) + return; - var serialisedData = _serializer.Serialize(data); - await _storageProvider.SetItemAsync(key, serialisedData, cancellationToken).ConfigureAwait(false); + var serialisedData = _serializer.Serialize(data); + await _storageProvider.SetItemAsync(key, serialisedData, cancellationToken).ConfigureAwait(false); - RaiseOnChanged(key, e.OldValue, data); - } + RaiseOnChanged(key, e.OldValue, data); + } - public async ValueTask SetItemAsStringAsync(string key, string data, CancellationToken? cancellationToken = null) - { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); + public async ValueTask SetItemAsStringAsync(string key, string data, CancellationToken cancellationToken = default) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - if (data is null) - throw new ArgumentNullException(nameof(data)); + if (data is null) + throw new ArgumentNullException(nameof(data)); - var e = await RaiseOnChangingAsync(key, data).ConfigureAwait(false); + var e = await RaiseOnChangingAsync(key, data).ConfigureAwait(false); - if (e.Cancel) - return; + if (e.Cancel) + return; - await _storageProvider.SetItemAsync(key, data, cancellationToken).ConfigureAwait(false); + await _storageProvider.SetItemAsync(key, data, cancellationToken).ConfigureAwait(false); - RaiseOnChanged(key, e.OldValue, data); - } + RaiseOnChanged(key, e.OldValue, data); + } + + public async ValueTask GetItemAsync(string key, CancellationToken cancellationToken = default) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - public async ValueTask GetItemAsync(string key, CancellationToken? cancellationToken = null) + var serialisedData = await _storageProvider.GetItemAsync(key, cancellationToken).ConfigureAwait(false); + + if (string.IsNullOrWhiteSpace(serialisedData)) + return default; + + try { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); - - var serialisedData = await _storageProvider.GetItemAsync(key, cancellationToken).ConfigureAwait(false); - - if (string.IsNullOrWhiteSpace(serialisedData)) - return default; - - try - { - return _serializer.Deserialize(serialisedData); - } - catch (JsonException e) when (e.Path == "$" && typeof(T) == typeof(string)) - { - // For backward compatibility return the plain string. - // On the next save a correct value will be stored and this Exception will not happen again, for this 'key' - return (T)(object)serialisedData; - } + return _serializer.Deserialize(serialisedData); } - - public ValueTask GetItemAsStringAsync(string key, CancellationToken? cancellationToken = null) + catch (JsonException e) when (e.Path == "$" && typeof(T) == typeof(string)) { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); - - return _storageProvider.GetItemAsync(key, cancellationToken); + // For backward compatibility return the plain string. + // On the next save a correct value will be stored and this Exception will not happen again, for this 'key' + return (T)(object)serialisedData; } + } - public ValueTask RemoveItemAsync(string key, CancellationToken? cancellationToken = null) - { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); + public ValueTask GetItemAsStringAsync(string key, CancellationToken cancellationToken = default) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - return _storageProvider.RemoveItemAsync(key, cancellationToken); - } + return _storageProvider.GetItemAsync(key, cancellationToken); + } - public ValueTask ClearAsync(CancellationToken? cancellationToken = null) - => _storageProvider.ClearAsync(cancellationToken); + public ValueTask RemoveItemAsync(string key, CancellationToken cancellationToken = default) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - public ValueTask LengthAsync(CancellationToken? cancellationToken = null) - => _storageProvider.LengthAsync(cancellationToken); + return _storageProvider.RemoveItemAsync(key, cancellationToken); + } - public ValueTask KeyAsync(int index, CancellationToken? cancellationToken = null) - => _storageProvider.KeyAsync(index, cancellationToken); + public ValueTask ClearAsync(CancellationToken cancellationToken = default) + => _storageProvider.ClearAsync(cancellationToken); - public ValueTask ContainKeyAsync(string key, CancellationToken? cancellationToken = null) - => _storageProvider.ContainKeyAsync(key, cancellationToken); + public ValueTask LengthAsync(CancellationToken cancellationToken = default) + => _storageProvider.LengthAsync(cancellationToken); - public void SetItem(string key, T data) - { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); + public ValueTask KeyAsync(int index, CancellationToken cancellationToken = default) + => _storageProvider.KeyAsync(index, cancellationToken); - var e = RaiseOnChangingSync(key, data); + public ValueTask> KeysAsync(CancellationToken cancellationToken = default) + => _storageProvider.KeysAsync(cancellationToken); - if (e.Cancel) - return; + public ValueTask ContainKeyAsync(string key, CancellationToken cancellationToken = default) + => _storageProvider.ContainKeyAsync(key, cancellationToken); - var serialisedData = _serializer.Serialize(data); - _storageProvider.SetItem(key, serialisedData); + public void SetItem(string key, T data) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - RaiseOnChanged(key, e.OldValue, data); - } + var e = RaiseOnChangingSync(key, data); - public void SetItemAsString(string key, string data) - { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); + if (e.Cancel) + return; - if (data is null) - throw new ArgumentNullException(nameof(data)); + var serialisedData = _serializer.Serialize(data); + _storageProvider.SetItem(key, serialisedData); - var e = RaiseOnChangingSync(key, data); + RaiseOnChanged(key, e.OldValue, data); + } - if (e.Cancel) - return; + public void SetItemAsString(string key, string data) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - _storageProvider.SetItem(key, data); + if (data is null) + throw new ArgumentNullException(nameof(data)); - RaiseOnChanged(key, e.OldValue, data); - } + var e = RaiseOnChangingSync(key, data); + + if (e.Cancel) + return; + + _storageProvider.SetItem(key, data); + + RaiseOnChanged(key, e.OldValue, data); + } + + public T GetItem(string key) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); - public T GetItem(string key) + var serialisedData = _storageProvider.GetItem(key); + + if (string.IsNullOrWhiteSpace(serialisedData)) + return default; + + try { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); - - var serialisedData = _storageProvider.GetItem(key); - - if (string.IsNullOrWhiteSpace(serialisedData)) - return default; - - try - { - return _serializer.Deserialize(serialisedData); - } - catch (JsonException e) when (e.Path == "$" && typeof(T) == typeof(string)) - { - // For backward compatibility return the plain string. - // On the next save a correct value will be stored and this Exception will not happen again, for this 'key' - return (T)(object)serialisedData; - } + return _serializer.Deserialize(serialisedData); } - - public string GetItemAsString(string key) + catch (JsonException e) when (e.Path == "$" && typeof(T) == typeof(string)) { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); - - return _storageProvider.GetItem(key); + // For backward compatibility return the plain string. + // On the next save a correct value will be stored and this Exception will not happen again, for this 'key' + return (T)(object)serialisedData; } + } - public void RemoveItem(string key) - { - if (string.IsNullOrWhiteSpace(key)) - throw new ArgumentNullException(nameof(key)); + public string GetItemAsString(string key) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); + return _storageProvider.GetItem(key); + } + + public void RemoveItem(string key) + { + if (string.IsNullOrWhiteSpace(key)) + throw new ArgumentNullException(nameof(key)); + + _storageProvider.RemoveItem(key); + } + + public void RemoveItems(IEnumerable keys) + { + if (keys == null) + throw new ArgumentNullException(nameof(keys)); + + foreach (var key in keys) + { _storageProvider.RemoveItem(key); } + } - public void Clear() - => _storageProvider.Clear(); + public void Clear() + => _storageProvider.Clear(); - public int Length() - => _storageProvider.Length(); + public int Length() + => _storageProvider.Length(); - public string Key(int index) - => _storageProvider.Key(index); + public string Key(int index) + => _storageProvider.Key(index); + + public IEnumerable Keys() + => _storageProvider.Keys(); - public bool ContainKey(string key) - => _storageProvider.ContainKey(key); + public bool ContainKey(string key) + => _storageProvider.ContainKey(key); - public event EventHandler Changing; - private async Task RaiseOnChangingAsync(string key, object data) + public event EventHandler Changing; + private async Task RaiseOnChangingAsync(string key, object data) + { + var e = new ChangingEventArgs { - var e = new ChangingEventArgs - { - Key = key, - OldValue = await GetItemInternalAsync(key).ConfigureAwait(false), - NewValue = data - }; + Key = key, + OldValue = await GetItemInternalAsync(key).ConfigureAwait(false), + NewValue = data + }; - Changing?.Invoke(this, e); + Changing?.Invoke(this, e); - return e; - } + return e; + } - private ChangingEventArgs RaiseOnChangingSync(string key, object data) + private ChangingEventArgs RaiseOnChangingSync(string key, object data) + { + var e = new ChangingEventArgs { - var e = new ChangingEventArgs - { - Key = key, - OldValue = GetItemInternal(key), - NewValue = data - }; + Key = key, + OldValue = GetItemInternal(key), + NewValue = data + }; - Changing?.Invoke(this, e); + Changing?.Invoke(this, e); - return e; - } + return e; + } + + private async Task GetItemInternalAsync(string key) + { + if (string.IsNullOrEmpty(key)) + throw new ArgumentNullException(nameof(key)); - private async Task GetItemInternalAsync(string key) + var serialisedData = await _storageProvider.GetItemAsync(key).ConfigureAwait(false); + + if (string.IsNullOrWhiteSpace(serialisedData)) + return default; + try { - if (string.IsNullOrEmpty(key)) - throw new ArgumentNullException(nameof(key)); - - var serialisedData = await _storageProvider.GetItemAsync(key).ConfigureAwait(false); - - if (string.IsNullOrWhiteSpace(serialisedData)) - return default; - try - { - return _serializer.Deserialize(serialisedData); - } - catch (JsonException) - { - return (T)(object)serialisedData; - } + return _serializer.Deserialize(serialisedData); } - - private object GetItemInternal(string key) + catch (JsonException) { - if (string.IsNullOrEmpty(key)) - throw new ArgumentNullException(nameof(key)); - - var serialisedData = _storageProvider.GetItem(key); - - if (string.IsNullOrWhiteSpace(serialisedData)) - return default; - - try - { - return _serializer.Deserialize(serialisedData); - } - catch (JsonException) - { - return serialisedData; - } + return (T)(object)serialisedData; } + } + + private object GetItemInternal(string key) + { + if (string.IsNullOrEmpty(key)) + throw new ArgumentNullException(nameof(key)); - public event EventHandler Changed; - private void RaiseOnChanged(string key, object oldValue, object data) + var serialisedData = _storageProvider.GetItem(key); + + if (string.IsNullOrWhiteSpace(serialisedData)) + return default; + + try { - var e = new ChangedEventArgs - { - Key = key, - OldValue = oldValue, - NewValue = data - }; - - Changed?.Invoke(this, e); + return _serializer.Deserialize(serialisedData); } + catch (JsonException) + { + return serialisedData; + } + } + + public event EventHandler Changed; + private void RaiseOnChanged(string key, object oldValue, object data) + { + var e = new ChangedEventArgs + { + Key = key, + OldValue = oldValue, + NewValue = data + }; + + Changed?.Invoke(this, e); } } diff --git a/src/Blazored.SessionStorage/StorageOptions/LocalStorageOptions.cs b/src/Blazored.SessionStorage/StorageOptions/LocalStorageOptions.cs deleted file mode 100644 index 509f1f0..0000000 --- a/src/Blazored.SessionStorage/StorageOptions/LocalStorageOptions.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Text.Json; - -namespace Blazored.SessionStorage.StorageOptions -{ - public class SessionStorageOptions - { - public JsonSerializerOptions JsonSerializerOptions { get; } = new JsonSerializerOptions(); - } -} diff --git a/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs b/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs new file mode 100644 index 0000000..2156750 --- /dev/null +++ b/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs @@ -0,0 +1,8 @@ +using System.Text.Json; + +namespace Blazored.SessionStorage.StorageOptions; + +public class SessionStorageOptions +{ + public JsonSerializerOptions JsonSerializerOptions { get; } = new(); +} diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs index a7c8331..4b68577 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Clear.cs @@ -8,49 +8,48 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class Clear { - public class Clear - { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; - public Clear() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, serializer); - } + public Clear() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, serializer); + } - [Fact] - public void ClearsAnyItemsInTheStore() - { - // Arrange - var item1 = new TestObject(1, "Jane Smith"); - var item2 = new TestObject(2, "John Smith"); + [Fact] + public void ClearsAnyItemsInTheStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); - _sut.SetItem("Item1", item1); - _sut.SetItem("Item2", item2); + _sut.SetItem("Item1", item1); + _sut.SetItem("Item2", item2); - // Act - _sut.Clear(); + // Act + _sut.Clear(); - // Assert - Assert.Equal(0, _storageProvider.Length()); - } + // Assert + Assert.Equal(0, _storageProvider.Length()); + } - [Fact] - public void DoesNothingWhenStoreIsEmpty() - { - // Act - _sut.Clear(); + [Fact] + public void DoesNothingWhenStoreIsEmpty() + { + // Act + _sut.Clear(); - // Assert - Assert.Equal(0, _storageProvider.Length()); - } + // Assert + Assert.Equal(0, _storageProvider.Length()); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs index 69a71e4..3c39ac9 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ClearAsync.cs @@ -9,49 +9,48 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class ClearAsync { - public class ClearAsync - { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; - public ClearAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, serializer); - } + public ClearAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, serializer); + } - [Fact] - public async Task ClearsAnyItemsInTheStore() - { - // Arrange - var item1 = new TestObject(1, "Jane Smith"); - var item2 = new TestObject(2, "John Smith"); + [Fact] + public async Task ClearsAnyItemsInTheStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); - await _sut.SetItemAsync("Item1", item1); - await _sut.SetItemAsync("Item2", item2); + await _sut.SetItemAsync("Item1", item1); + await _sut.SetItemAsync("Item2", item2); - // Act - await _sut.ClearAsync(); + // Act + await _sut.ClearAsync(); - // Assert - Assert.Equal(0, await _storageProvider.LengthAsync()); - } + // Assert + Assert.Equal(0, await _storageProvider.LengthAsync()); + } - [Fact] - public async Task DoesNothingWhenItemDoesNotExistInStore() - { - // Act - await _sut.ClearAsync(); + [Fact] + public async Task DoesNothingWhenItemDoesNotExistInStore() + { + // Act + await _sut.ClearAsync(); - // Assert - Assert.Equal(0, await _storageProvider.LengthAsync()); - } + // Assert + Assert.Equal(0, await _storageProvider.LengthAsync()); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs index b09f482..81b67ab 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKey.cs @@ -8,49 +8,48 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class ContainsKey { - public class ContainsKey - { - private readonly SessionStorageService _sut; + private readonly SessionStorageService _sut; - public ContainsKey() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - IStorageProvider storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(storageProvider, serializer); - } + public ContainsKey() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } - [Fact] - public void ReturnsTrue_When_KeyExistsInStore() - { - // Arrange - const string key = "TestKey"; - var item1 = new TestObject(1, "Jane Smith"); - _sut.SetItem(key, item1); + [Fact] + public void ReturnsTrue_When_KeyExistsInStore() + { + // Arrange + const string key = "TestKey"; + var item1 = new TestObject(1, "Jane Smith"); + _sut.SetItem(key, item1); - // Act - var containsKey = _sut.ContainKey(key); + // Act + var containsKey = _sut.ContainKey(key); - // Assert - Assert.True(containsKey); - } + // Assert + Assert.True(containsKey); + } - [Fact] - public void ReturnsFalse_When_KeyDoesNotExistsInStore() - { - // Arrange - const string key = "TestKey"; + [Fact] + public void ReturnsFalse_When_KeyDoesNotExistsInStore() + { + // Arrange + const string key = "TestKey"; - // Act - var containsKey = _sut.ContainKey(key); + // Act + var containsKey = _sut.ContainKey(key); - // Assert - Assert.False(containsKey); - } + // Assert + Assert.False(containsKey); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs index c2a9cc4..74c65de 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/ContainsKeyAsync.cs @@ -9,49 +9,48 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class ContainsKeyAsync { - public class ContainsKeyAsync - { - private readonly SessionStorageService _sut; + private readonly SessionStorageService _sut; - public ContainsKeyAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - IStorageProvider storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(storageProvider, serializer); - } + public ContainsKeyAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } - [Fact] - public async Task ReturnsTrue_When_KeyExistsInStore() - { - // Arrange - const string key = "TestKey"; - var item1 = new TestObject(1, "Jane Smith"); - await _sut.SetItemAsync(key, item1); + [Fact] + public async Task ReturnsTrue_When_KeyExistsInStore() + { + // Arrange + const string key = "TestKey"; + var item1 = new TestObject(1, "Jane Smith"); + await _sut.SetItemAsync(key, item1); - // Act - var containsKey = await _sut.ContainKeyAsync(key); + // Act + var containsKey = await _sut.ContainKeyAsync(key); - // Assert - Assert.True(containsKey); - } + // Assert + Assert.True(containsKey); + } - [Fact] - public async Task ReturnsFalse_When_KeyDoesNotExistsInStore() - { - // Arrange - const string key = "TestKey"; + [Fact] + public async Task ReturnsFalse_When_KeyDoesNotExistsInStore() + { + // Arrange + const string key = "TestKey"; - // Act - var containsKey = await _sut.ContainKeyAsync(key); + // Act + var containsKey = await _sut.ContainKeyAsync(key); - // Assert - Assert.False(containsKey); - } + // Assert + Assert.False(containsKey); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs index 6052294..ee957a0 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItem.cs @@ -9,97 +9,96 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class GetItem { - public class GetItem - { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; - private const string Key = "testKey"; + private const string Key = "testKey"; - public GetItem() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - _serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, _serializer); - } + public GetItem() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - var action = new Action(() => _sut.GetItem(key)); + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Action(() => _sut.GetItem(key)); - // assert - Assert.Throws(action); - } + // assert + Assert.Throws(action); + } - [Theory] - [InlineData("Item1", "stringTest")] - [InlineData("Item2", 11)] - [InlineData("Item3", 11.11)] - public void ReturnsDeserializedDataFromStore(string key, T data) - { - // Arrange - _sut.SetItem(key, data); + [Theory] + [InlineData("Item1", "stringTest")] + [InlineData("Item2", 11)] + [InlineData("Item3", 11.11)] + public void ReturnsDeserializedDataFromStore(string key, T data) + { + // Arrange + _sut.SetItem(key, data); - // Act - var result = _sut.GetItem(key); + // Act + var result = _sut.GetItem(key); - // Assert - Assert.Equal(data, result); - } + // Assert + Assert.Equal(data, result); + } - [Fact] - public void ReturnsComplexObjectFromStore() - { - // Arrange - var objectToSave = new TestObject(2, "Jane Smith"); - _sut.SetItem(Key, objectToSave); + [Fact] + public void ReturnsComplexObjectFromStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + _sut.SetItem(Key, objectToSave); - // Act - var result = _sut.GetItem(Key); + // Act + var result = _sut.GetItem(Key); - // Assert - Assert.Equal(objectToSave.Id, result.Id); - Assert.Equal(objectToSave.Name, result.Name); - } + // Assert + Assert.Equal(objectToSave.Id, result.Id); + Assert.Equal(objectToSave.Name, result.Name); + } - [Fact] - public void ReturnsNullFromStore_When_NullValueSaved() - { - // Arrange - var valueToSave = (string)null; - _sut.SetItem(Key, valueToSave); + [Fact] + public void ReturnsNullFromStore_When_NullValueSaved() + { + // Arrange + var valueToSave = (string)null; + _sut.SetItem(Key, valueToSave); - // Act - var result = _sut.GetItem(Key); + // Act + var result = _sut.GetItem(Key); - // Assert - Assert.Null(result); - } + // Assert + Assert.Null(result); + } - [Fact] - public void ReturnsStringFromStore_When_JsonExceptionIsThrown() - { - // Arrange - var jsonData = "[{ id: 5, name: \"Jane Smith\"}]"; - _storageProvider.SetItem(Key, jsonData); + [Fact] + public void ReturnsStringFromStore_When_JsonExceptionIsThrown() + { + // Arrange + var jsonData = "[{ id: 5, name: \"Jane Smith\"}]"; + _storageProvider.SetItem(Key, jsonData); - // Act - var result = _sut.GetItem(Key); + // Act + var result = _sut.GetItem(Key); - // Assert - Assert.Equal(jsonData, result); - } + // Assert + Assert.Equal(jsonData, result); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs index 253ed78..92f985a 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsString.cs @@ -9,70 +9,69 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class GetItemAsString { - public class GetItemAsString - { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; - private const string Key = "testKey"; + private const string Key = "testKey"; - public GetItemAsString() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - _serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, _serializer); - } + public GetItemAsString() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - var action = new Action(() => _sut.GetItemAsString(key)); + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Action(() => _sut.GetItemAsString(key)); - // assert - Assert.Throws(action); - } + // assert + Assert.Throws(action); + } - [Theory] - [InlineData("Item1", "stringTest")] - [InlineData("Item2", 11)] - [InlineData("Item3", 11.11)] - public void ReturnsDeserializedDataFromStore(string key, T data) - { - // Arrange - _sut.SetItem(key, data); + [Theory] + [InlineData("Item1", "stringTest")] + [InlineData("Item2", 11)] + [InlineData("Item3", 11.11)] + public void ReturnsDeserializedDataFromStore(string key, T data) + { + // Arrange + _sut.SetItem(key, data); - // Act - var result = _sut.GetItemAsString(key); + // Act + var result = _sut.GetItemAsString(key); - // Assert - var serializedData = _serializer.Serialize(data); - Assert.Equal(serializedData, result); - } + // Assert + var serializedData = _serializer.Serialize(data); + Assert.Equal(serializedData, result); + } - [Fact] - public void ReturnsComplexObjectFromStore() - { - // Arrange - var objectToSave = new TestObject(2, "Jane Smith"); - _sut.SetItem(Key, objectToSave); + [Fact] + public void ReturnsComplexObjectFromStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + _sut.SetItem(Key, objectToSave); - // Act - var result = _sut.GetItemAsString(Key); + // Act + var result = _sut.GetItemAsString(Key); - // Assert - var serializedData = _serializer.Serialize(objectToSave); - Assert.Equal(serializedData, result); - } + // Assert + var serializedData = _serializer.Serialize(objectToSave); + Assert.Equal(serializedData, result); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs index 9a7b3d7..a3dedb7 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsStringAsync.cs @@ -10,70 +10,69 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class GetItemAsStringAsync { - public class GetItemAsStringAsync - { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; - private const string Key = "testKey"; + private const string Key = "testKey"; - public GetItemAsStringAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - _serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, _serializer); - } + public GetItemAsStringAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - var action = new Func(async () => await _sut.GetItemAsStringAsync(key)); + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Func(async () => await _sut.GetItemAsStringAsync(key)); - // assert - Assert.ThrowsAsync(action); - } + // assert + Assert.ThrowsAsync(action); + } - [Theory] - [InlineData("Item1", "stringTest")] - [InlineData("Item2", 11)] - [InlineData("Item3", 11.11)] - public async Task ReturnsDeserializedDataFromStore(string key, T data) - { - // Arrange - await _sut.SetItemAsync(key, data); + [Theory] + [InlineData("Item1", "stringTest")] + [InlineData("Item2", 11)] + [InlineData("Item3", 11.11)] + public async Task ReturnsDeserializedDataFromStore(string key, T data) + { + // Arrange + await _sut.SetItemAsync(key, data); - // Act - var result = await _sut.GetItemAsStringAsync(key); + // Act + var result = await _sut.GetItemAsStringAsync(key); - // Assert - var serializedData = _serializer.Serialize(data); - Assert.Equal(serializedData, result); - } + // Assert + var serializedData = _serializer.Serialize(data); + Assert.Equal(serializedData, result); + } - [Fact] - public async Task ReturnsComplexObjectFromStore() - { - // Arrange - var objectToSave = new TestObject(2, "Jane Smith"); - await _sut.SetItemAsync(Key, objectToSave); + [Fact] + public async Task ReturnsComplexObjectFromStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + await _sut.SetItemAsync(Key, objectToSave); - // Act - var result = await _sut.GetItemAsStringAsync(Key); + // Act + var result = await _sut.GetItemAsStringAsync(Key); - // Assert - var serializedData = _serializer.Serialize(objectToSave); - Assert.Equal(serializedData, result); - } + // Assert + var serializedData = _serializer.Serialize(objectToSave); + Assert.Equal(serializedData, result); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs index cba032e..67de73f 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/GetItemAsync.cs @@ -10,97 +10,96 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class GetItemAsync { - public class GetItemAsync - { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; - private const string Key = "testKey"; + private const string Key = "testKey"; - public GetItemAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - _serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, _serializer); - } + public GetItemAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - var action = new Func(async () => await _sut.GetItemAsync(key)); + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Func(async () => await _sut.GetItemAsync(key)); - // assert - Assert.ThrowsAsync(action); - } + // assert + Assert.ThrowsAsync(action); + } - [Theory] - [InlineData("Item1", "stringTest")] - [InlineData("Item2", 11)] - [InlineData("Item3", 11.11)] - public async Task ReturnsDeserializedDataFromStore(string key, T data) - { - // Arrange - await _sut.SetItemAsync(key, data); + [Theory] + [InlineData("Item1", "stringTest")] + [InlineData("Item2", 11)] + [InlineData("Item3", 11.11)] + public async Task ReturnsDeserializedDataFromStore(string key, T data) + { + // Arrange + await _sut.SetItemAsync(key, data); - // Act - var result = await _sut.GetItemAsync(key); + // Act + var result = await _sut.GetItemAsync(key); - // Assert - Assert.Equal(data, result); - } + // Assert + Assert.Equal(data, result); + } - [Fact] - public async Task ReturnsComplexObjectFromStore() - { - // Arrange - var objectToSave = new TestObject(2, "Jane Smith"); - await _sut.SetItemAsync(Key, objectToSave); + [Fact] + public async Task ReturnsComplexObjectFromStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + await _sut.SetItemAsync(Key, objectToSave); - // Act - var result = await _sut.GetItemAsync(Key); + // Act + var result = await _sut.GetItemAsync(Key); - // Assert - Assert.Equal(objectToSave.Id, result.Id); - Assert.Equal(objectToSave.Name, result.Name); - } + // Assert + Assert.Equal(objectToSave.Id, result.Id); + Assert.Equal(objectToSave.Name, result.Name); + } - [Fact] - public async Task ReturnsNullFromStore_When_NullValueSaved() - { - // Arrange - var valueToSave = (string)null; - await _sut.SetItemAsync(Key, valueToSave); + [Fact] + public async Task ReturnsNullFromStore_When_NullValueSaved() + { + // Arrange + var valueToSave = (string)null; + await _sut.SetItemAsync(Key, valueToSave); - // Act - var result = await _sut.GetItemAsync(Key); + // Act + var result = await _sut.GetItemAsync(Key); - // Assert - Assert.Null(result); - } + // Assert + Assert.Null(result); + } - [Fact] - public async Task ReturnsStringFromStore_When_JsonExceptionIsThrown() - { - // Arrange - var valueToSave = "[{ id: 5, name: \"Jane Smith\"}]"; - await _storageProvider.SetItemAsync(Key, valueToSave); + [Fact] + public async Task ReturnsStringFromStore_When_JsonExceptionIsThrown() + { + // Arrange + var valueToSave = "[{ id: 5, name: \"Jane Smith\"}]"; + await _storageProvider.SetItemAsync(Key, valueToSave); - // Act - var result = await _sut.GetItemAsync(Key); + // Act + var result = await _sut.GetItemAsync(Key); - // Assert - Assert.Equal(valueToSave, result); - } + // Assert + Assert.Equal(valueToSave, result); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs index 5082df1..ac8cba3 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Key.cs @@ -8,55 +8,54 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class Key { - public class Key - { - private readonly SessionStorageService _sut; + private readonly SessionStorageService _sut; - public Key() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - IStorageProvider storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(storageProvider, serializer); - } + public Key() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } - [Fact] - public void ReturnsNameOfKeyAtIndex_When_KeyExistsInStore() - { - // Arrange - const string key1 = "TestKey1"; - const string key2 = "TestKey2"; + [Fact] + public void ReturnsNameOfKeyAtIndex_When_KeyExistsInStore() + { + // Arrange + const string key1 = "TestKey1"; + const string key2 = "TestKey2"; - var item1 = new TestObject(1, "Jane Smith"); - var item2 = new TestObject(2, "John Smith"); + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); - _sut.SetItem(key1, item1); - _sut.SetItem(key2, item2); + _sut.SetItem(key1, item1); + _sut.SetItem(key2, item2); - // Act - var keyName = _sut.Key(1); + // Act + var keyName = _sut.Key(1); - // Assert - Assert.Equal(key2, keyName); - } + // Assert + Assert.Equal(key2, keyName); + } - [Fact] - public void ReturnsNull_When_KeyDoesNotExistInStore() - { - // Arrange - var item1 = new TestObject(1, "Jane Smith"); - _sut.SetItem("TestKey1", item1); + [Fact] + public void ReturnsNull_When_KeyDoesNotExistInStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + _sut.SetItem("TestKey1", item1); - // Act - var keyName = _sut.Key(1); + // Act + var keyName = _sut.Key(1); - // Assert - Assert.Null(keyName); - } + // Assert + Assert.Null(keyName); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs index 86dec29..0ec8a92 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/KeyAsync.cs @@ -9,55 +9,54 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class KeyAsync { - public class KeyAsync - { - private readonly SessionStorageService _sut; + private readonly SessionStorageService _sut; - public KeyAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - IStorageProvider storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(storageProvider, serializer); - } + public KeyAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } - [Fact] - public async Task ReturnsNameOfKeyAtIndex_When_KeyExistsInStore() - { - // Arrange - const string key1 = "TestKey1"; - const string key2 = "TestKey2"; + [Fact] + public async Task ReturnsNameOfKeyAtIndex_When_KeyExistsInStore() + { + // Arrange + const string key1 = "TestKey1"; + const string key2 = "TestKey2"; - var item1 = new TestObject(1, "Jane Smith"); - var item2 = new TestObject(2, "John Smith"); + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); - await _sut.SetItemAsync(key1, item1); - await _sut.SetItemAsync(key2, item2); + await _sut.SetItemAsync(key1, item1); + await _sut.SetItemAsync(key2, item2); - // Act - var keyName = await _sut.KeyAsync(1); + // Act + var keyName = await _sut.KeyAsync(1); - // Assert - Assert.Equal(key2, keyName); - } + // Assert + Assert.Equal(key2, keyName); + } - [Fact] - public async Task ReturnsNull_When_KeyDoesNotExistInStore() - { - // Arrange - var item1 = new TestObject(1, "Jane Smith"); - await _sut.SetItemAsync("TestKey1", item1); + [Fact] + public async Task ReturnsNull_When_KeyDoesNotExistInStore() + { + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + await _sut.SetItemAsync("TestKey1", item1); - // Act - var keyName = await _sut.KeyAsync(1); + // Act + var keyName = await _sut.KeyAsync(1); - // Assert - Assert.Null(keyName); - } + // Assert + Assert.Null(keyName); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Keys.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Keys.cs new file mode 100644 index 0000000..d243c19 --- /dev/null +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Keys.cs @@ -0,0 +1,153 @@ +using System.Linq; +using System.Text.Json; +using Blazored.SessionStorage.JsonConverters; +using Blazored.SessionStorage.Serialization; +using Blazored.SessionStorage.StorageOptions; +using Blazored.SessionStorage.TestExtensions; +using Blazored.SessionStorage.Tests.TestAssets; +using Microsoft.Extensions.Options; +using Moq; +using Xunit; + +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class Keys + { + private readonly SessionStorageService _sut; + + public Keys() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public void ReturnsKeysAsync() + { + // Arrange + const string key1 = "TestKey1"; + const string key2 = "TestKey2"; + _sut.Clear(); + + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + + _sut.SetItem(key1, item1); + _sut.SetItem(key2, item2); + + // Act + var keyNames = _sut.KeysAsync().Result.ToList(); + + // Assert + Assert.Collection(keyNames, + item => Assert.Equal(key1, item), + item => Assert.Equal(key2, item)); + } + + [Fact] + public void ReturnsKeys() + { + // Arrange + const string key1 = "TestKey1"; + const string key2 = "TestKey2"; + _sut.Clear(); + + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + + _sut.SetItem(key1, item1); + _sut.SetItem(key2, item2); + + // Act + var keyNames = _sut.Keys().ToList(); + + // Assert + Assert.Collection(keyNames, + item => Assert.Equal(key1, item), + item => Assert.Equal(key2, item)); + } + + [Fact] + public void ReturnsEmptyWhenCollectionEmptyAsync() + { + // Arrange + _sut.Clear(); + + // Act + var keyNames = _sut.KeysAsync().Result; + + // Assert + Assert.Empty(keyNames); + } + + [Fact] + public void ReturnsEmptyWhenCollectionEmpty() + { + // Arrange + _sut.Clear(); + + // Act + var keyNames = _sut.Keys(); + + // Assert + Assert.Empty(keyNames); + } + + [Fact] + public void RemoveKeysAsync() + { + // Arrange + const string key1 = "TestKey1"; + const string key2 = "TestKey2"; + const string key3 = "TestKey3"; + _sut.Clear(); + + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + var item3 = new TestObject(3, "Jade Smith"); + + _sut.SetItem(key1, item1); + _sut.SetItem(key2, item2); + _sut.SetItem(key3, item3); + + // Act + var keyNames = new[] { key1, key2 }; + _sut.RemoveItemsAsync(keyNames).AsTask().Wait(); + + // Assert + Assert.Equal(1, _sut.Length()); + Assert.NotNull(_sut.GetItem(key3)); + } + + [Fact] + public void RemoveKeys() + { + // Arrange + const string key1 = "TestKey1"; + const string key2 = "TestKey2"; + const string key3 = "TestKey3"; + _sut.Clear(); + + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); + var item3 = new TestObject(3, "Jade Smith"); + + _sut.SetItem(key1, item1); + _sut.SetItem(key2, item2); + _sut.SetItem(key3, item3); + + // Act + var keyNames = new[] { key1, key2 }; + _sut.RemoveItems(keyNames); + + // Assert + Assert.Equal(1, _sut.Length()); + Assert.NotNull(_sut.GetItem(key3)); + } + } diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs index 94d189d..aaecf4e 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/Length.cs @@ -8,48 +8,47 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class Length { - public class Length + private readonly SessionStorageService _sut; + + public Length() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public void ReturnsZeroWhenStoreIsEmpty() + { + // Act + var itemCount = _sut.Length(); + + // Assert + Assert.Equal(0, itemCount); + } + + [Fact] + public void ReturnsNumberOfItemsInStore() { - private readonly SessionStorageService _sut; - - public Length() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - IStorageProvider storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(storageProvider, serializer); - } - - [Fact] - public void ReturnsZeroWhenStoreIsEmpty() - { - // Act - var itemCount = _sut.Length(); - - // Assert - Assert.Equal(0, itemCount); - } - - [Fact] - public void ReturnsNumberOfItemsInStore() - { - // Arrange - var item1 = new TestObject(1, "Jane Smith"); - var item2 = new TestObject(2, "John Smith"); + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); - _sut.SetItem("Item1", item1); - _sut.SetItem("Item2", item2); + _sut.SetItem("Item1", item1); + _sut.SetItem("Item2", item2); - // Act - var itemCount = _sut.Length(); + // Act + var itemCount = _sut.Length(); - // Assert - Assert.Equal(2, itemCount); - } + // Assert + Assert.Equal(2, itemCount); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs index 6cc547e..700780d 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/LengthAsync.cs @@ -9,48 +9,47 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class LengthAsync { - public class LengthAsync + private readonly SessionStorageService _sut; + + public LengthAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + IStorageProvider storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(storageProvider, serializer); + } + + [Fact] + public async Task ReturnsZeroWhenStoreIsEmpty() + { + // Act + var itemCount = await _sut.LengthAsync(); + + // Assert + Assert.Equal(0, itemCount); + } + + [Fact] + public async Task ReturnsNumberOfItemsInStore() { - private readonly SessionStorageService _sut; - - public LengthAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - IStorageProvider storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(storageProvider, serializer); - } - - [Fact] - public async Task ReturnsZeroWhenStoreIsEmpty() - { - // Act - var itemCount = await _sut.LengthAsync(); - - // Assert - Assert.Equal(0, itemCount); - } - - [Fact] - public async Task ReturnsNumberOfItemsInStore() - { - // Arrange - var item1 = new TestObject(1, "Jane Smith"); - var item2 = new TestObject(2, "John Smith"); + // Arrange + var item1 = new TestObject(1, "Jane Smith"); + var item2 = new TestObject(2, "John Smith"); - await _sut.SetItemAsync("Item1", item1); - await _sut.SetItemAsync("Item2", item2); + await _sut.SetItemAsync("Item1", item1); + await _sut.SetItemAsync("Item2", item2); - // Act - var itemCount = await _sut.LengthAsync(); + // Act + var itemCount = await _sut.LengthAsync(); - // Assert - Assert.Equal(2, itemCount); - } + // Assert + Assert.Equal(2, itemCount); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs index bc088d4..1433b44 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItem.cs @@ -9,61 +9,60 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class RemoveItem { - public class RemoveItem - { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; - private const string Key = "testKey"; + private const string Key = "testKey"; - public RemoveItem() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, serializer); - } + public RemoveItem() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, serializer); + } - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - var action = new Action(() => _sut.RemoveItem(key)); + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Action(() => _sut.RemoveItem(key)); - // assert - Assert.Throws(action); - } + // assert + Assert.Throws(action); + } - [Fact] - public void RemovesItemFromStoreIfExists() - { - // Arrange - var data = new TestObject(2, "Jane Smith"); - _sut.SetItem(Key, data); + [Fact] + public void RemovesItemFromStoreIfExists() + { + // Arrange + var data = new TestObject(2, "Jane Smith"); + _sut.SetItem(Key, data); - // Act - _sut.RemoveItem(Key); + // Act + _sut.RemoveItem(Key); - // Assert - Assert.Equal(0, _storageProvider.Length()); - } + // Assert + Assert.Equal(0, _storageProvider.Length()); + } - [Fact] - public void DoesNothingWhenItemDoesNotExistInStore() - { - // Act - _sut.RemoveItem(Key); + [Fact] + public void DoesNothingWhenItemDoesNotExistInStore() + { + // Act + _sut.RemoveItem(Key); - // Assert - Assert.Equal(0, _storageProvider.Length()); - } + // Assert + Assert.Equal(0, _storageProvider.Length()); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs index 56f27c4..cd138ee 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/RemoveItemAsync.cs @@ -10,61 +10,60 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class RemoveItemAsync { - public class RemoveItemAsync - { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; - private const string Key = "testKey"; + private const string Key = "testKey"; - public RemoveItemAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, serializer); - } + public RemoveItemAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + IJsonSerializer serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, serializer); + } - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - var action = new Func(async () => await _sut.RemoveItemAsync(key)); + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + var action = new Func(async () => await _sut.RemoveItemAsync(key)); - // assert - Assert.ThrowsAsync(action); - } + // assert + Assert.ThrowsAsync(action); + } - [Fact] - public async Task RemovesItemFromStoreIfExists() - { - // Arrange - var data = new TestObject(2, "Jane Smith"); - await _sut.SetItemAsync(Key, data); + [Fact] + public async Task RemovesItemFromStoreIfExists() + { + // Arrange + var data = new TestObject(2, "Jane Smith"); + await _sut.SetItemAsync(Key, data); - // Act - await _sut.RemoveItemAsync(Key); + // Act + await _sut.RemoveItemAsync(Key); - // Assert - Assert.Equal(0, await _storageProvider.LengthAsync()); - } + // Assert + Assert.Equal(0, await _storageProvider.LengthAsync()); + } - [Fact] - public async Task DoesNothingWhenItemDoesNotExistInStore() - { - // Act - await _sut.RemoveItemAsync(Key); + [Fact] + public async Task DoesNothingWhenItemDoesNotExistInStore() + { + // Act + await _sut.RemoveItemAsync(Key); - // Assert - Assert.Equal(0, await _storageProvider.LengthAsync()); - } + // Assert + Assert.Equal(0, await _storageProvider.LengthAsync()); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs index f722851..48c3f92 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItem.cs @@ -9,226 +9,225 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class SetItem { - public class SetItem + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public SetItem() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; - - private const string Key = "testKey"; - - public SetItem() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - _serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, _serializer); - } - - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - const string data = "Data"; - var action = new Action(() => _sut.SetItem(key, data)); - - // assert - Assert.Throws(action); - } - - [Fact] - public void RaisesOnChangingEvent_When_SavingNewData() - { - // arrange - var onChangingCalled = false; - _sut.Changing += (_, _) => onChangingCalled = true; - - // act - _sut.SetItem("Key", "Data"); - - // assert - Assert.True(onChangingCalled); - } + // arrange / act + const string data = "Data"; + var action = new Action(() => _sut.SetItem(key, data)); + + // assert + Assert.Throws(action); + } + + [Fact] + public void RaisesOnChangingEvent_When_SavingNewData() + { + // arrange + var onChangingCalled = false; + _sut.Changing += (_, _) => onChangingCalled = true; + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.True(onChangingCalled); + } - [Fact] - public void OnChangingEventContainsEmptyOldValue_When_SavingData() - { - // arrange - var oldValue = ""; - _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - _sut.SetItem("Key", "Data"); - - // assert - Assert.Equal(default, oldValue); - } + [Fact] + public void OnChangingEventContainsEmptyOldValue_When_SavingData() + { + // arrange + var oldValue = ""; + _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } - [Fact] - public void OnChangingEventContainsNewValue_When_SavingNewData() - { - // arrange - const string data = "Data"; - var newValue = ""; - _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); - - // act - _sut.SetItemAsync("Key", data); - - // assert - Assert.Equal(data, newValue); - } + [Fact] + public void OnChangingEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); + + // act + _sut.SetItemAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } - [Fact] - public void OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() - { - // arrange - _sut.Changing += (_, args) => args.Cancel = true; - - // act - _sut.SetItem("Key", "Data"); - - // assert - Assert.Equal(0, _storageProvider.Length()); - } + [Fact] + public void OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() + { + // arrange + _sut.Changing += (_, args) => args.Cancel = true; + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.Equal(0, _storageProvider.Length()); + } - [Theory] - [InlineData("stringTest")] - [InlineData(11)] - [InlineData(11.11)] - public void SavesDataAsJsonToStore(T valueToSave) - { - // Act - _sut.SetItem(Key, valueToSave); - - // Assert - var serializedValue = _storageProvider.GetItem(Key); - var valueFromStore = _serializer.Deserialize(serializedValue); - - Assert.Equal(1, _storageProvider.Length()); - Assert.Equal(valueToSave, valueFromStore); - } - - [Fact] - public void SavesComplexObjectAsJsonToStore() - { - // Arrange - var objectToSave = new TestObject(2, "Jane Smith"); - - // Act - _sut.SetItem(Key, objectToSave); - - // Assert - var serializedObject = _storageProvider.GetItem(Key); - var objectFromStore = _serializer.Deserialize(serializedObject); - - Assert.Equal(1, _storageProvider.Length()); - Assert.Equal(objectToSave.Id, objectFromStore.Id); - Assert.Equal(objectToSave.Name, objectFromStore.Name); - } + [Theory] + [InlineData("stringTest")] + [InlineData(11)] + [InlineData(11.11)] + public void SavesDataAsJsonToStore(T valueToSave) + { + // Act + _sut.SetItem(Key, valueToSave); + + // Assert + var serializedValue = _storageProvider.GetItem(Key); + var valueFromStore = _serializer.Deserialize(serializedValue); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Equal(valueToSave, valueFromStore); + } + + [Fact] + public void SavesComplexObjectAsJsonToStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + + // Act + _sut.SetItem(Key, objectToSave); + + // Assert + var serializedObject = _storageProvider.GetItem(Key); + var objectFromStore = _serializer.Deserialize(serializedObject); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Equal(objectToSave.Id, objectFromStore.Id); + Assert.Equal(objectToSave.Name, objectFromStore.Name); + } - [Fact] - public void SavesNullIntoStore_When_NullValueProvided() - { - // Arrange - var valueToSave = (string)null; - - // Act - _sut.SetItem(Key, valueToSave); - - // Assert - var serializedValue = _storageProvider.GetItem(Key); - var valueFromStore = _serializer.Deserialize(serializedValue); - - Assert.Equal(1, _storageProvider.Length()); - Assert.Null(valueFromStore); - } + [Fact] + public void SavesNullIntoStore_When_NullValueProvided() + { + // Arrange + var valueToSave = (string)null; + + // Act + _sut.SetItem(Key, valueToSave); + + // Assert + var serializedValue = _storageProvider.GetItem(Key); + var valueFromStore = _serializer.Deserialize(serializedValue); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Null(valueFromStore); + } - [Fact] - public void OverwriteExistingValueInStore_When_UsingTheSameKey() - { - // Arrange - const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; - const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; + [Fact] + public void OverwriteExistingValueInStore_When_UsingTheSameKey() + { + // Arrange + const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; + const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; - var serializedValue = _serializer.Serialize(existingValue); - _storageProvider.SetItem(Key, serializedValue); + var serializedValue = _serializer.Serialize(existingValue); + _storageProvider.SetItem(Key, serializedValue); - // Act - _sut.SetItem(Key, newValue); + // Act + _sut.SetItem(Key, newValue); - // Assert - var serializedUpdatedValue = _storageProvider.GetItem(Key); - var updatedValue = _serializer.Deserialize(serializedUpdatedValue); + // Assert + var serializedUpdatedValue = _storageProvider.GetItem(Key); + var updatedValue = _serializer.Deserialize(serializedUpdatedValue); - Assert.Equal(newValue, updatedValue); - } + Assert.Equal(newValue, updatedValue); + } - [Fact] - public void RaisesOnChangedEvent_When_SavingData() - { - // arrange - var onChangedCalled = false; - _sut.Changed += (_, _) => onChangedCalled = true; - - // act - _sut.SetItem("Key", "Data"); - - // assert - Assert.True(onChangedCalled); - } + [Fact] + public void RaisesOnChangedEvent_When_SavingData() + { + // arrange + var onChangedCalled = false; + _sut.Changed += (_, _) => onChangedCalled = true; + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.True(onChangedCalled); + } - [Fact] - public void OnChangedEventContainsEmptyOldValue_When_SavingNewData() - { - // arrange - var oldValue = ""; - _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - _sut.SetItem("Key", "Data"); - - // assert - Assert.Equal(default, oldValue); - } + [Fact] + public void OnChangedEventContainsEmptyOldValue_When_SavingNewData() + { + // arrange + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } - [Fact] - public void OnChangedEventContainsNewValue_When_SavingNewData() - { - // arrange - const string data = "Data"; - var newValue = ""; - _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); - - // act - _sut.SetItem("Key", data); - - // assert - Assert.Equal(data, newValue); - } + [Fact] + public void OnChangedEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); + + // act + _sut.SetItem("Key", data); + + // assert + Assert.Equal(data, newValue); + } - [Fact] - public void OnChangedEventContainsOldValue_When_UpdatingExistingData() - { - // arrange - var existingValue = "Foo"; - _storageProvider.SetItem("Key", existingValue); - var oldValue = ""; - _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - _sut.SetItem("Key", "Data"); - - // assert - Assert.Equal(existingValue, oldValue); - } + [Fact] + public void OnChangedEventContainsOldValue_When_UpdatingExistingData() + { + // arrange + var existingValue = "Foo"; + _storageProvider.SetItem("Key", existingValue); + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItem("Key", "Data"); + + // assert + Assert.Equal(existingValue, oldValue); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs index 24ec2fd..913b043 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsString.cs @@ -8,197 +8,196 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class SetItemAsString { - public class SetItemAsString + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public SetItemAsString() { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; - - private const string Key = "testKey"; - - public SetItemAsString() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - _serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, _serializer); - } - - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - const string data = "Data"; - var action = new Action(() => _sut.SetItemAsString(key, data)); - - // assert - Assert.Throws(action); - } + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + const string data = "Data"; + var action = new Action(() => _sut.SetItemAsString(key, data)); + + // assert + Assert.Throws(action); + } - [Fact] - public void ThrowsArgumentNullException_When_DataIsNull() - { - // arrange / act - var data = (string)null; - var action = new Action(() => _sut.SetItemAsString("MyValue", data)); - - // assert - Assert.Throws(action); - } - - [Fact] - public void RaisesOnChangingEvent_When_SavingNewData() - { - // arrange - var onChangingCalled = false; - _sut.Changing += (_, _) => onChangingCalled = true; - - // act - _sut.SetItemAsString("Key", "Data"); - - // assert - Assert.True(onChangingCalled); - } + [Fact] + public void ThrowsArgumentNullException_When_DataIsNull() + { + // arrange / act + var data = (string)null; + var action = new Action(() => _sut.SetItemAsString("MyValue", data)); + + // assert + Assert.Throws(action); + } + + [Fact] + public void RaisesOnChangingEvent_When_SavingNewData() + { + // arrange + var onChangingCalled = false; + _sut.Changing += (_, _) => onChangingCalled = true; + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.True(onChangingCalled); + } - [Fact] - public void OnChangingEventContainsEmptyOldValue_When_SavingData() - { - // arrange - var oldValue = ""; - _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - _sut.SetItemAsString("Key", "Data"); - - // assert - Assert.Equal(default, oldValue); - } + [Fact] + public void OnChangingEventContainsEmptyOldValue_When_SavingData() + { + // arrange + var oldValue = ""; + _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } - [Fact] - public void OnChangingEventContainsNewValue_When_SavingNewData() - { - // arrange - const string data = "Data"; - var newValue = ""; - _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); - - // act - _sut.SetItemAsString("Key", data); - - // assert - Assert.Equal(data, newValue); - } + [Fact] + public void OnChangingEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); + + // act + _sut.SetItemAsString("Key", data); + + // assert + Assert.Equal(data, newValue); + } - [Fact] - public void OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() - { - // arrange - _sut.Changing += (_, args) => args.Cancel = true; - - // act - _sut.SetItemAsString("Key", "Data"); - - // assert - Assert.Equal(0, _storageProvider.Length()); - } + [Fact] + public void OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() + { + // arrange + _sut.Changing += (_, args) => args.Cancel = true; + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.Equal(0, _storageProvider.Length()); + } - [Fact] - public void SavesDataToStore() - { - // Act - var valueToSave = "StringValue"; - _sut.SetItemAsString(Key, valueToSave); - - // Assert - var valueFromStore = _storageProvider.GetItem(Key); - - Assert.Equal(1, _storageProvider.Length()); - Assert.Equal(valueToSave, valueFromStore); - } + [Fact] + public void SavesDataToStore() + { + // Act + var valueToSave = "StringValue"; + _sut.SetItemAsString(Key, valueToSave); + + // Assert + var valueFromStore = _storageProvider.GetItem(Key); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Equal(valueToSave, valueFromStore); + } - [Fact] - public void OverwriteExistingValueInStore_When_UsingTheSameKey() - { - // Arrange - const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; - const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; + [Fact] + public void OverwriteExistingValueInStore_When_UsingTheSameKey() + { + // Arrange + const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; + const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; - _storageProvider.SetItem(Key, existingValue); + _storageProvider.SetItem(Key, existingValue); - // Act - _sut.SetItemAsString(Key, newValue); + // Act + _sut.SetItemAsString(Key, newValue); - // Assert - var updatedValue = _storageProvider.GetItem(Key); + // Assert + var updatedValue = _storageProvider.GetItem(Key); - Assert.Equal(newValue, updatedValue); - } + Assert.Equal(newValue, updatedValue); + } - [Fact] - public void RaisesOnChangedEvent_When_SavingData() - { - // arrange - var onChangedCalled = false; - _sut.Changed += (_, _) => onChangedCalled = true; - - // act - _sut.SetItemAsString("Key", "Data"); - - // assert - Assert.True(onChangedCalled); - } + [Fact] + public void RaisesOnChangedEvent_When_SavingData() + { + // arrange + var onChangedCalled = false; + _sut.Changed += (_, _) => onChangedCalled = true; + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.True(onChangedCalled); + } - [Fact] - public void OnChangedEventContainsEmptyOldValue_When_SavingNewData() - { - // arrange - var oldValue = ""; - _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - _sut.SetItemAsString("Key", "Data"); - - // assert - Assert.Equal(default, oldValue); - } + [Fact] + public void OnChangedEventContainsEmptyOldValue_When_SavingNewData() + { + // arrange + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } - [Fact] - public void OnChangedEventContainsNewValue_When_SavingNewData() - { - // arrange - const string data = "Data"; - var newValue = ""; - _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); - - // act - _sut.SetItemAsString("Key", data); - - // assert - Assert.Equal(data, newValue); - } + [Fact] + public void OnChangedEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); + + // act + _sut.SetItemAsString("Key", data); + + // assert + Assert.Equal(data, newValue); + } - [Fact] - public void OnChangedEventContainsOldValue_When_UpdatingExistingData() - { - // arrange - var existingValue = "Foo"; - _storageProvider.SetItem("Key", existingValue); - var oldValue = ""; - _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - _sut.SetItemAsString("Key", "Data"); - - // assert - Assert.Equal(existingValue, oldValue); - } + [Fact] + public void OnChangedEventContainsOldValue_When_UpdatingExistingData() + { + // arrange + var existingValue = "Foo"; + _storageProvider.SetItem("Key", existingValue); + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + _sut.SetItemAsString("Key", "Data"); + + // assert + Assert.Equal(existingValue, oldValue); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs index 4a5d0a2..7857a1b 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsStringAsync.cs @@ -9,197 +9,196 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class SetItemAsStringAsync { - public class SetItemAsStringAsync + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public SetItemAsStringAsync() { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; - - private const string Key = "testKey"; - - public SetItemAsStringAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - _serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, _serializer); - } - - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - const string data = "Data"; - var action = new Func(async () => await _sut.SetItemAsStringAsync(key, data)); - - // assert - Assert.ThrowsAsync(action); - } + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) + { + // arrange / act + const string data = "Data"; + var action = new Func(async () => await _sut.SetItemAsStringAsync(key, data)); + + // assert + Assert.ThrowsAsync(action); + } - [Fact] - public void ThrowsArgumentNullException_When_DataIsNull() - { - // arrange / act - var data = (string)null; - var action = new Func(async () => await _sut.SetItemAsStringAsync("MyValue", data)); - - // assert - Assert.ThrowsAsync(action); - } - - [Fact] - public async Task RaisesOnChangingEvent_When_SavingNewData() - { - // arrange - var onChangingCalled = false; - _sut.Changing += (_, _) => onChangingCalled = true; - - // act - await _sut.SetItemAsStringAsync("Key", "Data"); - - // assert - Assert.True(onChangingCalled); - } + [Fact] + public void ThrowsArgumentNullException_When_DataIsNull() + { + // arrange / act + var data = (string)null; + var action = new Func(async () => await _sut.SetItemAsStringAsync("MyValue", data)); + + // assert + Assert.ThrowsAsync(action); + } + + [Fact] + public async Task RaisesOnChangingEvent_When_SavingNewData() + { + // arrange + var onChangingCalled = false; + _sut.Changing += (_, _) => onChangingCalled = true; + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.True(onChangingCalled); + } - [Fact] - public async Task OnChangingEventContainsEmptyOldValue_When_SavingData() - { - // arrange - var oldValue = ""; - _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - await _sut.SetItemAsStringAsync("Key", "Data"); - - // assert - Assert.Equal(default, oldValue); - } + [Fact] + public async Task OnChangingEventContainsEmptyOldValue_When_SavingData() + { + // arrange + var oldValue = ""; + _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } - [Fact] - public async Task OnChangingEventContainsNewValue_When_SavingNewData() - { - // arrange - const string data = "Data"; - var newValue = ""; - _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); - - // act - await _sut.SetItemAsStringAsync("Key", data); - - // assert - Assert.Equal(data, newValue); - } + [Fact] + public async Task OnChangingEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } - [Fact] - public async Task OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() - { - // arrange - _sut.Changing += (_, args) => args.Cancel = true; - - // act - await _sut.SetItemAsStringAsync("Key", "Data"); - - // assert - Assert.Equal(0, _storageProvider.Length()); - } + [Fact] + public async Task OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() + { + // arrange + _sut.Changing += (_, args) => args.Cancel = true; + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.Equal(0, _storageProvider.Length()); + } - [Fact] - public async Task SavesDataToStore() - { - // Act - var valueToSave = "StringValue"; - await _sut.SetItemAsStringAsync(Key, valueToSave); - - // Assert - var valueFromStore = _storageProvider.GetItem(Key); - - Assert.Equal(1, _storageProvider.Length()); - Assert.Equal(valueToSave, valueFromStore); - } + [Fact] + public async Task SavesDataToStore() + { + // Act + var valueToSave = "StringValue"; + await _sut.SetItemAsStringAsync(Key, valueToSave); + + // Assert + var valueFromStore = _storageProvider.GetItem(Key); + + Assert.Equal(1, _storageProvider.Length()); + Assert.Equal(valueToSave, valueFromStore); + } - [Fact] - public async Task OverwriteExistingValueInStore_When_UsingTheSameKey() - { - // Arrange - const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; - const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; + [Fact] + public async Task OverwriteExistingValueInStore_When_UsingTheSameKey() + { + // Arrange + const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; + const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; - _storageProvider.SetItem(Key, existingValue); + _storageProvider.SetItem(Key, existingValue); - // Act - await _sut.SetItemAsStringAsync(Key, newValue); + // Act + await _sut.SetItemAsStringAsync(Key, newValue); - // Assert - var updatedValue = _storageProvider.GetItem(Key); + // Assert + var updatedValue = _storageProvider.GetItem(Key); - Assert.Equal(newValue, updatedValue); - } + Assert.Equal(newValue, updatedValue); + } - [Fact] - public async Task RaisesOnChangedEvent_When_SavingData() - { - // arrange - var onChangedCalled = false; - _sut.Changed += (_, _) => onChangedCalled = true; - - // act - await _sut.SetItemAsStringAsync("Key", "Data"); - - // assert - Assert.True(onChangedCalled); - } + [Fact] + public async Task RaisesOnChangedEvent_When_SavingData() + { + // arrange + var onChangedCalled = false; + _sut.Changed += (_, _) => onChangedCalled = true; + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.True(onChangedCalled); + } - [Fact] - public async Task OnChangedEventContainsEmptyOldValue_When_SavingNewData() - { - // arrange - var oldValue = ""; - _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - await _sut.SetItemAsStringAsync("Key", "Data"); - - // assert - Assert.Equal(default, oldValue); - } + [Fact] + public async Task OnChangedEventContainsEmptyOldValue_When_SavingNewData() + { + // arrange + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } - [Fact] - public async Task OnChangedEventContainsNewValue_When_SavingNewData() - { - // arrange - const string data = "Data"; - var newValue = ""; - _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); - - // act - await _sut.SetItemAsStringAsync("Key", data); - - // assert - Assert.Equal(data, newValue); - } + [Fact] + public async Task OnChangedEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } - [Fact] - public async Task OnChangedEventContainsOldValue_When_UpdatingExistingData() - { - // arrange - var existingValue = "Foo"; - _storageProvider.SetItem("Key", existingValue); - var oldValue = ""; - _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - await _sut.SetItemAsStringAsync("Key", "Data"); - - // assert - Assert.Equal(existingValue, oldValue); - } + [Fact] + public async Task OnChangedEventContainsOldValue_When_UpdatingExistingData() + { + // arrange + var existingValue = "Foo"; + _storageProvider.SetItem("Key", existingValue); + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsStringAsync("Key", "Data"); + + // assert + Assert.Equal(existingValue, oldValue); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs index df49036..8aa1e49 100644 --- a/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs +++ b/tests/Blazored.SessionStorage.Tests/SessionStorageServiceTests/SetItemAsync.cs @@ -10,226 +10,225 @@ using Moq; using Xunit; -namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests +namespace Blazored.SessionStorage.Tests.SessionStorageServiceTests; + +public class SetItemAsync { - public class SetItemAsync + private readonly SessionStorageService _sut; + private readonly IStorageProvider _storageProvider; + private readonly IJsonSerializer _serializer; + + private const string Key = "testKey"; + + public SetItemAsync() + { + var mockOptions = new Mock>(); + var jsonOptions = new JsonSerializerOptions(); + jsonOptions.Converters.Add(new TimespanJsonConverter()); + mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); + _serializer = new SystemTextJsonSerializer(mockOptions.Object); + _storageProvider = new InMemoryStorageProvider(); + _sut = new SessionStorageService(_storageProvider, _serializer); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) { - private readonly SessionStorageService _sut; - private readonly IStorageProvider _storageProvider; - private readonly IJsonSerializer _serializer; - - private const string Key = "testKey"; - - public SetItemAsync() - { - var mockOptions = new Mock>(); - var jsonOptions = new JsonSerializerOptions(); - jsonOptions.Converters.Add(new TimespanJsonConverter()); - mockOptions.Setup(u => u.Value).Returns(new SessionStorageOptions()); - _serializer = new SystemTextJsonSerializer(mockOptions.Object); - _storageProvider = new InMemoryStorageProvider(); - _sut = new SessionStorageService(_storageProvider, _serializer); - } - - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public void ThrowsArgumentNullException_When_KeyIsInvalid(string key) - { - // arrange / act - const string data = "Data"; - var action = new Func(async () => await _sut.SetItemAsync(key, data)); - - // assert - Assert.ThrowsAsync(action); - } - - [Fact] - public async Task RaisesOnChangingEvent_When_SavingNewData() - { - // arrange - var onChangingCalled = false; - _sut.Changing += (sender, args) => onChangingCalled = true; - - // act - await _sut.SetItemAsync("Key", "Data"); - - // assert - Assert.True(onChangingCalled); - } + // arrange / act + const string data = "Data"; + var action = new Func(async () => await _sut.SetItemAsync(key, data)); + + // assert + Assert.ThrowsAsync(action); + } + + [Fact] + public async Task RaisesOnChangingEvent_When_SavingNewData() + { + // arrange + var onChangingCalled = false; + _sut.Changing += (sender, args) => onChangingCalled = true; + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.True(onChangingCalled); + } - [Fact] - public async Task OnChangingEventContainsEmptyOldValue_When_SavingData() - { - // arrange - var oldValue = ""; - _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - await _sut.SetItemAsync("Key", "Data"); - - // assert - Assert.Equal(default, oldValue); - } + [Fact] + public async Task OnChangingEventContainsEmptyOldValue_When_SavingData() + { + // arrange + var oldValue = ""; + _sut.Changing += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } - [Fact] - public async Task OnChangingEventContainsNewValue_When_SavingNewData() - { - // arrange - const string data = "Data"; - var newValue = ""; - _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); - - // act - await _sut.SetItemAsync("Key", data); - - // assert - Assert.Equal(data, newValue); - } + [Fact] + public async Task OnChangingEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changing += (_, args) => newValue = args.NewValue.ToString(); + + // act + await _sut.SetItemAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } - [Fact] - public async Task OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() - { - // arrange - _sut.Changing += (_, args) => args.Cancel = true; - - // act - await _sut.SetItemAsync("Key", "Data"); - - // assert - Assert.Equal(0, await _storageProvider.LengthAsync()); - } + [Fact] + public async Task OnChangingEventIsCancelled_When_SettingCancelToTrue_When_SavingNewData() + { + // arrange + _sut.Changing += (_, args) => args.Cancel = true; + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.Equal(0, await _storageProvider.LengthAsync()); + } - [Theory] - [InlineData("stringTest")] - [InlineData(11)] - [InlineData(11.11)] - public async Task SavesDataAsJsonToStore(T valueToSave) - { - // Act - await _sut.SetItemAsync(Key, valueToSave); - - // Assert - var serializedValue = await _storageProvider.GetItemAsync(Key); - var valueFromStore = _serializer.Deserialize(serializedValue); - - Assert.Equal(1, await _storageProvider.LengthAsync()); - Assert.Equal(valueToSave, valueFromStore); - } - - [Fact] - public async Task SavesComplexObjectAsJsonToStore() - { - // Arrange - var objectToSave = new TestObject(2, "Jane Smith"); - - // Act - await _sut.SetItemAsync(Key, objectToSave); - - // Assert - var serializedObject = await _storageProvider.GetItemAsync(Key); - var objectFromStore = _serializer.Deserialize(serializedObject); - - Assert.Equal(1, await _storageProvider.LengthAsync()); - Assert.Equal(objectToSave.Id, objectFromStore.Id); - Assert.Equal(objectToSave.Name, objectFromStore.Name); - } + [Theory] + [InlineData("stringTest")] + [InlineData(11)] + [InlineData(11.11)] + public async Task SavesDataAsJsonToStore(T valueToSave) + { + // Act + await _sut.SetItemAsync(Key, valueToSave); + + // Assert + var serializedValue = await _storageProvider.GetItemAsync(Key); + var valueFromStore = _serializer.Deserialize(serializedValue); + + Assert.Equal(1, await _storageProvider.LengthAsync()); + Assert.Equal(valueToSave, valueFromStore); + } + + [Fact] + public async Task SavesComplexObjectAsJsonToStore() + { + // Arrange + var objectToSave = new TestObject(2, "Jane Smith"); + + // Act + await _sut.SetItemAsync(Key, objectToSave); + + // Assert + var serializedObject = await _storageProvider.GetItemAsync(Key); + var objectFromStore = _serializer.Deserialize(serializedObject); + + Assert.Equal(1, await _storageProvider.LengthAsync()); + Assert.Equal(objectToSave.Id, objectFromStore.Id); + Assert.Equal(objectToSave.Name, objectFromStore.Name); + } - [Fact] - public async Task SavesNullIntoStore_When_NullValueProvided() - { - // Arrange - var valueToSave = (string)null; - - // Act - await _sut.SetItemAsync(Key, valueToSave); - - // Assert - var serializedValue = await _storageProvider.GetItemAsync(Key); - var valueFromStore = _serializer.Deserialize(serializedValue); - - Assert.Equal(1, await _storageProvider.LengthAsync()); - Assert.Null(valueFromStore); - } + [Fact] + public async Task SavesNullIntoStore_When_NullValueProvided() + { + // Arrange + var valueToSave = (string)null; + + // Act + await _sut.SetItemAsync(Key, valueToSave); + + // Assert + var serializedValue = await _storageProvider.GetItemAsync(Key); + var valueFromStore = _serializer.Deserialize(serializedValue); + + Assert.Equal(1, await _storageProvider.LengthAsync()); + Assert.Null(valueFromStore); + } - [Fact] - public async Task OverwriteExistingValueInStore_When_UsingTheSameKey() - { - // Arrange - const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; - const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; + [Fact] + public async Task OverwriteExistingValueInStore_When_UsingTheSameKey() + { + // Arrange + const string existingValue = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiYWRtaW4iLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZXhwIjoxNTg1NjYwNzEyLCJpc3MiOiJDb2RlUmVkQm9va2luZy5TZXJ2ZXIiLCJhdWQiOiJDb2RlUmVkQm9va2luZy5DbGllbnRzIn0.JhK1M1H7NLCFexujJYCDjTn9La0HloGYADMHXGCFksU"; + const string newValue = "6QLE0LL7iw7tHPAwold31qUENt3lVTUZxDGqeXQFx38="; - var serializedValue = _serializer.Serialize(existingValue); - await _storageProvider.SetItemAsync(Key, serializedValue); + var serializedValue = _serializer.Serialize(existingValue); + await _storageProvider.SetItemAsync(Key, serializedValue); - // Act - await _sut.SetItemAsync(Key, newValue); + // Act + await _sut.SetItemAsync(Key, newValue); - // Assert - var serializedUpdatedValue = await _storageProvider.GetItemAsync(Key); - var updatedValue = _serializer.Deserialize(serializedUpdatedValue); + // Assert + var serializedUpdatedValue = await _storageProvider.GetItemAsync(Key); + var updatedValue = _serializer.Deserialize(serializedUpdatedValue); - Assert.Equal(newValue, updatedValue); - } + Assert.Equal(newValue, updatedValue); + } - [Fact] - public async Task RaisesOnChangedEvent_When_SavingData() - { - // arrange - var onChangedCalled = false; - _sut.Changed += (sender, args) => onChangedCalled = true; - - // act - await _sut.SetItemAsync("Key", "Data"); - - // assert - Assert.True(onChangedCalled); - } + [Fact] + public async Task RaisesOnChangedEvent_When_SavingData() + { + // arrange + var onChangedCalled = false; + _sut.Changed += (sender, args) => onChangedCalled = true; + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.True(onChangedCalled); + } - [Fact] - public async Task OnChangedEventContainsEmptyOldValue_When_SavingNewData() - { - // arrange - var oldValue = ""; - _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - await _sut.SetItemAsync("Key", "Data"); - - // assert - Assert.Equal(default, oldValue); - } + [Fact] + public async Task OnChangedEventContainsEmptyOldValue_When_SavingNewData() + { + // arrange + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.Equal(default, oldValue); + } - [Fact] - public async Task OnChangedEventContainsNewValue_When_SavingNewData() - { - // arrange - const string data = "Data"; - var newValue = ""; - _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); - - // act - await _sut.SetItemAsync("Key", data); - - // assert - Assert.Equal(data, newValue); - } + [Fact] + public async Task OnChangedEventContainsNewValue_When_SavingNewData() + { + // arrange + const string data = "Data"; + var newValue = ""; + _sut.Changed += (_, args) => newValue = args.NewValue.ToString(); + + // act + await _sut.SetItemAsync("Key", data); + + // assert + Assert.Equal(data, newValue); + } - [Fact] - public async Task OnChangedEventContainsOldValue_When_UpdatingExistingData() - { - // arrange - var existingValue = "Foo"; - await _storageProvider.SetItemAsync("Key", existingValue); - var oldValue = ""; - _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); - - // act - await _sut.SetItemAsync("Key", "Data"); - - // assert - Assert.Equal(existingValue, oldValue); - } + [Fact] + public async Task OnChangedEventContainsOldValue_When_UpdatingExistingData() + { + // arrange + var existingValue = "Foo"; + await _storageProvider.SetItemAsync("Key", existingValue); + var oldValue = ""; + _sut.Changed += (_, args) => oldValue = args.OldValue?.ToString(); + + // act + await _sut.SetItemAsync("Key", "Data"); + + // assert + Assert.Equal(existingValue, oldValue); } -} +} \ No newline at end of file diff --git a/tests/Blazored.SessionStorage.Tests/TestAssets/TestObject.cs b/tests/Blazored.SessionStorage.Tests/TestAssets/TestObject.cs index 126a9f1..5ee381d 100644 --- a/tests/Blazored.SessionStorage.Tests/TestAssets/TestObject.cs +++ b/tests/Blazored.SessionStorage.Tests/TestAssets/TestObject.cs @@ -1,15 +1,14 @@ -namespace Blazored.SessionStorage.Tests.TestAssets +namespace Blazored.SessionStorage.Tests.TestAssets; + +public class TestObject { - public class TestObject - { - public int Id { get; set; } - public string Name { get; set; } + public int Id { get; set; } + public string Name { get; set; } - public TestObject() { } - public TestObject(int id, string name) - { - Id = id; - Name = name; - } + public TestObject() { } + public TestObject(int id, string name) + { + Id = id; + Name = name; } -} +} \ No newline at end of file From 7772060bd6d3a5f5e242067ee32dd81ff4635758 Mon Sep 17 00:00:00 2001 From: Ricardo Ferreira Date: Mon, 14 Aug 2023 16:27:38 +0100 Subject: [PATCH 20/20] Added public setter for System.Text.Json JsonSerialize --- .../StorageOptions/SessionStorageOptions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs b/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs index 2156750..727545b 100644 --- a/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs +++ b/src/Blazored.SessionStorage/StorageOptions/SessionStorageOptions.cs @@ -4,5 +4,5 @@ namespace Blazored.SessionStorage.StorageOptions; public class SessionStorageOptions { - public JsonSerializerOptions JsonSerializerOptions { get; } = new(); + public JsonSerializerOptions JsonSerializerOptions { get; set; } = new(); }