Simplify _.camelCase and add tests.

This commit is contained in:
John-David Dalton
2014-03-27 22:12:33 -07:00
parent 1c643cda5b
commit 3b9ebf358c
2 changed files with 7 additions and 11 deletions

View File

@@ -6947,14 +6947,11 @@
* _.camelCase('__hello_world__');
* // => 'helloWorld'
*/
var camelCase = createCompounder(function(result, word, index, words) {
var camelCase = createCompounder(function(result, word, index) {
if (!index && reAllCaps.test(word)) {
return result + word.toLowerCase();
}
var lastWord = index && words[index - 1],
isCapped = index && !(index > 1 && words.length == 3 && (lastWord == 2 || lastWord == 4));
return result + (word.charAt(0)[isCapped ? 'toUpperCase' : 'toLowerCase']() + word.slice(1));
return result + (word.charAt(0)[index ? 'toUpperCase' : 'toLowerCase']() + word.slice(1));
});
/**

View File

@@ -1068,16 +1068,15 @@
QUnit.module('lodash.camelCase');
(function() {
test('should work with numbers', 6, function() {
equal(_.camelCase('P2P'), 'p2p');
equal(_.camelCase('ascii 2 unicode'), 'ascii2unicode');
equal(_.camelCase('two 4 one'), 'two4one');
test('should work with numbers', 3, function() {
equal(_.camelCase('too legit 2 quit'), 'tooLegit2Quit');
equal(_.camelCase('walk 500 miles'), 'walk500Miles');
equal(_.camelCase('xhr2 request'), 'xhr2Request');
equal(_.camelCase('too legit 2 quit'), 'tooLegit2Quit');
});
test('should handle acronyms', 1, function() {
test('should handle acronyms', 3, function() {
equal(_.camelCase('safe HTML'), 'safeHTML');
equal(_.camelCase('escape HTML entities'), 'escapeHTMLEntities');
equal(_.camelCase('XMLHttpRequest'), 'xmlHttpRequest');
});
}());