camel case everything

libxmljs · Jan 19, 2010 · bbbcd7c · bbbcd7c
1 parent 6c61b3d
commit bbbcd7c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 25 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,5 @@
 v0.1.1
+  api change: camel case everything (nextSibling, prevSibling, defineNamespace)
   feature: add #toString() to nodes
   feature: add #remove() to nodes
   housekeeping: update spectacular

diff --git a/spec/spec_attribute.js b/spec/spec_attribute.js
@@ -43,11 +43,11 @@ describe('Attribute', function() {
   });
 
   it('knows its previous sibling', function() {
-    assertEqual('attr-one-key', node.attr('attr-two-key').prev_sibling().name());
+    assertEqual('attr-one-key', node.attr('attr-two-key').prevSibling().name());
   });
 
   it('knows its next sibling', function() {
-    assertEqual('attr-three-key', node.attr('attr-two-key').next_sibling().name());
+    assertEqual('attr-three-key', node.attr('attr-two-key').nextSibling().name());
   });
 
   it('can set and retrieve its namespace', function() {

diff --git a/spec/spec_namespaces.js b/spec/spec_namespaces.js
@@ -4,7 +4,7 @@ describe('A namespace', function() {
   it('can be created and not set', function() {
     var doc = new libxml.Document();
     var elem = doc.node('name1');
-    var ns = elem.define_namespace('http://my-namespace.com');
+    var ns = elem.defineNamespace('http://my-namespace.com');
     assertEqual(null, elem.namespace());
     assertEqual(null, ns.prefix());
     assertEqual('http://my-namespace.com', ns.href());
@@ -13,7 +13,7 @@ describe('A namespace', function() {
   it('can be created with a prefix and not set', function() {
     var doc = new libxml.Document();
     var elem = doc.node('name1');
-    var ns = elem.define_namespace('pref', 'http://my-namespace.com');
+    var ns = elem.defineNamespace('pref', 'http://my-namespace.com');
     assertEqual(null, elem.namespace());
     assertEqual('pref', ns.prefix());
     assertEqual('http://my-namespace.com', ns.href());
@@ -65,15 +65,15 @@ describe('A namespace', function() {
   it('will use an existing namespace with only a url', function() {
     var doc = new libxml.Document();
     var elem = doc.node('name1');
-    var ns = elem.define_namespace('http://my-namespace.com');
+    var ns = elem.defineNamespace('http://my-namespace.com');
     elem.namespace('http://my-namespace.com');
     assert(ns == elem.namespace());
   });
 
   it('will use an existing namespace with a prefix', function() {
     var doc = new libxml.Document();
     var elem = doc.node('name1');
-    var ns = elem.define_namespace('pref', 'http://my-namespace.com');
+    var ns = elem.defineNamespace('pref', 'http://my-namespace.com');
     elem.namespace('pref', 'http://my-namespace.com');
     assert(ns == elem.namespace());
   });

diff --git a/spec/spec_node_attributes.js b/spec/spec_node_attributes.js
@@ -55,10 +55,10 @@ describe('A node attribute', function() {
                     .attr({foo: 'bar'})
                     .attr({bar: 'baz'})
                     .attr({baz: 'foo'});
-    assertEqual(elem.attr('baz'), elem.attr('bar').next_sibling());
-    assertEqual(elem.attr('foo'), elem.attr('bar').prev_sibling());
-    assertEqual(null, elem.attr('foo').prev_sibling());
-    assertEqual(null, elem.attr('baz').next_sibling());
+    assertEqual(elem.attr('baz'), elem.attr('bar').nextSibling());
+    assertEqual(elem.attr('foo'), elem.attr('bar').prevSibling());
+    assertEqual(null, elem.attr('foo').prevSibling());
+    assertEqual(null, elem.attr('baz').nextSibling());
   });
 
   it('can get back to its node', function() {

diff --git a/spec/spec_traversal.js b/spec/spec_traversal.js
@@ -70,15 +70,15 @@ describe('Document traversal on a built document', function() {
     var children = [];
     var doc = new libxml.Document(function(n) {
       n.node('root', function(n) {
-        children.push(n.node('prev_sibling'));
+        children.push(n.node('prevSibling'));
         children.push(n.node('child'));
-        children.push(n.node('next_sibling'));
+        children.push(n.node('nextSibling'));
       });
     });
-    assertEqual(children[0], children[1].prev_sibling());
-    assertEqual(children[2], children[1].next_sibling());
-    assertEqual(null, children[0].prev_sibling());
-    assertEqual(null, children[2].next_sibling());
+    assertEqual(children[0], children[1].prevSibling());
+    assertEqual(children[2], children[1].nextSibling());
+    assertEqual(null, children[0].prevSibling());
+    assertEqual(null, children[2].nextSibling());
   });
 });
 
@@ -133,15 +133,15 @@ describe('Document traversal on a parsed document', function() {
   it('can traverse siblings', function() {
     var doc = libxml.parseXmlString(
       '<?xml version="1.0"?>\
-      <root><prev_sibling /><child /><next_sibling /></root>\
+      <root><prevSibling /><child /><nextSibling /></root>\
     ');
 
-    var children = ['prev_sibling', 'child', 'next_sibling'];
+    var children = ['prevSibling', 'child', 'nextSibling'];
     var child = doc.child(2);
     assertEqual('child', child.name());
-    assertEqual(children[0], child.prev_sibling().name());
-    assertEqual(children[2], child.next_sibling().name());
-    assertEqual(null, child.prev_sibling().prev_sibling());
-    assertEqual(null, child.next_sibling().next_sibling());
+    assertEqual(children[0], child.prevSibling().name());
+    assertEqual(children[2], child.nextSibling().name());
+    assertEqual(null, child.prevSibling().prevSibling());
+    assertEqual(null, child.nextSibling().nextSibling());
   });
 });
diff --git a/src/xml_element.js b/src/xml_element.js
@@ -42,7 +42,7 @@ libxml.Element.prototype.get = function() {
   return this.find.apply(this, arguments)[0];
 };
 
-libxml.Element.prototype.define_namespace = function() {
+libxml.Element.prototype.defineNamespace = function() {
   var args = arguments.length == 1 ? [null, arguments[0]] : [arguments[0], arguments[1]];
   return new libxml.Namespace(this, args[0], args[1]);
 };
diff --git a/src/xml_node.cc b/src/xml_node.cc
@@ -290,11 +290,11 @@ XmlNode::Initialize(v8::Handle<v8::Object> target) {
                         XmlNode::Namespace);
 
   LXJS_SET_PROTO_METHOD(constructor_template,
-                        "prev_sibling",
+                        "prevSibling",
                         XmlNode::PrevSibling);
 
   LXJS_SET_PROTO_METHOD(constructor_template,
-                        "next_sibling",
+                        "nextSibling",
                         XmlNode::NextSibling);
 
   LXJS_SET_PROTO_METHOD(constructor_template,