Changeset 766

Timestamp:

17/11/08 15:50:15 (2 months ago)

Author:

mpo

Message:

Fix for #121. Allowing uri-templates to hold sub-property expressions on the context.
Plus some extra tests for this feature.

Files:

• trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/js/uritemplate.js (modified) (3 diffs)
• trunk/modules/kauri-forms/kauri-forms-framework/src/test/js/test-uritemplate.js (modified) (2 diffs)

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/js/uritemplate.js

@@ -37 +37 @@
- * - listjoin operator was renamed to list (0.3) 
- * - making %HH codes uppercase (per recommendation of URI rfc) - converting number-values automatically
+ * - allowing sub-references on context-objects through $.getProperty()
- * 
- * Added feature
@@ -54 +55 @@
-    var kp = $.org.kauriproject;
-
+    
+    var EXPR_REGEXP = /[.[]/; // tests if this is an expression to evaluate
+    var SUBPROP_REGEXP = /^(\w+)([.[].*)$/;  // matches [1] for the propname and [2] for the remainder
+    var INDEXPROP_REGEXP = /^\[("([^"]+)"|'([^']+)'|(\d*))\](.*)$/; // produces [2] or [3] for propnames or [4] for index number + \5 for remainder
+    
+    /**
+     * Gets a property as noted in a js expression (including array and property references) from a context object.
+     * <p>Supported sub-property notations include:
+     * <ul> <li>x.y</li>
+     *      <li>x["y"] or x['y']</li>
+     *      <li>x[1]></li>
+     * 
+     * @param {context} 
+     *      object to read property from
+     * @param {expr}
+     *      expression to be evaluated versus the context 
+     */
+    $.getProperty = function (context, expr) {
+        if ($.isEmpty(expr) || context == undefined) return context;
+        
+        // fast turn around for the simplest case.
+        if (Object.hasOwnProperty.call(context,expr)) return context[expr];
+        // no need to further evaluate if there is no expression inside:
+        if (!EXPR_REGEXP.test(expr))
+            return undefined;
+        
+        
+        /* unsafe eval implementation 
+         * disadvantages: 
+         *   1/ inherited context through with() 
+         *   2/ eval could execute unwanted things
+         *   3/ method call-arguments should not be expressed             
+        var result = undefined;
+        with (context) {
+            try {
+                result = eval(expr);
+            } catch (e) {
+            }
+        }
+        return result;
+        */
+        
+        var subexpr, remainder;
+
+        // switch between two options: starts with '[' or not
+        if (expr.charAt(0) == '[') {  // expression starts with ["abc"] ['xyz'] or [123]
+            var match = INDEXPROP_REGEXP.exec(expr);
+            if (match) {
+                subexpr = match[2] || match[3] || match[4];
+                remainder = match[5];
+            }
+            else {
+                throw "incorrect index-property syntax in expression= " + expr;
+            }
+        } else { // expression starts with normal character
+            var match = SUBPROP_REGEXP.exec(expr);
+            if (match) {
+                subexpr = match[1];
+                remainder = match[2];
+            }
+            else {
+                throw "incorrect sub-property syntax in expression= " + expr;
+            }            
+        }
+        var subcontext = $.getProperty(context, subexpr);
+        if (remainder.charAt(0) == '.')
+            remainder = remainder.substring(1);
+        return $.getProperty(subcontext, remainder);
+    }
+    
+    
-    function Template() {
-
@@ -190 +262 @@
-        var name = variable[0];
-        var def = variable[1];
-context[name]
+$.getProperty(context, name)
-        if (value instanceof Function) {
-            value = value();

trunk/modules/kauri-forms/kauri-forms-framework/src/test/js/test-uritemplate.js

@@ -1 +1 @@
-module('Template URI Testing');
+
+
+test("getProperty tests", function() {
+
+    expect(15);
+    
+    var context = {
+        "obj" : {
+            "str": "ok",
+            "int": "1",
+            "arr": [2, "way", {"str":"do", "int": 3}]
+        },
+        "arr" : [4, "wake", {"str":"!", "int": 5}, ["sleep", 6]],
+        "str" : "hello",
+        "int" : 7,
+        "quad.func": function(){return 4;}
+    };
+
+    checkProperty(context, "int", 7 );
+    checkProperty(context, "str", "hello");
+    checkProperty(context, "arr[0]", 4);
+    checkProperty(context, "arr[1]", "wake");
+    checkProperty(context, "arr[2].str", "!");
+    checkProperty(context, 'arr[2]["int"]', 5);
+    checkProperty(context, "arr[3][0]", "sleep");
+    checkProperty(context, "arr[3][1]", 6);
+    checkProperty(context, "obj.int", 1);
+    checkProperty(context, "obj.str", "ok");
+    checkProperty(context, "obj.arr[0]", 2);
+    checkProperty(context, "obj.arr[1]", "way");
+    checkProperty(context, "obj.arr[2].str", "do");
+    checkProperty(context, "obj.arr[2]['int']", 3);    
+    checkProperty(context, "quad.func", context['quad.func']);   
+    //checkProperty(context, "alert('me')", 4);       
+});
+
+function checkProperty(context, expr, expected) {
+    equals($.getProperty(context, expr), expected, "getProperty for [" + expr + "]"); 
+}
+
-
-/*
@@ -13 +53 @@
-
-    var testdata = {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-