Add default privatePrefix

SassDoc · Feb 4, 2015 · bae60fa · bae60fa
1 parent 6a8d939
commit bae60fa
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/src/annotation/annotations/access.js b/src/annotation/annotations/access.js
@@ -1,4 +1,7 @@
 export default function access(env) {
+
+  const defaultPrivatePrefixTest = RegExp.prototype.test.bind(/^[_-]/);
+
   return {
     name: 'access',
 
@@ -7,11 +10,18 @@ export default function access(env) {
     },
 
     autofill(item) {
+      if (env.privatePrefix === false) { return; }
+
+      let testFunc = defaultPrivatePrefixTest;
+
       if (typeof env.privatePrefix !== 'undefined') {
-        if ((new RegExp(env.privatePrefix)).test(item.context.name)) {
-          return 'private';
-        }
+        testFunc = RegExp.prototype.test.bind(new RegExp(env.privatePrefix));
       }
+
+      if (testFunc(item.context.name)) {
+        return 'private';
+      }
+
     },
 
     default() {

diff --git a/test/annotations/access.test.js b/test/annotations/access.test.js
@@ -13,9 +13,23 @@ describe('#access', function () {
     assert.equal(access.parse('\nte\nst\t'), 'te\nst');
   });
 
-  it('should autofill based on privatePrefix', function () {
-    var accessEnv = accessCtor({ privatePrefix: '^_' });
+  it('should autofill based on default', function () {
+    assert.equal(access.autofill({ context: { name: 'non-private'}, access: 'public'}), undefined);
+    assert.equal(access.autofill({ context: { name: '_private-name'}, access: 'public'}), 'private');
+    assert.equal(access.autofill({ context: { name: '-private-name'}, access: 'public'}), 'private');
+  });
+
+  it('should ignore autofill if privatePrefix is false', function () {
+    var accessEnv = accessCtor({ privatePrefix: false });
     assert.equal(accessEnv.autofill({ context: { name: 'non-private'}, access: 'public'}), undefined);
-    assert.equal(accessEnv.autofill({ context: { name: '_private-name'}, access: 'public'}), 'private');
+    assert.equal(accessEnv.autofill({ context: { name: '_private-name'}, access: 'public'}), undefined);
+    assert.equal(accessEnv.autofill({ context: { name: '-private-name'}, access: 'public'}), undefined);
+  });
+
+  it('should autofill based on privatePrefix', function () {
+    var accessEnv = accessCtor({ privatePrefix: '^--' });
+    assert.equal(accessEnv.autofill({ context: { name: '-non-private'}, access: 'public'}), undefined);
+    assert.equal(accessEnv.autofill({ context: { name: '_non-private'}, access: 'public'}), undefined);
+    assert.equal(accessEnv.autofill({ context: { name: '--private-name'}, access: 'public'}), 'private');
   });
 });