IronRubyMvc.Tests/Extensions/IEnumerableExtensionsFixture.cs IronRubyMvc.Tests/Extensions/ObjectExtensionsFixture.cs IronRubyMvc.Tests/Extensions/StringExtensionsFixture.cs IronRubyMvc/Controllers/._RubyControllerFactory.cs IronRubyMvc/Core/RubyEngine.cs IronRubyMvc/Core/RubyMvcApplication.cs IronRubyMvcKey.public IronRubyMvcKey.snk dependencies/ClassInitGenerator.exe @@ -6,7 +6,7 @@ using Xunit; #endregion -namespace IronRubyMvcLibrary.Tests.Extensions +namespace IronRubyMvc.Tests.Extensions { public class InflectorTest { IronRubyMvc.Tests/Extensions/InflectorTest.cs @@ -12,6 +12,8 @@ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SignAssembly>false</SignAssembly> + <AssemblyOriginatorKeyFile>IronRubyMvcKey.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -92,7 +94,10 @@ <Compile Include="Core\AssemblyResourceReaderSpec.cs" /> <Compile Include="Core\FileReaderSpec.cs" /> <Compile Include="Core\RubyMediatorTest.cs" /> + <Compile Include="Extensions\IEnumerableExtensionsFixture.cs" /> <Compile Include="Extensions\InflectorTest.cs" /> + <Compile Include="Extensions\ObjectExtensionsFixture.cs" /> + <Compile Include="Extensions\StringExtensionsFixture.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="RubyExperiments.cs" /> <Compile Include="UnitTestHelpers.cs" /> @@ -112,6 +117,11 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> + <ItemGroup> + <None Include="..\IronRubyMvcKey.snk"> + <Link>IronRubyMvcKey.snk</Link> + </None> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. IronRubyMvc.Tests/IronRubyMvc.Tests.csproj @@ -255,14 +255,14 @@ namespace IronRubyMvcLibrary.Tests operations.Call(member, "DLR context").ToString().ShouldBeEqualTo("DLR context is expired "); } - [Fact] - public void ShouldBeAbleToFindController() - { - ScriptScope scope = _engine.CreateScope(); - object res = _engine.Execute("IronRubyMvc", scope); - - Assert.True((bool) res); - } +// [Fact] +// public void ShouldBeAbleToFindController() +// { +// ScriptScope scope = _engine.CreateScope(); +// object res = _engine.Execute("IronRubyMvc", scope); +// +// Assert.True((bool) res); +// } private void AddClass(ScriptScope scope) { IronRubyMvc.Tests/RubyExperiments.cs @@ -1,6 +1,7 @@ #region Usings using System; +using IronRubyMvcLibrary.ViewEngine; using Xunit; #endregion @@ -171,6 +172,20 @@ namespace IronRubyMvcLibrary.Tests Assert.Equal(expected, result); } + [Fact] + public void CanConverToScript() + { + var template = new RubyTemplate("<% puts 'test' %></html>"); + string result = template.ToScript("puts_test"); + + string expected = "def puts_test" + Environment.NewLine + + "puts 'test'" + Environment.NewLine + + ExpectedWrite("\"</html>\"") + Environment.NewLine + + "end"; + + Assert.Equal(expected, result); + } + private string ExpectedWrite(string s) { return "response.Write({0})".FormattedWith(s); IronRubyMvc.Tests/ViewEngine/RubyTemplateTests.cs @@ -12,6 +12,6 @@ namespace IronRubyMvcLibrary.Controllers { public RequestContext Context { get; set; } public RubyClass RubyClass { get; set; } - public RubyMediator Mediator { get; set; } + public RubyEngine Engine { get; set; } } } \ No newline at end of file IronRubyMvc/Controllers/ControllerConfiguration.cs @@ -12,7 +12,7 @@ namespace IronRubyMvcLibrary.Controllers private readonly string _actionName; private readonly ControllerDescriptor _controllerDescriptor; // private readonly MethodInfo _methodInfo; - private ParameterDescriptor[] _parametersCache; +// private ParameterDescriptor[] _parametersCache; public RubyActionDescriptor(string actionName, ControllerDescriptor controllerDescriptor) { @@ -52,7 +52,7 @@ namespace IronRubyMvcLibrary.Controllers public override object Execute(ControllerContext controllerContext, IDictionary<string, object> parameters) { - return RubyControllerDescriptor.RubyMediator.CallMethod(controllerContext.Controller, ActionName); + return RubyControllerDescriptor.RubyEngine.CallMethod(controllerContext.Controller, ActionName); } public override ParameterDescriptor[] GetParameters() //return an empty array for now IronRubyMvc/Controllers/RubyActionDescriptor.cs @@ -10,6 +10,8 @@ using System.Web.Mvc; using System.Web.Routing; using IronRuby.Builtins; using IronRubyMvcLibrary.Core; +using IronRubyMvcLibrary.Extensions; +using IronRubyMvcLibrary.Helpers; using Microsoft.Scripting; using RubyModuleDefinition = IronRuby.Runtime.RubyModuleAttribute; using RubyClassDefinition = IronRuby.Runtime.RubyClassAttribute; @@ -46,7 +48,7 @@ namespace IronRubyMvcLibrary.Controllers public static readonly MethodInfo InvokeActionMethod = typeof (RubyController).GetMethod("InvokeAction"); private readonly Dictionary<object, object> _viewData = new Dictionary<object, object>(); - private RubyMediator _mediator; + private RubyEngine _engine; private IDictionary<object, object> _params; public string ControllerName { get; internal set; } @@ -107,29 +109,29 @@ namespace IronRubyMvcLibrary.Controllers internal void InternalInitialize(ControllerConfiguration config) { Initialize(config.Context); - SetMediator(config.Mediator); + SetMediator(config.Engine); ControllerName = config.RubyClass.Name.Replace("Controller", string.Empty); RubyType = config.RubyClass; } - internal void SetMediator(RubyMediator mediator) + internal void SetMediator(RubyEngine engine) { - if (mediator == null) throw new ArgumentNullException("mediator"); - _mediator = mediator; + if (engine == null) throw new ArgumentNullException("engine"); + _engine = engine; } protected override void Execute(RequestContext requestContext) { - ActionInvoker = new RubyControllerActionInvoker(ControllerClassName, _mediator); + ActionInvoker = new RubyControllerActionInvoker(ControllerClassName, _engine); base.Execute(requestContext); } - [NonAction] - public object InvokeAction(Func<object> __action) - { - return __action(); - } +// [NonAction] +// public object InvokeAction(Func<object> action) +// { +// return action(); +// } [NonAction] public ActionResult RedirectToRoute(Hash values) @@ -176,7 +178,7 @@ namespace IronRubyMvcLibrary.Controllers protected override ViewResult View(string viewName, string masterName, object model) { var vdd = new ViewDataDictionary(); - vdd["__scriptRuntime"] = HttpContext.Application.GetScriptRuntime(); + vdd["__scriptRuntime"] = _engine.Runtime; foreach (var entry in _viewData) vdd[Convert.ToString(entry.Key, CultureInfo.InvariantCulture)] = entry.Value; IronRubyMvc/Controllers/RubyController.cs @@ -9,20 +9,20 @@ namespace IronRubyMvcLibrary.Controllers { internal class RubyControllerActionInvoker : ControllerActionInvoker { - public RubyControllerActionInvoker(string controllerName, RubyMediator mediator) + public RubyControllerActionInvoker(string controllerName, RubyEngine engine) { ControllerName = controllerName; - RubyMediator = mediator; + RubyEngine = engine; } public string ControllerName { get; private set; } - public RubyMediator RubyMediator { get; private set; } + public RubyEngine RubyEngine { get; private set; } protected override ControllerDescriptor GetControllerDescriptor(ControllerContext controllerContext) { return new RubyControllerDescriptor(((RubyController) controllerContext.Controller).RubyType, - controllerContext) {RubyMediator = RubyMediator}; + controllerContext) {RubyEngine = RubyEngine}; } protected override ActionDescriptor FindAction(ControllerContext controllerContext, IronRubyMvc/Controllers/RubyControllerActionInvoker.cs @@ -4,6 +4,7 @@ using System; using System.Web.Mvc; using IronRuby.Builtins; using IronRubyMvcLibrary.Core; +using IronRubyMvcLibrary.Extensions; #endregion @@ -29,7 +30,7 @@ namespace IronRubyMvcLibrary.Controllers get { return RubyControllerClass.Name; } } - internal RubyMediator RubyMediator { get; set; } + internal RubyEngine RubyEngine { get; set; } public override Type ControllerType { @@ -40,10 +41,10 @@ namespace IronRubyMvcLibrary.Controllers public override ActionDescriptor FindAction(ControllerContext controllerContext, string actionName) { - Func<object> action = RubyMediator.GetControllerAction((RubyController) controllerContext.Controller, + var hasControllerAction = RubyEngine.HasControllerAction((RubyController) controllerContext.Controller, actionName); - if (action.IsNull()) return null; + if (!hasControllerAction) return null; return RubyActionDescriptor.Create(actionName, this); } IronRubyMvc/Controllers/RubyControllerDescriptor.cs @@ -4,6 +4,7 @@ using System; using System.Web.Mvc; using System.Web.Routing; using IronRubyMvcLibrary.Core; +using Microsoft.Scripting.Hosting; #endregion @@ -12,28 +13,30 @@ namespace IronRubyMvcLibrary.Controllers public class RubyControllerFactory : IControllerFactory { private readonly IControllerFactory _innerFactory; + private readonly RubyEngine _engine; - public RubyControllerFactory(IControllerFactory innerFactory) + internal RubyControllerFactory(IControllerFactory innerFactory, RubyEngine engine) { _innerFactory = innerFactory; + _engine = engine; } #region IControllerFactory Members - public IController CreateController(RequestContext context, string controllerName) + public IController CreateController(RequestContext requestContext, string controllerName) { - IController result = null; + IController result; try { - result = _innerFactory.CreateController(context, controllerName); + return _innerFactory.CreateController(requestContext, controllerName); } catch { } - RubyMediator mediator = RubyMediator.Create(); - result = mediator.LoadController(context, controllerName); +// RubyEngine engine = RubyEngine.Create(_engine); + result = _engine.LoadController(requestContext, controllerName); return result; } IronRubyMvc/Controllers/RubyControllerFactory.cs @@ -2,6 +2,7 @@ using System.IO; using System.Reflection; +using IronRubyMvcLibrary.Extensions; #endregion IronRubyMvc/Core/AssemblyResourceReader.cs @@ -2,22 +2,18 @@ using System; using System.Web.Hosting; +using IronRubyMvcLibrary.Extensions; using Microsoft.Scripting.Hosting; #endregion namespace IronRubyMvcLibrary.Core { - internal class DefaultScriptRunner + internal class DefaultScriptRunner : IScriptRunner { private readonly ScriptEngine _engine; - public DefaultScriptRunner(ScriptEngine engine) - : this(engine, string.Empty, new FileReader()) - { - } - public DefaultScriptRunner(ScriptEngine engine, ReaderType readerType) : this( engine, string.Empty, @@ -47,40 +43,16 @@ namespace IronRubyMvcLibrary.Core return ExecuteScript(Reader.Read(ScriptPath)); } - public virtual T Execute<T>() - { - return (T) Execute(); - } - public virtual object ExecuteFile(string scriptPath) { ScriptPath = scriptPath; return Execute(); } - public virtual T ExecuteFile<T>(string scriptPath) - { - return (T) ExecuteFile(scriptPath); - } - public virtual object ExecuteScript(string script) { return _engine.Execute(script); } - public virtual T ExecuteScript<T>(string script) - { - return (T) ExecuteScript(script); - } - - public bool Exists(string scriptPath) - { - return HostingEnvironment.VirtualPathProvider.FileExists(scriptPath); - } - - public bool Exists() - { - return ScriptPath.IsNullOrBlank() ? false : Exists(ScriptPath); - } } } \ No newline at end of file IronRubyMvc/Core/DefaultScriptRunner.cs @@ -1,6 +1,6 @@ namespace IronRubyMvcLibrary.Core { - internal interface IReader + public interface IReader { string Read(string filePath); } IronRubyMvc/Core/IReader.cs @@ -5,12 +5,7 @@ namespace IronRubyMvcLibrary.Core string ScriptPath { get; } IReader Reader { get; } object Execute(); - T Execute<T>(); object ExecuteFile(string scriptPath); - T ExecuteFile<T>(string scriptPath); object ExecuteScript(string script); - T ExecuteScript<T>(string script); - bool Exists(string scriptPath); - bool Exists(); } } \ No newline at end of file IronRubyMvc/Core/IScriptRunner.cs @@ -2,6 +2,7 @@ using System; using System.Web.Hosting; +using IronRubyMvcLibrary.Extensions; using Microsoft.Scripting.Hosting; #endregion @@ -19,13 +20,6 @@ namespace IronRubyMvcLibrary.Core { } - public ScopedScriptRunner(ScriptEngine engine, ScriptScope scope, ReaderType readerType) - : this( - engine, scope, string.Empty, - readerType == ReaderType.File ? new FileReader() : (IReader) new AssemblyResourceReader()) - { - } - public ScopedScriptRunner(ScriptEngine engine, ScriptScope scope, string scriptPath, IReader reader) { _engine = engine; @@ -51,42 +45,17 @@ namespace IronRubyMvcLibrary.Core return ExecuteScript(Reader.Read(ScriptPath)); } - public virtual T Execute<T>() - { - return (T) Execute(); - } - public virtual object ExecuteFile(string scriptPath) { ScriptPath = scriptPath; return Execute(); } - public virtual T ExecuteFile<T>(string scriptPath) - { - return (T) ExecuteFile(scriptPath); - } - public virtual object ExecuteScript(string script) { return _engine.Execute(script, _scope); } - public virtual T ExecuteScript<T>(string script) - { - return (T) ExecuteScript(script); - } - - public bool Exists(string scriptPath) - { - return HostingEnvironment.VirtualPathProvider.FileExists(scriptPath); - } - - public bool Exists() - { - return ScriptPath.IsNullOrBlank() ? false : Exists(ScriptPath); - } - #endregion } } \ No newline at end of file IronRubyMvc/Core/ScopedScriptRunner.cs @@ -6,7 +6,7 @@ using System.Web.Routing; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.Extensions { public static class DictionaryExtensions { IronRubyMvc/Extensions/DictionaryExtensions.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.Extensions { public static class IEnumerableExtensions { IronRubyMvc/Extensions/IEnumerableExtensions.cs @@ -4,7 +4,9 @@ #region Usings using System.Collections.Generic; +using System.Globalization; using System.Text.RegularExpressions; +using System.Threading; #endregion @@ -77,7 +79,10 @@ namespace IronRubyMvcLibrary.Extensions #endregion - private static readonly List<Rule> _plurals = new List<Rule>(); + private static readonly List<Rule> _plurals = new List<Rule> + { + + }; private static readonly List<Rule> _singulars = new List<Rule>(); private static readonly List<string> _uncountables = new List<string>(); @@ -89,7 +94,7 @@ namespace IronRubyMvcLibrary.Extensions private static void AddUncountable(string word) { - _uncountables.Add(word.ToLower()); + _uncountables.Add(word.ToUpperInvariant()); } private static void AddPlural(string rule, string replacement) @@ -112,11 +117,11 @@ namespace IronRubyMvcLibrary.Extensions return ApplyRules(_singulars, word); } - private static string ApplyRules(List<Rule> rules, string word) + private static string ApplyRules(IList<Rule> rules, string word) { string result = word; - if (!_uncountables.Contains(word.ToLower())) + if (!_uncountables.Contains(word.ToUpperInvariant())) { for (int i = rules.Count - 1; i >= 0; i--) { @@ -133,7 +138,7 @@ namespace IronRubyMvcLibrary.Extensions public static string Titleize(this string word) { return Regex.Replace(Humanize(Underscore(word)), @"\b([a-z])", - delegate(Match match) { return match.Captures[0].Value.ToUpper(); }); + delegate(Match match) { return match.Captures[0].Value.ToUpper(CultureInfo.InvariantCulture); }); } public static string Humanize(this string lowercaseAndUnderscoredWord) @@ -143,7 +148,7 @@ namespace IronRubyMvcLibrary.Extensions public static string Pascalize(this string lowercaseAndUnderscoredWord) { - return Regex.Replace(lowercaseAndUnderscoredWord, "(?:^|_)(.)", match => match.Groups[1].Value.ToUpper()); + return Regex.Replace(lowercaseAndUnderscoredWord, "(?:^|_)(.)", match => match.Groups[1].Value.ToUpper(CultureInfo.InvariantCulture)); } public static string Camelize(this string lowercaseAndUnderscoredWord) @@ -156,22 +161,22 @@ namespace IronRubyMvcLibrary.Extensions return Regex.Replace( Regex.Replace( Regex.Replace(pascalCasedWord, @"([A-Z]+)([A-Z][a-z])", "$1_$2"), @"([a-z\d])([A-Z])", - "$1_$2"), @"[-\s]", "_").ToLower(); + "$1_$2"), @"[-\s]", "_").ToLowerInvariant(); } public static string Capitalize(this string word) { - return word.Substring(0, 1).ToUpper() + word.Substring(1).ToLower(); + return word.Substring(0, 1).ToUpperInvariant() + word.Substring(1).ToLowerInvariant(); } public static string Uncapitalize(this string word) { - return word.Substring(0, 1).ToLower() + word.Substring(1); + return word.Substring(0, 1).ToLowerInvariant() + word.Substring(1); } public static string Ordinalize(this string number) { - int n = int.Parse(number); + int n = int.Parse(number, CultureInfo.InvariantCulture); int nMod100 = n%100; if (nMod100 >= 11 && nMod100 <= 13) IronRubyMvc/Extensions/Inflector.cs @@ -8,11 +8,14 @@ using System.Web.Routing; using IronRuby; using IronRuby.Runtime; using IronRubyMvcLibrary.Controllers; +using IronRubyMvcLibrary.Core; +using IronRubyMvcLibrary.ViewEngine; using Microsoft.Scripting.Hosting; +using VirtualPathProvider=System.Web.Hosting.VirtualPathProvider; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.Extensions { public static class InitializeIronRubyMvcExtensions { @@ -36,42 +39,26 @@ namespace IronRubyMvcLibrary runtimeSetup.DebugMode = true; ScriptRuntime runtime = Ruby.CreateRuntime(runtimeSetup); + RubyEngine engine = RubyEngine.Create(runtime); - app.Application.SetScriptRuntime(runtime); + ProcessRubyRoutes(engine, routesPath); - if (vpp.FileExists(routesPath)) - ProcessRubyRoutes(runtime, vpp, routesPath); - - var factory = new RubyControllerFactory(ControllerBuilder.Current.GetControllerFactory()); + var factory = new RubyControllerFactory(ControllerBuilder.Current.GetControllerFactory(), engine); ControllerBuilder.Current.SetControllerFactory(factory); ViewEngines.Engines.Add(new RubyViewEngine()); } - private static void ProcessRubyRoutes(ScriptRuntime runtime, VirtualPathProvider vpp, string routesPath) + private static void ProcessRubyRoutes(RubyEngine engine, string routesPath) { var routeCollection = new RubyRouteCollection(RouteTable.Routes); - ScriptEngine rubyEngine = Ruby.GetEngine(runtime); - RubyContext rubyContext = Ruby.GetExecutionContext(runtime); - - rubyContext.DefineReadOnlyGlobalVariable("routes", routeCollection); - - // REVIEW: Should we pull this information from the loaded versions of these assemblies? - string header = - @" -require 'System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' -require 'System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' -require 'System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' - "; + engine.DefineReadOnlyGlobalVariable("routes", routeCollection); - rubyEngine.CreateScriptSourceFromString(header).Execute(); + engine.LoadAssembly(typeof (HttpResponseBase).Assembly); + engine.LoadAssembly(typeof (RouteTable).Assembly); + engine.LoadAssembly(typeof (ActionDescriptor).Assembly); - using (Stream stream = vpp.GetFile(routesPath).Open()) - using (var reader = new StreamReader(stream)) - { - string routesText = reader.ReadToEnd(); - rubyEngine.CreateScriptSourceFromString(routesText).Execute(); - } + engine.RequireRubyFile(routesPath, ReaderType.File); } } } \ No newline at end of file IronRubyMvc/Extensions/InitializeIronRubyMvcExtensions.cs @@ -1,15 +1,32 @@ -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.Extensions { + /// <summary> + /// Contains the extension methods for <see cref="object" /> + /// </summary> public static class ObjectExtensions { - public static bool IsNotNull(this object obj) + /// <summary> + /// Determines whether [is not null] [the specified value]. + /// </summary> + /// <param name="value">The value.</param> + /// <returns> + /// <c>true</c> if [is not null] [the specified value]; otherwise, <c>false</c>. + /// </returns> + public static bool IsNotNull(this object value) { - return obj != null; + return value != null; } - public static bool IsNull(this object obj) + /// <summary> + /// Determines whether the specified value is null. + /// </summary> + /// <param name="value">The value.</param> + /// <returns> + /// <c>true</c> if the specified value is null; otherwise, <c>false</c>. + /// </returns> + public static bool IsNull(this object value) { - return obj == null; + return value == null; } } } \ No newline at end of file IronRubyMvc/Extensions/ObjectExtensions.cs @@ -1,20 +1,45 @@ +using System.Globalization; + namespace IronRubyMvcLibrary { + /// <summary> + /// Contains the extension methods for <see cref="string"/> + /// </summary> public static class StringExtensions { + /// <summary> + /// Determines whether the value is null or blank. + /// </summary> + /// <param name="value">The value.</param> + /// <returns> + /// <c>true</c> if the specified value is null or blank; otherwise, <c>false</c>. + /// </returns> public static bool IsNullOrBlank(this string value) { return string.IsNullOrEmpty(value) || value.Trim().Length == 0; } + /// <summary> + /// Determines whether the specified value is not null or blank. + /// </summary> + /// <param name="value">The value.</param> + /// <returns> + /// <c>true</c> if the specified value is not null or blank; otherwise, <c>false</c>. + /// </returns> public static bool IsNotNullOrBlank(this string value) { return !value.IsNullOrBlank(); } - public static string FormattedWith(this string formatString, params object[] parameters) + /// <summary> + /// Formats the specified format string with the provided parameters. + /// </summary> + /// <param name="value">The format string.</param> + /// <param name="parameters">The parameters.</param> + /// <returns></returns> + public static string FormattedWith(this string value, params object[] parameters) { - return string.Format(formatString, parameters); + return string.Format(CultureInfo.CurrentUICulture, value, parameters); } } } \ No newline at end of file IronRubyMvc/Extensions/StringExtensions.cs @@ -7,7 +7,7 @@ using IronRuby.Builtins; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.Helpers { public class HashWrapper : CustomTypeDescriptor { IronRubyMvc/Helpers/HashWrapper.cs @@ -3,14 +3,12 @@ using System.Web.Mvc; using System.Web.Mvc.Html; using IronRuby.Builtins; +using IronRubyMvcLibrary.Extensions; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.Helpers { - // Note, it looks like DLR interop is not calling base methods. Until this is fixed, we might - // want to come through and add pass-throughs (in addition to the Hash-specific versions). - public class RubyHtmlHelper : HtmlHelper { private readonly HtmlHelper _helper; IronRubyMvc/Helpers/RubyHtmlHelper.cs @@ -3,10 +3,11 @@ using System.Web.Mvc; using System.Web.Routing; using IronRuby.Builtins; +using IronRubyMvcLibrary.Extensions; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.Helpers { public class RubyUrlHelper : UrlHelper { @@ -22,7 +23,7 @@ namespace IronRubyMvcLibrary public string Action(string actionName, Hash values) { - return base.Action(actionName, values.ToRouteDictionary()); + return Action(actionName, values.ToRouteDictionary()); } public new string Action(string actionName, string controllerName) @@ -32,22 +33,22 @@ namespace IronRubyMvcLibrary public string Action(string actionName, string controllerName, Hash values) { - return base.Action(actionName, controllerName, values.ToRouteDictionary()); + return Action(actionName, controllerName, values.ToRouteDictionary()); } public string Action(Hash values) { - return base.RouteUrl(values.ToRouteDictionary()); + return RouteUrl(values.ToRouteDictionary()); } - public string e(object s) + public string E(object value) { - return base.Encode(s.ToString()); + return Encode(value.ToString()); } - public string e(string s) + public string E(string value) { - return base.Encode(s); + return Encode(value); } } } \ No newline at end of file IronRubyMvc/Helpers/RubyUrlHelper.cs @@ -12,6 +12,9 @@ <AssemblyName>IronRubyMvcLibrary</AssemblyName> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <SignAssembly>false</SignAssembly> + <AssemblyOriginatorKeyFile>..\IronRubyMvcKey.snk</AssemblyOriginatorKeyFile> + <DelaySign>true</DelaySign> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -21,6 +24,9 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <RunCodeAnalysis>true</RunCodeAnalysis> + <CodeAnalysisRules>-Microsoft.Design#CA2210</CodeAnalysisRules> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -81,6 +87,7 @@ <Compile Include="Core\IPathProvider.cs" /> <Compile Include="Core\IReader.cs" /> <Compile Include="Core\Reader.cs" /> + <Compile Include="Core\RubyMvcApplication.cs" /> <Compile Include="Core\ScopedScriptRunner.cs" /> <Compile Include="Core\IScriptRunner.cs" /> <Compile Include="Controllers\RubyActionDescriptor.cs" /> @@ -88,12 +95,11 @@ <Compile Include="Controllers\RubyControllerActionInvoker.cs" /> <Compile Include="Controllers\RubyControllerDescriptor.cs" /> <Compile Include="Controllers\RubyControllerFactory.cs" /> - <Compile Include="Core\RubyMediator.cs" /> + <Compile Include="Core\RubyEngine.cs" /> <Compile Include="Controllers\RubyParameterDescriptor.cs" /> <Compile Include="Core\VirtualPathProvider.cs" /> <Compile Include="Extensions\IEnumerableExtensions.cs" /> <Compile Include="Extensions\ObjectExtensions.cs" /> - <Compile Include="Extensions\ScriptRuntimeExtensions.cs" /> <Compile Include="Extensions\StringExtensions.cs" /> <Compile Include="Helpers\DescriptorUtil.cs" /> <Compile Include="Helpers\HashWrapper.cs" /> @@ -118,6 +124,11 @@ <ItemGroup> <EmbeddedResource Include="Controllers\controller.rb" /> </ItemGroup> + <ItemGroup> + <None Include="..\IronRubyMvcKey.snk"> + <Link>IronRubyMvcKey.snk</Link> + </None> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. IronRubyMvc/IronRubyMvcLibrary.csproj @@ -44,4 +44,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: InternalsVisibleTo("IronRubyMvc.Tests")] \ No newline at end of file +[assembly: InternalsVisibleTo("IronRubyMvc.Tests")] +//[assembly: InternalsVisibleTo("IronRubyMvc.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010055d5760ba0b8b9718d28fef038ec00ca8dc0192f727fffd05e110d5f15e57ea468a60461e18bed28076b4237cd05d6804048fcf0b3e9d298009412ae4d0df1aaa6a67f811b308ad992557c255ff8631a99572ccafc4c39a3019440e0059090c04305a5360821a2abd3a81f356522c0d2be1b3473de20202ba75359366d5818c1")] + IronRubyMvc/Properties/AssemblyInfo.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Web.Mvc; using System.Web.Routing; +using IronRubyMvcLibrary.Extensions; #endregion IronRubyMvc/Routing/RubyRouteCollection.cs @@ -6,7 +6,7 @@ using System; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.ViewEngine { internal class RubyScriptBlock { @@ -23,7 +23,7 @@ namespace IronRubyMvcLibrary } int endOffset = 4; - if (block.EndsWith("-%>")) + if (block.EndsWith("-%>", StringComparison.OrdinalIgnoreCase)) { endOffset = 5; ignoreNextNewLine = true; @@ -33,7 +33,7 @@ namespace IronRubyMvcLibrary ignoreNextNewLine = false; } - if (block.StartsWith("<%=")) + if (block.StartsWith("<%=", StringComparison.OrdinalIgnoreCase)) { int outputLength = block.Length - endOffset - 1; if (outputLength < 1) @@ -44,7 +44,7 @@ namespace IronRubyMvcLibrary return; } - if (block.StartsWith("<%")) + if (block.StartsWith("<%", StringComparison.OrdinalIgnoreCase)) { Contents = block.Substring(2, block.Length - endOffset).Trim(); return; IronRubyMvc/ViewEngine/RubyScriptBlock.cs @@ -4,10 +4,11 @@ using System; using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; +using IronRubyMvcLibrary.ViewEngine; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.ViewEngine { public class RubyTemplate { IronRubyMvc/ViewEngine/RubyTemplate.cs @@ -6,11 +6,12 @@ using System.Text; using System.Web.Mvc; using IronRuby; using IronRuby.Runtime; +using IronRubyMvcLibrary.Helpers; using Microsoft.Scripting.Hosting; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.ViewEngine { public class RubyView : IView { @@ -19,6 +20,7 @@ namespace IronRubyMvcLibrary private readonly RubyView _master; private RubyTemplate _template; + public RubyView(string viewContents, RubyView master, string helperContents) { _master = master; @@ -40,7 +42,7 @@ namespace IronRubyMvcLibrary public void Render(ViewContext context, TextWriter writer) { - ScriptRuntime runtime = context.HttpContext.Application.GetScriptRuntime(); + ScriptRuntime runtime = context.ViewData["__scriptRuntime"] as ScriptRuntime; ScriptEngine rubyEngine = Ruby.GetEngine(runtime); RubyContext rubyContext = Ruby.GetExecutionContext(runtime); IronRubyMvc/ViewEngine/RubyView.cs @@ -3,10 +3,11 @@ using System; using System.IO; using System.Web.Mvc; +using IronRubyMvcLibrary.ViewEngine; #endregion -namespace IronRubyMvcLibrary +namespace IronRubyMvcLibrary.ViewEngine { public class RubyViewEngine : VirtualPathProviderViewEngine { IronRubyMvc/ViewEngine/RubyViewEngine.cs IronRubyMvcWeb/App_Data/NORTHWND.MDF IronRubyMvcWeb/App_Data/NORTHWND_log.ldf @@ -9,12 +9,7 @@ class ProductsRepository < IronRubyRepository end class BaseController < Controller - def initialize(context = nil) - if(context != nil) - base.Initialize(context) - end - end - + def fill_view_data instance_variables.each { |varname| view_data.Add(varname[1..-1], instance_variable_get(varname.to_sym)) } end IronRubyMvcWeb/Controllers/ProductsController.rb @@ -3,17 +3,14 @@ using System; using System.Web; using IronRubyMvcLibrary; +using IronRubyMvcLibrary.Core; #endregion namespace IronRubyMvcWeb { - public class GlobalApplication : HttpApplication + public class GlobalApplication : RubyMvcApplication { - protected void Application_Start(object sender, EventArgs e) - { - this.InitializeIronRubyMvc(); - } protected void Application_BeginRequest(object sender, EventArgs e) { IronRubyMvcWeb/Global.asax.cs @@ -1,2 +1,2 @@ <%@ Import Namespace="Pictures"%> -<%@ Application Codebehind="Global.asax.cs" Inherits="GlobalApplication" Language="C#" %> +<%@ Application Codebehind="Global.asax.cs" Inherits="Pictures.GlobalApplication" Language="C#" %> Pictures/Global.asax @@ -1,18 +1,12 @@ #region Usings -using System; -using System.Web; -using IronRubyMvcLibrary; +using IronRubyMvcLibrary.Core; #endregion namespace Pictures { - public class GlobalApplication : HttpApplication + public class GlobalApplication : RubyMvcApplication { - protected void Application_Start(object sender, EventArgs e) - { - this.InitializeIronRubyMvc(); - } } } \ No newline at end of file Pictures/Global.asax.cs @@ -32,13 +32,13 @@ affects performance, set this value to true only during development. --> - <compilation debug="false"> + <compilation debug="true"> <assemblies> <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> - <add assembly="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> + <add assembly="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> @@ -124,4 +124,4 @@ <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.Routing.UrlRoutingHandler, System.Web.Routing, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> </handlers> </system.webServer> -</configuration> \ No newline at end of file +</configuration> Pictures/Web.config dependencies/IronRuby.Libraries.Yaml.dll dependencies/IronRuby.Libraries.Yaml.pdb dependencies/IronRuby.Libraries.dll dependencies/IronRuby.Libraries.pdb dependencies/IronRuby.dll dependencies/IronRuby.pdb dependencies/Microsoft.Dynamic.dll dependencies/Microsoft.Dynamic.pdb dependencies/Microsoft.Scripting.Core.dll dependencies/Microsoft.Scripting.Core.pdb dependencies/Microsoft.Scripting.ExtensionAttribute.dll dependencies/Microsoft.Scripting.ExtensionAttribute.pdb dependencies/Microsoft.Scripting.dll dependencies/Microsoft.Scripting.pdb e65e3b5ef436853f9efa1bd66a1edcd667d475d5 casualjim ivan@flanders.co.nz http://github.com/jschementi/ironrubymvc/commit/1430d13c332db731fbda05e8566efa071a5cf58c 1430d13c332db731fbda05e8566efa071a5cf58c 2009-02-14T05:45:15-08:00 2009-02-14T05:45:15-08:00 Added some more tests and moved ruby engine to application level c0121a0e166ebbbabe76a9f1ab3797a8faceb5b1 casualjim ivan@flanders.co.nz