Support milliseconds in dateTime and time datatyped literals.

Fixes #394.

Author: gkellogg

lib/rdf/model/literal/datetime.rb

@@ -7,7 +7,7 @@ module RDF; class Literal
   class DateTime < Literal
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#dateTime")
     GRAMMAR  = %r(\A(-?(?:\d{4}|[1-9]\d{4,})-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
-    FORMAT   = '%Y-%m-%dT%H:%M:%S%:z'.freeze
+    FORMAT   = '%Y-%m-%dT%H:%M:%S.%L%:z'.freeze
 
     ##
     # @param  [DateTime] value
@@ -31,9 +31,9 @@ def initialize(value, datatype: nil, lexical: nil, **options)
     def canonicalize!
       if self.valid?
         @string = if has_timezone?
-          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z')
+          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z').sub('.000', '')
         else
-          @object.strftime(FORMAT[0..-4])
+          @object.strftime(FORMAT[0..-4]).sub('.000', '')
         end
       end
       self
@@ -80,6 +80,16 @@ def valid?
       super && object && value !~ %r(\A0000)
     end
 
+    ##
+    # Does the literal representation include millisectonds?
+    #
+    # @return [Boolean]
+    # @since 1.1.6
+    def has_milliseconds?
+      self.format("%L").to_i > 0
+    end
+    alias_method :has_ms?, :has_milliseconds?
+
     ##
     # Does the literal representation include a timezone? Note that this is only possible if initialized using a string, or `:lexical` option.
     #
@@ -98,7 +108,7 @@ def has_timezone?
     #
     # @return [String]
     def to_s
-      @string || @object.strftime(FORMAT).sub("+00:00", 'Z')
+      @string || @object.strftime(FORMAT).sub("+00:00", 'Z').sub('.000', '')
     end
 
     ##

lib/rdf/model/literal/time.rb

@@ -12,7 +12,7 @@ module RDF; class Literal
   class Time < Literal
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#time")
     GRAMMAR  = %r(\A(\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
-    FORMAT   = '%H:%M:%S%:z'.freeze
+    FORMAT   = '%H:%M:%S.%L%:z'.freeze
 
     ##
     # @param  [String, DateTime, #to_datetime] value
@@ -43,9 +43,9 @@ def initialize(value, datatype: nil, lexical: nil, **options)
     def canonicalize!
       if self.valid?
         @string = if has_timezone?
-          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z')
+          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z').sub('.000', '')
         else
-          @object.strftime(FORMAT[0..-4])
+          @object.strftime(FORMAT[0..-4]).sub('.000', '')
         end
       end
       self
@@ -91,7 +91,7 @@ def has_timezone?
     #
     # @return [String]
     def to_s
-      @string || @object.strftime(FORMAT).sub("+00:00", 'Z')
+      @string || @object.strftime(FORMAT).sub("+00:00", 'Z').sub('.000', '')
     end
 
     ##
@@ -122,7 +122,7 @@ def ==(other)
         return super unless other.valid?
         # Compare as strings, as time includes a date portion, and adjusting for UTC
         # can create a mismatch in the date portion.
-        self.object.new_offset.strftime('%H%M%S') == other.object.new_offset.strftime('%H%M%S')
+        self.object.new_offset.strftime('%H%M%S.%L') == other.object.new_offset.strftime('%H%M%S.%L')
       when Literal::DateTime, Literal::Date
         false
       else

spec/model_literal_spec.rb

@@ -681,9 +681,9 @@ def self.literals(*selector)
       ["2010-01-01T01:00:00+01:00", "2010-01-01T00:00:00Z", "01:00:00 AM +01:00 on Friday, 01 January 2010"],
       ["2009-12-31T23:00:00-01:00", "2010-01-01T00:00:00Z", "11:00:00 PM -01:00 on Thursday, 31 December 2009"],
       ["-2010-01-01T00:00:00Z",     "-2010-01-01T00:00:00Z","12:00:00 AM UTC on Friday, 01 January -2010"],
-      #["2014-09-01T12:13:14.567",   "2014-09-01T12:13:14",  "12:13:14 PM on Monday, 01 September 2014"],
-      #["2014-09-01T12:13:14.567Z",   "2014-09-01T12:13:14Z", "12:13:14 PM UTC on Monday, 01 September 2014"],
-      #["2014-09-01T12:13:14.567-08:00","2014-09-01T20:13:14Z","12:13:14 PM -08:00 on Monday, 01 September 2014"],
+      ["2014-09-01T12:13:14.567",   "2014-09-01T12:13:14.567",  "12:13:14 PM on Monday, 01 September 2014"],
+      ["2014-09-01T12:13:14.567Z",   "2014-09-01T12:13:14.567Z", "12:13:14 PM UTC on Monday, 01 September 2014"],
+      ["2014-09-01T12:13:14.567-08:00","2014-09-01T20:13:14.567Z","12:13:14 PM -08:00 on Monday, 01 September 2014"],
     ]
     it_behaves_like 'RDF::Literal validation', RDF::XSD.dateTime,
       %w(
@@ -834,6 +834,8 @@ def self.literals(*selector)
       ["00:00:00+00:00", "00:00:00Z", "12:00:00 AM UTC"],
       ["01:00:00+01:00", "00:00:00Z", "01:00:00 AM +01:00"],
       ["23:00:00-01:00", "00:00:00Z", "11:00:00 PM -01:00"],
+      ["12:13:14.567",   "12:13:14.567",  "12:13:14 PM"],
+      ["12:13:14.567Z",   "12:13:14.567Z", "12:13:14 PM UTC"],
     ]
     it_behaves_like 'RDF::Literal validation', RDF::XSD.time,
       %w(