Merge pull request #6 from DataValues/timeOpts

Add precision and calendar opts to TimeParser
wmde · Mar 11, 2014 · ba7da7e · ba7da7e
2 parents 8461d7e + 9936c7d
commit ba7da7e
Show file tree

Hide file tree

Showing 4 changed files with 250 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ DataValues Time has been written by the Wikidata team, as [Wikimedia Germany]
 ### 0.3 (dev)
 
 * Renamed CalenderModelParser to CalendarModelParser
+* Added Calandar and Precision options to TimeParser
 
 ### 0.2 (2014-02-11)
 

diff --git a/src/DataValues/TimeValue.php b/src/DataValues/TimeValue.php
@@ -105,7 +105,7 @@ public function __construct( $time, $timezone, $before, $after, $precision, $cal
 		}
 
 		if ( !preg_match( '!^[-+]\d{1,16}-(0\d|1[012])-([012]\d|3[01])T([01]\d|2[0123]):[0-5]\d:([0-5]\d|6[012])Z$!', $time ) ) {
-			throw new IllegalValueException( '$time needs to be a valid ISO 8601 date' );
+			throw new IllegalValueException( '$time needs to be a valid ISO 8601 date, given ' . $time );
 		}
 
 		if ( !is_integer( $timezone ) ) {

diff --git a/src/ValueParsers/TimeParser.php b/src/ValueParsers/TimeParser.php
@@ -16,6 +16,19 @@
  */
 class TimeParser extends StringValueParser {
 
+	/**
+	 * @since 0.3
+	 */
+	const OPT_PRECISION = 'precision';
+	const OPT_CALENDAR = 'calender';
+
+	/**
+	 * @since 0.3
+	 */
+	const CALENDAR_GREGORIAN = 'http://www.wikidata.org/entity/Q1985727';
+	const CALENDAR_JULIAN = 'http://www.wikidata.org/entity/Q1985786';
+	const PRECISION_NONE = 'noprecision';
+
 	/**
 	 * Regex pattern constant matching the sign preceding the time
 	 */
@@ -37,18 +50,38 @@ class TimeParser extends StringValueParser {
 	 * @param ParserOptions|null $options
 	 */
 	public function __construct( CalendarModelParser $calendarModelParser, ParserOptions $options = null ) {
+
+		$options->defaultOption( TimeParser::OPT_CALENDAR, TimeParser::CALENDAR_GREGORIAN );
+		$options->defaultOption( TimeParser::OPT_PRECISION, TimeParser::PRECISION_NONE );
+
 		parent::__construct( $options );
 		$this->calendarModelParser = $calendarModelParser;
 	}
 
 	protected function stringParse( $value ) {
 		list( $sign, $time, $model ) = $this->splitTimeString( $value );
-		$time = $this->padTime( $time );
-		$precision = $this->getPrecisionFromTime( $sign . $time );
+		$time = $sign . $this->padTime( $time );
+
+		$calendarOpt = $this->getOptions()->getOption( TimeParser::OPT_CALENDAR );
+		$calanderModelRegex = '/(' . preg_quote( self::CALENDAR_GREGORIAN, '/' ). '|' . preg_quote( self::CALENDAR_JULIAN, '/' ) . ')/i';
+
+		if( $model === '' && preg_match( $calanderModelRegex, $calendarOpt ) ) {
+			$model = $calendarOpt;
+		} else if( $model !== '' ) {
+			$model = $this->calendarModelParser->parse( $model );
+		} else {
+			$model = self::CALENDAR_GREGORIAN;
+		}
+
+		$precisionOpt = $this->getOptions()->getOption( TimeParser::OPT_PRECISION );
+		if( is_int( $precisionOpt ) ) {
+			$precision = $precisionOpt;
+		} else {
+			$precision = $this->getPrecisionFromTime( $time );
+		}
 
 		try {
-			$time = $this->newTimeFromParts( $sign . $time, $model, $precision );
-			return $time;
+			return new TimeValue( $time, 0, 0, 0, $precision, $model );
 		} catch ( IllegalValueException $ex ) {
 			throw new ParseException( $ex->getMessage() );
 		}
@@ -109,11 +142,6 @@ private function getPrecisionFromYear( $year ) {
 		return $precision;
 	}
 
-	private function newTimeFromParts( $time, $model, $precision ) {
-		$model = $this->calendarModelParser->parse( $model );
-		return new TimeValue( $time, 0, 0, 0, $precision, $model );
-	}
-
 	private function splitTimeString( $value ) {
 		if ( !is_string( $value ) ) {
 			throw new InvalidArgumentException( '$value must be a string' );