rdf-xsd 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88c3fc78f625a07c1e4f7bd3e572039be95d39c7
-  data.tar.gz: a4e9108ea175b57e2841ff37d55fa584682f7f3f
+  metadata.gz: 8c014eaaff792361c1d6fa05e26933472485d7aa
+  data.tar.gz: f63f51ec09699752ad13ad04af7e92faa072acb2
 SHA512:
-  metadata.gz: ecfab1a047ad7509866c18a60fb5d56e8fe72544bab73853a517607fefeb79ede30906e446513950e1c9835e44b8f023475e28d0484deb039fce92546527a7a4
-  data.tar.gz: 8586b94faec499fca481fa96a494e6053ce38ba612ac19e3b926e5c0efbc6186953c1e88b5129792b20a3355a31c4847b92a7fa401de81bdea409dc478628bb9
+  metadata.gz: 73c34000bb89d17d584115d821a8d33b3d8bae4c3e01a4db59d259b16d8f10fa88c21c8dbb0259af01b43fe351af334c932d85a5f54eabdd1b8dde945819a9d1
+  data.tar.gz: ec76f7f67c5d8b68a8552da55745f1c9446e7a6c6e42cd49eeea4309085c10a27b59e35b296bfd974f1820542814c97a185d79c3fd770aae88eef78e6e8ee052

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/rdf/xsd/any_uri.rb

@@ -14,7 +14,7 @@ module RDF; class Literal
   # This type should be used to specify the intention that the value fulfills
   # the role of a URI as defined by [RFC 2396], as amended by [RFC 2732].
   #
-  # @see http://www.w3.org/TR/xmlschema-2/#anyURI
+  # @see http://www.w3.org/TR/xmlschema11-2/#anyURI
   # @see http://www.ietf.org/rfc/rfc2396.txt
   # @see http://www.ietf.org/rfc/rfc2732.txt
   class AnyURI < RDF::Literal

data/lib/rdf/xsd/binary.rb

@@ -50,7 +50,7 @@ module RDF; class Literal
     # Converts this literal into its canonical lexical representation.
     #
     # @return [RDF::Literal] `self`
-    # @see    http://www.w3.org/TR/xmlschema-2/#dateTime
+    # @see    http://www.w3.org/TR/xmlschema11-2/#dateTime
     def canonicalize!
       @string = ::Base64.encode64(@object)
       self

data/lib/rdf/xsd/date.rb

@@ -2,6 +2,18 @@
 require 'rdf'
 
 module RDF; class Literal
+  ##
+  # dateTimeStamp
+  #
+  # The dateTimeStamp datatype is ·derived· from dateTime by giving the value required to its explicitTimezone facet. The result is that all values of dateTimeStamp are required to have explicit time zone offsets and the datatype is totally ordered.
+  #
+  # @see http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#dateTimeStamp
+  class DateTimeStamp < RDF::Literal::DateTime
+    DATATYPE = XSD.dateTimeStamp
+    GRAMMAR  = %r(\A(-?\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:%SZ'.freeze
+  end
+
   ##
   # gYearMonth represents a specific gregorian month in a specific gregorian year. The value space of gYearMonth is
   # the set of Gregorian calendar months as defined in § 5.2.1 of [ISO 8601]. Specifically, it is a set of one-month
@@ -47,7 +59,7 @@ module RDF; class Literal
   # @see http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#gMonthDay
   class MonthDay < RDF::Literal::Date
     DATATYPE = XSD.gMonthDay
-    GRAMMAR  = %r(\A(\d{2}-\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|Z)?\Z).freeze
+    GRAMMAR  = %r(\A--(\d{2}-\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|Z)?\Z).freeze
     FORMAT   = '%m-%d%Z'.freeze
 
     def initialize(value, options = {})
@@ -65,7 +77,7 @@ module RDF; class Literal
   # @see http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#gDay
   class Day < RDF::Literal::Date
     DATATYPE = XSD.gDay
-    GRAMMAR  = %r(\A(\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|Z)?\Z).freeze
+    GRAMMAR  = %r(\A---(\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|Z)?\Z).freeze
     FORMAT   = '%d%Z'.freeze
 
     def initialize(value, options = {})
@@ -82,7 +94,7 @@ module RDF; class Literal
   # @see http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#gMonth
   class Month < RDF::Literal::Date
     DATATYPE = XSD.gMonth
-    GRAMMAR  = %r(\A(\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|Z)?\Z).freeze
+    GRAMMAR  = %r(\A--(\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|Z)?\Z).freeze
     FORMAT   = '%m%Z'.freeze
 
     def initialize(value, options = {})

data/lib/rdf/xsd/duration.rb

@@ -5,11 +5,27 @@ module RDF; class Literal
   ##
   # A duration literal.
   #
-  # @see   http://www.w3.org/TR/xmlschema-2/#duration
-  # @since 0.2.1
+  # @see   http://www.w3.org/TR/xmlschema11-2/#duration
   class Duration < Literal
     DATATYPE = XSD.duration
-    GRAMMAR  = %r(\A(-?)P(\d+Y)?(\d+M)?(\d+D)?T?(\d+H)?(\d+M)?([\d\.]+S)?\Z).freeze
+    GRAMMAR  = %r(\A
+      (?<si>-)?
+      P(?:(?:(?:(?:(?<yr>\d+)Y)(?:(?<mo>\d+)M)?(?:(?<da>\d+)D)?)
+          |  (?:(?:(?<mo>\d+)M)(?:(?<da>\d+)D)?)
+          |  (?:(?<da>\d+)D)
+          )
+          (?:T(?:(?:(?:(?<hr>\d+)H)(?:(?<mi>\d+)M)?(?<se>\d+(?:\.\d+)?S)?)
+              |  (?:(?:(?<mi>\d+)M)(?:(?<se>\d+(?:\.\d+)?)S)?)
+              |  (?:(?<se>\d+(?:\.\d+)?)S)
+              )
+          )?
+       |(?:T(?:(?:(?:(?<hr>\d+)H)(?:(?<mi>\d+)M)?(?<se>\d+(?:\.\d+)?S)?)
+            |  (?:(?:(?<mi>\d+)M)(?:(?<se>\d+(?:\.\d+)?)S)?)
+            |   (?:(?<se>\d+(?:\.\d+)?)S)
+            )
+        )
+       )
+    \z)x.freeze
 
     ##
     # * Given a Numeric, assumes that it is milliseconds
@@ -33,9 +49,8 @@ module RDF; class Literal
       when Duration, Numeric
         {:se => value.to_f}
       else
-        parse(value.to_s) rescue { }
+        parse(value.to_s)
       end
-      @object[:si] ||= 1
     end
 
     ##
@@ -44,11 +59,11 @@ module RDF; class Literal
     # Also normalizes elements
     #
     # @return [RDF::Literal] `self`
-    # @see    http://www.w3.org/TR/xmlschema-2/#dateTime
+    # @see    http://www.w3.org/TR/xmlschema11-2/#dateTime
     def canonicalize!
       @string = @humanize = nil
       if @object[:se].to_i > 60
-        m_r = (@object[:se].to_i / 60) - 1
+        m_r = (@object[:se].to_f / 60) - 1
         @object[:se] -=  m_r * 60
         @object[:mi] = @object[:mi].to_i + m_r
       end
@@ -72,7 +87,7 @@ module RDF; class Literal
         @object[:mo] -=  y_r * 12
         @object[:yr] = @object[:yr].to_i + y_r
       end
-      @object.to_s  # site-effect
+      @object.to_s  # side-effect
       self
     end
 
@@ -83,7 +98,6 @@ module RDF; class Literal
     # Special case for date and dateTime, for which '0000' is not a valid year
     #
     # @return [Boolean]
-    # @since  0.2.1
     def valid?
       !!(value =~ GRAMMAR)
     end
@@ -94,7 +108,7 @@ module RDF; class Literal
     # @return [String]
     def to_s
       @string ||= begin
-        str = @object[:si] < 0 ? "-P" : "P"
+        str = @object[:si] == '-' ? "-P" : "P"
         str << "%dY" % @object[:yr].to_i if @object[:yr]
         str << "%dM" % @object[:mo].to_i if @object[:mo]
         str << "%dD" % @object[:da].to_i if @object[:da]
@@ -106,7 +120,7 @@ module RDF; class Literal
     end
 
     def plural(v, str)
-      "#{v} #{str}#{v == 1 ? '' : 's'}" if v
+      "#{v} #{str}#{v.to_i == 1 ? '' : 's'}" if v
     end
     
     ##
@@ -126,7 +140,7 @@ module RDF; class Literal
         last = ar.pop
         first = ar.join(" ")
         res = first.empty? ? last : "#{first} and #{last}"
-        @object[:si] < 0 ? "#{res} ago" : res
+        @object[:si] == '-' ? "#{res} ago" : res
       end
     end
 
@@ -159,7 +173,7 @@ module RDF; class Literal
         @object[:hr].to_i * 3600 +
         @object[:mi].to_i * 60 +
         @object[:se].to_f
-      ) * @object[:si]
+      ) * (@object[:si] == '-' ? -1 : 1)
     end
 
     # @return [Integer]
@@ -174,22 +188,55 @@ module RDF; class Literal
     # @param [String] value XSD formatted duration
     # @return [Duration]
     def parse(value)
-      hash = {}
-      if value.to_s.match(GRAMMAR)
-        hash[:si] = $1 == "-" ? -1 : 1
-        hash[:yr] = $2.to_i if $2
-        hash[:mo] = $3.to_i if $3
-        hash[:da] = $4.to_i if $4
-        hash[:hr] = $5.to_i if $5
-        hash[:mi] = $6.to_i if $6
-        hash[:se] = $7.to_f if $7
-      end
-      hash
+      value.to_s.match(GRAMMAR)
     end
     
     def sec_str
-      usec = (@object[:se] * 1000).to_i % 1000
-      usec > 0 ? ("%2.3f" % @object[:se]).sub(/0*\Z/, '') : @object[:se].to_i.to_s
+      sec = @object[:se].to_f
+      ((sec.truncate == sec ? "%d" : "%2.3f") % sec).sub(/(\.[1-9]+)0+$/, '\1')
     end
   end # Duration
+
+  ##
+  # A DayTimeDuration literal.
+  #
+  # dayTimeDuration is a datatype ·derived· from duration by restricting its ·lexical representations· to instances of dayTimeDurationLexicalRep. The ·value space· of dayTimeDuration is therefore that of duration restricted to those whose ·months· property is 0.  This results in a duration datatype which is totally ordered.
+  #
+  # @see   http://www.w3.org/TR/xmlschema11-2/#dayTimeDuration
+  class DayTimeDuration < Literal
+    DATATYPE = XSD.dayTimeDuration
+    GRAMMAR  = %r(\A
+      (?<si>-)?
+      P(?:(?:(?:(?<da>\d+)D)
+          )
+          (?:T(?:(?:(?:(?<hr>\d+)H)(?:(?<mi>\d+)M)?(?<se>\d+(?:\.\d+)?S)?)
+              |  (?:(?:(?<mi>\d+)M)(?:(?<se>\d+(?:\.\d+)?)S)?)
+              |  (?:(?<se>\d+(?:\.\d+)?)S)
+              )
+          )?
+       |(?:T(?:(?:(?:(?<hr>\d+)H)(?:(?<mi>\d+)M)?(?<se>\d+(?:\.\d+)?S)?)
+            |  (?:(?:(?<mi>\d+)M)(?:(?<se>\d+(?:\.\d+)?)S)?)
+            |   (?:(?<se>\d+(?:\.\d+)?)S)
+            )
+        )
+       )
+    \z)x.freeze
+  end # DayTimeDuration
+
+  ##
+  # A YearMonthDuration literal.
+  #
+  # yearMonthDuration is a datatype ·derived· from duration by restricting its ·lexical representations· to instances of yearMonthDurationLexicalRep.  The ·value space· of yearMonthDuration is therefore that of duration restricted to those whose ·seconds· property is 0.  This results in a duration datatype which is totally ordered.
+  #
+  # @see   http://www.w3.org/TR/xmlschema11-2/#yearMonthDuration
+  class YearMonthDuration < Literal
+    DATATYPE = XSD.yearMonthDuration
+    GRAMMAR  = %r(\A
+      (?<si>-)?
+      P(?:(?:(?:(?:(?<yr>\d+)Y)(?:(?<mo>\d+)M)?)
+          |  (?:(?:(?<mo>\d+)M))
+          )
+       )
+    \z)x.freeze
+  end # DayTimeDuration
 end; end # RDF::Literal

data/lib/rdf/xsd/integer.rb

@@ -14,7 +14,6 @@ module RDF; class Literal
     # Returns `self` negated.
     #
     # @return [RDF::Literal::Numeric]
-    # @since  0.2.3
     def -@
       if object != 0
         # XXX Raise error?
@@ -41,7 +40,6 @@ module RDF; class Literal
     # Returns `self` negated.
     #
     # @return [RDF::Literal::Numeric]
-    # @since  0.2.3
     def -@
       if object != 0
         # XXX Raise error?

data/lib/rdf/xsd/xml.rb

@@ -27,7 +27,6 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/rdf-concepts/#section-XMLLiteral
   # @see   http://www.w3.org/TR/rdfa-core/#s_xml_literals
   # @see   http://www.w3.org/TR/xml-exc-c14n/
-  # @since 0.2.1
   class XML < Literal
     DATATYPE = RDF.XMLLiteral
     GRAMMAR  = nil
@@ -145,7 +144,6 @@ module RDF; class Literal
   # [DOM DocumentFragment](http://www.w3.org/TR/dom/#interface-documentfragment).
   #
   # @see   https://dvcs.w3.org/hg/rdf/raw-file/default/rdf-concepts/index.html#section-html
-  # @since 0.3.7
   class HTML < XML
   end
 end; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-xsd
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-xsd
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Extended XSD Datatypes for RDF.rb.