Fix some bugs in the bits library.

creationix · creationix · commit 9a56cdf01e99 · 2009-12-02T15:29:21.000-06:00
diff --git a/postgres-js/bits.js b/postgres-js/bits.js
@@ -9,7 +9,8 @@
 
   var chr, proto;
   
-  exports.Encoder = function () {
+  exports.Encoder = function (header) {
+    this.header = header || "";
     this.data = "";
   };
 
@@ -30,13 +31,9 @@
     return chr(a) + chr(b) + chr(c) + chr(d);
   }
 
-  // Add a postgres header to the binary string
-  proto.add_header = function (code) {
-    if (code === undefined) {
-      code = "";
-    }
-    this.data = code + encode_int32(this.data.length + 4) + this.data;
-    return this;
+  // Add a postgres header to the binary string and return it.
+  proto.toString = function () {
+    return this.header + encode_int32(this.data.length + 4) + this.data;
   };
 
   // Encode number as 32 bit 2s compliment
@@ -73,6 +70,16 @@
     this.data += fields.join("\0") + "\0\0";
     return this;
   };
+  
+  proto.push_hash = function (hash) {
+    for (key in hash) {
+      if (hash.hasOwnProperty(key)) {
+        this.data += key + "\0" + hash[key] + "\0";
+      }
+    }
+    this.data += "\0";
+    return this;
+  };
 
 }());
 
@@ -89,6 +96,12 @@
 
   proto = exports.Decoder.prototype;
 
+  proto.shift_code = function () {
+    var code = this.data[0];
+    this.data = this.data.substr(1);
+    return code;
+  }
+
   // Convert 4 characters to signed 32 bit integer
   proto.shift_int32 = function () {
     var unsigned = this.data.charCodeAt(0) * 0x1000000 + this.data.charCodeAt(1) * 0x10000 + this.data.charCodeAt(2) * 0x100 + this.data.charCodeAt(3);
@@ -113,7 +126,7 @@
   // Grab a null terminated string
   proto.shift_cstring = function () {
     var pos, string;
-    pos = this.indexOf("\0");
+    pos = this.data.indexOf("\0");
     string = this.data.substr(0, pos);
     this.data = this.data.substr(pos + 1);
     return string;
