Various changes

xmppjs · Sep 10, 2015 · 4c58e44 · 4c58e44
1 parent 4d41636
commit 4c58e44
Show file tree

Hide file tree

Showing 28 changed files with 179 additions and 2,218 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
-node_modules
-npm-debug.log
+node_modules/
+
+ltx.js
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,10 @@
+test/
+
+.editorconfig
+.gitignore
+.jshintrc
+.npmignore
+.travis.yml
+benchmark.js
+CONTRIBUTING.md
+Gruntfile.js
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -13,7 +13,7 @@ module.exports = function(grunt) {
         browserify: {
             dist: {
                 files: {
-                    'ltx-browser.js': ['./lib/index-browserify.js']
+                    'ltx.js': ['./lib/index.js']
                 },
                 options: {
                     debug: grunt.cli.options.debug

diff --git a/benchmark.js b/benchmark.js
@@ -0,0 +1,27 @@
+'use strict'
+
+var benchmark = require('benchmark')
+var ltx = require('./lib/index')
+var parsers = require('./lib/parsers')
+
+var XML = [
+    '<message to="foo@bar" from="bar@to" type="chat" id="foobar">',
+        '<body>Where there is love there is life.</body>',
+    '</message>'
+].join('')
+
+var suite = new benchmark.Suite('parse');
+
+parsers.forEach(function(Parser) {
+    suite.add(Parser.name, function() {
+        ltx.parse(XML, {Parser: Parser})
+    })
+})
+
+suite.on('cycle', function(event) {
+  console.log(event.target.toString());
+})
+.on('complete', function() {
+  console.log('Fastest is ' + this.filter('fastest').pluck('name'));
+})
+.run({ 'async': true });
diff --git a/benchmark/.gitignore b/benchmark/.gitignore
diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js
diff --git a/benchmark/build.js b/benchmark/build.js
diff --git a/benchmark/index.html b/benchmark/index.html
diff --git a/index.js b/index.js
diff --git a/lib/dom-element.js → lib/DOMElement.js b/lib/dom-element.js → lib/DOMElement.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var util = require('util')
-  , Element = require('./element').Element
+  , Element = require('./Element')
 
 function DOMElement(name, attrs) {
     Element.call(this, name, attrs)
@@ -118,5 +118,4 @@ DOMElement.createElement = function(name, attrs /*, child1, child2, ...*/) {
     return el
 }
 
-
 module.exports = DOMElement
diff --git a/lib/element.js → lib/Element.js b/lib/element.js → lib/Element.js
@@ -1,5 +1,9 @@
 'use strict';
 
+var escape = require('./escape')
+var escapeXML = escape.escapeXML
+var escapeXMLText = escape.escapeXMLText
+
 /**
  * This cheap replica of DOM/Builder puts me to shame :-)
  *
@@ -338,9 +342,9 @@ Element.prototype._addChildren = function(writer) {
             if (child.write) {
                 child.write(writer)
             } else if (typeof child === 'string') {
-                writer(escapeXmlText(child))
+                writer(escapeXMLText(child))
             } else if (child.toString) {
-                writer(escapeXmlText(child.toString(10)))
+                writer(escapeXMLText(child.toString(10)))
             }
         }
     }
@@ -361,7 +365,7 @@ Element.prototype.write = function(writer) {
             if (typeof v !== 'string') {
                 v = v.toString(10)
             }
-            writer(escapeXml(v))
+            writer(escapeXML(v))
             writer('"')
         }
     }
@@ -383,22 +387,4 @@ Element.createElement = function(name, attrs /*, child1, child2, ...*/) {
     return el
 }
 
-
-function escapeXml(s) {
-    return s.
-        replace(/\&/g, '&amp;').
-        replace(/</g, '&lt;').
-        replace(/>/g, '&gt;').
-        replace(/"/g, '&quot;').
-        replace(/"/g, '&apos;')
-}
-
-function escapeXmlText(s) {
-    return s.
-        replace(/\&/g, '&amp;').
-        replace(/</g, '&lt;').
-        replace(/>/g, '&gt;')
-}
-
-exports.Element = Element
-exports.escapeXml = escapeXml
+module.exports = Element
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -0,0 +1,72 @@
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+var inherits = require('util').inherits
+var Element = require('./Element')
+var LtxParser = require('./parsers/ltx')
+
+var Parser = function(options) {
+    EventEmitter.call(this)
+
+    var ParserInterface = this.Parser = (options && options.Parser) || LtxParser
+    var ElementInterface = this.Element = (options && options.Element) || Element
+
+    if (!ParserInterface) {
+        throw new Error('No SAX parser available')
+    }
+    this.parser = new ParserInterface()
+
+    var el
+      , self = this
+    this.parser.on('startElement', function(name, attrs) {
+        var child = new ElementInterface(name, attrs)
+        if (!el) {
+            el = child
+        } else {
+            el = el.cnode(child)
+        }
+    })
+    this.parser.on('endElement', function(name) {
+        /* jshint -W035 */
+        if (!el) {
+            /* Err */
+        } else if (name === el.name) {
+            if (el.parent) {
+                el = el.parent
+            } else if (!self.tree) {
+                self.tree = el
+                el = undefined
+            }
+        }
+        /* jshint +W035 */
+    })
+    this.parser.on('text', function(str) {
+        if (el) {
+            el.t(str)
+        }
+    })
+    this.parser.on('error', function(e) {
+        self.error = e
+        self.emit('error', e)
+    })
+}
+
+inherits(Parser, EventEmitter)
+
+Parser.prototype.write = function(data) {
+    this.parser.write(data)
+}
+
+Parser.prototype.end = function(data) {
+    this.parser.end(data)
+
+    if (!this.error) {
+        if (this.tree) {
+            this.emit('tree', this.tree)
+        } else {
+            this.emit('error', new Error('Incomplete document'))
+        }
+    }
+}
+
+module.exports = Parser
diff --git a/lib/escape.js b/lib/escape.js
@@ -0,0 +1,17 @@
+'use strict';
+
+module.exports.escapeXML = function escapeXML(s) {
+    return s.
+        replace(/\&/g, '&amp;').
+        replace(/</g, '&lt;').
+        replace(/>/g, '&gt;').
+        replace(/"/g, '&quot;').
+        replace(/"/g, '&apos;')
+}
+
+module.exports.escapeXMLText = function escapeXMLText(s) {
+    return s.
+        replace(/\&/g, '&amp;').
+        replace(/</g, '&lt;').
+        replace(/>/g, '&gt;')
+}