lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

- Making IEventHandler an IDependency and related changes to the event bus and the shell container factory.

Browse Source 
- Refactoring ZoneManager to use IEventHandlers.
- Other related changes to event handler based components, removing unneeded looping through handlers in the component since the event bus does that.

--HG--
branch : dev
This commit is contained in:
Suha Can
2010-05-12 19:07:03 -07:00
parent c384bae408
commit 7ec0dc57ee
12 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
View File

@@ -27,7 +27,8 @@ namespace Orchard.Core.Tests.Feeds.Controllers {
var controller = new FeedController(
Enumerable.Empty<IFeedQueryProvider>(),
Enumerable.Empty<IFeedBuilderProvider>(),
Enumerable.Empty<IFeedItemBuilder>()) {
new StubItemBuilder()
) {
ValueProvider = Values.From(new { })
};
@@ -54,7 +55,8 @@ namespace Orchard.Core.Tests.Feeds.Controllers {
var controller = new FeedController(
new[] { queryProvider.Object },
new[] { formatProvider.Object },
Enumerable.Empty<IFeedItemBuilder>()) {
new StubItemBuilder()
) {
ValueProvider = Values.From(new { })
};
@@ -86,15 +88,20 @@ namespace Orchard.Core.Tests.Feeds.Controllers {
}
}
class StubItemBuilder : IFeedItemBuilder {
public void Populate(FeedContext context) {
}
}
[Test]
public void RssFeedShouldBeStructuredAppropriately() {
var query = new StubQuery(Enumerable.Empty<ContentItem>());
var builder = new ContainerBuilder();
//builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.RegisterType<FeedController>();
builder.RegisterType<RssFeedBuilder>().As<IFeedBuilderProvider>();
builder.RegisterInstance(query).As<IFeedQueryProvider>();
builder.RegisterInstance(new StubItemBuilder()).As<IFeedItemBuilder>();
var container = builder.Build();
var controller = container.Resolve<FeedController>();
@@ -117,9 +124,9 @@ namespace Orchard.Core.Tests.Feeds.Controllers {
});
var builder = new ContainerBuilder();
//builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.RegisterType<FeedController>();
builder.RegisterType<RssFeedBuilder>().As<IFeedBuilderProvider>();
builder.RegisterInstance(new StubItemBuilder()).As<IFeedItemBuilder>();
builder.RegisterInstance(query).As<IFeedQueryProvider>();
var container = builder.Build();

10
src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs
View File

@@ -10,15 +10,15 @@ namespace Orchard.Core.Feeds.Controllers {
public class FeedController : Controller {
private readonly IEnumerable<IFeedBuilderProvider> _feedFormatProviders;
private readonly IEnumerable<IFeedQueryProvider> _feedQueryProviders;
private readonly IEnumerable<IFeedItemBuilder> _feedItemBuilders;
private readonly IFeedItemBuilder _feedItemBuilder;
public FeedController(
IEnumerable<IFeedQueryProvider> feedQueryProviders,
IEnumerable<IFeedBuilderProvider> feedFormatProviders,
IEnumerable<IFeedItemBuilder> feedItemBuilders) {
IFeedItemBuilder feedItemBuilder) {
_feedQueryProviders = feedQueryProviders;
_feedFormatProviders = feedFormatProviders;
_feedItemBuilders = feedItemBuilders;
_feedItemBuilder = feedItemBuilder;
Logger = NullLogger.Instance;
}
@@ -49,9 +49,7 @@ namespace Orchard.Core.Feeds.Controllers {
return context.Builder.Process(context, () => {
bestQueryMatch.FeedQuery.Execute(context);
foreach (var feedItemBuilder in _feedItemBuilders) {
feedItemBuilder.Populate(context);
}
_feedItemBuilder.Populate(context);
foreach (var contextualizer in context.Response.Contextualizers) {
if (ControllerContext != null &&
ControllerContext.RequestContext != null) {

2
src/Orchard.Web/Core/Feeds/StandardBuilders/CorePartsFeedItemBuilder.cs
View File

@@ -9,7 +9,7 @@ using Orchard.Core.Feeds.Models;
namespace Orchard.Core.Feeds.StandardBuilders {
[UsedImplicitly]
public class CorePartsFeedItemBuilder : IFeedItemBuilder, IDependency {
public class CorePartsFeedItemBuilder : IFeedItemBuilder {
private readonly IContentManager _contentManager;
private readonly RouteCollection _routes;

2
src/Orchard.Web/Core/Scheduling/Services/ScheduledTaskExecutor.cs
View File

@@ -12,7 +12,7 @@ using Orchard.Tasks.Scheduling;
namespace Orchard.Core.Scheduling.Services {
[UsedImplicitly]
public class ScheduledTaskExecutor : IBackgroundTask, IDependency {
public class ScheduledTaskExecutor : IBackgroundTask {
private readonly IClock _clock;
private readonly IRepository<ScheduledTaskRecord> _repository;
private readonly IEnumerable<IScheduledTaskHandler> _handlers;

2
src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentFeedItemBuilder.cs
View File

@@ -12,7 +12,7 @@ using Orchard.Localization;
namespace Orchard.Comments.Feeds {
[UsedImplicitly]
public class CommentFeedItemBuilder : IFeedItemBuilder, IDependency {
public class CommentFeedItemBuilder : IFeedItemBuilder {
private readonly IContentManager _contentManager;
public CommentFeedItemBuilder(

2
src/Orchard.Web/Modules/Orchard.Pages/Security/AuthorizationEventHandler.cs
View File

@@ -7,7 +7,7 @@ using Orchard.Security.Permissions;
namespace Orchard.Pages.Security {
[UsedImplicitly]
public class AuthorizationEventHandler : IAuthorizationServiceEventHandler, IDependency {
public class AuthorizationEventHandler : IAuthorizationServiceEventHandler {
public void Checking(CheckAccessContext context) { }
public void Complete(CheckAccessContext context) { }

4
src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs
View File

@@ -62,7 +62,9 @@ namespace Orchard.Environment.ShellBuilders {
.EnableDynamicProxy(dynamicProxyContext)
.InstancePerLifetimeScope();
foreach (var interfaceType in item.Type.GetInterfaces().Where(itf => typeof(IDependency).IsAssignableFrom(itf))) {
foreach (var interfaceType in item.Type.GetInterfaces()
.Where(itf => typeof(IDependency).IsAssignableFrom(itf)
&& !typeof(IEventHandler).IsAssignableFrom(itf))) {
registration = registration.As(interfaceType);
if (typeof(ISingletonDependency).IsAssignableFrom(interfaceType)) {
registration = registration.InstancePerMatchingLifetimeScope("shell");

6
src/Orchard/Events/DefaultOrchardEventBus.cs
View File

@@ -8,9 +8,9 @@ using Orchard.Logging;
namespace Orchard.Events {
public class DefaultOrchardEventBus : IEventBus {
private readonly Func<IEnumerable<IEventBusHandler>> _handlers;
private readonly IEnumerable<IEventHandler> _eventHandlers;
private readonly Func<IEnumerable<IEventHandler>> _eventHandlers;
public DefaultOrchardEventBus(Func<IEnumerable<IEventBusHandler>> handlers, IEnumerable<IEventHandler> eventHandlers) {
public DefaultOrchardEventBus(Func<IEnumerable<IEventBusHandler>> handlers, Func<IEnumerable<IEventHandler>> eventHandlers) {
_handlers = handlers;
_eventHandlers = eventHandlers;
Logger = NullLogger.Instance;
@@ -34,7 +34,7 @@ namespace Orchard.Events {
string interfaceName = parameters[0];
string methodName = parameters[1];
foreach (var eventHandler in _eventHandlers) {
foreach (var eventHandler in _eventHandlers()) {
TryInvoke(eventHandler, interfaceName, methodName, eventData);
}
}

2
src/Orchard/Events/IEventHandler.cs
View File

@@ -1,4 +1,4 @@
namespace Orchard.Events {
public interface IEventHandler {
public interface IEventHandler : IDependency {
}
}

9
src/Orchard/Tasks/BackgroundService.cs
View File

@@ -1,4 +1,3 @@
using System.Collections.Generic;
using JetBrains.Annotations;
using Orchard.Logging;
@@ -10,9 +9,9 @@ namespace Orchard.Tasks {
[UsedImplicitly]
public class BackgroundService : IBackgroundService {
private readonly IEnumerable<IBackgroundTask> _tasks;
private readonly IBackgroundTask _tasks;
public BackgroundService(IEnumerable<IBackgroundTask> tasks) {
public BackgroundService(IBackgroundTask tasks) {
_tasks = tasks;
Logger = NullLogger.Instance;
}
@@ -20,9 +19,7 @@ namespace Orchard.Tasks {
public ILogger Logger { get; set; }
public void Sweep() {
foreach (var task in _tasks) {
task.Sweep();
}
_tasks.Sweep();
}
}
}

3
src/Orchard/UI/Zones/IZoneManagerEvents.cs
View File

@@ -1,8 +1,9 @@
using System.Collections.Generic;
using System.Web.Mvc;
using Orchard.Events;
namespace Orchard.UI.Zones {
public interface IZoneManagerEvents : IEvents {
public interface IZoneManagerEvents : IEventHandler {
void ZoneRendering(ZoneRenderContext context);
void ZoneItemRendering(ZoneRenderContext context, ZoneItem item);
void ZoneItemRendered(ZoneRenderContext context, ZoneItem item);

23
src/Orchard/UI/Zones/ZoneManager.cs
View File

@@ -8,10 +8,10 @@ using Orchard.UI.Navigation;
namespace Orchard.UI.Zones {
public class ZoneManager : IZoneManager {
private readonly IEnumerable<IZoneManagerEvents> _events;
private readonly IEnumerable<IZoneManagerEvents> _zoneManagerEventHandler;
public ZoneManager(IEnumerable<IZoneManagerEvents> events) {
_events = events;
public ZoneManager(IEnumerable<IZoneManagerEvents> eventHandler) {
_zoneManagerEventHandler = eventHandler;
Logger = NullLogger.Instance;
}
@@ -38,16 +38,23 @@ namespace Orchard.UI.Zones {
RenderingItems = groups.SelectMany(x => x.Items).ToList()
};
_events.Invoke(x => x.ZoneRendering(context), Logger);
foreach (var zoneManagerEventHandler in _zoneManagerEventHandler) {
zoneManagerEventHandler.ZoneRendering(context);
}
foreach (var item in context.RenderingItems) {
var zoneItem = item;
_events.Invoke(x => x.ZoneItemRendering(context, zoneItem), Logger);
foreach (var zoneManagerEventHandler in _zoneManagerEventHandler) {
zoneManagerEventHandler.ZoneItemRendering(context, zoneItem);
}
zoneItem.WasExecuted = true;
zoneItem.Execute(html);
_events.Invoke(x => x.ZoneItemRendered(context, zoneItem), Logger);
foreach (var zoneManagerEventHandler in _zoneManagerEventHandler) {
zoneManagerEventHandler.ZoneItemRendered(context, zoneItem);
}
}
foreach (var zoneManagerEventHandler in _zoneManagerEventHandler) {
zoneManagerEventHandler.ZoneRendered(context);
}
_events.Invoke(x => x.ZoneRendered(context), Logger);
}
protected ILogger Logger { get; set; }