Several fixes during testing.

in FileSystem.FilePath don't prepend the current working directory if it's a root path. In Template, set the __KEY__ context var when iterating an array. Add additional accessors for Template.Context. Some fixes to Iterable.Shuffle
Whiteknight · Dec 30, 2011 · 5af6a1d · 5af6a1d
1 parent 058c486
commit 5af6a1d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/src/filesystem/FilePath.winxed b/src/filesystem/FilePath.winxed
@@ -24,7 +24,7 @@ class Rosella.FileSystem.FilePath
         self.details["shortname"] = entryname;
         self.details["pathseparator"] = pathsep;
         self.details["basepath_parts"] = pathparts;
-        self.details["basepath"] = join(pathsep, pathparts);
+        self.details["basepath"] = join(pathsep, pathparts) + pathsep;
     }
 
     // The file extension, without "."
@@ -37,8 +37,12 @@ class Rosella.FileSystem.FilePath
     // starting at the file system root.
     function full_base_path()
     {
+        // TODO: Fix for windows
+        string base_path = string(self.details["basepath"]);
+        if (substr(base_path, 0, 1) == "/")
+            return base_path;
         var cwd = Rosella.FileSystem.Directory.current_directory();
-        return string(cwd) + string(self.details["basepath"]);
+        return string(cwd) + base_path;
     }
 
     // The base path of the file starting from the current working

diff --git a/src/query/iterable/Iterators.winxed b/src/query/iterable/Iterators.winxed
@@ -447,6 +447,7 @@ class Rosella.Query.Iterable.Sort : Rosella.Query.Iterable
         if (self.sorted == null) {
             int is_sorted = int(self.is_sorted);
             var d = self.source.to_array();
+            var f = self.func;
             Rosella.Query.sort_array(d, 0, elements(d), f, is_sorted:[named("is_sorted")]);
             self.sorted = new Rosella.Query.Iterable.Array(d);
         }
@@ -481,14 +482,13 @@ class Rosella.Query.Iterable.Shuffle : Rosella.Query.Iterable
 
     function next()
     {
-        if (self.shuffled != null) {
-            if (self.shuffled.has_more())
-                return self.shuffled.next();
-            self.__empty();
+        if (self.shuffled == null) {
+            var d = self.source.to_array();
+            Rosella.Random.shuffle_array(d);
+            self.shuffled = new Rosella.Query.Iterable.Array(d);
         }
-        var d = self.to_array();
-        Rosella.Random.shuffle_array(d);
-        self.shuffled = new Rosella.Query.Iterable.Array(d);
+        if (!self.shuffled.has_more())
+            self.__empty();
         return self.shuffled.next();
     }
 

diff --git a/src/template/Context.winxed b/src/template/Context.winxed
@@ -46,5 +46,20 @@ namespace Rosella { namespace Template
         {
             return self.get_value(key);
         }
+
+        function get_integer_keyed[vtable](var key)
+        {
+            return int(self.get_value(key));
+        }
+
+        function get_string_keyed[vtable](var key)
+        {
+            return string(self.get_value(key));
+        }
+
+        function get_number_keyed[vtable](var key)
+        {
+            return float(self.get_value(key));
+        }
     }
 }}
diff --git a/src/template/handler/For.winxed b/src/template/handler/For.winxed
@@ -6,7 +6,7 @@ namespace Rosella { namespace Template { namespace Handler
     */
     class For : Rosella.Template.Handler.Children
     {
-        const string HASH_KEY_VARNAME = "__KEY__";
+        const string KEY_VARNAME = "__KEY__";
         const string FIRST_VARNAME = "__FIRST__";
         const string LAST_VARNAME = "__LAST__";
         var varname;
@@ -41,7 +41,7 @@ namespace Rosella { namespace Template { namespace Handler
                     else
                         self.__render_scalar(engine, ctx, sb, values);
                 }
-            }, ctx, HASH_KEY_VARNAME, FIRST_VARNAME, LAST_VARNAME);
+            }, ctx, KEY_VARNAME, FIRST_VARNAME, LAST_VARNAME);
         }
 
         /* Internal Helper Routines
@@ -57,7 +57,7 @@ namespace Rosella { namespace Template { namespace Handler
             for (string key in values) {
                 var value = values[key];
                 ctx.set_temporary(self.varname, value);
-                ctx.set_temporary(HASH_KEY_VARNAME, key);
+                ctx.set_temporary(KEY_VARNAME, key);
                 ctx.set_temporary(FIRST_VARNAME, is_first);
                 ctx.set_temporary(LAST_VARNAME, is_last);
                 self.__render_children(engine, ctx, sb);
@@ -73,15 +73,17 @@ namespace Rosella { namespace Template { namespace Handler
             int is_first = 1;
             int num_items = elements(values);
             int is_last = num_items == 1;
-            ctx.set_temporary(HASH_KEY_VARNAME, "");
+            int idx = 0;
             for (var value in values) {
                 ctx.set_temporary(self.varname, value);
+                ctx.set_temporary(KEY_VARNAME, idx);
                 ctx.set_temporary(FIRST_VARNAME, is_first);
                 ctx.set_temporary(LAST_VARNAME, is_last);
                 self.__render_children(engine, ctx, sb);
                 num_items--;
                 is_last = num_items == 1;
                 is_first = 0;
+                idx++;
             }
         }