Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

trying to use the cache convention to get a singleton

  • Loading branch information...
commit 6f8fc7271bba7d572157f8c0575d65973e2aa0d8 1 parent a55541a
@drusellers drusellers authored
2  buildsupport
@@ -1 +1 @@
-Subproject commit 1330bc6e3ebca7299549c8fabc8cd58177d0a6c6
+Subproject commit f33962e3c0d376be326eb3e24783c12604cc3f37
View
2  runst.bat
@@ -1,4 +1,4 @@
-start lib\storyteller\StoryTellerUI.exe
+start src\packages\Storyteller.1.0.2.471\tools\StoryTellerUI.exe
View
6 src/FubuMVC.Core/Assets/AssetDeclarationChecker.cs
@@ -16,9 +16,9 @@ public class AssetDeclarationChecker
private readonly IAssetPipeline _pipeline;
private readonly IPackageLog _log;
- private readonly AssetLogs _assetLogs;
+ private readonly AssetLogsCache _assetLogs;
- public AssetDeclarationChecker(IAssetPipeline pipeline, IPackageLog log, AssetLogs assetLogs)
+ public AssetDeclarationChecker(IAssetPipeline pipeline, IPackageLog log, AssetLogsCache assetLogs)
{
_pipeline = pipeline;
_log = log;
@@ -41,7 +41,7 @@ public void VerifyFileDependency(string name)
// For testing purposes only
- public static string GetErrorMessage(string name, AssetLogs logs)
+ public static string GetErrorMessage(string name, AssetLogsCache logs)
{
var logsBuilder = new StringBuilder("Unable to locate asset named {0}".ToFormat(name));
View
4 src/FubuMVC.Core/Assets/AssetDeclarationVerificationActivator.cs
@@ -9,12 +9,12 @@ namespace FubuMVC.Core.Assets
public class AssetDeclarationVerificationActivator : IActivator
{
private readonly AssetGraph _graph;
- private readonly AssetLogs _assetLogs;
+ private readonly AssetLogsCache _assetLogs;
private readonly IAssetPipeline _pipeline;
public static bool Latched { get; set; }
- public AssetDeclarationVerificationActivator(IAssetPipeline pipeline, AssetGraph graph, AssetLogs assetLogs)
+ public AssetDeclarationVerificationActivator(IAssetPipeline pipeline, AssetGraph graph, AssetLogsCache assetLogs)
{
_pipeline = pipeline;
_graph = graph;
View
2  src/FubuMVC.Core/Assets/AssetGraphConfigurationActivator.cs
@@ -15,7 +15,7 @@ public class AssetGraphConfigurationActivator : IActivator
private readonly IFileSystem _fileSystem;
private readonly AssetRegistrationDiagnostics _diagnostics;
- public AssetGraphConfigurationActivator(AssetGraph assets, IFileSystem fileSystem, AssetLogs logs)
+ public AssetGraphConfigurationActivator(AssetGraph assets, IFileSystem fileSystem, AssetLogsCache logs)
{
_assets = assets;
_fileSystem = fileSystem;
View
4 src/FubuMVC.Core/Assets/Diagnostics/AssetLogs.cs → ...FubuMVC.Core/Assets/Diagnostics/AssetLogsCache.cs
@@ -4,9 +4,9 @@
namespace FubuMVC.Core.Assets.Diagnostics
{
- public class AssetLogs
+ public class AssetLogsCache
{
- public AssetLogs()
+ public AssetLogsCache()
{
Entries = new List<AssetLog>();
}
View
4 src/FubuMVC.Core/Assets/Diagnostics/AssetRegistrationDiagnostics.cs
@@ -5,10 +5,10 @@ namespace FubuMVC.Core.Assets.Diagnostics
public class AssetRegistrationDiagnostics : IAssetRegistration
{
private readonly IAssetRegistration _inner;
- private readonly AssetLogs _logs;
+ private readonly AssetLogsCache _logs;
private string _provenance;
- public AssetRegistrationDiagnostics(IAssetRegistration inner, AssetLogs logs)
+ public AssetRegistrationDiagnostics(IAssetRegistration inner, AssetLogsCache logs)
{
_inner = inner;
_logs = logs;
View
2  src/FubuMVC.Core/FubuMVC.Core.csproj
@@ -90,7 +90,7 @@
<Compile Include="Assets\Caching\IAssetFileWatcher.cs" />
<Compile Include="Assets\Diagnostics\AssetLog.cs" />
<Compile Include="Assets\Diagnostics\AssetLogEntry.cs" />
- <Compile Include="Assets\Diagnostics\AssetLogs.cs" />
+ <Compile Include="Assets\Diagnostics\AssetLogsCache.cs" />
<Compile Include="Assets\Diagnostics\AssetRegistrationDiagnostics.cs" />
<Compile Include="Assets\Content\ITransformerPolicyLibrary.cs" />
<Compile Include="Assets\Content\IContentPlanCache.cs" />
View
6 src/FubuMVC.Tests/Assets/AssetDeclarationCheckerTester.cs
@@ -21,7 +21,7 @@ public void SetUp()
{
AssetDeclarationVerificationActivator.Latched = false;
- var logs = new AssetLogs();
+ var logs = new AssetLogsCache();
logs.FindByName(theAssetName)
.Add(_provenance, "Test log message 1");
@@ -48,7 +48,7 @@ public void asset_the_log_message_contains_provenance()
ClassUnderTest.VerifyFileDependency(theAssetName);
- var expectedMessage = AssetDeclarationChecker.GetErrorMessage(theAssetName, MockFor<AssetLogs>());
+ var expectedMessage = AssetDeclarationChecker.GetErrorMessage(theAssetName, MockFor<AssetLogsCache>());
Console.Write(expectedMessage);
@@ -63,7 +63,7 @@ public void log_a_problem_if_an_asset_file_cannot_be_found()
ClassUnderTest.VerifyFileDependency(theAssetName);
- var expectedMessage = AssetDeclarationChecker.GetErrorMessage(theAssetName, MockFor<AssetLogs>());
+ var expectedMessage = AssetDeclarationChecker.GetErrorMessage(theAssetName, MockFor<AssetLogsCache>());
MockFor<IPackageLog>().AssertWasCalled(x => x.MarkFailure(expectedMessage));
View
2  src/FubuMVC.Tests/Assets/AssetGraphConfigurationActivatorIntegrationTester.cs
@@ -23,7 +23,7 @@ public void SetUp()
assets = new AssetGraph();
- activator = new AssetGraphConfigurationActivator(assets, new FileSystem(), new AssetLogs());
+ activator = new AssetGraphConfigurationActivator(assets, new FileSystem(), new AssetLogsCache());
log = new PackageLog();
}
Please sign in to comment.
Something went wrong with that request. Please try again.