Merge pull request #81 from bem/issue-68

Presets

Author: blond

README.md

@@ -394,16 +394,13 @@ Read more in the [Guidelines](http://cssguidelin.es/#bem-like-naming).
 Example:
 
 ```js
-var csswizardry = bemNaming({
-    elem: '__',
-    mod: { name: '--', val: '_' }
-});
+var twoDashes = bemNaming('two-dashes');
 
-csswizardry.parse('block__elem');    // { block: 'block', elem: 'elem' }
-csswizardry.parse('block--mod_val'); // { block: 'block',
-                                     //   modName: 'mod', modVal: 'val' }
+twoDashes.parse('block__elem');    // { block: 'block', elem: 'elem' }
+twoDashes.parse('block--mod_val'); // { block: 'block',
+                                   //   modName: 'mod', modVal: 'val' }
 
-csswizardry.stringify({              // 'block__elem--mod'
+twoDashes.stringify({              // 'block__elem--mod'
     block: 'block',
     elem: 'elem',
     modName: 'mod'

README.ru.md

@@ -392,16 +392,13 @@ myNaming.stringify({              // 'blockName-elemName--boolElemMod'
 Пример:
 
 ```js
-var csswizardry = bemNaming({
-    elem: '__',
-    mod: { name: '--', val: '_' }
-});
+var twoDashes = bemNaming('two-dashes');
 
-csswizardry.parse('block__elem');    // { block: 'block', elem: 'elem' }
-csswizardry.parse('block--mod_val'); // { block: 'block',
-                                     //   modName: 'mod', modVal: `val` }
+twoDashes.parse('block__elem');    // { block: 'block', elem: 'elem' }
+twoDashes.parse('block--mod_val'); // { block: 'block',
+                                   //   modName: 'mod', modVal: `val` }
 
-csswizardry.stringify({              // 'block__elem--mod'
+twoDashes.stringify({              // 'block__elem--mod'
     block: 'block',
     elem: 'elem',
     modName: 'mod'

index.js

@@ -205,28 +205,42 @@ var defineAsGlobal = true,
         'isBlock', 'isElem', 'isBlockMod', 'isElemMod'
     ],
     fields = ['elemDelim', 'modDelim', 'modValDelim'],
+    presets = {
+        'two-dashes': {
+            elem: '__',
+            modName: '--',
+            modVal: '_',
+            wordPattern: '[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*'
+        }
+    },
     bemNaming = function (options) {
         options || (options = {});
 
-        var mod = options.mod || '_',
-            modName, modVal;
+        var naming;
 
-        if (typeof mod === 'string') {
-            modName = mod;
-            modVal = mod;
+        if (options === 'two-dashes') {
+            naming = presets['two-dashes'];
         } else {
-            modName = mod.name || '_';
-            modVal = mod.val || modName;
-        }
-
-        var naming = {
+            var mod = options.mod || '_',
+                modName, modVal;
+
+            if (typeof mod === 'string') {
+                modName = mod;
+                modVal = mod;
+            } else {
+                modName = mod.name || '_';
+                modVal = mod.val || modName;
+            }
+
+            naming = {
                 elem: options.elem || '__',
                 modName: modName,
                 modVal: modVal,
                 wordPattern: options.wordPattern || '[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*'
-            },
-            id = JSON.stringify(naming);
+            }
+        }
 
+        var id = JSON.stringify(naming);
         if (cache[id]) {
             return cache[id];
         }

test/presets/original/is-block-mod.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const naming = require('../../../index');
+const naming = require('../../../index')('origin');
 
 test('should detect mod of block', t => {
     t.true(naming.isBlockMod('block_mod_val'));

test/presets/original/is-elem-mod.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const naming = require('../../../index');
+const naming = require('../../../index')('origin');
 
 test('should detect mod of elem', t => {
     t.true(naming.isElemMod('block__elem_mod_val'));

test/presets/original/is-elem.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const naming = require('../../../index');
+const naming = require('../../../index')('origin');
 
 test('should detect elem', t => {
     t.true(naming.isElem('block__elem'));

test/presets/original/parse.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const naming = require('../../../index');
+const naming = require('../../../index')('origin');
 
 test('should not parse not valid string', t => {
     const obj = naming.parse('(*)_(*)');

test/presets/original/stringify.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const naming = require('../../../index');
+const naming = require('../../../index')('origin');
 
 test('should stringify block', t => {
     const str = naming.stringify({ block: 'block' });

test/presets/original/type-of.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const naming = require('../../../index');
+const naming = require('../../../index')('origin');
 
 test('should not determine not valid string', t => {
     const type = naming.typeOf('(*)_(*)');

test/presets/original/validate.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const naming = require('../../../index');
+const naming = require('../../../index')('origin');
 
 test('should validate block', t => {
     t.true(naming.validate('block'));