cleanup for $2418

Eran Hammer · Eran Hammer · commit 4e38dba4fab6 · 2015-02-20T12:29:52.000-08:00
diff --git a/lib/methods.js b/lib/methods.js
@@ -35,7 +35,7 @@ internals.Methods.prototype.add = function (name, method, options, realm) {
 };
 
 
-exports.methodNameRx = /^[_$a-zA-Z]\w*(?:\.[_$a-zA-Z]\w*)*$/;
+exports.methodNameRx = /^[_$a-zA-Z][$\w]*(?:\.[_$a-zA-Z][$\w]*)*$/;
 
 
 internals.Methods.prototype._add = function (name, method, options, realm) {
diff --git a/test/methods.js b/test/methods.js
@@ -73,6 +73,40 @@ describe('Methods', function () {
         });
     });
 
+    it('registers a method with _', function (done) {
+
+        var _add = function (a, b, next) {
+
+            return next(null, a + b);
+        };
+
+        var server = new Hapi.Server();
+        server.method('add_._that', _add);
+
+        server.methods.add_._that(1, 5, function (err, result) {
+
+            expect(result).to.equal(6);
+            done();
+        });
+    });
+
+    it('registers a method with $', function (done) {
+
+        var $add = function (a, b, next) {
+
+            return next(null, a + b);
+        };
+
+        var server = new Hapi.Server();
+        server.method('add$.$that', $add);
+
+        server.methods.add$.$that(1, 5, function (err, result) {
+
+            expect(result).to.equal(6);
+            done();
+        });
+    });
+
     it('registers a method (no callback)', function (done) {
 
         var add = function (a, b) {
