Merge pull request #41 from bem/issue-34

Added support for CamelCase
bem · Oct 29, 2014 · 1b44373 · 1b44373
2 parents ac0f763 + 5462f83
commit 1b44373
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/bem-naming.js b/lib/bem-naming.js
@@ -6,8 +6,8 @@
  * @param {Object} [options]
  * @param {Object} [options.elem='__'] Separates element's name from block.
  * @param {Object} [options.mod='_']   Separates names and values of modifiers from blocks and elements.
- * @param {Object} [options.wordPattern='[a-z0-9]+(?:-[a-z0-9]+)*'] Defines which symbols can be used for block,
- *                                                                  element and modifier's names.
+ * @param {Object} [options.wordPattern='[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*] Defines which symbols can be used for block,
+ *                                                                       element and modifier's names.
  *
  * @name BEMNaming
  * @constructor
@@ -17,7 +17,8 @@ var BEMNaming = function (options) {
 
     this._elemDelimiter = options.elem || options.elemSeparator || '__';
     this._modDelimiter = options.mod || options.modSeparator || '_';
-    this._wordPattern = options.wordPattern || options.literal && (options.literal + '+') || '[a-z0-9]+(?:-[a-z0-9]+)*';
+    this._wordPattern = options.wordPattern || options.literal && (options.literal + '+') ||
+        '[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*';
 
     this._buildRegex();
 };

diff --git a/test/harry-roberts/validate.test.js b/test/harry-roberts/validate.test.js
@@ -57,5 +57,9 @@ describe('harry roberts', function () {
         it('should not validate block name with illegal literals', function () {
             naming.validate('block_elem').should.be.false;
         });
+
+        it('should support CamelCase', function () {
+            naming.validate('BlockName').should.be.true;
+        });
     });
 });
diff --git a/test/original/validate.test.js b/test/original/validate.test.js
@@ -57,5 +57,9 @@ describe('original', function () {
         it('should not validate block name with illegal literals', function () {
             naming.validate('^_^').should.be.false;
         });
+
+        it('should support CamelCase', function () {
+            naming.validate('BlockName').should.be.true;
+        });
     });
 });