trackler 2.2.1.104 → 2.2.1.105

data/tracks/cfml/exercises/luhn/Solution.cfc

@@ -3,25 +3,25 @@
 */
 component {
 
-	function valid( input ) {
+	function valid( value ) {
 		// Remove whitespace
-		input = input.reReplace( '\s', '', 'all' );
+		value = value.reReplace( '\s', '', 'all' );
 		
 		// Any non numeric chars means invalid
-		if( input.reFindNoCase( '[^0-9]' ) ) {
+		if( value.reFindNoCase( '[^0-9]' ) ) {
 			return false;
 		}
 		
 		// A single 0 is invalid
-		if( compare( input, '0' ) == 0 ) {
+		if( compare( value, '0' ) == 0 ) {
 			return false;
 		}
 		
 		var accumulator = [];
 		var oddEven = 0;
 		// Loop backwards over the digits
-		for( var i=input.len(); i>0; i-- ) {
-			var digit = input[ i ];
+		for( var i=value.len(); i>0; i-- ) {
+			var digit = value[ i ];
 			// Double every other one
 			if( ++oddEven%2 == 0 ) {
 				var doubleDigit = digit*2;

data/tracks/cfml/exercises/markdown/Markdown.cfc

@@ -6,9 +6,9 @@ component {
 	/**
 	* @returns
 	*/
-	function parse(required string input) {
+	function parse(required string markdown) {
 		
-		var lines = listToArray( arguments.input, chr( 10 ) );
+		var lines = listToArray( arguments.markdown, chr( 10 ) );
 		var output = [];
 
 		var isInList = false;
@@ -49,7 +49,7 @@ component {
 						line = "<ul><li>" & trim( replace( matches[1], "*", "", "all" ) ) & "</li>";
 					} 
 					else {
-						line = "<ul><li><p>" & trim( replace( matches[1], "*", "", "all" ) ) & "</p></li>";
+						line = "<ul><li>" & trim( replace( matches[1], "*", "", "all" ) ) & "</li>";
 					}
 
 				} 
@@ -79,7 +79,7 @@ component {
 						line = "<li>" & trim( replace( matches[1], "*", "", "all" ) ) & "</li>";
 					} 
 					else {
-						line = "<li><p>" & trim( replace( matches[1], "*", "", "all" ) ) & "</p></li>";
+						line = "<li>" & trim( replace( matches[1], "*", "", "all" ) ) & "</li>";
 					}
 				}
 			} 

data/tracks/cfml/exercises/markdown/MarkdownTest.cfc

@@ -9,39 +9,39 @@ component extends="testbox.system.BaseSpec" {
 		describe( "My Markdown class", function(){			
 
 			it( 'parses normal text as a paragraph', function(){
-				expect( SUT.parse( input='This will be a paragraph' ) ).toBe( '<p>This will be a paragraph</p>' );
+				expect( SUT.parse( markdown='This will be a paragraph' ) ).toBe( '<p>This will be a paragraph</p>' );
 			});
 
 			it( 'parsing italics', function(){
-				expect( SUT.parse( input='_This will be italic_' ) ).toBe( '<p><em>This will be italic</em></p>' );
+				expect( SUT.parse( markdown='_This will be italic_' ) ).toBe( '<p><em>This will be italic</em></p>' );
 			});
 
 			it( 'parsing bold text', function(){
-				expect( SUT.parse( input='__This will be bold__' ) ).toBe( '<p><strong>This will be bold</strong></p>' );
+				expect( SUT.parse( markdown='__This will be bold__' ) ).toBe( '<p><strong>This will be bold</strong></p>' );
 			});
 
 			it( 'mixed normal, italics and bold text', function(){
-				expect( SUT.parse( input='This will _be_ __mixed__' ) ).toBe( '<p>This will <em>be</em> <strong>mixed</strong></p>' );
+				expect( SUT.parse( markdown='This will _be_ __mixed__' ) ).toBe( '<p>This will <em>be</em> <strong>mixed</strong></p>' );
 			});
 
 			it( 'with h1 header level', function(){
-				expect( SUT.parse( input='## This will be an h1' ) ).toBe( '<h1>This will be an h1</h1>' );
+				expect( SUT.parse( markdown='## This will be an h1' ) ).toBe( '<h1>This will be an h1</h1>' );
 			});
 
 			it( 'with h2 header level', function(){
-				expect( SUT.parse( input='#### This will be an h2' ) ).toBe( '<h2>This will be an h2</h2>' );
+				expect( SUT.parse( markdown='#### This will be an h2' ) ).toBe( '<h2>This will be an h2</h2>' );
 			});
 
 			it( 'with h6 header level', function(){
-				expect( SUT.parse( input='############ This will be an h6' ) ).toBe( '<h6>This will be an h6</h6>' );
+				expect( SUT.parse( markdown='############ This will be an h6' ) ).toBe( '<h6>This will be an h6</h6>' );
 			});
 
 			it( 'unordered lists', function(){
-				expect( SUT.parse( input='* Item 1#chr( 10 )#* Item 2' ) ).toBe( '<ul><li><p>Item 1</p></li><li><p>Item 2</p></li></ul>' );
+				expect( SUT.parse( markdown='* Item 1#chr( 10 )#* Item 2' ) ).toBe( '<ul><li>Item 1</li><li>Item 2</li></ul>' );
 			});
 
 			it( 'With a little bit of everything', function(){
-				expect( SUT.parse( input='## Header!#chr( 10 )#* __Bold Item__#chr( 10 )#* _Italic Item_' ) ).toBe( '<h1>Header!</h1><ul><li><strong>Bold Item</strong></li><li><em>Italic Item</em></li></ul>' );
+				expect( SUT.parse( markdown='## Header!#chr( 10 )#* __Bold Item__#chr( 10 )#* _Italic Item_' ) ).toBe( '<h1>Header!</h1><ul><li><strong>Bold Item</strong></li><li><em>Italic Item</em></li></ul>' );
 			});
 
 		});

data/tracks/cfml/exercises/markdown/Solution.cfc

@@ -6,11 +6,11 @@ component {
 	/**
 	* Parse markdown
 	* 
-	* @input.hint markdown to parse
+	* @markdown.hint markdown to parse
 	*/
-	public string function parse(required string input) {
+	public string function parse(required string markdown) {
 		
-		var lines = listToArray( arguments.input, chr( 10 ) );
+		var lines = listToArray( arguments.markdown, chr( 10 ) );
 		var output = [];
 		var isInList = false;
 
@@ -151,7 +151,7 @@ component {
 		/* Add a p tag to item if no other tag is present */
 		if ( !reFindNoCase("<li><", output ) ) {
 			var pattern = "<li>(.*)</li>";
-			var replacement = "<li><p>\1</p></li>";
+			var replacement = "<li>\1</li>";
 			var output = reReplaceNoCase( output, pattern, replacement );
 		}
 

data/tracks/cfml/exercises/nth-prime/NthPrime.cfc

@@ -6,7 +6,7 @@ component {
 	/**
 	* @returns 
 	*/
-	function prime( input ) {
+	function prime( number ) {
 		// Implement me here
 	}
 	

data/tracks/cfml/exercises/nth-prime/NthPrimeTest.cfc

@@ -9,23 +9,23 @@ component extends="testbox.system.BaseSpec" {
 		describe( "My NthPrime class", function(){			
 
 			it( 'first prime', function(){
-				expect( SUT.prime( input='1' ) ).toBe( '2' );
+				expect( SUT.prime( number='1' ) ).toBe( '2' );
 			});
 
 			it( 'second prime', function(){
-				expect( SUT.prime( input='2' ) ).toBe( '3' );
+				expect( SUT.prime( number='2' ) ).toBe( '3' );
 			});
 
 			it( 'sixth prime', function(){
-				expect( SUT.prime( input='6' ) ).toBe( '13' );
+				expect( SUT.prime( number='6' ) ).toBe( '13' );
 			});
 
 			it( 'big prime', function(){
-				expect( SUT.prime( input='10001' ) ).toBe( '104743' );
+				expect( SUT.prime( number='10001' ) ).toBe( '104743' );
 			});
 
 			it( 'there is no zeroth prime', function(){
-				expect( SUT.prime( input='0' ) ).toBeFalse();
+				expect( function(){ SUT.prime( number='0' ); } ).toThrow( message='there is no zeroth prime' );
 			});
 
 		});

data/tracks/cfml/exercises/nth-prime/Solution.cfc

@@ -3,13 +3,13 @@
 */
 component {
 
-	function prime( input ) {
-		if( input == 0 ) {
-			return false;
+	function prime( number ) {
+		if( number == 0 ) {
+			throw( 'there is no zeroth prime' );
 		}
 		var primes = [];
 		var candidate = 1;
-		while( primes.len() < input ) {
+		while( primes.len() < number ) {
 			candidate ++;
 			if( candidate % 2 == 0 && candidate != 2 ) {
 				continue;

data/tracks/cfml/exercises/pangram/Pangram.cfc

@@ -6,7 +6,7 @@ component {
 	/**
 	* @returns 
 	*/
-	 function isPangram( input ) {
+	 function isPangram( sentence ) {
 		// Implement me here
 	}
 	

data/tracks/cfml/exercises/pangram/PangramTest.cfc

@@ -11,39 +11,43 @@ component extends="testbox.system.BaseSpec" {
 			describe( 'Check if the given string is an pangram', function(){
 
 				it( 'sentence empty', function(){
-					expect( SUT.isPangram( input='' ) ).toBeFalse();
+					expect( SUT.isPangram( sentence='' ) ).toBeFalse();
+				});
+
+				it( 'recognizes a perfect lower case pangram', function(){
+					expect( SUT.isPangram( sentence='abcdefghijklmnopqrstuvwxyz' ) ).toBeTrue();
 				});
 
 				it( 'pangram with only lower case', function(){
-					expect( SUT.isPangram( input='the quick brown fox jumps over the lazy dog' ) ).toBeTrue();
+					expect( SUT.isPangram( sentence='the quick brown fox jumps over the lazy dog' ) ).toBeTrue();
 				});
 
 				it( 'missing character ''x''', function(){
-					expect( SUT.isPangram( input='a quick movement of the enemy will jeopardize five gunboats' ) ).toBeFalse();
+					expect( SUT.isPangram( sentence='a quick movement of the enemy will jeopardize five gunboats' ) ).toBeFalse();
 				});
 
-				it( 'another missing character ''x''', function(){
-					expect( SUT.isPangram( input='the quick brown fish jumps over the lazy dog' ) ).toBeFalse();
+				it( 'another missing character, e.g. ''h''', function(){
+					expect( SUT.isPangram( sentence='five boxing wizards jump quickly at it' ) ).toBeFalse();
 				});
 
 				it( 'pangram with underscores', function(){
-					expect( SUT.isPangram( input='the_quick_brown_fox_jumps_over_the_lazy_dog' ) ).toBeTrue();
+					expect( SUT.isPangram( sentence='the_quick_brown_fox_jumps_over_the_lazy_dog' ) ).toBeTrue();
 				});
 
 				it( 'pangram with numbers', function(){
-					expect( SUT.isPangram( input='the 1 quick brown fox jumps over the 2 lazy dogs' ) ).toBeTrue();
+					expect( SUT.isPangram( sentence='the 1 quick brown fox jumps over the 2 lazy dogs' ) ).toBeTrue();
 				});
 
 				it( 'missing letters replaced by numbers', function(){
-					expect( SUT.isPangram( input='7h3 qu1ck brown fox jumps ov3r 7h3 lazy dog' ) ).toBeFalse();
+					expect( SUT.isPangram( sentence='7h3 qu1ck brown fox jumps ov3r 7h3 lazy dog' ) ).toBeFalse();
 				});
 
 				it( 'pangram with mixed case and punctuation', function(){
-					expect( SUT.isPangram( input='"Five quacking Zephyrs jolt my wax bed."' ) ).toBeTrue();
+					expect( SUT.isPangram( sentence='"Five quacking Zephyrs jolt my wax bed."' ) ).toBeTrue();
 				});
 
 				it( 'upper and lower case versions of the same character should not be counted separately', function(){
-					expect( SUT.isPangram( input='the quick brown fox jumps over with lazy FX' ) ).toBeFalse();
+					expect( SUT.isPangram( sentence='the quick brown fox jumps over with lazy FX' ) ).toBeFalse();
 				});
 
 			});

data/tracks/cfml/exercises/pangram/README.md

@@ -2,7 +2,7 @@
 
 Determine if a sentence is a pangram. A pangram (Greek: παν γράμμα, pan gramma,
 "every letter") is a sentence using every letter of the alphabet at least once.
-The best known English pangram is: 
+The best known English pangram is:
 > The quick brown fox jumps over the lazy dog.
 
 The alphabet used consists of ASCII letters `a` to `z`, inclusive, and is case

data/tracks/cfml/exercises/pangram/Solution.cfc

@@ -3,14 +3,14 @@
 */
 component {
 
-	 function isPangram( input ) {
-	 	// Lowercase input to simplify search
-		input = input.lCase();
+	 function isPangram( sentence ) {
+	 	// Lowercase sentence to simplify search
+		sentence = sentence.lCase();
 		var i = 96;
 		// ASCII codes 97-122 are a-z
 		while( ++i <= 122 ) {
 			// If any letter is missing, then quit
-			if( !input.find( chr( i ) ) ) {
+			if( !sentence.find( chr( i ) ) ) {
 				return false;
 			}
 		}

data/tracks/cfml/exercises/pig-latin/PigLatin.cfc

@@ -6,7 +6,7 @@ component {
 	/**
 	* @returns 
 	*/
-	function translate( input ) {
+	function translate( phrase ) {
 		// Implement me here
 	}
 	

data/tracks/cfml/exercises/pig-latin/PigLatinTest.cfc

@@ -11,27 +11,27 @@ component extends="testbox.system.BaseSpec" {
 			describe( 'ay is added to words that start with vowels', function(){
 
 				it( 'word beginning with a', function(){
-					expect( SUT.translate( input='apple' ) ).toBe( 'appleay' );
+					expect( SUT.translate( phrase='apple' ) ).toBe( 'appleay' );
 				});
 
 				it( 'word beginning with e', function(){
-					expect( SUT.translate( input='ear' ) ).toBe( 'earay' );
+					expect( SUT.translate( phrase='ear' ) ).toBe( 'earay' );
 				});
 
 				it( 'word beginning with i', function(){
-					expect( SUT.translate( input='igloo' ) ).toBe( 'iglooay' );
+					expect( SUT.translate( phrase='igloo' ) ).toBe( 'iglooay' );
 				});
 
 				it( 'word beginning with o', function(){
-					expect( SUT.translate( input='object' ) ).toBe( 'objectay' );
+					expect( SUT.translate( phrase='object' ) ).toBe( 'objectay' );
 				});
 
 				it( 'word beginning with u', function(){
-					expect( SUT.translate( input='under' ) ).toBe( 'underay' );
+					expect( SUT.translate( phrase='under' ) ).toBe( 'underay' );
 				});
 
 				it( 'word beginning with a vowel and followed by a qu', function(){
-					expect( SUT.translate( input='equal' ) ).toBe( 'equalay' );
+					expect( SUT.translate( phrase='equal' ) ).toBe( 'equalay' );
 				});
 
 			});
@@ -39,23 +39,19 @@ component extends="testbox.system.BaseSpec" {
 			describe( 'first letter and ay are moved to the end of words that start with consonants', function(){
 
 				it( 'word beginning with p', function(){
-					expect( SUT.translate( input='pig' ) ).toBe( 'igpay' );
+					expect( SUT.translate( phrase='pig' ) ).toBe( 'igpay' );
 				});
 
 				it( 'word beginning with k', function(){
-					expect( SUT.translate( input='koala' ) ).toBe( 'oalakay' );
-				});
-
-				it( 'word beginning with y', function(){
-					expect( SUT.translate( input='yellow' ) ).toBe( 'ellowyay' );
+					expect( SUT.translate( phrase='koala' ) ).toBe( 'oalakay' );
 				});
 
 				it( 'word beginning with x', function(){
-					expect( SUT.translate( input='xenon' ) ).toBe( 'enonxay' );
+					expect( SUT.translate( phrase='xenon' ) ).toBe( 'enonxay' );
 				});
 
 				it( 'word beginning with q without a following u', function(){
-					expect( SUT.translate( input='qat' ) ).toBe( 'atqay' );
+					expect( SUT.translate( phrase='qat' ) ).toBe( 'atqay' );
 				});
 
 			});
@@ -63,27 +59,27 @@ component extends="testbox.system.BaseSpec" {
 			describe( 'some letter clusters are treated like a single consonant', function(){
 
 				it( 'word beginning with ch', function(){
-					expect( SUT.translate( input='chair' ) ).toBe( 'airchay' );
+					expect( SUT.translate( phrase='chair' ) ).toBe( 'airchay' );
 				});
 
 				it( 'word beginning with qu', function(){
-					expect( SUT.translate( input='queen' ) ).toBe( 'eenquay' );
+					expect( SUT.translate( phrase='queen' ) ).toBe( 'eenquay' );
 				});
 
 				it( 'word beginning with qu and a preceding consonant', function(){
-					expect( SUT.translate( input='square' ) ).toBe( 'aresquay' );
+					expect( SUT.translate( phrase='square' ) ).toBe( 'aresquay' );
 				});
 
 				it( 'word beginning with th', function(){
-					expect( SUT.translate( input='therapy' ) ).toBe( 'erapythay' );
+					expect( SUT.translate( phrase='therapy' ) ).toBe( 'erapythay' );
 				});
 
 				it( 'word beginning with thr', function(){
-					expect( SUT.translate( input='thrush' ) ).toBe( 'ushthray' );
+					expect( SUT.translate( phrase='thrush' ) ).toBe( 'ushthray' );
 				});
 
 				it( 'word beginning with sch', function(){
-					expect( SUT.translate( input='school' ) ).toBe( 'oolschay' );
+					expect( SUT.translate( phrase='school' ) ).toBe( 'oolschay' );
 				});
 
 			});
@@ -91,11 +87,27 @@ component extends="testbox.system.BaseSpec" {
 			describe( 'some letter clusters are treated like a single vowel', function(){
 
 				it( 'word beginning with yt', function(){
-					expect( SUT.translate( input='yttria' ) ).toBe( 'yttriaay' );
+					expect( SUT.translate( phrase='yttria' ) ).toBe( 'yttriaay' );
 				});
 
 				it( 'word beginning with xr', function(){
-					expect( SUT.translate( input='xray' ) ).toBe( 'xrayay' );
+					expect( SUT.translate( phrase='xray' ) ).toBe( 'xrayay' );
+				});
+
+			});
+
+			describe( 'position of y in a word determines if it is a consonant or a vowel', function(){
+
+				it( 'y is treated like a consonant at the beginning of a word', function(){
+					expect( SUT.translate( phrase='yellow' ) ).toBe( 'ellowyay' );
+				});
+
+				it( 'y is treated like a vowel at the end of a consonant cluster', function(){
+					expect( SUT.translate( phrase='rhythm' ) ).toBe( 'ythmrhay' );
+				});
+
+				it( 'y as second letter in two letter word', function(){
+					expect( SUT.translate( phrase='my' ) ).toBe( 'ymay' );
 				});
 
 			});
@@ -103,7 +115,7 @@ component extends="testbox.system.BaseSpec" {
 			describe( 'phrases are translated', function(){
 
 				it( 'a whole phrase', function(){
-					expect( SUT.translate( input='quick fast run' ) ).toBe( 'ickquay astfay unray' );
+					expect( SUT.translate( phrase='quick fast run' ) ).toBe( 'ickquay astfay unray' );
 				});
 
 			});

data/tracks/cfml/exercises/pig-latin/Solution.cfc

@@ -3,11 +3,11 @@
 */
 component {
 
-	function translate( input ) {
+	function translate( phrase ) {
 		var response = '';
 		
 		// Loop over each work
-		return input
+		return phrase
 			.listToArray( ' ' )
 			.map( function( word ) {
 		
@@ -15,8 +15,8 @@ component {
 				if( word.reFindNoCase( '^(a|e|i|o|u|yt|xr)' ) ) {
 					return word & 'ay';
 				// Consonate sounds
-				} else if( word.reFindNoCase( '^(ch|squ|qu|thr|th|sch)' ) ) {
-					return word.reReplaceNoCase( '^(ch|squ|qu|thr|th|sch)(.*)', '\2\1ay' );
+				} else if( word.reFindNoCase( '^(ch|squ|qu|thr|th|sch|rh)' ) ) {
+					return word.reReplaceNoCase( '^(ch|squ|qu|thr|th|sch|rh)(.*)', '\2\1ay' );
 				// Everything else
 				} else {
 					return word.right( -1 ) & word.left( 1 ) & 'ay';