Fixing Widget / Scripting / Framework dependency loading.

--HG--
branch : dev

src/Orchard.Profile/profiling-setup-commands.txt

@@ -1,3 +1,3 @@
-setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,Orchard.PublishLater,HomePage,Contents,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental
+setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,Orchard.PublishLater,HomePage,Contents,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Scripting,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental
 add profiling data
 feature disable Orchard.Experimental

src/Orchard.Specs/Bindings/OrchardSiteFactory.cs

@@ -13,7 +13,7 @@ namespace Orchard.Specs.Bindings {
             var webApp = Binding<WebAppHosting>();
 
             webApp.GivenIHaveACleanSiteWith(TableData(
-                new { extension = "module", names = "Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Widgets, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce" },
+                new { extension = "module", names = "Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce" },
                 new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, Routable, Scheduling, Settings, Shapes, XmlRpc" },
                 new { extension = "theme", names = "SafeMode, TheAdmin, TheThemeMachine" }));
 

src/Orchard.Tests.Modules/Scripting/ScriptingTests.cs

@@ -20,7 +20,7 @@ namespace Orchard.Tests.Modules.Scripting {
         [SetUp]
         public void Init() {
             var builder = new ContainerBuilder();
-            builder.RegisterType<ScriptingRuntime>().As<IScriptingRuntime>();
+            builder.RegisterType<RubyScriptingRuntime>().As<IScriptingRuntime>();
             builder.RegisterType<ScriptingManager>().As<IScriptingManager>();
             _container = builder.Build();
             _scriptingRuntime = _container.Resolve<IScriptingRuntime>();

src/Orchard.Tests.Modules/Widgets/RuleEngine/UrlRuleProviderTest.cs

@@ -2,8 +2,8 @@
 using NUnit.Framework;
 using Orchard.Mvc;
 using Orchard.Tests.Stubs;
-using Orchard.UI.Widgets;
 using Orchard.Widgets.RuleEngine;
+using Orchard.Widgets.Services;
 
 namespace Orchard.Tests.Modules.Widgets.RuleEngine {
     [TestFixture]

src/Orchard.Tests.Modules/Widgets/Services/WidgetsServiceTest.cs

@@ -20,8 +20,6 @@ using Orchard.Environment.Extensions.Models;
 using Orchard.Environment.Features;
 using Orchard.Security;
 using Orchard.Tests.Stubs;
-using Orchard.Themes;
-using Orchard.Themes.Models;
 using Orchard.UI.Notify;
 using Orchard.Widgets.Models;
 using Orchard.Widgets.Services;

src/Orchard.Tests.Modules/Widgets/WidgetsTests.cs

@@ -2,8 +2,8 @@
 using Autofac;
 using NUnit.Framework;
 using Orchard.Scripting.Services;
-using Orchard.UI.Widgets;
 using Orchard.Widgets.RuleEngine;
+using Orchard.Widgets.Services;
 
 namespace Orchard.Tests.Modules.Widgets {
     [TestFixture]
@@ -14,7 +14,7 @@ namespace Orchard.Tests.Modules.Widgets {
         [SetUp]
         public void Init() {
             var builder = new ContainerBuilder();
-            builder.RegisterType<ScriptingRuntime>().As<IScriptingRuntime>();
+            builder.RegisterType<RubyScriptingRuntime>().As<IScriptingRuntime>();
             builder.RegisterType<ScriptingManager>().As<IScriptingManager>();
             builder.RegisterType<AlwaysTrueRuleProvider>().As<IRuleProvider>();
             builder.RegisterType<RuleManager>().As<IRuleManager>();

src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj

@@ -87,8 +87,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\IScriptingManager.cs" />
     <Compile Include="Services\IScriptingRuntime.cs" />
+    <Compile Include="Services\RubyScriptingRuntime.cs" />
     <Compile Include="Services\ScriptingManager.cs" />
-    <Compile Include="Services\ScriptingRuntime.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">

src/Orchard.Web/Modules/Orchard.Scripting/Services/IScriptingManager.cs

@@ -9,4 +9,4 @@ namespace Orchard.Scripting.Services {
         void ExecuteFile(string fileName);
         dynamic ExecuteOperation(Func<ObjectOperations, object> invoke);
     }
-}
+}

src/Orchard.Web/Modules/Orchard.Scripting/Services/IScriptingRuntime.cs

@@ -6,4 +6,4 @@ namespace Orchard.Scripting.Services {
         dynamic ExecuteExpression(string expression, ScriptScope scope);
         void ExecuteFile(string fileName, ScriptScope scope);
     }
-}
+}

src/Orchard.Web/Modules/Orchard.Scripting/Services/RubyScriptingRuntime.cs

@@ -2,11 +2,11 @@
 using Microsoft.Scripting.Hosting;
 
 namespace Orchard.Scripting.Services {
-    public class ScriptingRuntime : IScriptingRuntime {
+    public class RubyScriptingRuntime : IScriptingRuntime {
         private readonly LanguageSetup _defaultLanguageSetup;
         private readonly ScriptRuntime _scriptingRuntime;
 
-        public ScriptingRuntime() {
+        public RubyScriptingRuntime() {
             _defaultLanguageSetup = Ruby.CreateRubySetup();
 
             var setup = new ScriptRuntimeSetup();
@@ -14,7 +14,7 @@ namespace Orchard.Scripting.Services {
             _scriptingRuntime = new ScriptRuntime(setup);
         }
 
-        ScriptEngine GetDefaultEngine() {
+        public ScriptEngine GetDefaultEngine() {
             return _scriptingRuntime.GetEngineByTypeName(_defaultLanguageSetup.TypeName);
         }
 
@@ -33,4 +33,4 @@ namespace Orchard.Scripting.Services {
             engine.ExecuteFile(fileName, scope);
         }
     }
-}
+}

src/Orchard.Web/Modules/Orchard.Scripting/Services/ScriptingManager.cs

@@ -4,8 +4,8 @@ using Microsoft.Scripting.Hosting;
 namespace Orchard.Scripting.Services {
     public class ScriptingManager : IScriptingManager {
         private readonly IScriptingRuntime _scriptingRuntime;
-        private Lazy<ScriptScope> _scope;
+        private readonly Lazy<ScriptScope> _scope;
-        private Lazy<ObjectOperations> _operations;
+        private readonly Lazy<ObjectOperations> _operations;
 
         public ScriptingManager(IScriptingRuntime scriptingRuntime) {
             _scriptingRuntime = scriptingRuntime;
@@ -32,6 +32,5 @@ namespace Orchard.Scripting.Services {
         public void ExecuteFile(string fileName) {
             _scriptingRuntime.ExecuteFile(fileName, _scope.Value);
         }
-
     }
-}
+}

src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs

@@ -69,7 +69,7 @@ namespace Orchard.Setup.Services {
                 string[] hardcoded = {
                     // Framework
                     "Orchard.Framework",
-                    
+
                     // Core
                     "Common",
                     "Containers",
@@ -98,6 +98,7 @@ namespace Orchard.Setup.Services {
                     "Orchard.Tags",
                     "Orchard.Themes",
                     "Orchard.Users",
+                    "Orchard.Scripting",
                     "Orchard.Widgets",
                     "TinyMce",
 
@@ -108,7 +109,6 @@ namespace Orchard.Setup.Services {
                 context.EnabledFeatures = hardcoded;
             }
 
-            
             var shellSettings = new ShellSettings(_shellSettings);
 
             if (string.IsNullOrEmpty(shellSettings.DataProvider)) {

src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs

@@ -4,7 +4,6 @@ using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Localization;
-using Orchard.UI.Widgets;
 using Orchard.Widgets.Models;
 using Orchard.Widgets.Services;
 

src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs

@@ -7,8 +7,8 @@ using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.Mvc.Filters;
 using Orchard.UI.Admin;
-using Orchard.UI.Widgets;
 using Orchard.Widgets.Models;
+using Orchard.Widgets.Services;
 
 namespace Orchard.Widgets.Filters {
     public class WidgetFilter : FilterProvider, IResultFilter {

src/Orchard.Web/Modules/Orchard.Widgets/Module.txt

@@ -9,4 +9,4 @@ Features:
     Orchard.Widgets:
         Description: An implementation of widgets.
         Category: Widget
-		Dependencies: Orchard.Scripting
+        Dependencies: Orchard.Scripting

src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj

@@ -88,7 +88,10 @@
     <Compile Include="RuleEngine\BuiltinRuleProvider.cs" />
     <Compile Include="RuleEngine\RuleManager.cs" />
     <Compile Include="RuleEngine\UrlRuleProvider.cs" />
+    <Compile Include="Services\IRuleManager.cs" />
+    <Compile Include="Services\IRuleProvider.cs" />
     <Compile Include="Services\IWidgetsService.cs" />
+    <Compile Include="Services\RuleContext.cs" />
     <Compile Include="Services\WidgetsService.cs" />
     <Compile Include="Shapes.cs" />
     <Compile Include="ViewModels\WidgetsIndexViewModel.cs" />

src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/AuthenticatedRuleProvider.cs

@@ -1,6 +1,6 @@
 using System;
 using Orchard.Security;
-using Orchard.UI.Widgets;
+using Orchard.Widgets.Services;
 
 namespace Orchard.Widgets.RuleEngine {
     public class AuthenticatedRuleProvider : IRuleProvider {

src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/BuiltinRuleProvider.cs

@@ -1,5 +1,5 @@
 using System;
-using Orchard.UI.Widgets;
+using Orchard.Widgets.Services;
 
 namespace Orchard.Widgets.RuleEngine {
     public class BuiltinRuleProvider : IRuleProvider {

src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/RuleManager.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using Orchard.Scripting;
 using Orchard.Scripting.Services;
-using Orchard.UI.Widgets;
+using Orchard.Widgets.Services;
 
 namespace Orchard.Widgets.RuleEngine {
     public class RuleManager : IRuleManager {
@@ -17,15 +16,15 @@ namespace Orchard.Widgets.RuleEngine {
         public bool Matches(string expression) {
             object execContextType = _scriptingManager.ExecuteExpression(@"
                                         class ExecContext
-	                                        def execute(callbacks, text)
+                                            def execute(callbacks, text)
-		                                        @callbacks = callbacks;
+                                                @callbacks = callbacks;
-		                                        temp = instance_eval(text.to_s);
+                                                temp = instance_eval(text.to_s);
-		                                        @callbacks = 0;
+                                                @callbacks = 0;
                                                 return temp;
-	                                        end
+                                            end
 
-	                                        def method_missing(name, *args, &block)
+                                            def method_missing(name, *args, &block)
-		                                        @callbacks.send(name, args, &block);
+                                                @callbacks.send(name, args, &block);
                                             end
                                         end
                                         ExecContext

src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/UrlRuleProvider.cs

@@ -1,6 +1,6 @@
 using System;
 using Orchard.Mvc;
-using Orchard.UI.Widgets;
+using Orchard.Widgets.Services;
 
 namespace Orchard.Widgets.RuleEngine {
     public class UrlRuleProvider : IRuleProvider {

src/Orchard.Web/Modules/Orchard.Widgets/Services/IRuleManager.cs

@@ -1,4 +1,4 @@
-namespace Orchard.UI.Widgets {
+namespace Orchard.Widgets.Services {
     public interface IRuleManager : IDependency {
         bool Matches(string expression);
     }

src/Orchard.Web/Modules/Orchard.Widgets/Services/IRuleProvider.cs

@@ -1,4 +1,4 @@
-namespace Orchard.UI.Widgets {
+namespace Orchard.Widgets.Services {
     public interface IRuleProvider : IDependency {
         void Process(RuleContext ruleContext);
     }

src/Orchard.Web/Modules/Orchard.Widgets/Services/RuleContext.cs

@@ -1,4 +1,4 @@
-namespace Orchard.UI.Widgets {
+namespace Orchard.Widgets.Services {
     public class RuleContext {
         public string FunctionName { get; set; }
         public object[] Arguments { get; set; }

src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs

@@ -8,7 +8,6 @@ using Autofac.Builder;
 using Autofac.Configuration;
 using Autofac.Core;
 using Autofac.Features.Indexed;
-using Autofac.Integration.Web.Mvc;
 using Orchard.Environment.AutofacUtil.DynamicProxy2;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.ShellBuilders.Models;
@@ -123,4 +122,4 @@ namespace Orchard.Environment.ShellBuilders {
                 .WithMetadata("Feature", item.Feature);
         }
     }
-}
+}

src/Orchard/Orchard.Framework.csproj

@@ -180,9 +180,6 @@
     <Compile Include="UI\Navigation\Pager.cs" />
     <Compile Include="UI\Resources\IResourceManifestProvider.cs" />
     <Compile Include="UI\Resources\ResourceManifestBuilder.cs" />
-    <Compile Include="UI\Widgets\IRuleManager.cs" />
-    <Compile Include="UI\Widgets\IRuleProvider.cs" />
-    <Compile Include="UI\Widgets\RuleContext.cs" />
     <Compile Include="UI\Zones\LayoutWorkContext.cs" />
     <Compile Include="UI\Zones\ZoneHoldingBehavior.cs" />
     <Compile Include="Mvc\ViewEngines\ThemeAwareness\ConfiguredEnginesCache.cs" />