rdf 1.1.4 → 1.1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb26de738e672fd9328d6f653a98b7171f65805
-  data.tar.gz: da26233652361aaa44fa23fe258d0fbbc666dbf0
+  metadata.gz: 4528e4244296e7f1bfa2c3751d49678d90bb4cd2
+  data.tar.gz: 209cd71246df1ff9b0a50e3e8bcd6e8eacb71d53
 SHA512:
-  metadata.gz: da30c447f12e8412899db7ca822097ced698a689384384a698a5c1ea326d6d1faf32c65053d363424c3f4c73460417bf02fbc8cd6d0930c9edaf3667dfe7b6dd
-  data.tar.gz: b4093866aba7ef2198e458d41537eec08142e5faae9f56c0fee832d1f34e88e1f7481a9b5d11257b779719b2b4f37c41be73900277a64c7bcaab11c67df1ae1b
+  metadata.gz: 3adc84e76a53c55caf276e33bca707cd371ac71301b5c7dbc48dd555e786cd58744cabe96a56642a2012a05050eb8fabdbaeddf06361fa3076fa8a2e8a177af5
+  data.tar.gz: 884a542d5a761812dc881212ae913e4e8d06201cfed0f4dcc1b8ab3901baa2c2ab86ff9ad5216fecc06ed9d7d56d253c1207127e7692e2249a5ad97522aca56b

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.4.1

data/lib/rdf/cli/vocab-loader.rb

@@ -134,7 +134,7 @@ module RDF
         # This file generated automatically using vocab-fetch from #{source}
         require 'rdf'
         module #{module_name}
-          class #{class_name} < RDF::#{"Strict" if @strict}Vocabulary("#{uri}")
+          class #{class_name} < #{"Strict" if @strict}Vocabulary("#{uri}")
         ).gsub(/^        /, '') if @output_class_file
 
       # Extract statements with subjects that have the vocabulary prefix and organize into a hash of properties and values

data/lib/rdf/query/solution.rb

@@ -25,7 +25,7 @@ class RDF::Query
     undef_method(*instance_methods.
                   map(&:to_s).
                   select {|m| m =~ /^\w+$/}.
-                  reject {|m| %w(object_id dup instance_eval inspect to_s class should should_not pretty_print).include?(m) || m[0,2] == '__'}.
+                  reject {|m| %w(object_id dup instance_eval inspect to_s private_methods class should should_not pretty_print).include?(m) || m[0,2] == '__'}.
                   map(&:to_sym))
 
     include Enumerable

data/lib/rdf/reader.rb

@@ -431,6 +431,7 @@ module RDF
                                  lineno: lineno)
     end
 
+  public
     ##
     # Returns the encoding of the input stream.
     #

data/lib/rdf/util/cache.rb

@@ -85,6 +85,17 @@ module RDF; module Util
         end
         value
       end
+
+      ##
+      # Remove cache entry for key
+      #
+      # @param [Object] key
+      # @return [Object] the previously referenced object
+      def delete(key)
+        id = @cache[key]
+        @cache.delete(key)
+        @index.delete(id) if id
+      end
     end # ObjectSpaceCache
 
     ##
@@ -124,6 +135,16 @@ module RDF; module Util
         end
         value
       end
+
+      ##
+      # Remove cache entry for key
+      #
+      # @param [Object] key
+      # @return [Object] the previously referenced object
+      def delete(key)
+        ref = @cache.delete(key)
+        ref.__getobj__ rescue nil
+      end
     end # WeakRefCache
   end # Cache
 end; end # RDF::Util

data/lib/rdf/util/file.rb

@@ -57,8 +57,9 @@ module RDF; module Util
         result = nil
         until remote_document do
           Net::HTTP::start(parsed_url.host, parsed_url.port,
-                          :open_timeout => 60 * 1000,
-                          :use_ssl => filename_or_url.start_with?("https")
+                          open_timeout: 60 * 1000,
+                          use_ssl: parsed_url.scheme == 'https',
+                          verify_mode: OpenSSL::SSL::VERIFY_NONE
           ) do |http|
             request = Net::HTTP::Get.new(parsed_url.request_uri, headers)
             http.request(request) do |response|

data/lib/rdf/vocab.rb

@@ -134,8 +134,10 @@ module RDF
         else
           name, options = args
           options = {:label => name.to_s, vocab: self}.merge(options || {})
-          prop = Term.intern([to_s, name.to_s].join(''), attributes: options)
-          props[prop] = options
+          uri_str = [to_s, name.to_s].join('')
+          Term.cache.delete(uri_str)  # Clear any previous entry
+          prop = Term.intern(uri_str, attributes: options)
+          props[name.to_sym] = prop
           (class << self; self; end).send(:define_method, name) { prop } unless name.to_s == "property"
           prop
         end
@@ -148,7 +150,7 @@ module RDF
       ##
       #  @return [Array<RDF::URI>] a list of properties in the current vocabulary
       def properties
-        props.keys
+        props.values
       end
       alias_method :__properties__, :properties
 
@@ -157,6 +159,7 @@ module RDF
       #
       # @param [String, #to_s] pname
       # @return [RDF::URI]
+      # @raise [KeyError] if pname suffix not found in identified vocabulary
       def expand_pname(pname)
         prefix, suffix = pname.to_s.split(":", 2)
         if prefix == "rdf"
@@ -169,12 +172,18 @@ module RDF
       end
 
       ##
-      # Return the Vocabulary associated with a URI
+      # Return the Vocabulary associated with a URI. Allows the trailing '/' or '#' to be excluded
       #
       # @param [RDF::URI] uri
       # @return [Vocabulary]
       def find(uri)
-        RDF::Vocabulary.detect {|v| RDF::URI(uri).start_with?(v.to_uri)}
+        RDF::Vocabulary.detect do |v|
+          if uri.length >= v.to_uri.length
+            RDF::URI(uri).start_with?(v.to_uri)
+          else
+            v.to_uri.to_s.sub(%r([/#]$), '') == uri.to_s
+          end
+        end
       end
 
       ##
@@ -186,7 +195,7 @@ module RDF
         uri = RDF::URI(uri)
         return uri if uri.is_a?(Vocabulary::Term)
         vocab = RDF::Vocabulary.detect {|v| uri.start_with?(v.to_uri)}
-        term = vocab[uri.to_s[vocab.to_uri.to_s.length..-1]] if vocab
+        vocab[uri.to_s[vocab.to_uri.to_s.length..-1]] if vocab
       end
 
       ##
@@ -195,21 +204,48 @@ module RDF
       # @param  [#to_s] property
       # @return [RDF::URI]
       def [](property)
-        if self.respond_to?(property.to_sym)
-          self.send(property.to_sym)
+        if props.has_key?(property.to_sym)
+          props[property.to_sym]
         else
           Term.intern([to_s, property.to_s].join(''), attributes: {vocab: self})
         end
       end
 
+      ##
+      # List of vocabularies this vocabulary `owl:imports`
+      #
+      # @note the alias {__imports__} guards against `RDF::OWL.imports` returning a term, rather than an array of vocabularies
+      # @return [Array<RDF::Vocabulary>]
+      def imports
+        @imports ||= begin
+          Array(self[""].attributes["owl:imports"]).map {|pn|find(expand_pname(pn)) rescue nil}.compact
+        rescue KeyError
+          []
+        end
+      end
+      alias_method :__imports__, :imports
+
+      ##
+      # List of vocabularies which import this vocabulary
+      # @return [Array<RDF::Vocabulary>]
+      def imported_from
+        @imported_from ||= begin
+          RDF::Vocabulary.select {|v| v.__imports__.include?(self)}
+        end
+      end
+
+      ##
       # @return [String] The label for the named property
+      # @deprecated Use {RDF::Vocabulary::Term#label}
       def label_for(name)
-        props.fetch(self[name], {}).fetch(:label, "")
+        self[name].label || ''
       end
 
+      ##
       # @return [String] The comment for the named property
+      # @deprecated Use {RDF::Vocabulary::Term#comment}
       def comment_for(name)
-        props.fetch(self[name], {}).fetch(:comment, "")
+        self[name].comment || ''
       end
 
       ##
@@ -244,8 +280,8 @@ module RDF
       # @yield statement
       # @yieldparam [RDF::Statement]
       def each_statement(&block)
-        props.each do |subject, attributes|
-          attributes.each do |prop, values|
+        props.each do |name, subject|
+          subject.attributes.each do |prop, values|
             prop = RDF::Vocabulary.expand_pname(prop) unless prop.is_a?(Symbol)
             next unless prop
             Array(values).each do |value|
@@ -344,9 +380,8 @@ module RDF
           term_defs
         end
 
-        # Create each term
         term_defs.each do |term, attributes|
-          vocab.term term, attributes
+          vocab.__property__ term, attributes
         end
 
         vocab
@@ -494,23 +529,23 @@ module RDF
       #
       # @overload URI(options = {})
       #   @param  [Hash{Symbol => Object}] options
-      #   @option options [Boolean] :validate (false)
-      #   @option options [Boolean] :canonicalize (false)
-      #   @option [Vocabulary] :vocab The {Vocabulary} associated with this term.
-      #   @option [String, #to_s] :scheme The scheme component.
-      #   @option [String, #to_s] :user The user component.
-      #   @option [String, #to_s] :password The password component.
-      #   @option [String, #to_s] :userinfo
-      #     The userinfo component. If this is supplied, the user and password
-      #     components must be omitted.
-      #   @option [String, #to_s] :host The host component.
-      #   @option [String, #to_s] :port The port component.
-      #   @option [String, #to_s] :authority
-      #     The authority component. If this is supplied, the user, password,
-      #     userinfo, host, and port components must be omitted.
-      #   @option [String, #to_s] :path The path component.
-      #   @option [String, #to_s] :query The query component.
-      #   @option [String, #to_s] :fragment The fragment component.
+      #   @option options options [Boolean] :validate (false)
+      #   @option options options [Boolean] :canonicalize (false)
+      #   @option options [Vocabulary] :vocab The {Vocabulary} associated with this term.
+      #   @option options [String, #to_s] :scheme The scheme component.
+      #   @option options [String, #to_s] :user The user component.
+      #   @option options [String, #to_s] :password The password component.
+      #   @option options [String, #to_s] :userinfo
+      #     The u optionsserinfo component. If this is supplied, the user and password
+      #     compo optionsnents must be omitted.
+      #   @option options [String, #to_s] :host The host component.
+      #   @option options [String, #to_s] :port The port component.
+      #   @option options [String, #to_s] :authority
+      #     The a optionsuthority component. If this is supplied, the user, password,
+      #     useri optionsnfo, host, and port components must be omitted.
+      #   @option options [String, #to_s] :path The path component.
+      #   @option options [String, #to_s] :query The query component.
+      #   @option options [String, #to_s] :fragment The fragment component.
       #   @option options [Hash{Symbol,Resource => Term, #to_s}] :attributes
       #     Attributes of this vocabulary term, used for finding `label` and `comment` and to serialize the term back to RDF
       def initialize(*args)
@@ -616,10 +651,14 @@ module RDF
       # Is this a strict vocabulary, or a liberal vocabulary allowing arbitrary properties?
       def strict?; true; end
 
+      ##
+      # Returns the URI for the term `property` in this vocabulary.
+      #
+      # @param  [#to_s] property
+      # @return [RDF::URI]
+      # @raise [KeyError] if property not defined in vocabulary
       def [](name)
-        prop = super
-        props.fetch(prop) #raises KeyError on missing value
-        return prop
+        props.fetch(name.to_sym)
       end
     end
   end # StrictVocabulary

data/lib/rdf/vocab/cert.rb

@@ -64,7 +64,7 @@ module RDF
       label: "RSA Public Key".freeze,
       "rdfs:isDefinedBy" => %(cert:).freeze,
       "rdfs:seeAlso" => %(http://en.wikipedia.org/wiki/RSA).freeze,
-      subClassOf: "cert:PublicKey".freeze,
+      subClassOf: ["cert:PublicKey".freeze, "cert:RSAKey".freeze],
       type: "owl:Class".freeze,
       "vs:term_status" => %(unstable).freeze
     term :Signature,
@@ -108,16 +108,16 @@ module RDF
          It turns out that this relation is unintuitive to write out and to name.
          One should instead use cert:key
     ).freeze,
-      type: "rdf:Property".freeze,
+      type: ["rdf:Property".freeze, "owl:ObjectProperty".freeze],
       "vs:term_status" => %(archaic).freeze
     property :key,
       comment: %(relates an agent to a key - most often the public key.).freeze,
       domain: "foaf:Agent".freeze,
       label: "key".freeze,
       "owl:inverseOf" => %(cert:identity).freeze,
-      range: "cert:Key".freeze,
+      range: ["cert:Key".freeze, "cert:PublicKey".freeze],
       "rdfs:isDefinedBy" => %(cert:).freeze,
-      type: "rdf:Property".freeze,
+      type: ["rdf:Property".freeze, "owl:InverseFunctionalProperty".freeze, "owl:ObjectProperty".freeze],
       "vs:term_status" => %(unstable).freeze
     property :modulus,
       comment: %(    
@@ -132,9 +132,9 @@ module RDF
  <p>The only difference is that the octet string is then encoded using either xsd:base64Binary or xsd:hexBinary. Currently for all usages of this relation, the xsd:hexBinary datatype should be used until the SPARQL working group specifies specifies in its <a href="http://www.w3.org/TR/sparql11-entailment/#DEntRegime">D-Entailment</a> that those two types are equivalent.</p>
  <p>It would have been better had there been a hexInteger datatype that was standard and supported by all tools.</p>
    ).freeze,
-      domain: "cert:DSAKey".freeze,
+      domain: ["cert:DSAKey".freeze, "cert:RSAKey".freeze],
       label: "modulus".freeze,
-      range: "xsd:base64Binary".freeze,
+      range: ["xsd:base64Binary".freeze, "xsd:hexBinary".freeze],
       "rdfs:isDefinedBy" => %(cert:).freeze,
       type: "owl:DatatypeProperty".freeze,
       "vs:term_status" => %(unstable).freeze

data/lib/rdf/vocab/dc.rb

@@ -12,7 +12,7 @@ module RDF
       "dc:issued" => %(2008-01-14).freeze,
       label: "Agent".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      type: "dc:AgentClass".freeze
+      type: ["dc:AgentClass".freeze, "rdfs:Class".freeze]
     term :AgentClass,
       comment: %(A group of agents.).freeze,
       "dc:description" => %(Examples of Agent Class include groups seen as classes, such as students, women, charities, lecturers.).freeze,
@@ -184,7 +184,7 @@ module RDF
       "dc:modified" => %(2008-01-14).freeze,
       label: "Abstract".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:description".freeze,
+      subPropertyOf: ["dc11:description".freeze, "dc:description".freeze],
       type: "rdf:Property".freeze
     property :accessRights,
       comment: %(Information about who can access the resource or an indication of its security status.).freeze,
@@ -195,7 +195,7 @@ module RDF
       label: "Access Rights".freeze,
       range: "dc:RightsStatement".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:rights".freeze,
+      subPropertyOf: ["dc11:rights".freeze, "dc:rights".freeze],
       type: "rdf:Property".freeze
     property :accrualMethod,
       comment: %(The method by which items are added to a collection.).freeze,
@@ -236,7 +236,7 @@ module RDF
       label: "Alternative Title".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:title".freeze,
+      subPropertyOf: ["dc11:title".freeze, "dc:title".freeze],
       type: "rdf:Property".freeze
     property :audience,
       comment: %(A class of entity for whom the resource is intended or useful.).freeze,
@@ -255,7 +255,7 @@ module RDF
       label: "Date Available".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:date".freeze,
+      subPropertyOf: ["dc11:date".freeze, "dc:date".freeze],
       type: "rdf:Property".freeze
     property :bibliographicCitation,
       comment: %(A bibliographic reference for the resource.).freeze,
@@ -267,7 +267,7 @@ module RDF
       label: "Bibliographic Citation".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:identifier".freeze,
+      subPropertyOf: ["dc11:identifier".freeze, "dc:identifier".freeze],
       type: "rdf:Property".freeze
     property :conformsTo,
       comment: %(An established standard to which the described resource conforms.).freeze,
@@ -277,7 +277,7 @@ module RDF
       label: "Conforms To".freeze,
       range: "dc:Standard".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :contributor,
       comment: %(An entity responsible for making contributions to the resource.).freeze,
@@ -309,7 +309,7 @@ module RDF
       label: "Date Created".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:date".freeze,
+      subPropertyOf: ["dc11:date".freeze, "dc:date".freeze],
       type: "rdf:Property".freeze
     property :creator,
       comment: %(An entity primarily responsible for making the resource.).freeze,
@@ -321,7 +321,7 @@ module RDF
       "owl:equivalentProperty" => %(foaf:maker).freeze,
       range: "dc:Agent".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:creator".freeze,
+      subPropertyOf: ["dc11:creator".freeze, "dc:contributor".freeze],
       type: "rdf:Property".freeze
     property :date,
       comment: %(A point or period of time associated with an event in the lifecycle of the resource.).freeze,
@@ -343,7 +343,7 @@ module RDF
       label: "Date Accepted".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:date".freeze,
+      subPropertyOf: ["dc11:date".freeze, "dc:date".freeze],
       type: "rdf:Property".freeze
     property :dateCopyrighted,
       comment: %(Date of copyright.).freeze,
@@ -353,7 +353,7 @@ module RDF
       label: "Date Copyrighted".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:date".freeze,
+      subPropertyOf: ["dc11:date".freeze, "dc:date".freeze],
       type: "rdf:Property".freeze
     property :dateSubmitted,
       comment: %(Date of submission of the resource.).freeze,
@@ -364,7 +364,7 @@ module RDF
       label: "Date Submitted".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:date".freeze,
+      subPropertyOf: ["dc11:date".freeze, "dc:date".freeze],
       type: "rdf:Property".freeze
     property :description,
       comment: %(An account of the resource.).freeze,
@@ -394,7 +394,7 @@ module RDF
       label: "Extent".freeze,
       range: "dc:SizeOrDuration".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:format".freeze,
+      subPropertyOf: ["dc11:format".freeze, "dc:format".freeze],
       type: "rdf:Property".freeze
     property :format,
       comment: %(The file format, physical medium, or dimensions of the resource.).freeze,
@@ -415,7 +415,7 @@ module RDF
       label: "Has Format".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :hasPart,
       comment: %(A related resource that is included either physically or logically in the described resource.).freeze,
@@ -425,7 +425,7 @@ module RDF
       label: "Has Part".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :hasVersion,
       comment: %(A related resource that is a version, edition, or adaptation of the described resource.).freeze,
@@ -435,7 +435,7 @@ module RDF
       label: "Has Version".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :identifier,
       comment: %(An unambiguous reference to the resource within a given context.).freeze,
@@ -466,7 +466,7 @@ module RDF
       label: "Is Format Of".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :isPartOf,
       comment: %(A related resource in which the described resource is physically or logically included.).freeze,
@@ -476,7 +476,7 @@ module RDF
       label: "Is Part Of".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :isReferencedBy,
       comment: %(A related resource that references, cites, or otherwise points to the described resource.).freeze,
@@ -486,7 +486,7 @@ module RDF
       label: "Is Referenced By".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :isReplacedBy,
       comment: %(A related resource that supplants, displaces, or supersedes the described resource.).freeze,
@@ -496,7 +496,7 @@ module RDF
       label: "Is Replaced By".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :isRequiredBy,
       comment: %(A related resource that requires the described resource to support its function, delivery, or coherence.).freeze,
@@ -506,7 +506,7 @@ module RDF
       label: "Is Required By".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :isVersionOf,
       comment: %(A related resource of which the described resource is a version, edition, or adaptation.).freeze,
@@ -517,7 +517,7 @@ module RDF
       label: "Is Version Of".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :issued,
       comment: %(Date of formal issuance \(e.g., publication\) of the resource.).freeze,
@@ -527,7 +527,7 @@ module RDF
       label: "Date Issued".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:date".freeze,
+      subPropertyOf: ["dc11:date".freeze, "dc:date".freeze],
       type: "rdf:Property".freeze
     property :language,
       comment: %(A language of the resource.).freeze,
@@ -548,7 +548,7 @@ module RDF
       label: "License".freeze,
       range: "dc:LicenseDocument".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:rights".freeze,
+      subPropertyOf: ["dc11:rights".freeze, "dc:rights".freeze],
       type: "rdf:Property".freeze
     property :mediator,
       comment: %(An entity that mediates access to the resource and for whom the resource is intended or useful.).freeze,
@@ -570,7 +570,7 @@ module RDF
       label: "Medium".freeze,
       range: "dc:PhysicalMedium".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:format".freeze,
+      subPropertyOf: ["dc11:format".freeze, "dc:format".freeze],
       type: "rdf:Property".freeze
     property :modified,
       comment: %(Date on which the resource was changed.).freeze,
@@ -580,7 +580,7 @@ module RDF
       label: "Date Modified".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:date".freeze,
+      subPropertyOf: ["dc11:date".freeze, "dc:date".freeze],
       type: "rdf:Property".freeze
     property :provenance,
       comment: %(A statement of any changes in ownership and custody of the resource since its creation that are significant for its authenticity, integrity, and interpretation.).freeze,
@@ -611,7 +611,7 @@ module RDF
       label: "References".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :relation,
       comment: %(A related resource.).freeze,
@@ -632,7 +632,7 @@ module RDF
       label: "Replaces".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :requires,
       comment: %(A related resource that is required by the described resource to support its function, delivery, or coherence.).freeze,
@@ -642,7 +642,7 @@ module RDF
       label: "Requires".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:relation".freeze,
+      subPropertyOf: ["dc11:relation".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :rights,
       comment: %(Information about rights held in and over the resource.).freeze,
@@ -673,7 +673,7 @@ module RDF
       label: "Source".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
       "skos:note" => %(This term is intended to be used with non-literal values as defined in the DCMI Abstract Model \(http://dublincore.org/documents/abstract-model/\).  As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration.).freeze,
-      subPropertyOf: "dc11:source".freeze,
+      subPropertyOf: ["dc11:source".freeze, "dc:relation".freeze],
       type: "rdf:Property".freeze
     property :spatial,
       comment: %(Spatial characteristics of the resource.).freeze,
@@ -683,7 +683,7 @@ module RDF
       label: "Spatial Coverage".freeze,
       range: "dc:Location".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:coverage".freeze,
+      subPropertyOf: ["dc11:coverage".freeze, "dc:coverage".freeze],
       type: "rdf:Property".freeze
     property :subject,
       comment: %(The topic of the resource.).freeze,
@@ -703,7 +703,7 @@ module RDF
       "dc:modified" => %(2008-01-14).freeze,
       label: "Table Of Contents".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:description".freeze,
+      subPropertyOf: ["dc11:description".freeze, "dc:description".freeze],
       type: "rdf:Property".freeze
     property :temporal,
       comment: %(Temporal characteristics of the resource.).freeze,
@@ -713,7 +713,7 @@ module RDF
       label: "Temporal Coverage".freeze,
       range: "dc:PeriodOfTime".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:coverage".freeze,
+      subPropertyOf: ["dc11:coverage".freeze, "dc:coverage".freeze],
       type: "rdf:Property".freeze
     property :title,
       comment: %(A name given to the resource.).freeze,
@@ -744,7 +744,7 @@ module RDF
       label: "Date Valid".freeze,
       range: "rdfs:Literal".freeze,
       "rdfs:isDefinedBy" => %(dc:).freeze,
-      subPropertyOf: "dc11:date".freeze,
+      subPropertyOf: ["dc11:date".freeze, "dc:date".freeze],
       type: "rdf:Property".freeze
 
     # Datatype definitions
@@ -858,6 +858,11 @@ module RDF
       type: "rdfs:Datatype".freeze
 
     # Extra definitions
+    term :"",
+      "dc:modified" => %(2012-06-14).freeze,
+      "dc:publisher" => %(http://purl.org/dc/aboutdcmi#DCMI).freeze,
+      "dc:title" => %(DCMI Metadata Terms - other).freeze,
+      label: "".freeze
     term :DCMIType,
       comment: %(The set of classes specified by the DCMI Type Vocabulary, used to categorize the nature or genre of the resource.).freeze,
       "dc:hasVersion" => %(http://dublincore.org/usage/terms/history/#DCMIType-005).freeze,