Merge branch 'master' of git@github.com:sprsquish/libxmljs

libxmljs · Mar 5, 2010 · 2c3f9f5 · 2c3f9f5
2 parents 72ed52b + 60b5408
commit 2c3f9f5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/spec/spec_html_parser.js b/spec/spec_html_parser.js
@@ -52,7 +52,7 @@ describe('Parsing HTML', function() {
   var filename = path.dirname(__filename)+'/fixtures/parser.html';
 
   it('can be done by string', function() {
-    var str = posix.cat(filename).wait();
+    var str = fs.readFileSync(filename);
 
     var doc = libxml.parseHtmlString(str);
     assertEqual('html', doc.root().name());
@@ -77,7 +77,7 @@ describe('A recoverable parse error when parsing an HTML file', function() {
 });
 
 describe('A recoverable parse error when parsing an HTML string', function() {
-  var str = posix.cat(recoverableFile).wait();
+  var str = fs.readFileSync(recoverableFile);
 
   it('will attach the errors to the document', function() {
     var doc = libxml.parseHtmlString(str);

diff --git a/spec/spec_xml_parser.js b/spec/spec_xml_parser.js
@@ -4,7 +4,7 @@ describe('Parsing XML', function() {
   var filename = path.dirname(__filename)+'/fixtures/parser.xml';
 
   it('can be done by string', function() {
-    var str = posix.cat(filename).wait();
+    var str = fs.readFileSync(filename);
 
     var doc = libxml.parseXmlString(str);
     assertEqual('1.0', doc.version());
@@ -82,7 +82,7 @@ describe('A recoverable parse error when parsing an XML file', function() {
 
 describe('A fatal parse error when parsing an XML string', function() {
   var filename = path.dirname(__filename)+'/fixtures/errors/comment.xml';
-  var str = posix.cat(filename).wait();
+  var str = fs.readFileSync(filename);
   var err = null;
 
   it('will throw an exception', function() {
@@ -109,7 +109,7 @@ describe('A fatal parse error when parsing an XML string', function() {
 
 describe('A recoverable parse error when parsing an XML string', function() {
   var filename = path.dirname(__filename)+'/fixtures/warnings/ent9.xml';
-  var str = posix.cat(filename).wait();
+  var str = fs.readFileSync(filename);
 
   it('will attach the errors to the document', function() {
     var doc = libxml.parseXmlString(str);

diff --git a/spec/spec_xml_sax_parser.js b/spec/spec_xml_sax_parser.js
@@ -60,7 +60,7 @@ describe("SAX Push Parser", function() {
   });
 
   it('will properly parse a regular string', function() {
-    var str = posix.cat(filename).wait();
+    var str = fs.readFileSync(filename);
     var parser = createParser('SaxParser');
     parser.parseString(str);
     var control = JSON.stringify(callbackControl);
@@ -69,7 +69,7 @@ describe("SAX Push Parser", function() {
   });
 
   it('will properly parse a string chunk by chunk', function() {
-    var str_ary = posix.cat(filename).wait().split("\n");
+    var str_ary = fs.readFileSync(filename).split("\n");
     var parser = createParser('SaxPushParser');
     var i;
     for (i = 0; i < str_ary.length; i++)
@@ -89,7 +89,7 @@ describe("SAX Push Parser", function() {
   });
 
   it('can can be reused as a string parser', function() {
-    var str = posix.cat(filename).wait();
+    var str = fs.readFileSync(filename);
     var parser = createParser('SaxParser');
 
     for (var i=0; i<10; i++)

diff --git a/spec/tacular.js b/spec/tacular.js
@@ -49,7 +49,7 @@ process.mixin(require('sys'));
 
 (function() {
   var path = require('path');
-  var posix = require('posix');
+  var fs = require('fs');
   var specCount    = 0;
   var specStack    = [];
   var specFailures = [];
@@ -216,13 +216,13 @@ process.mixin(require('sys'));
   };
 
   var specDirectory = path.dirname(__filename);
-  var files = posix.readdir(specDirectory).wait();
+  var files = fs.readdirSync(specDirectory);
   var i;
   for(i = 0; i < files.length; i++) {
     var file = files[i];
     if(file.match(/^spec/)) {
       if (specVerbose) print(file+"\n");
-      var content = posix.cat(specDirectory + "/" + file, "utf8").wait();
+      var content = fs.readFileSync(specDirectory + "/" + file, "utf8");
       eval(content);
     }
   }

diff --git a/src/xml_sax_parser.cc b/src/xml_sax_parser.cc
@@ -90,7 +90,7 @@ XmlSaxParser::NewPushParser(const v8::Arguments& args) {
 
 void
 XmlSaxParser::SetCallbacks(v8::Handle<v8::Object> self,
-                        const v8::Handle<v8::Function> callbacks) {
+                           const v8::Handle<v8::Function> callbacks) {
   v8::HandleScope scope;
 
   v8::Handle<v8::Function> set_callbacks = v8::Handle<v8::Function>::Cast(
@@ -110,8 +110,8 @@ XmlSaxParser::Callback(const char* what) {
 
 void
 XmlSaxParser::Callback(const char* what,
-                    int argc,
-                    v8::Handle<v8::Value> argv[]) {
+                       int argc,
+                       v8::Handle<v8::Value> argv[]) {
   v8::HandleScope scope;
 
   v8::Handle<v8::Function> callback = v8::Handle<v8::Function>::Cast(