Makes call to require so it can be patched

iwache · Oct 14, 2009 · bc80a30 · bc80a30
1 parent 65d978f
commit bc80a30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/IronRubyMvc/Controllers/RubyControllerFactory.cs b/IronRubyMvc/Controllers/RubyControllerFactory.cs
@@ -67,7 +67,7 @@ private RubyController LoadController(RequestContext requestContext, string cont
             if (controllerFilePath.IsNullOrBlank())
                 return null;
 
-            _engine.RequireRubyFile(controllerFilePath, ReaderType.File);
+            _engine.RequireRubyFile(controllerFilePath);
 
             var controllerClass = _engine.GetRubyClass(controllerClassName);
             var controller = ConfigureController(controllerClass, requestContext);

diff --git a/IronRubyMvc/Core/RubyEngine.cs b/IronRubyMvc/Core/RubyEngine.cs
@@ -236,8 +236,9 @@ public void ExecuteFile(string path, bool throwIfNotExist)
                 throw new FileNotFoundException("Can't find the file", path);
 
             if (!PathProvider.FileExists(path)) return;
-
-            HandleError(() => Engine.ExecuteFile(PathProvider.MapPath(path), CurrentScope));
+
+            HandleError(() => Engine.ExecuteFile(PathProvider.MapPath(path), CurrentScope));
+            //HandleError(() => Engine.CreateOperations(CurrentScope).InvokeMember(null, "require", path));
         }
 
 
@@ -289,7 +290,8 @@ public void LoadAssemblies(params Type[] assemblies)
         /// <param name="path">The path.</param>
         public void RequireRubyFile(string path)
         {
-            Engine.RequireRubyFile(path);
+            //Engine.RequireRubyFile(path);
+            ExecuteScript("require '" + path.Replace("\\","/").Replace("~", string.Empty) + "'", CurrentScope);
         }
 
         /// <summary>