RubyGems - envjs - Versions diffs - 0.3.7 → 0.3.8 - Mend

envjs 0.3.7 → 0.3.8

Files changed (19) hide show

@@ -82,10 +82,12 @@ get cookie(c){
 	//case we must check our current location.protocol to make sure it's
 	//https:
 	var allcookies = [], i;
-	return cookieString($cookies.temporary) + cookieString($cookies.persistent);
+        return cookieString.call(this, $cookies.temporary) +
+                cookieString.call(this, $cookies.persistent);
 }});
 var cookieString = function(cookies) {
+    var $w = this._parentWindow;
     var cookieString = "";
     for (var i in cookies) {
         // check if the cookie is in the current domain (if domain is set)

data/src/html/element.js CHANGED

@@ -109,6 +109,7 @@ __extend__(HTMLElement.prototype, {
 		},
 		offsetLeft: 0,
 		offsetRight: 0,
+		offsetTop: 0,
 		get offsetParent(){
 		    /* TODO */
 		    return;
@@ -117,6 +118,7 @@ __extend__(HTMLElement.prototype, {
 		    /* TODO */
 		    return;
 	    },
+		scrollTop: 0,
 		scrollHeight: 0,
 		scrollWidth: 0,
 		scrollLeft: 0,

data/src/html/form.js CHANGED

@@ -456,7 +456,7 @@ var __param__= function( array, boundary ) {
                 array[i].value.push(content);
                 array[i].value = array[i].value.join("\r\n");
             }
-            serialized.push('Content-Disposition: form-data; name="'+array[i].name+'"'+fn+'\r\n');
+            serialized.push('Content-Disposition: form-data; name="'+array[i].name+'"'+fn+'\r\n\r\n');
             serialized.push(array[i].value);
             serialized.push( "\r\n" );
         }

data/src/platform/johnson.js CHANGED

@@ -1,5 +1,5 @@
 $env.log = function(msg, level){
-    debug(' '+ (level?level:'LOG') + ':\t['+ new Date()+"] {ENVJS} "+msg);
+    print(' '+ (level?level:'LOG') + ':\t['+ new Date()+"] {ENVJS} "+msg);
 };
 $env.location = function(path, base){

data/src/window/event.js CHANGED

@@ -34,6 +34,9 @@ function __removeEventListener__(target, type, fn){
     target.uuid = $events.length;
     $events[target.uuid] = {};
   }
+  if (!$events[target.uiid]) {
+      return;
+  }
   if ( !$events[target.uuid][type] ){
 		$events[target.uuid][type] = [];
 	}
@@ -98,7 +101,8 @@ function __dispatchEvent__(target, event, bubbles){
                 var skip = false;
                 if (url[0] === "#") {
-                    // print("return anchor only");
+                    window.location.hash = url;
+                    // print("return anchor only: "+window.location);
                     skip = true;
                 }

data/src/window/location.js CHANGED

@@ -10,11 +10,12 @@ $env.__url = function(url){
 };
 $w.__defineSetter__("location", function(url){
-  if (false) {
-    if (url[0] === "#") {
-      // print("return anchor only");
+  if (url[0] === "#") {
+      window.location.hash = url;
+      // print("return anchor only: "+window.location.href);
       return;
-    }
+  }
+  if (false) {
     var now = window.location.href.replace(/^file:\/\//,"").replace(/#.*/,"");
     var to = $master.first_script_window && $master.first_script_window.location.href;
     // var to = $env.location(url,window.location.href != "about:blank" ? window.location.href: undefined);

data/src/window/xhr.js CHANGED

@@ -41,12 +41,20 @@ XMLHttpRequest.prototype = {
                           }else{
                                 try {
                                     $debug("parsing response text into xml document");
-                                    responseXML = $domparser.parseFromString(_this.responseText+"");
+                                    /* responseXML = $domparser.parseFromString(_this.responseText+""); */
+                                    responseXML =
+                                        document.implementation.createDocument().
+                                          loadXML(_this.responseText+"");
                                     return responseXML;
                                 } catch(e) {
                                     $error('response XML does not apear to be well formed xml', e);
+                                    /*
                                     responseXML = $domparser.parseFromString("<html>"+
                                         "<head/><body><p> parse error </p></body></html>");
+                                    */
+                                    responseXML =
+                                        document.implementation.createDocument().
+                                          loadXML("<html><head/><body><p> parse error </p></body></html>");
                                     return responseXML;
                                 }
                             }

data/src/xpath/implementation.js CHANGED

@@ -671,6 +671,7 @@ function TokenExpr(m) {
 }
 TokenExpr.prototype.evaluate = function() {
+// print("0 "+arguments.callee+" "+this.value);
   return new StringValue(this.value);
 };
@@ -961,12 +962,14 @@ function NodeTestAny() {
 }
 NodeTestAny.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   return this.value;
 };
 function NodeTestElementOrAttribute() {}
 NodeTestElementOrAttribute.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   return new BooleanValue(
       ctx.node.nodeType == DOMNode.ELEMENT_NODE ||
       ctx.node.nodeType == DOMNode.ATTRIBUTE_NODE);
@@ -975,12 +978,14 @@ NodeTestElementOrAttribute.prototype.evaluate = function(ctx) {
 function NodeTestText() {}
 NodeTestText.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   return new BooleanValue(ctx.node.nodeType == DOMNode.TEXT_NODE);
 }
 function NodeTestComment() {}
 NodeTestComment.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   return new BooleanValue(ctx.node.nodeType == DOMNode.COMMENT_NODE);
 }
@@ -989,6 +994,7 @@ function NodeTestPI(target) {
 }
 NodeTestPI.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   return new
   BooleanValue(ctx.node.nodeType == DOMNode.PROCESSING_INSTRUCTION_NODE &&
                (!this.target || ctx.node.nodeName == this.target));
@@ -1000,6 +1006,7 @@ function NodeTestNC(nsprefix) {
 }
 NodeTestNC.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   var n = ctx.node;
   return new BooleanValue(this.regex.match(n.nodeName));
 }
@@ -1010,6 +1017,7 @@ function NodeTestName(name) {
 }
 NodeTestName.prototype.evaluate = function(ctx) {
+// print("0 !!! "+arguments.callee);
   var n = ctx.node;
   if (ctx.caseInsensitive || n instanceof HTMLElement) {
     if (n.nodeName.length != this.name.length) return new BooleanValue(false);
@@ -1024,6 +1032,7 @@ function PredicateExpr(expr) {
 }
 PredicateExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   var v = this.expr.evaluate(ctx);
   if (v.type == 'number') {
     // NOTE(mesch): Internally, position is represented starting with
@@ -1045,9 +1054,11 @@ FunctionCallExpr.prototype.appendArg = function(arg) {
 };
 FunctionCallExpr.prototype.evaluate = function(ctx) {
+  // print("0 "+arguments.callee+" "+this.name.value);
   var fn = '' + this.name.value;
   var f = this.xpathfunctions[fn];
   if (f) {
+    // print("1 "+f);
     return f.call(this, ctx);
   } else {
     xpathLog('XPath NO SUCH FUNCTION ' + fn);
@@ -1121,6 +1132,9 @@ FunctionCallExpr.prototype.xpathfunctions = {
     if (n.length == 0) {
       return new StringValue('');
     } else {
+      if (ctx.caseInsensitive || n[0] instanceof HTMLElement) {
+        return new StringValue(n[0].nodeName.toLowerCase());
+      }
       return new StringValue(n[0].nodeName);
     }
   },
@@ -1398,6 +1412,7 @@ function UnionExpr(expr1, expr2) {
 }
 UnionExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   var nodes1 = this.expr1.evaluate(ctx).nodeSetValue();
   var nodes2 = this.expr2.evaluate(ctx).nodeSetValue();
   var I1 = nodes1.length;
@@ -1423,6 +1438,7 @@ function PathExpr(filter, rel) {
 }
 PathExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   var nodes = this.filter.evaluate(ctx).nodeSetValue();
   var nodes1 = [];
   if (ctx.returnOnFirstMatch) {
@@ -1451,6 +1467,7 @@ function FilterExpr(expr, predicate) {
 }
 FilterExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   // the filter expression should be evaluated in its entirety with no
   // optimization, as we can't backtrack to it after having moved on to
   // evaluating the relative location path. See the testReturnOnFirstMatch
@@ -1479,6 +1496,7 @@ function UnaryMinusExpr(expr) {
 }
 UnaryMinusExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   return new NumberValue(-this.expr.evaluate(ctx).numberValue());
 };
@@ -1489,6 +1507,7 @@ function BinaryExpr(expr1, op, expr2) {
 }
 BinaryExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   var ret;
   switch (this.op.value) {
     case 'or':
@@ -1653,6 +1672,7 @@ function LiteralExpr(value) {
 }
 LiteralExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee+" "+this.value);
   return new StringValue(this.value);
 };
@@ -1661,6 +1681,7 @@ function NumberExpr(value) {
 }
 NumberExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   return new NumberValue(this.value);
 };
@@ -1669,6 +1690,7 @@ function VariableExpr(name) {
 }
 VariableExpr.prototype.evaluate = function(ctx) {
+// print("0 "+arguments.callee);
   return ctx.getVariable(this.name);
 }

data/test/primary-tests.js CHANGED

@@ -18,6 +18,7 @@ window.addEventListener("load",function(){
   }
   load("test/unit/parser.js");
   load("test/unit/timer.js");
+  load("test/unit/form.js");
   print("Load complete. Running tests.");
 });

data/test/unit/form.js ADDED

@@ -0,0 +1,40 @@
+module("form");
+test("__param__ without a boundary should do query string style uri encoding", function() {
+  serialized_params = $master.static.__param__([{ name: 'username', value: 'jresig' }, { name: 'password', value: 'letmein' }]);
+  ok((serialized_params == 'username=jresig&password=letmein'), 'params should be key=value and joined by &');
+});
+test("__param__ without a boundary should escape spaces in values as + not %20", function() {
+  serialized_params = $master.static.__param__([{ name: 'username', value: 'jresig' }, { name: 'password', value: 'let me in' }]);
+  ok((serialized_params == 'username=jresig&password=let+me+in'), 'params should have spaces escaped as + not %20');
+});
+test("__param__ with a boundary should start with a -- then the boundary and a \\r\\n newline", function() {
+  serialized_params = $master.static.__param__([{ name: 'username', value: 'jresig' }, { name: 'password', value: 'letmein' }], '--aboundary');
+  ok(serialized_params.match(/^----aboundary\r\n/), 'params should start with a -- then the boundary and \\r\\n');
+});
+test("__param__ with a boundary should end with the boundary then -- and a \\r\\n newline", function() {
+  serialized_params = $master.static.__param__([{ name: 'username', value: 'jresig' }, { name: 'password', value: 'letmein' }], '--aboundary');
+  ok(serialized_params.match(/--aboundary--\r\n$/), 'params should end with the boundary then -- and \\r\\n');
+});
+test("__param__ with a boundary should render each key and value with a header, two \\r\\n newlines and the value", function() {
+  serialized_params = $master.static.__param__([{ name: 'username', value: 'jresig' }, { name: 'password', value: 'letmein' }], '--aboundary');
+  ok(serialized_params.match(/Content-Disposition: form-data; name="username"\r\n\r\njresig\r\n/), 'username not properly encoded');
+  ok(serialized_params.match(/Content-Disposition: form-data; name="password"\r\n\r\nletmein\r\n/), 'password not properly encoded');
+});
+test("__param__ with a boundary should separate each key-value with --, the boundary and a \\r\\n newline", function() {
+  serialized_params = $master.static.__param__([{ name: 'username', value: 'jresig' }, { name: 'password', value: 'letmein' }], '--aboundary');
+  ok(serialized_params.match(/jresig\r\n----aboundary\r\nContent-Disposition: form-data; name="password"/), 'username and password not properly separated');
+});
+test("__param__ with a boundary should not render spaces in data as + or %20", function() {
+  serialized_params = $master.static.__param__([{ name: 'username', value: 'jresig' }, { name: 'password', value: 'let me in' }], '--aboundary');
+  ok(!serialized_params.match(/let+me+in/), 'spaces incorrectly encoded as +');
+  ok(!serialized_params.match(/let%20me%20in/), 'spaces incorrectly encoded as %20');
+  ok(serialized_params.match(/let me in/), 'spaces not left as spaces');
+});

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: envjs
 version: !ruby/object:Gem::Version
-  hash: 29
+  hash: 3
   prerelease: false
   segments:
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors:
 - John Resig
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-07-05 00:00:00 -07:00
+date: 2010-09-14 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -357,6 +357,7 @@ files:
 - test/unit/elementmembers.js
 - test/unit/events.js
 - test/unit/fixtures/external_script.js
+- test/unit/form.js
 - test/unit/iframe.js
 - test/unit/insertion.js
 - test/unit/multi-window.js