Re-implemented basic JavaScript value parsers

src/valueParsers/parsers/BoolParser.js

@@ -1,24 +1,56 @@
 /**
  * @licence GNU GPL v2+
- * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ * @author H. Snater < mediawiki@snater.com >
  */
-( function( vp, dv, util ) {
+( function( vp, dv, util, $ ) {
 	'use strict';
 
-	var PARENT = vp.ApiBasedValueParser;
+	var PARENT = vp.ValueParser;
 
 	/**
-	 * Constructor for string to boolean parsers.
+	 * Constructor for string-to-BoolValue parsers.
 	 *
 	 * @constructor
-	 * @extends vp.ApiBasedValueParser
+	 * @extends valueParsers.ValueParser
 	 * @since 0.1
 	 */
 	vp.BoolParser = util.inherit( PARENT, {
 		/**
-		 * @see ApiBasedValueParser.API_VALUE_PARSER_ID
+		 * @see valueParsers.ValueParser.parse
+		 * @since 0.1
+		 *
+		 * @param {string} rawValue
+		 * @return jQuery.Promise
 		 */
-		API_VALUE_PARSER_ID: 'bool'
+		parse: function( rawValue ) {
+			var deferred = $.Deferred(),
+				lowerCaseRawValue = rawValue.toLowerCase();
+
+			for( var value in this.constructor.values ) {
+				if( value === lowerCaseRawValue ) {
+					deferred.resolve( new dv.BoolValue( this.constructor.values[value] ) );
+					break;
+				}
+			}
+
+			if( deferred.state() === 'pending' ) {
+				// TODO: Clearly define reject() behaviour / parameters returned by reject()
+				deferred.reject( 'BoolParser: Unable to parse "' + rawValue + '"' );
+			}
+
+			return deferred.promise();
+		}
 	} );
 
-}( valueParsers, dataValues, util ) );
+	vp.BoolParser.values = {
+		'yes': true,
+		'on': true,
+		'1': true,
+		'true': true,
+		'no': false,
+		'off': false,
+		'0': false,
+		'false': false
+	};
+
+}( valueParsers, dataValues, util, jQuery ) );

src/valueParsers/parsers/FloatParser.js

@@ -1,24 +1,41 @@
 /**
  * @licence GNU GPL v2+
- * @author Daniel Werner < danweetz@web.de >
+ * @author H. Snater < mediawiki@snater.com >
  */
-( function( vp, dv, util ) {
+( function( vp, dv, util, $ ) {
 	'use strict';
 
-	var PARENT = vp.ApiBasedValueParser;
+	var PARENT = vp.ValueParser;
 
 	/**
-	 * Constructor for string to number parsers.
+	 * Constructor for string-to-float parsers.
 	 *
 	 * @constructor
-	 * @extends vp.ApiBasedValueParser
+	 * @extends valueParsers.ValueParser
 	 * @since 0.1
 	 */
 	vp.FloatParser = util.inherit( PARENT, {
 		/**
-		 * @see ApiBasedValueParser.API_VALUE_PARSER_ID
+		 * @see valueParsers.ValueParser.parse
+		 * @since 0.1
+		 *
+		 * @param {string} rawValue
+		 * @return jQuery.Promise
 		 */
-		API_VALUE_PARSER_ID: 'float'
+		parse: function( rawValue ) {
+			var deferred = $.Deferred();
+
+			// TODO: Localization
+			if( !isNaN( parseFloat( rawValue ) ) && isFinite( rawValue ) ) {
+				deferred.resolve( new dv.NumberValue( parseFloat( rawValue ) ) );
+			}
+
+			if( deferred.state() === 'pending' ) {
+				deferred.reject( 'FloatParser: Unable to parse "' + rawValue + '"' );
+			}
+
+			return deferred.promise();
+		}
 	} );
 
-}( valueParsers, dataValues, util ) );
+}( valueParsers, dataValues, util, jQuery ) );

src/valueParsers/parsers/IntParser.js

@@ -1,24 +1,41 @@
 /**
  * @licence GNU GPL v2+
- * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ * @author H. Snater < mediawiki@snater.com >
  */
-( function( vp, dv, util ) {
+( function( vp, dv, util, $ ) {
 	'use strict';
 
-	var PARENT = vp.ApiBasedValueParser;
+	var PARENT = vp.ValueParser;
 
 	/**
-	 * Constructor for string to integer parsers.
+	 * Constructor for string-to-float parsers.
 	 *
 	 * @constructor
-	 * @extends vp.ApiBasedValueParser
+	 * @extends valueParsers.ValueParser
 	 * @since 0.1
 	 */
 	vp.IntParser = util.inherit( PARENT, {
 		/**
-		 * @see ApiBasedValueParser.API_VALUE_PARSER_ID
+		 * @see valueParsers.ValueParser.parse
+		 * @since 0.1
+		 *
+		 * @param {string} rawValue
+		 * @return jQuery.Promise
 		 */
-		API_VALUE_PARSER_ID: 'int'
+		parse: function( rawValue ) {
+			var deferred = $.Deferred();
+
+			// TODO: Localization, option to set integer base
+			if( /^(-)?\d+$/.test( rawValue ) ) {
+				deferred.resolve( new dv.NumberValue( parseInt( rawValue, 10 ) ) );
+			}
+
+			if( deferred.state() === 'pending' ) {
+				deferred.reject( 'InParser: Unable to parse "' + rawValue + '"' );
+			}
+
+			return deferred.promise();
+		}
 	} );
 
-}( valueParsers, dataValues, util ) );
+}( valueParsers, dataValues, util, jQuery ) );

tests/src/valueParsers/parsers/BoolParser.tests.js

@@ -5,9 +5,7 @@
 ( function( vp, dv, util ) {
 	'use strict';
 
-	var PARENT = vp.tests.ValueParserTest,
-		constructor = function() {
-		};
+	var PARENT = vp.tests.ValueParserTest;
 
 	/**
 	 * Constructor for creating a test object holding tests for the BoolParser.
@@ -16,7 +14,7 @@
 	 * @extends dv.tests.ValueParserTest
 	 * @since 0.1
 	 */
-	vp.tests.BoolParserTest = util.inherit( PARENT, constructor, {
+	vp.tests.BoolParserTest = util.inherit( PARENT, {
 
 		/**
 		 * @see vp.tests.ValueParserTest.getConstructor

tests/src/valueParsers/parsers/IntParser.tests.js

@@ -5,9 +5,7 @@
 ( function( vp, dv, util ) {
 	'use strict';
 
-	var PARENT = vp.tests.ValueParserTest,
-		constructor = function() {
-		};
+	var PARENT = vp.tests.ValueParserTest;
 
 	/**
 	 * Constructor for creating a test object holding tests for the IntParser.
@@ -16,7 +14,7 @@
 	 * @extends dv.tests.ValueParserTest
 	 * @since 0.1
 	 */
-	vp.tests.IntParserTest = util.inherit( PARENT, constructor, {
+	vp.tests.IntParserTest = util.inherit( PARENT, {
 
 		/**
 		 * @see vp.tests.ValueParserTest.getConstructor