Merge

--HG-- branch : dev
2025-10-15 03:16:18 +08:00 · 2010-10-01 17:50:12 -07:00
parent 108fad5f0e 9f438da24a
commit 9a97e6aa2f
46 changed files with 269 additions and 40 deletions
--- a/lib/dlr/IronRuby.Libraries.dll
+++ b/lib/dlr/IronRuby.Libraries.dll
--- a/lib/dlr/IronRuby.dll
+++ b/lib/dlr/IronRuby.dll
--- a/lib/dlr/Microsoft.Dynamic.dll
+++ b/lib/dlr/Microsoft.Dynamic.dll
--- a/lib/dlr/Microsoft.Scripting.dll
+++ b/lib/dlr/Microsoft.Scripting.dll
--- a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Profile/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Profile/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Specs/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Specs/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj
+++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
@@ -83,7 +83,21 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\lib\fluentnhibernate\FluentNHibernate.dll</HintPath>
    </Reference>
+    <Reference Include="IronRuby, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\dlr\IronRuby.dll</HintPath>
+    </Reference>
+    <Reference Include="IronRuby.Libraries">
+      <HintPath>..\..\lib\dlr\IronRuby.Libraries.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Dynamic, Version=1.1.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\dlr\Microsoft.Dynamic.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Scripting">
+      <HintPath>..\..\lib\dlr\Microsoft.Scripting.dll</HintPath>
+    </Reference>
    <Reference Include="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\lib\moq\Moq.dll</HintPath>
@@ -229,6 +243,7 @@
    <Compile Include="Mvc\Routes\ShellRouteTests.cs" />
    <Compile Include="Mvc\Routes\UrlPrefixTests.cs" />
    <Compile Include="Records\BigRecord.cs" />
+    <Compile Include="Scripting\ScriptingTests.cs" />
    <Compile Include="Stubs\StubReportsCoordinator.cs" />
    <Compile Include="Stubs\StubVirtualPathProvider.cs" />
    <Compile Include="Stubs\StubFileSystem.cs" />
--- a/src/Orchard.Tests/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Tests/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Tests/Scripting/ScriptingTests.cs
+++ b/src/Orchard.Tests/Scripting/ScriptingTests.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Dynamic;
+using System.IO;
+using Autofac;
+using ClaySharp;
+using ClaySharp.Behaviors;
+using NUnit.Framework;
+using Orchard.Scripting;
+
+namespace Orchard.Tests.Scripting {
+    [TestFixture]
+    public class ScriptingTests {
+        private IContainer _container;
+        private IScriptingRuntime _scriptingRuntime;
+        private IScriptingManager _scriptingManager;
+        private string _tempFolderName;
+
+        [SetUp]
+        public void Init() {
+            var builder = new ContainerBuilder();
+            builder.RegisterType<ScriptingRuntime>().As<IScriptingRuntime>();
+            builder.RegisterType<ScriptingManager>().As<IScriptingManager>();
+            _container = builder.Build();
+            _scriptingRuntime = _container.Resolve<IScriptingRuntime>();
+            _scriptingManager = _container.Resolve<IScriptingManager>();
+            _tempFolderName = Path.GetTempFileName();
+            File.Delete(_tempFolderName);
+            Directory.CreateDirectory(_tempFolderName);
+        }
+
+        [TearDown]
+        public void Term() {
+            Directory.Delete(_tempFolderName, true);
+        }
+
+        [Test]
+        public void GetRubyEngineReturnsAWorkingRubyEngine() {
+            var ruby = _scriptingRuntime.GetRubyEngine();
+
+            Assert.IsNotNull(ruby);
+            Assert.That(ruby.Execute("21 + 21"), Is.EqualTo(42));
+        }
+
+        [Test]
+        public void ScriptingManagerCanGetAndSetRubyVariables() {
+            _scriptingManager.SetVariable("foo", 42);
+            Assert.That(_scriptingManager.GetVariable("foo"), Is.EqualTo(42));
+        }
+
+        [Test]
+        public void ScriptingManagerCanEvalExpression() {
+            _scriptingManager.SetVariable("foo", 21);
+            Assert.That(_scriptingManager.Eval("foo + 21"), Is.EqualTo(42));
+        }
+
+        [Test]
+        public void ScriptCanBeExecutedAndScopeProvidesContextIsolation() {
+            var scriptManager1 = new ScriptingManager(_scriptingRuntime);
+            var scriptManager2 = new ScriptingManager(_scriptingRuntime);
+
+            scriptManager1.SetVariable("foo", 1);
+            scriptManager2.SetVariable("foo", 2);
+
+            var result1 = scriptManager1.Eval("3 + foo");
+            var result2 = scriptManager2.Eval("3 + foo");
+
+            Assert.That(result1, Is.EqualTo(4));
+            Assert.That(result2, Is.EqualTo(5));
+        }
+
+        [Test]
+        public void ScriptingManagerCanExecuteFile() {
+            var targetPath = Path.Combine(_tempFolderName, "SampleMethodDefinition.rb");
+            File.WriteAllText(targetPath, "def f\r\nreturn 32\r\nend\r\n");
+            _scriptingManager.ExecuteFile(targetPath);
+            Assert.That(_scriptingManager.Eval("f / 4"), Is.EqualTo(8));
+        }
+
+        [Test]
+        public void GlobalObjectCanBeDynamic() {
+            dynamic global = new Clay(new PropBehavior());
+            _scriptingManager.SetScriptingScope(_scriptingRuntime.GetRubyEngine().CreateScope((IDynamicMetaObjectProvider)global));
+            
+            global.foo = 5;
+            Assert.That(_scriptingManager.Eval("3 + foo"), Is.EqualTo(8));
+        }
+
+        [Test]
+        public void CanDeclareCallbackOnGlobalMethod() {
+            _scriptingManager.SetVariable("x", new Clay(new ReturnMethodNameLengthBehavior()));
+
+            Assert.That(_scriptingManager.Eval("3 + x.foo()"), Is.EqualTo(6));
+        }
+
+
+        public class ReturnMethodNameLengthBehavior : ClayBehavior {
+            public override object InvokeMemberMissing(Func<object> proceed, object self, string name, INamedEnumerable<object> args) {
+                Trace.WriteLine("Returning length of " + name);
+                return name.Length;
+            }
+        }
+
+        [Test]
+        public void CanDeclareCallbackOnInstanceEvalWithFile() {
+            var targetPath = Path.Combine(_tempFolderName, "CallbackOnInstanceEval.rb");
+            File.WriteAllText(targetPath, "class ExecContext\r\ndef initialize(callbacks)\r\n@callbacks = callbacks;\r\nend\r\ndef execute(text)\r\ninstance_eval(text.to_s);\r\nend\r\ndef method_missing(name, *args, &block)\r\n@callbacks.send(name, args, &block);\r\nend\r\nend\r\ndef execute(&block)\r\nExecContext.new(callbacks).instance_eval(&block);\r\nend\r\n");
+            _scriptingManager.ExecuteFile(targetPath);
+            _scriptingManager.SetVariable("callbacks", new CallbackApi());
+
+            Assert.That(_scriptingManager.Eval("execute { 1 + hello + world('yep') }"), Is.EqualTo(11));
+        }
+
+        public class CallbackApi {
+            public object send(string name, IList<object> args) {
+                Trace.WriteLine("Returning length of method " + name);
+                return name.Length;
+            }
+        }
+    }
+}
+
--- a/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Core/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt
@@ -7,7 +7,7 @@ using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;

 namespace $$FeatureName$$.DataMigrations {
-    public class $$ClassName$$DataMigration : DataMigrationImpl {
+    public class Migration : DataMigrationImpl {

        public int Create() {
 $$Commands$$
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -65,16 +65,16 @@ namespace Orchard.CodeGeneration.Commands {
                return false;
            }

-            string dataMigrationsPath = HostingEnvironment.MapPath("~/Modules/" + extensionDescriptor.Name + "/DataMigrations/");
-            string dataMigrationPath = dataMigrationsPath + extensionDescriptor.DisplayName + "DataMigration.cs";
+            string dataMigrationFolderPath = HostingEnvironment.MapPath("~/Modules/" + extensionDescriptor.Name + "/");
+            string dataMigrationFilePath = dataMigrationFolderPath + "Migration.cs";
            string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard." + ModuleName + "/CodeGenerationTemplates/");
            string moduleCsProjPath = HostingEnvironment.MapPath(string.Format("~/Modules/{0}/{0}.csproj", extensionDescriptor.Name));
                    
-            if (!Directory.Exists(dataMigrationsPath)) {
-                Directory.CreateDirectory(dataMigrationsPath);
+            if (!Directory.Exists(dataMigrationFolderPath)) {
+                Directory.CreateDirectory(dataMigrationFolderPath);
            }

-            if (File.Exists(dataMigrationPath)) {
+            if (File.Exists(dataMigrationFilePath)) {
                Context.Output.WriteLine(T("Data migration already exists in target Module {0}.", extensionDescriptor.Name));
                return false;
            }
@@ -91,9 +91,8 @@ namespace Orchard.CodeGeneration.Commands {

            string dataMigrationText = File.ReadAllText(templatesPath + "DataMigration.txt");
            dataMigrationText = dataMigrationText.Replace("$$FeatureName$$", featureName);
-            dataMigrationText = dataMigrationText.Replace("$$ClassName$$", extensionDescriptor.DisplayName);
            dataMigrationText = dataMigrationText.Replace("$$Commands$$", stringWriter.ToString());
-            File.WriteAllText(dataMigrationPath, dataMigrationText);
+            File.WriteAllText(dataMigrationFilePath, dataMigrationText);

            string projectFileText = File.ReadAllText(moduleCsProjPath);

@@ -370,6 +369,7 @@ namespace Orchard.CodeGeneration.Commands {
            }
            else {
                var projectText = File.ReadAllText(_orchardWebProj);
+
                // find where the first ItemGroup is after any References
                var refIndex = projectText.LastIndexOf("<Reference Include");
                if (refIndex != -1) {
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Experimental/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs
@@ -3,4 +3,4 @@
 namespace Orchard.Widgets.Models {
    public class WidgetPart : ContentPart<WidgetPartRecord> {
    }
-}
+}
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard.Web/Themes/ClassicDark/Theme.txt
+++ b/src/Orchard.Web/Themes/ClassicDark/Theme.txt
@@ -4,3 +4,4 @@ description: Dark version of the Classic theme.
 version: 1.0
 tags: Classic, Dark, Serif 
 website: http://www.orchardproject.net
+zones: Sidebar
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -89,7 +89,19 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\lib\sharpziplib\ICSharpCode.SharpZipLib.dll</HintPath>
    </Reference>
+    <Reference Include="IronRuby">
+      <HintPath>..\..\lib\dlr\IronRuby.dll</HintPath>
+    </Reference>
+    <Reference Include="IronRuby.Libraries">
+      <HintPath>..\..\lib\dlr\IronRuby.Libraries.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Dynamic">
+      <HintPath>..\..\lib\dlr\Microsoft.Dynamic.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Scripting">
+      <HintPath>..\..\lib\dlr\Microsoft.Scripting.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\lib\aspnetmvc\Microsoft.WebPages.dll</HintPath>
@@ -158,6 +170,10 @@
    <Compile Include="Mvc\IOrchardViewPage.cs" />
    <Compile Include="Mvc\Spooling\HtmlStringWriter.cs" />
    <Compile Include="Mvc\ViewEngines\Razor\RazorViewEngine.cs" />
+    <Compile Include="Scripting\IScriptingManager.cs" />
+    <Compile Include="Scripting\IScriptingRuntime.cs" />
+    <Compile Include="Scripting\ScriptingManager.cs" />
+    <Compile Include="Scripting\ScriptingRuntime.cs" />
    <Compile Include="Security\CurrentUserWorkContext.cs" />
    <Compile Include="Settings\CurrentSiteWorkContext.cs" />
    <Compile Include="Settings\ResourceDebugMode.cs" />
--- a/src/Orchard/Properties/AssemblyInfo.cs
+++ b/src/Orchard/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Orchard/Scripting/IScriptingManager.cs
+++ b/src/Orchard/Scripting/IScriptingManager.cs
@@ -0,0 +1,11 @@
+using Microsoft.Scripting.Hosting;
+
+namespace Orchard.Scripting {
+    public interface IScriptingManager : IDependency {
+        dynamic GetVariable(string name);
+        void SetVariable(string name, object value);
+        dynamic Eval(string expression);
+        void ExecuteFile(string fileName);
+        void SetScriptingScope(ScriptScope scriptScope);
+    }
+}
--- a/src/Orchard/Scripting/IScriptingRuntime.cs
+++ b/src/Orchard/Scripting/IScriptingRuntime.cs
@@ -0,0 +1,7 @@
+using Microsoft.Scripting.Hosting;
+
+namespace Orchard.Scripting {
+    public interface IScriptingRuntime : ISingletonDependency {
+        ScriptEngine GetRubyEngine();
+    }
+}
--- a/src/Orchard/Scripting/ScriptingManager.cs
+++ b/src/Orchard/Scripting/ScriptingManager.cs
@@ -0,0 +1,38 @@
+using Microsoft.Scripting.Hosting;
+
+namespace Orchard.Scripting {
+    public class ScriptingManager : IScriptingManager {
+        private readonly IScriptingRuntime _scriptingRuntime;
+        private ScriptScope _scriptingScope;
+
+        public ScriptingManager(IScriptingRuntime scriptingRuntime) {
+            _scriptingRuntime = scriptingRuntime;
+            _scriptingScope = _scriptingRuntime.GetRubyEngine().CreateScope();
+        }
+
+        #region IScriptingContext Members
+
+        public dynamic GetVariable(string name) {
+            return _scriptingScope.GetVariable(name);
+        }
+
+        public void SetVariable(string name, object value) {
+            _scriptingScope.SetVariable(name, value);
+        }
+
+        public dynamic Eval(string expression) {
+            var script = _scriptingRuntime.GetRubyEngine().CreateScriptSourceFromString(expression);
+            return script.Execute(_scriptingScope);
+        }
+
+        public void ExecuteFile(string fileName) {
+            _scriptingRuntime.GetRubyEngine().ExecuteFile(fileName, _scriptingScope);
+        }
+
+        public void SetScriptingScope(ScriptScope scriptScope) {
+            _scriptingScope = scriptScope;
+        }
+
+        #endregion
+    }
+}
--- a/src/Orchard/Scripting/ScriptingRuntime.cs
+++ b/src/Orchard/Scripting/ScriptingRuntime.cs
@@ -0,0 +1,18 @@
+using IronRuby;
+using Microsoft.Scripting.Hosting;
+
+namespace Orchard.Scripting {
+    public class ScriptingRuntime : IScriptingRuntime {
+        private readonly ScriptRuntime _scriptingRuntime;
+
+        public ScriptingRuntime() {
+            var setup = new ScriptRuntimeSetup();
+            setup.LanguageSetups.Add(Ruby.CreateRubySetup());
+            _scriptingRuntime = new ScriptRuntime(setup);
+        }
+
+        public ScriptEngine GetRubyEngine() {
+            return _scriptingRuntime.GetEngine("ruby");
+        }
+    }
+}
--- a/src/Tools/MSBuild.Orchard.Tasks.Tests/Properties/AssemblyInfo.cs
+++ b/src/Tools/MSBuild.Orchard.Tasks.Tests/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs
+++ b/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs
+++ b/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/src/Tools/Orchard/Properties/AssemblyInfo.cs
+++ b/src/Tools/Orchard/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]