IronMvcSpecs/IronMvcSpecs.stproj IronMvcSpecs/Rakefile.rb IronMvcSpecs/bacon_helper.rb IronMvcSpecs/extensions/extensions.rb IronMvcSpecs/extensions/ienumerable_extensions_spec.rb IronMvcSpecs/extensions/object_extensions_spec.rb IronMvcSpecs/extensions/string_extensions_spec.rb IronMvcSpecs/lib/amok.rb IronMvcSpecs/workarounds/Workarounds.cs IronRubyMvc/Core/MvcApplication.cs IronRubyMvc/Core/MvcScriptHost.cs IronRubyMvc/Core/PathProviderPAL.cs IronRubyMvc/Core/TypeConverter.cs @@ -20,4 +20,4 @@ IronRubyMvc/Controllers/._controller.rb IronRubyMvc/Core/._RubyEngine.cs dependencies/IronRuby.Tests.exe dependencies/IronRuby.Tests.pdb -IronRubyMvcLibrarySpecs/bin/*.* \ No newline at end of file +IronMvcSpecs/bin/*.* \ No newline at end of file .gitignore @@ -41,7 +41,7 @@ namespace System.Web.Mvc.IronRuby.Tests.Core protected override void Because() { - _engine = RubyEngine.InitializeIronRubyMvc(_pathProvider, "~/routes.rb", path => new TestStreamContentProvider(path)); + _engine = RubyEngine.InitializeIronRubyMvc(_pathProvider, "~/routes.rb"); } IronRubyMvc.Tests/Core/RubyEngineSpec.cs @@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.markdown = README.markdown EndProjectSection EndProject +Project("{325B8569-0C7C-4A6A-8AF8-89C3B6BC9E74}") = "IronMvcSpecs", "IronMvcSpecs\IronMvcSpecs.stproj", "{4B1E7B70-F827-46A0-9D8D-68498B5EF73D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_Signed|Any CPU = Debug_Signed|Any CPU @@ -45,6 +47,14 @@ Global {13CD326E-5C1A-4404-A1AB-8D0BA6D9FDF9}.Release_Signed|Any CPU.Build.0 = Release_Signed|Any CPU {13CD326E-5C1A-4404-A1AB-8D0BA6D9FDF9}.Release|Any CPU.ActiveCfg = Release|Any CPU {13CD326E-5C1A-4404-A1AB-8D0BA6D9FDF9}.Release|Any CPU.Build.0 = Release|Any CPU + {4B1E7B70-F827-46A0-9D8D-68498B5EF73D}.Debug_Signed|Any CPU.ActiveCfg = Debug|Any CPU + {4B1E7B70-F827-46A0-9D8D-68498B5EF73D}.Debug_Signed|Any CPU.Build.0 = Debug|Any CPU + {4B1E7B70-F827-46A0-9D8D-68498B5EF73D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B1E7B70-F827-46A0-9D8D-68498B5EF73D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B1E7B70-F827-46A0-9D8D-68498B5EF73D}.Release_Signed|Any CPU.ActiveCfg = Release|Any CPU + {4B1E7B70-F827-46A0-9D8D-68498B5EF73D}.Release_Signed|Any CPU.Build.0 = Release|Any CPU + {4B1E7B70-F827-46A0-9D8D-68498B5EF73D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B1E7B70-F827-46A0-9D8D-68498B5EF73D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE IronRubyMvc.sln @@ -1,3 +1,4 @@ +extern alias clr3; #region Usings using System.Collections; @@ -7,6 +8,8 @@ using System.Web.Mvc.IronRuby.Core; using System.Web.Mvc.IronRuby.Extensions; using IronRuby.Builtins; +using clr3::System.Linq; + #endregion namespace System.Web.Mvc.IronRuby.Controllers @@ -54,7 +57,7 @@ namespace System.Web.Mvc.IronRuby.Controllers var methodAliases = (Hash) _rubyEngine.CallMethod(ControllerClass, "name_selectors"); AliasedMethods = methodAliases.Map(pair => KeyValuePairFor(pair)); NonAliasedMethods = - methodNames.Where( + clr3::System.Linq.Enumerable.Where(methodNames, method => AliasedMethods.DoesNotContain( pair => String.Equals(pair.Key, method.Underscore(), StringComparison.OrdinalIgnoreCase) || String.Equals(pair.Key, method.Pascalize(), StringComparison.OrdinalIgnoreCase) @@ -77,7 +80,7 @@ namespace System.Web.Mvc.IronRuby.Controllers PopulateLookupTables(controllerContext); // dynamic languages can add methods at runtime var methodsMatchingName = GetMatchingAliasedMethods(controllerContext, actionName); methodsMatchingName.AddRange( - NonAliasedMethods.Where( + clr3::System.Linq.Enumerable.Where(NonAliasedMethods, name => String.Equals(name, actionName.Underscore(), StringComparison.OrdinalIgnoreCase) || String.Equals(name, actionName.Pascalize(), StringComparison.OrdinalIgnoreCase))); var finalMethods = RunSelectionFilters(controllerContext, methodsMatchingName); IronRubyMvc/Controllers/RubyActionMethodSelector.cs @@ -1,9 +1,10 @@ +extern alias clr3; #region Usings using System.Web.Mvc.IronRuby.Core; using System.Web.Mvc.IronRuby.Extensions; using IronRuby.Builtins; - +using clr3::System.Linq; #endregion namespace System.Web.Mvc.IronRuby.Controllers IronRubyMvc/Controllers/RubyControllerDescriptor.cs @@ -2,6 +2,55 @@ def debugger System::Diagnostics::Debugger.break if System::Diagnostics::Debugger.launch end +module System + + module Web + class HttpRequestBase + + def post? + self.http_method.to_s.downcase.to_sym == :post + end + + def put? + self.http_method.to_s.downcase.to_sym == :put + end + + def get? + self.http_method.to_s.downcase.to_sym == :get + end + + def delete? + self.http_method.to_s.downcase.to_sym == :delete + end + + def head? + self.http_method.to_s.downcase.to_sym == :head + end + end + end + + class Object + + class << self + + def create_from_hash(options) + result = self.new + result.populate_from_hash options + result + end + + end + + def populate_from_hash(options) + options.each do |k, v| + mn = "#{k}=".to_sym + self.send(mn, v) if self.respond_to?(mn) + end + end + end + +end + module IronRubyMvc module Controllers @@ -222,6 +271,35 @@ module IronRubyMvc end + class PropertyDescriptor + + attr_accessor :name + + end + + class DefaultModelBinder + def initialize(target, values) + @target = target + @values = values + end + + def bind + @target + end + + def self.bind(target, values) + binder = DefaultModelBinder.new target, values + + binder.bind + end + + private + + def has_property? + target.get_type + end + end + #module Controllers class Controller < System::Web::Mvc::IronRuby::Controllers::RubyController @@ -235,9 +313,7 @@ module IronRubyMvc instance_variables.each { |varname| view_data.add(varname[1..-1], instance_variable_get(varname.to_sym)) } end - def post? - controller_context.http_context.request.http_method.to_s.downcase.to_sym == :post - end + end IronRubyMvc/Controllers/controller.rb @@ -10,7 +10,15 @@ namespace System.Web.Mvc.IronRuby.Core { string ApplicationPhysicalPath { get; } bool FileExists(string filePath); + bool DirectoryExists(string dirPath); + string[] GetDirectories(string path, string searchPattern); + string[] GetFiles(string path, string searchPattern); Stream Open(string filePath); string MapPath(string filePath); + bool IsAbsolutePath(string path); + string GetFullPath(string path); + + Stream Open(string path, FileMode mode, FileAccess access, FileShare share); + Stream Open(string path, FileMode mode, FileAccess access, FileShare share, int size); } } \ No newline at end of file IronRubyMvc/Core/IPathProvider.cs @@ -15,22 +15,6 @@ namespace System.Web.Mvc.IronRuby.Core /// </summary> public interface IRubyEngine { -// /// <summary> -// /// Loads the controller. -// /// </summary> -// /// <param name="requestContext">The request context.</param> -// /// <param name="controllerName">Name of the controller.</param> -// /// <returns></returns> -// RubyController LoadController(RequestContext requestContext, string controllerName); -// -// /// <summary> -// /// Configures the controller. -// /// </summary> -// /// <param name="rubyClass">The ruby class.</param> -// /// <param name="requestContext">The request context.</param> -// /// <returns></returns> -// RubyController ConfigureController(RubyClass rubyClass, RequestContext requestContext); - /// <summary> /// Calls the method. /// </summary> @@ -40,16 +24,6 @@ namespace System.Web.Mvc.IronRuby.Core /// <returns></returns> object CallMethod(object receiver, string message, params object[] args); -// /// <summary> -// /// Determines whether the specified controller as the action. -// /// </summary> -// /// <param name="controller">The controller.</param> -// /// <param name="actionName">Name of the action.</param> -// /// <returns> -// /// <c>true</c> if the specified controller has the action; otherwise, <c>false</c>. -// /// </returns> -// bool HasControllerAction(RubyController controller, string actionName); - /// <summary> /// Gets the method names for the controller class. /// </summary> @@ -86,6 +60,68 @@ namespace System.Web.Mvc.IronRuby.Core object ExecuteScript(string script, ScriptScope scope); /// <summary> + /// Executes the file. + /// </summary> + /// <param name="path">The path.</param> + /// <param name="scope">The scope.</param> + /// <param name="throwIfNotExist">if set to <c>true</c> [throw if not exist].</param> + /// <returns></returns> + object ExecuteFile(string path, ScriptScope scope, bool throwIfNotExist); + + /// <summary> + /// Executes the file. + /// </summary> + /// <typeparam name="T"></typeparam> + /// <param name="path">The path.</param> + /// <param name="throwIfNotExist">if set to <c>true</c> [throw if not exist].</param> + /// <returns></returns> + T ExecuteFile<T>(string path, bool throwIfNotExist); + + + /// <summary> + /// Executes the file. + /// </summary> + /// <typeparam name="T"></typeparam> + /// <param name="path">The path.</param> + /// <returns></returns> + T ExecuteFile<T>(string path); + + /// <summary> + /// Executes the script. + /// </summary> + /// <typeparam name="T"></typeparam> + /// <param name="script">The script.</param> + /// <returns></returns> + T ExecuteScript<T>(string script); + + /// <summary> + /// Executes the script. + /// </summary> + /// <typeparam name="T"></typeparam> + /// <param name="script">The script.</param> + /// <param name="scope">The scope.</param> + /// <returns></returns> + T ExecuteScript<T>(string script, ScriptScope scope); + + /// <summary> + /// Executes the file. + /// </summary> + /// <typeparam name="T"></typeparam> + /// <param name="path">The path.</param> + /// <param name="scope">The scope.</param> + /// <param name="throwIfNotExist">if set to <c>true</c> [throw if not exist].</param> + /// <returns></returns> + T ExecuteFile<T>(string path, ScriptScope scope, bool throwIfNotExist); + + + /// <summary> + /// Executes the file. + /// </summary> + /// <param name="path">The path.</param> + /// <returns></returns> + object ExecuteFile(string path); + + /// <summary> /// Defines the read only global variable. /// </summary> /// <param name="variableName">Name of the variable.</param> IronRubyMvc/Core/IRubyEngine.cs @@ -26,8 +26,6 @@ namespace System.Web.Mvc.IronRuby.Core /// </summary> public class RubyEngine : IRubyEngine { - private readonly Func<string, StreamContentProvider> _contentProviderFactory; - /// <summary> /// Initializes a new instance of the <see cref="RubyEngine"/> class. /// </summary> @@ -37,15 +35,6 @@ namespace System.Web.Mvc.IronRuby.Core { Runtime = runtime; PathProvider = pathProvider; - _contentProviderFactory = path => new VirtualPathStreamContentProvider(path); - Initialize(); - } - - internal RubyEngine(ScriptRuntime runtime, IPathProvider pathProvider, Func<string, StreamContentProvider> contentProviderFactory) - { - Runtime = runtime; - PathProvider = pathProvider; - _contentProviderFactory = contentProviderFactory; Initialize(); } @@ -172,6 +161,51 @@ namespace System.Web.Mvc.IronRuby.Core return Engine.Execute(script, scope ?? CurrentScope); } + public object ExecuteFile(string path, ScriptScope scope, bool throwIfNotExist) + { + path.EnsureArgumentNotNull("path"); + scope.EnsureArgumentNotNull("scope"); + + if (throwIfNotExist && !PathProvider.FileExists(path)) throw new FileNotFoundException("Can't find the file", path); + + if(!PathProvider.FileExists(path)) return null; + + var source = Engine.CreateScriptSourceFromFile(path); + + return source.Execute(scope); + } + + public T ExecuteFile<T>(string path) + { + return (T) ExecuteFile(path); + } + + public T ExecuteFile<T>(string path, bool throwIfNotExist) + { + return (T)ExecuteFile(path, CurrentScope, throwIfNotExist); + } + + + public T ExecuteScript<T>(string script) + { + return (T) ExecuteScript(script); + } + + public T ExecuteScript<T>(string script, ScriptScope scope) + { + return (T) ExecuteScript(script, scope); + } + + public T ExecuteFile<T>(string path, ScriptScope scope, bool throwIfNotExist) + { + return (T) ExecuteFile(path, scope, throwIfNotExist); + } + + public object ExecuteFile(string path) + { + return Engine.ExecuteFile(path, CurrentScope); + } + /// <summary> /// Defines the read only global variable. /// </summary> @@ -231,7 +265,7 @@ namespace System.Web.Mvc.IronRuby.Core public void RequireRubyFile(string path, ReaderType readerType) { Engine.CreateScriptSource(readerType == ReaderType.File - ? _contentProviderFactory(path) + ? (StreamContentProvider)new VirtualPathStreamContentProvider(path) : new AssemblyStreamContentProvider(path, typeof (IRubyEngine).Assembly), null, Encoding.ASCII).Execute(); } @@ -262,7 +296,7 @@ namespace System.Web.Mvc.IronRuby.Core private void RequireControllerFile() { // RequireRubyFile(PathProvider.MapPath("~/Controllers/controller.rb")); - RequireRubyFile("System.Web.Mvc.IronRuby.Controllers.controller.rb", ReaderType.AssemblyResource); + Engine.CreateScriptSource(new AssemblyStreamContentProvider("System.Web.Mvc.IronRuby.Controllers.controller.rb", typeof(IRubyEngine).Assembly), null, Encoding.ASCII).Execute(CurrentScope); } /// <summary> @@ -275,7 +309,7 @@ namespace System.Web.Mvc.IronRuby.Core var filtersDir = Path.Combine(PathProvider.ApplicationPhysicalPath, Constants.Filters); var helpersDir = Path.Combine(PathProvider.ApplicationPhysicalPath, Constants.Helpers); - Context.Loader.SetLoadPaths(new[] {controllersDir, modelsDir, filtersDir, helpersDir}); + Context.Loader.SetLoadPaths(new[] {PathProvider.ApplicationPhysicalPath, controllersDir, modelsDir, filtersDir, helpersDir}); } @@ -286,40 +320,29 @@ namespace System.Web.Mvc.IronRuby.Core /// <param name="routesPath">The routes path.</param> public static RubyEngine InitializeIronRubyMvc(IPathProvider pathProvider, string routesPath) { - return InitializeIronRubyMvc(pathProvider, routesPath, path => new VirtualPathStreamContentProvider(path)); - } - - /// <summary> - /// Initializes the ironruby MVC. - /// </summary> - /// <param name="pathProvider">The path provider.</param> - /// <param name="routesPath">The routes path.</param> - /// <param name="contentProviderFactory">The content provider factory.</param> - /// <returns></returns> - public static RubyEngine InitializeIronRubyMvc(IPathProvider pathProvider, string routesPath, Func<string, StreamContentProvider> contentProviderFactory) - { - var engine = InitializeIronRuby(pathProvider, contentProviderFactory); + var engine = InitializeIronRuby(pathProvider); ProcessRubyRoutes(engine, pathProvider, routesPath); IntializeMvc(pathProvider, engine); return engine; } - private static void IntializeMvc(IPathProvider pathProvider, IRubyEngine engine) + private static void IntializeMvc(IPathProvider pathProvider, IRubyEngine engine) { var factory = new RubyControllerFactory(pathProvider, ControllerBuilder.Current.GetControllerFactory(), engine); ControllerBuilder.Current.SetControllerFactory(factory); ViewEngines.Engines.Add(new RubyViewEngine(engine)); } - private static RubyEngine InitializeIronRuby(IPathProvider vpp, Func<string, StreamContentProvider> contentProviderFactory) + private static RubyEngine InitializeIronRuby(IPathProvider vpp) { var rubySetup = Ruby.CreateRubySetup(); var runtimeSetup = new ScriptRuntimeSetup(); runtimeSetup.LanguageSetups.Add(rubySetup); runtimeSetup.DebugMode = true; +// runtimeSetup.HostType = typeof (MvcScriptHost); var runtime = Ruby.CreateRuntime(runtimeSetup); - return new RubyEngine(runtime, vpp, contentProviderFactory); + return new RubyEngine(runtime, vpp); } private static void ProcessRubyRoutes(IRubyEngine engine, IPathProvider vpp, string routesPath) IronRubyMvc/Core/RubyEngine.cs @@ -6,9 +6,21 @@ namespace System.Web.Mvc.IronRuby.Core { public class RubyMvcApplication : HttpApplication { + public IRubyEngine RubyEngine + { + get + { + return Application["___RubyEngine"] as IRubyEngine; + } + set + { + Application["___RubyEngine"] = value; + } + } protected void Application_Start(object sender, EventArgs e) { - RubyEngine.InitializeIronRubyMvc(new VirtualPathProvider(), "~/routes.rb"); + var pathProvider = new VirtualPathProvider(); + RubyEngine = Core.RubyEngine.InitializeIronRubyMvc(pathProvider, "~/routes.rb"); OnStart(); } IronRubyMvc/Core/RubyMvcApplication.cs @@ -4,34 +4,116 @@ namespace System.Web.Mvc.IronRuby.Core { public class RubyMvcModule : IHttpModule { + + private IRubyEngine _rubyEngine; + private MvcApplication _mvcApplication; + private HttpApplication _application; + #region Implementation of IHttpModule /// <summary> - /// nitializes a module and prepares it to handle requests. + /// initializes a module and prepares it to handle requests. /// </summary> /// <param name="context"> /// An <see cref="T:System.Web.HttpApplication" /> that provides access to the methods, properties, and events common to all application objects within an ASP.NET application /// </param> public void Init(HttpApplication context) { - context.Error += context_Error; + context.EnsureArgumentNotNull("context"); + + if (!InitializeRubyEngine(context)) return; + if (!InitializeRubyApplication(context)) return; + InitializeRubyApplicationHooks(context); + + _application = context; + } + + private void InitializeRubyApplicationHooks(HttpApplication context) + { + if (_mvcApplication.IsNull()) return; + + context.Error += (sender, args) => _mvcApplication.Error(sender, args); + context.AcquireRequestState += (sender, args) => _mvcApplication.AcquireRequestState(sender, args); + context.AuthenticateRequest += (sender, args) => _mvcApplication.AuthenticateRequest(sender, args); + context.AuthorizeRequest += (sender, args) => _mvcApplication.AuthorizeRequest(sender, args); + context.BeginRequest += (sender, args) => _mvcApplication.BeginRequest(sender, args); + context.Disposed += (sender, args) => _mvcApplication.Disposed(sender, args); + context.EndRequest += (sender, args) => _mvcApplication.EndRequest(sender, args); + context.LogRequest += (sender, args) => _mvcApplication.LogRequest(sender, args); + context.PostAcquireRequestState += (sender, args) => _mvcApplication.PostAcquireRequestState(sender, args); + context.MapRequestHandler += (sender, args) => _mvcApplication.MapRequestHandler(sender, args); + context.PostAuthenticateRequest += (sender, args) => _mvcApplication.PostAuthenticateRequest(sender, args); + context.PostAuthorizeRequest += (sender, args) => _mvcApplication.PostAuthorizeRequest(sender, args); + context.PostLogRequest += (sender, args) => _mvcApplication.PostLogRequest(sender, args); + context.PostMapRequestHandler += (sender, args) => _mvcApplication.PostMapRequestHandler(sender, args); + context.PostReleaseRequestState += (sender, args) => _mvcApplication.PostReleaseRequestState(sender, args); + context.PostRequestHandlerExecute += (sender, args) => _mvcApplication.PostRequestHandlerExecute(sender, args); + context.PostResolveRequestCache += (sender, args) => _mvcApplication.PostResolveRequestCache(sender, args); + context.PostUpdateRequestCache += (sender, args) => _mvcApplication.PostUpdateRequestCache(sender, args); + context.PreRequestHandlerExecute += (sender, args) => _mvcApplication.PreRequestHandlerExecute(sender, args); + context.PreSendRequestContent += (sender, args) => _mvcApplication.PreSendRequestContent(sender, args); + context.PreSendRequestHeaders += (sender, args) => _mvcApplication.PreSendRequestHeaders(sender, args); + context.ReleaseRequestState += (sender, args) => _mvcApplication.ReleaseRequestState(sender, args); + context.ResolveRequestCache += (sender, args) => _mvcApplication.ResolveRequestCache(sender, args); + context.UpdateRequestCache += (sender, args) => _mvcApplication.UpdateRequestCache(sender, args); + } - void context_Error(object sender, EventArgs e) + private bool InitializeRubyApplication(HttpApplication context) { - var application = sender as RubyMvcApplication; - if(sender.IsNotNull()) - { - application.Context.Error - } + if (_mvcApplication.IsNotNull()) return false; + + _mvcApplication = _rubyEngine.ExecuteFile<MvcApplication>("~/mvc_application.rb", false); + if(_mvcApplication.IsNotNull()) _mvcApplication.Start(context, EventArgs.Empty); + return true; } + private bool InitializeRubyEngine(HttpApplication context) + { + var rubyMvcApp = context as RubyMvcApplication; + if(rubyMvcApp.IsNull()) return false; + + if(rubyMvcApp.RubyEngine.IsNull()) + rubyMvcApp.RubyEngine = RubyEngine.InitializeIronRubyMvc(new VirtualPathProvider(), "~/routes.rb"); + + if (_rubyEngine.IsNull()) + _rubyEngine = rubyMvcApp.RubyEngine; + + return true; + } + + /// <summary> - /// Disposes of the resources (other than memory) used by the module that implements <see cref="T:System.Web.IHttpModule" />. + /// Disposes of the resources (other than memory) used by the module that implements <see cref="T:System.Web.IHttpModule" />. /// </summary> public void Dispose() { - throw new System.NotImplementedException(); + if (_application.IsNull()) return; + + _application.Error -= (sender, args) => _mvcApplication.Error(sender, args); + _application.AcquireRequestState -= (sender, args) => _mvcApplication.AcquireRequestState(sender, args); + _application.AuthenticateRequest -= (sender, args) => _mvcApplication.AuthenticateRequest(sender, args); + _application.AuthorizeRequest -= (sender, args) => _mvcApplication.AuthorizeRequest(sender, args); + _application.BeginRequest -= (sender, args) => _mvcApplication.BeginRequest(sender, args); + _application.Disposed -= (sender, args) => _mvcApplication.Disposed(sender, args); + _application.EndRequest -= (sender, args) => _mvcApplication.EndRequest(sender, args); + _application.LogRequest -= (sender, args) => _mvcApplication.LogRequest(sender, args); + _application.PostAcquireRequestState -= (sender, args) => _mvcApplication.PostAcquireRequestState(sender, args); + _application.MapRequestHandler -= (sender, args) => _mvcApplication.MapRequestHandler(sender, args); + _application.PostAuthenticateRequest -= (sender, args) => _mvcApplication.PostAuthenticateRequest(sender, args); + _application.PostAuthorizeRequest -= (sender, args) => _mvcApplication.PostAuthorizeRequest(sender, args); + _application.PostLogRequest -= (sender, args) => _mvcApplication.PostLogRequest(sender, args); + _application.PostMapRequestHandler -= (sender, args) => _mvcApplication.PostMapRequestHandler(sender, args); + _application.PostReleaseRequestState -= (sender, args) => _mvcApplication.PostReleaseRequestState(sender, args); + _application.PostRequestHandlerExecute -= (sender, args) => _mvcApplication.PostRequestHandlerExecute(sender, args); + _application.PostResolveRequestCache -= (sender, args) => _mvcApplication.PostResolveRequestCache(sender, args); + _application.PostUpdateRequestCache -= (sender, args) => _mvcApplication.PostUpdateRequestCache(sender, args); + _application.PreRequestHandlerExecute -= (sender, args) => _mvcApplication.PreRequestHandlerExecute(sender, args); + _application.PreSendRequestContent -= (sender, args) => _mvcApplication.PreSendRequestContent(sender, args); + _application.PreSendRequestHeaders -= (sender, args) => _mvcApplication.PreSendRequestHeaders(sender, args); + _application.ReleaseRequestState -= (sender, args) => _mvcApplication.ReleaseRequestState(sender, args); + _application.ResolveRequestCache -= (sender, args) => _mvcApplication.ResolveRequestCache(sender, args); + _application.UpdateRequestCache -= (sender, args) => _mvcApplication.UpdateRequestCache(sender, args); } #endregion IronRubyMvc/Core/RubyMvcModule.cs @@ -14,9 +14,25 @@ namespace System.Web.Mvc.IronRuby.Core public bool FileExists(string filePath) { + return HostingEnvironment.VirtualPathProvider.FileExists(filePath); } + public bool DirectoryExists(string dirPath) + { + return HostingEnvironment.VirtualPathProvider.DirectoryExists(dirPath); + } + + public string[] GetDirectories(string path, string searchPattern) + { + return Directory.GetDirectories(HostingEnvironment.MapPath(path) ?? ApplicationPhysicalPath, searchPattern); + } + + public string[] GetFiles(string path, string searchPattern) + { + return Directory.GetFiles(HostingEnvironment.MapPath(path) ?? ApplicationPhysicalPath, searchPattern); + } + public Stream Open(string filePath) { var file = HostingEnvironment.VirtualPathProvider.GetFile(filePath); @@ -28,6 +44,26 @@ namespace System.Web.Mvc.IronRuby.Core return HostingEnvironment.MapPath(filePath); } + public bool IsAbsolutePath(string path) + { + return new Uri(GetFullPath(path), UriKind.RelativeOrAbsolute).IsAbsoluteUri; + } + + public string GetFullPath(string path) + { + return path.Replace(Path.DirectorySeparatorChar, '/'); + } + + public Stream Open(string path, FileMode mode, FileAccess access, FileShare share) + { + return new FileStream(MapPath(path), mode, access, share); + } + + public Stream Open(string path, FileMode mode, FileAccess access, FileShare share, int size) + { + return new FileStream(MapPath(path), mode, access, share, size); + } + public string ApplicationPhysicalPath { get { return HostingEnvironment.ApplicationPhysicalPath; } IronRubyMvc/Core/VirtualPathProvider.cs @@ -1,11 +1,13 @@ -#region Usings +extern alias clr3; + +#region Usings using System.Collections; using System.Collections.Generic; using System.Web.Routing; using IronRuby.Builtins; using Microsoft.Scripting; - +using clr3::System.Linq; #endregion namespace System.Web.Mvc.IronRuby.Extensions @@ -67,7 +69,10 @@ namespace System.Web.Mvc.IronRuby.Extensions var filters = new List<TITarget>(); var key = SymbolTable.StringToId(actionName); var hasKey = filterDescriptions.ContainsKey(key); - if (hasKey) filters.AddRange((filterDescriptions[key] as RubyArray).Cast<TITarget>()); + if (hasKey) + { + filters.AddRange((filterDescriptions[key] as RubyArray).Cast<TITarget>()); + } return filters; } IronRubyMvc/Extensions/IDictionaryExtensions.cs @@ -30,6 +30,7 @@ namespace System.Web.Mvc.IronRuby.Extensions [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "o")] public static bool IsEmpty<T>(this IEnumerable<T> collection) { + // not guarding for null foreach does that for me foreach (var o in collection) { return false; @@ -40,6 +41,7 @@ namespace System.Web.Mvc.IronRuby.Extensions [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "o")] public static bool IsEmpty(this IEnumerable collection) { + // not guarding for null, foreach does that for me foreach (var o in collection) { return false; @@ -47,34 +49,7 @@ namespace System.Web.Mvc.IronRuby.Extensions return true; } - public static bool Contains<T>(this IEnumerable<T> collection, T value) - { - foreach (var t in collection) - { - if ((t.IsNull() && value.IsNull()) || (t.IsNotNull() && t.Equals(value))) return true; - } - return false; - } - - public static bool DoesNotContain<T>(this IEnumerable<T> collection, T value) - { - foreach (var t in collection) - { - if (t.Equals(value)) return false; - } - return true; - } - - public static bool DoesNotContain(this IEnumerable collection, object value) - { - foreach (var t in collection) - { - if (t.Equals(value)) return false; - } - return true; - } - - public static bool DoesNotContain<TSource>(this IEnumerable<TSource> collection, Func<TSource, bool> predicate) + internal static bool DoesNotContain<TSource>(this IEnumerable<TSource> collection, Func<TSource, bool> predicate) { foreach (var o in collection) { @@ -83,88 +58,6 @@ namespace System.Web.Mvc.IronRuby.Extensions return true; } - public static bool Contains(this IEnumerable collection, Predicate<object> predicate) - { - foreach (var o in collection) - { - if (predicate(o)) return true; - } - return false; - } - - public static bool Contains(this IEnumerable collection, object value) - { - foreach (var t in collection) - { - if (t.Equals(value)) return true; - } - return false; - } - - public static IEnumerable<TSource> Where<TSource>(this IEnumerable<TSource> collection, Predicate<TSource> predicate) - { - foreach (var source in collection) - { - if (predicate(source)) yield return source; - } - } - - public static TSource FirstOrDefault<TSource>(this IEnumerable<TSource> collection, Predicate<TSource> predicate) - { - foreach (var source in collection) - { - if (predicate(source)) return source; - } - return default(TSource); - } - - public static TSource FirstOrDefault<TSource>(this IEnumerable<TSource> collection) - { - foreach (var source in collection) - { - return source; - } - return default(TSource); - } - - public static bool All<TSource>(this IEnumerable<TSource> collection, Predicate<TSource> predicate) - { - foreach (var source in collection) - { - if (!predicate(source)) return false; - } - return true; - } - - public static bool Any<TSource>(this IEnumerable<TSource> collection, Predicate<TSource> predicate) - { - foreach (var source in collection) - { - if (predicate(source)) return true; - } - return false; - } - - public static IEnumerable Where(this IEnumerable collection, Predicate<object> predicate) - { - foreach (var source in collection) - { - if (predicate(source)) yield return source; - } - } - - - internal static IEnumerable<TTarget> Cast<TTarget>(this IEnumerable collection) where TTarget : class - { - var result = new List<TTarget>(); - collection.ForEach(item => - { - var casted = (typeof (TTarget) == typeof (string)) ? item.ToString() as TTarget : item as TTarget; - if (casted.IsNotNull()) result.Add(casted); - }); - return result; - } - internal static IEnumerable<TTarget> Map<TSource, TTarget>(this IEnumerable<TSource> collection, Func<TSource, TTarget> iterator) { foreach (var source in collection) @@ -181,36 +74,6 @@ namespace System.Web.Mvc.IronRuby.Extensions } } - internal static int Count(this IEnumerable collection) - { - var count = 0; - foreach (var o in collection) - { - count++; - } - return count; - } - - internal static int Count<TSource>(this IEnumerable<TSource> collection, Predicate<TSource> predicate) - { - var count = 0; - foreach (var o in collection) - { - if (predicate(o)) count++; - } - return count; - } - - internal static TSource[] ToArray<TSource>(this IEnumerable<TSource> collection) - { - var result = new TSource[collection.Count()]; - var idx = 0; - - collection.ForEach(item => result[idx++] = item); - - return result; - } - internal static IEnumerable<SelectListItem> ToSelectListItemList(this IEnumerable collection) { var result = new List<SelectListItem>(); IronRubyMvc/Extensions/IEnumerableExtensions.cs @@ -1,8 +1,10 @@ +extern alias clr3; #region Usings using System.Collections.Generic; using IronRuby.Builtins; - +using Microsoft.Scripting.Runtime; +using clr3::System.Linq; #endregion namespace System.Web.Mvc.IronRuby.Extensions @@ -41,11 +43,16 @@ namespace System.Web.Mvc.IronRuby.Extensions /// </summary> /// <param name="value">The value.</param> /// <param name="argumentName">Name of the argument.</param> - public static void EnsureArgumentNotNull(this object value, string argumentName) + internal static void EnsureArgumentNotNull(this object value, string argumentName) { if (value.IsNull()) throw new ArgumentNullException(argumentName, "Cannot be null"); } + /// <summary> + /// Converts the object to a string collection. + /// </summary> + /// <param name="value">The value.</param> + /// <returns></returns> internal static IEnumerable<string> ToStringCollection(this object value) { var array = (RubyArray) value; IronRubyMvc/Extensions/ObjectExtensions.cs @@ -52,7 +52,7 @@ namespace System.Web.Mvc.IronRuby.Extensions /// </summary> /// <param name="value">The value.</param> /// <returns></returns> - public static SymbolId ToSymbolId(this string value) + internal static SymbolId ToSymbolId(this string value) { return ToSymbolId(value, true); } @@ -63,7 +63,7 @@ namespace System.Web.Mvc.IronRuby.Extensions /// <param name="value">The value.</param> /// <param name="caseSensitive">if set to <c>true</c> the <see cref="SymbolId"/> will be case-sensitive.</param> /// <returns></returns> - public static SymbolId ToSymbolId(this string value, bool caseSensitive) + internal static SymbolId ToSymbolId(this string value, bool caseSensitive) { return caseSensitive ? SymbolTable.StringToId(value) : SymbolTable.StringToCaseInsensitiveId(value); } @@ -73,7 +73,7 @@ namespace System.Web.Mvc.IronRuby.Extensions /// </summary> /// <param name="value">The value.</param> /// <param name="argumentName">Name of the argument.</param> - public static void EnsureArgumentNotEmpty(this string value, string argumentName) + internal static void EnsureArgumentNotEmpty(this string value, string argumentName) { if (value.IsNullOrBlank()) throw new ArgumentNullException(argumentName, "Cannot be null"); } IronRubyMvc/Extensions/StringExtensions.cs @@ -1,10 +1,13 @@ -using System.Collections.Generic; +#region Usings + using System.Web.Mvc.Ajax; using System.Web.Mvc.Html; using System.Web.Mvc.IronRuby.Extensions; using System.Web.Routing; using IronRuby.Builtins; +#endregion + namespace System.Web.Mvc.IronRuby.Helpers { public class RubyAjaxHelper : AjaxHelper @@ -51,7 +54,8 @@ namespace System.Web.Mvc.IronRuby.Helpers return _helper.ActionLink(linkText, actionName, controllerName, routeValues.ToRouteDictionary(), ajaxOptions, htmlAttributes.ToDictionary()); } - public string ActionLink(string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, Hash routeValues, AjaxOptions ajaxOptions, Hash htmlAttributes) + public string ActionLink(string linkText, string actionName, string controllerName, string protocol, string hostName, string fragment, Hash routeValues, AjaxOptions ajaxOptions, + Hash htmlAttributes) { return _helper.ActionLink(linkText, actionName, controllerName, protocol, hostName, fragment, routeValues.ToRouteDictionary(), ajaxOptions, htmlAttributes.ToDictionary()); } @@ -136,7 +140,5 @@ namespace System.Web.Mvc.IronRuby.Helpers { return _helper.RouteLink(linkText, routeName, routeValues.ToRouteDictionary(), ajaxOptions, htmlAttributes.ToDictionary()); } - - } } \ No newline at end of file IronRubyMvc/Helpers/RubyAjaxHelper.cs @@ -77,6 +77,10 @@ </Reference> <Reference Include="System" /> <Reference Include="System.configuration" /> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + <Aliases>clr3</Aliases> + </Reference> <Reference Include="System.Web" /> <Reference Include="System.Data" /> <Reference Include="System.Web.Abstractions"> @@ -103,7 +107,15 @@ <Compile Include="Controllers\RubyResultFilter.cs" /> <Compile Include="Core\Constants.cs" /> <Compile Include="Core\Enums.cs" /> - <Compile Include="Core\RubyMvcApplication.cs" /> + <Compile Include="Core\MvcApplication.cs" /> + <Compile Include="Core\MvcScriptHost.cs" /> + <Compile Include="Core\PathProviderPAL.cs" /> + <Compile Include="Core\RubyMvcApplication.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="Core\RubyMvcModule.cs"> + <SubType>Code</SubType> + </Compile> <Compile Include="Core\RubyRoutes.cs" /> <Compile Include="Controllers\RubyActionDescriptor.cs" /> <Compile Include="Controllers\RubyController.cs" /> @@ -111,6 +123,7 @@ <Compile Include="Controllers\RubyControllerDescriptor.cs" /> <Compile Include="Controllers\RubyControllerFactory.cs" /> <Compile Include="Core\RubyEngine.cs" /> + <Compile Include="Core\TypeConverter.cs" /> <Compile Include="Core\VirtualPathProvider.cs" /> <Compile Include="Core\VirtualPathStreamContentProvider.cs" /> <Compile Include="Extensions\FilterInfoExtensions.cs" /> IronRubyMvc/System.Web.Mvc.IronRuby.csproj @@ -1,3 +1,3 @@ <%@ Page Language="C#" %> <% - Response.Redirect("~/Home");%> \ No newline at end of file +Response.Redirect("~/Home");%> \ No newline at end of file IronRubyMvcWeb/Default.aspx @@ -80,6 +80,7 @@ <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/> </httpHandlers> <httpModules> +<!-- <add name="RubyMvcModule" type="System.Web.Mvc.IronRuby.Core.RubyMvcModule, System.Web.Mvc.IronRuby"/>--> <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> </httpModules> @@ -109,6 +110,7 @@ <modules runAllManagedModulesForAllRequests="true"> <remove name="ScriptModule"/> <remove name="UrlRoutingModule"/> +<!-- <add name="RubyMvcModule" type="System.Web.Mvc.IronRuby.Core.RubyMvcModule, System.Web.Mvc.IronRuby"/>--> <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> </modules> IronRubyMvcWeb/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.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 dependencies/xUnit.BDDExtensions.dll dependencies/xUnit.BDDExtensions.pdb dependencies/xunit.dll @@ -1486,14 +1486,7 @@ <summary> Creates a new instance of the <see cref="T:Xunit.Sdk.AssemblyResult"/> class. </summary> - <param name="assemblyFilename">The filename of the assembly</param> - </member> - <member name="M:Xunit.Sdk.AssemblyResult.#ctor(System.String,System.String)"> - <summary> - Creates a new instance of the <see cref="T:Xunit.Sdk.AssemblyResult"/> class. - </summary> - <param name="assemblyFilename">The filename of the assembly</param> - <param name="configFilename">The configuration filename</param> + <param name="filename">The filename of the assembly</param> </member> <member name="M:Xunit.Sdk.AssemblyResult.ToXml(System.Xml.XmlNode)"> <summary> @@ -1502,11 +1495,6 @@ <param name="parentNode">The parent node.</param> <returns>The newly created XML node.</returns> </member> - <member name="P:Xunit.Sdk.AssemblyResult.ConfigFilename"> - <summary> - Gets the fully qualified filename of the configuration file. - </summary> - </member> <member name="P:Xunit.Sdk.AssemblyResult.Directory"> <summary> Gets the directory where the assembly resides. dependencies/xunit.xml c2ab2f4c4008de66783fae617bf835b54046125e Ivan Porto Carrero ivan@flanders.co.nz http://github.com/jschementi/ironrubymvc/commit/39143f05182d7eebdeeb5c8c22532c5663ad3ece 39143f05182d7eebdeeb5c8c22532c5663ad3ece 2009-05-01T11:34:15-07:00 2009-05-01T11:34:15-07:00 Started writing bacon specs before going any further e8d549e728442fecadb5a65b1d5af4800e200fdf Ivan Porto Carrero ivan@flanders.co.nz