Skip to content

Commit

Permalink
Fixing remote storage handling with new remote storage URL pattern co…
Browse files Browse the repository at this point in the history 
…nfig
  • Loading branch information
@Piedone
Piedone committed Jun 1, 2015
1 parent d69b269 commit ba700a6
Show file tree
Hide file tree
Showing 14 changed files with 165 additions and 95 deletions.
3 changes: 2 additions & 1 deletion CombinedResourceManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public override IList<ResourceRequiredContext> BuildRequiredResources(string str

var settings = new CombinatorSettings
{
CombineCDNResources = settingsPart.CombineCdnResources,
CombineCdnResources = settingsPart.CombineCdnResources,
ResourceBaseUri = resourceBaseUri,
EmbedCssImages = settingsPart.EmbedCssImages,
EmbeddedImagesMaxSizeKB = settingsPart.EmbeddedImagesMaxSizeKB,
Expand All @@ -86,6 +86,7 @@ public override IList<ResourceRequiredContext> BuildRequiredResources(string str
};

if (!string.IsNullOrEmpty(settingsPart.CombinationExcludeRegex)) settings.CombinationExcludeFilter = new Regex(settingsPart.CombinationExcludeRegex);
if (!string.IsNullOrEmpty(settingsPart.RemoteStorageUrlRegex)) settings.RemoteStorageUrlPattern = new Regex(settingsPart.RemoteStorageUrlRegex);
if (!string.IsNullOrEmpty(settingsPart.EmbedCssImagesStylesheetExcludeRegex)) settings.EmbedCssImagesStylesheetExcludeFilter = new Regex(settingsPart.EmbedCssImagesStylesheetExcludeRegex);
if (!string.IsNullOrEmpty(settingsPart.MinificationExcludeRegex)) settings.MinificationExcludeFilter = new Regex(settingsPart.MinificationExcludeRegex);
if (!string.IsNullOrEmpty(settingsPart.ResourceSharingExcludeRegex)) settings.ResourceSharingExcludeFilter = new Regex(settingsPart.ResourceSharingExcludeRegex);
Expand Down
6 changes: 6 additions & 0 deletions Drivers/CombinatorSettingsPartDriver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ protected override DriverResult Editor(CombinatorSettingsPart part, IUpdateModel
dynamic formerSettings = new ExpandoObject();
formerSettings.CombinationExcludeRegex = part.CombinationExcludeRegex;
formerSettings.CombineCdnResources = part.CombineCdnResources;
formerSettings.RemoteStorageUrlRegex = part.RemoteStorageUrlRegex;
formerSettings.ResourceBaseUrl = part.ResourceBaseUrl;
formerSettings.MinifyResources = part.MinifyResources;
formerSettings.MinificationExcludeRegex = part.MinificationExcludeRegex;
Expand All @@ -75,6 +76,7 @@ protected override DriverResult Editor(CombinatorSettingsPart part, IUpdateModel
if (part.CombinationExcludeRegex != formerSettings.CombinationExcludeRegex
|| part.CombineCdnResources != formerSettings.CombineCdnResources
|| part.RemoteStorageUrlRegex != formerSettings.RemoteStorageUrlRegex
|| part.ResourceBaseUrl != formerSettings.ResourceBaseUrl
|| part.MinifyResources != formerSettings.MinifyResources
|| (part.MinifyResources && part.MinificationExcludeRegex != formerSettings.MinificationExcludeRegex)
Expand Down Expand Up @@ -105,6 +107,10 @@ protected override DriverResult Editor(CombinatorSettingsPart part, IUpdateModel
{
if (!TestRegex(part.CombinationExcludeRegex, T("combination exclude regex"), updater)) valuesAreValid = false;
}
if (!string.IsNullOrEmpty(part.RemoteStorageUrlRegex))
{
if (!TestRegex(part.RemoteStorageUrlRegex, T("remote storage pattern regex"), updater)) valuesAreValid = false;
}
if (!string.IsNullOrEmpty(part.MinificationExcludeRegex))
{
if (!TestRegex(part.MinificationExcludeRegex, T("minification exclude regex"), updater)) valuesAreValid = false;
Expand Down
16 changes: 6 additions & 10 deletions Models/CombinatorResource.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,17 @@ public bool IsCdnResource
{
var fullPath = NormalizedFullPath;

return Uri.IsWellFormedUriString(fullPath, UriKind.Absolute)
return
!IsRemoteStorageResource &&
Uri.IsWellFormedUriString(fullPath, UriKind.Absolute)
&& new Uri(fullPath).Authority != _httpContext.Request.Url.Authority;
}
}

/// <summary>
/// True if the resource comes from a non-local storage like Azure Blob Storage
/// <c>true</c> if the resource comes from a non-local storage like Azure Blob Storage.
/// </summary>
public bool IsRemoteStorageResource
{
get
{
return !IsOriginal && IsCdnResource;
}
}
public bool IsRemoteStorageResource { get; set; }

public bool IsConditional
{
Expand All @@ -121,7 +117,7 @@ public bool IsConditional
public string Content { get; set; }

/// <summary>
/// Indicates that the resource was not touched and was kept in its original state
/// Indicates that the resource was not touched and was kept in its original state.
/// </summary>
public bool IsOriginal { get; set; }

Expand Down
25 changes: 24 additions & 1 deletion Models/CombinatorSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ namespace Piedone.Combinator.Models
public class CombinatorSettings : ICombinatorSettings
{
public Regex CombinationExcludeFilter { get; set; }
public bool CombineCDNResources { get; set; }
public bool CombineCdnResources { get; set; }
public Regex RemoteStorageUrlPattern { get; set; }
public Uri ResourceBaseUri { get; set; }
public bool MinifyResources { get; set; }
public Regex MinificationExcludeFilter { get; set; }
Expand All @@ -19,5 +20,27 @@ public class CombinatorSettings : ICombinatorSettings
public bool EnableResourceSharing { get; set; }
public Regex ResourceSharingExcludeFilter { get; set; }
public Regex[] ResourceSetFilters { get; set; }


public CombinatorSettings()
{
}

public CombinatorSettings(ICombinatorSettings previous)
{
CombinationExcludeFilter = previous.CombinationExcludeFilter;
CombineCdnResources = previous.CombineCdnResources;
RemoteStorageUrlPattern = previous.RemoteStorageUrlPattern;
ResourceBaseUri = previous.ResourceBaseUri;
MinifyResources = previous.MinifyResources;
MinificationExcludeFilter = previous.MinificationExcludeFilter;
EmbedCssImages = previous.EmbedCssImages;
EmbeddedImagesMaxSizeKB = previous.EmbeddedImagesMaxSizeKB;
EmbedCssImagesStylesheetExcludeFilter = previous.EmbedCssImagesStylesheetExcludeFilter;
GenerateImageSprites = previous.GenerateImageSprites;
EnableResourceSharing = previous.EnableResourceSharing;
ResourceSharingExcludeFilter = previous.ResourceSharingExcludeFilter;
ResourceSetFilters = previous.ResourceSetFilters;
}
}
}
6 changes: 6 additions & 0 deletions Models/CombinatorSettingsPart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ public bool CombineCdnResources
set { this.Store(x => x.CombineCdnResources, value); }
}

public string RemoteStorageUrlRegex
{
get { return this.Retrieve(x => x.RemoteStorageUrlRegex, @"\/devstoreaccount|blob.core.windows.net"); }
set { this.Store(x => x.RemoteStorageUrlRegex, value); }
}

public string ResourceBaseUrl
{
get { return this.Retrieve(x => x.ResourceBaseUrl); }
Expand Down
3 changes: 2 additions & 1 deletion Models/ICombinatorSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ namespace Piedone.Combinator.Models
public interface ICombinatorSettings
{
Regex CombinationExcludeFilter { get; }
bool CombineCDNResources { get; }
bool CombineCdnResources { get; }
Regex RemoteStorageUrlPattern { get; }
Uri ResourceBaseUri { get; }
bool MinifyResources { get; }
Regex MinificationExcludeFilter { get; }
Expand Down
14 changes: 7 additions & 7 deletions Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ public void SaveShouldBePersistent()
var storageProvider = _container.Resolve<IStorageProvider>();
Assert.That(storageProvider.GetFile(storageProvider.Combine("_PiedoneModules", storageProvider.Combine("Combinator", storageProvider.Combine("Styles", _cssResourcesFingerprint + "-1.css")))), Is.Not.Null);

var resources = _cacheFileService.GetCombinedResources(_jsResourceFingerprint, false);
var resources = _cacheFileService.GetCombinedResources(_jsResourceFingerprint, new CombinatorSettings());

Assert.That(resources, Is.Not.Null);
Assert.That(resources.Count, Is.EqualTo(2));

Assert.That(_cacheFileService.GetCount(), Is.EqualTo(3));

Assert.That(_cacheFileService.Exists(_cssResourcesFingerprint, false), Is.True);
Assert.That(_cacheFileService.Exists(_cssResourcesFingerprint, new CombinatorSettings()), Is.True);
}

[Test]
Expand All @@ -98,8 +98,8 @@ public void EmtpyShouldDeleteAll()
_cacheFileService.Empty();
ClearSession();

Assert.That(_cacheFileService.GetCombinedResources(_cssResourcesFingerprint, false).Count, Is.EqualTo(0));
Assert.That(_cacheFileService.GetCombinedResources(_jsResourceFingerprint, false).Count, Is.EqualTo(0));
Assert.That(_cacheFileService.GetCombinedResources(_cssResourcesFingerprint, new CombinatorSettings()).Count, Is.EqualTo(0));
Assert.That(_cacheFileService.GetCombinedResources(_jsResourceFingerprint, new CombinatorSettings()).Count, Is.EqualTo(0));
Assert.That(_cacheFileService.GetCount(), Is.EqualTo(0));
}

Expand All @@ -108,10 +108,10 @@ private void SaveTestResources()
{
var resource1 = _resourceRepository.NewResource(ResourceType.Style);
resource1.Content = "test";
_cacheFileService.Save(_cssResourcesFingerprint, resource1, null, false);
_cacheFileService.Save(_cssResourcesFingerprint, resource1, new CombinatorSettings());

_cacheFileService.Save(_jsResourceFingerprint, _resourceRepository.NewResource(ResourceType.JavaScript), null, false);
_cacheFileService.Save(_jsResourceFingerprint, _resourceRepository.NewResource(ResourceType.JavaScript), null, false);
_cacheFileService.Save(_jsResourceFingerprint, _resourceRepository.NewResource(ResourceType.JavaScript), new CombinatorSettings());
_cacheFileService.Save(_jsResourceFingerprint, _resourceRepository.NewResource(ResourceType.JavaScript), new CombinatorSettings());

ClearSession();
}
Expand Down
12 changes: 6 additions & 6 deletions Piedone.Combinator.Tests/Services/CombinatorServiceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void CdnStylesAreCombined()
{
_resourceRepository.FillWithTestStyles();

var combinedResources = _combinatorService.CombineStylesheets(_resourceRepository.GetResources(ResourceType.Style), new CombinatorSettings() { CombineCDNResources = true });
var combinedResources = _combinatorService.CombineStylesheets(_resourceRepository.GetResources(ResourceType.Style), new CombinatorSettings() { CombineCdnResources = true });

Assert.That(combinedResources.Count, Is.EqualTo(1));
}
Expand All @@ -125,7 +125,7 @@ public void CdnStylesAreNotCombined()
{
_resourceRepository.FillWithTestStyles();

var combinedResources = _combinatorService.CombineStylesheets(_resourceRepository.GetResources(ResourceType.Style), new CombinatorSettings() { CombineCDNResources = false });
var combinedResources = _combinatorService.CombineStylesheets(_resourceRepository.GetResources(ResourceType.Style), new CombinatorSettings() { CombineCdnResources = false });

Assert.That(combinedResources.Count, Is.EqualTo(4));
Assert.That(combinedResources[0].Resource.Url, Is.EqualTo("//google.com/style.css"));
Expand Down Expand Up @@ -193,7 +193,7 @@ private class StubResourceProcessingService : IResourceProcessingService
{
public void ProcessResource(CombinatorResource resource, StringBuilder combinedContent, ICombinatorSettings settings)
{
if (resource.IsCdnResource && !settings.CombineCDNResources)
if (resource.IsCdnResource && !settings.CombineCdnResources)
{
resource.IsOriginal = true;
return;
Expand Down Expand Up @@ -221,7 +221,7 @@ public StubCacheFileService(ISignals signals, ResourceRepository resourceReposit
_resourceRepository = resourceRepository;
}

public void Save(string fingerprint, CombinatorResource resource, Uri resourceBaseUri, bool useResourceShare)
public void Save(string fingerprint, CombinatorResource resource, ICombinatorSettings settings)
{
int count;
sliceCounts.TryGetValue(fingerprint, out count);
Expand Down Expand Up @@ -257,14 +257,14 @@ public void Save(string fingerprint, CombinatorResource resource, Uri resourceBa
_resourceRepository.SaveResource(sliceName, savedResource);
}

public IList<CombinatorResource> GetCombinedResources(string fingerprint, bool useResourceShare)
public IList<CombinatorResource> GetCombinedResources(string fingerprint, ICombinatorSettings settings)
{
return (from r in _resourceRepository.Resources
where r.Key.Contains(fingerprint + "-")
select r.Value).ToList();
}

public bool Exists(string fingerprint, bool useResourceShare)
public bool Exists(string fingerprint, ICombinatorSettings settings)
{
return false;
}
Expand Down
Loading

0 comments on commit ba700a6

Please sign in to comment.