rdf 3.0.13 → 3.1.4

data/lib/rdf/vocab/rdfs.rb

@@ -5,118 +5,181 @@ require 'rdf'
 module RDF
   # @!parse
   #   # Vocabulary for <http://www.w3.org/2000/01/rdf-schema#>
+  #   #
+  #   # The RDF Schema vocabulary (RDFS)
+  #   # @see http://www.w3.org/2000/01/rdf-schema-more
   #   class RDFS < RDF::StrictVocabulary
+  #     # The class of classes.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :Class
+  #
+  #     # The class of RDF containers.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :Container
+  #
+  #     # The class of container membership properties, rdf:_1, rdf:_2, ...,                     all of which are sub-properties of 'member'.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :ContainerMembershipProperty
+  #
+  #     # The class of RDF datatypes.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :Datatype
+  #
+  #     # The class of literal values, eg. textual strings and integers.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :Literal
+  #
+  #     # The class resource, everything.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :Resource
+  #
+  #     # A description of the subject resource.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :comment
+  #
+  #     # A domain of the subject property.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :domain
+  #
+  #     # The defininition of the subject resource.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :isDefinedBy
+  #
+  #     # A human-readable name for the subject.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :label
+  #
+  #     # A member of the subject resource.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :member
+  #
+  #     # A range of the subject property.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :range
+  #
+  #     # Further information about the subject resource.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :seeAlso
+  #
+  #     # The subject is a subclass of a class.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :subClassOf
+  #
+  #     # The subject is a subproperty of a property.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :subPropertyOf
+  #
   #   end
-  class RDFS < RDF::StrictVocabulary("http://www.w3.org/2000/01/rdf-schema#")
+  RDFS = Class.new(RDF::StrictVocabulary("http://www.w3.org/2000/01/rdf-schema#")) do
 
     # Ontology definition
     ontology :"http://www.w3.org/2000/01/rdf-schema#",
-      "dc11:title": %(The RDF Schema vocabulary \(RDFS\)).freeze,
-      "rdfs:seeAlso": %(http://www.w3.org/2000/01/rdf-schema-more).freeze,
+      "dc11:title": "The RDF Schema vocabulary (RDFS)".freeze,
+      "rdfs:seeAlso": "http://www.w3.org/2000/01/rdf-schema-more".freeze,
       type: "owl:Ontology".freeze
 
     # Class definitions
     term :Class,
       comment: %(The class of classes.).freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "Class".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       subClassOf: "rdfs:Resource".freeze,
       type: "rdfs:Class".freeze
     term :Container,
       comment: %(The class of RDF containers.).freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "Container".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       subClassOf: "rdfs:Resource".freeze,
       type: "rdfs:Class".freeze
     term :ContainerMembershipProperty,
       comment: %(The class of container membership properties, rdf:_1, rdf:_2, ...,
                     all of which are sub-properties of 'member'.).freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "ContainerMembershipProperty".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       subClassOf: "rdf:Property".freeze,
       type: "rdfs:Class".freeze
     term :Datatype,
       comment: %(The class of RDF datatypes.).freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "Datatype".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       subClassOf: "rdfs:Class".freeze,
       type: "rdfs:Class".freeze
     term :Literal,
       comment: %(The class of literal values, eg. textual strings and integers.).freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "Literal".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       subClassOf: "rdfs:Resource".freeze,
       type: "rdfs:Class".freeze
     term :Resource,
       comment: %(The class resource, everything.).freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "Resource".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdfs:Class".freeze
 
     # Property definitions
     property :comment,
       comment: %(A description of the subject resource.).freeze,
       domain: "rdfs:Resource".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "comment".freeze,
       range: "rdfs:Literal".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdf:Property".freeze
     property :domain,
       comment: %(A domain of the subject property.).freeze,
       domain: "rdf:Property".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "domain".freeze,
       range: "rdfs:Class".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdf:Property".freeze
     property :isDefinedBy,
       comment: %(The defininition of the subject resource.).freeze,
       domain: "rdfs:Resource".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "isDefinedBy".freeze,
       range: "rdfs:Resource".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       subPropertyOf: "rdfs:seeAlso".freeze,
       type: "rdf:Property".freeze
     property :label,
       comment: %(A human-readable name for the subject.).freeze,
       domain: "rdfs:Resource".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "label".freeze,
       range: "rdfs:Literal".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdf:Property".freeze
     property :member,
       comment: %(A member of the subject resource.).freeze,
       domain: "rdfs:Resource".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "member".freeze,
       range: "rdfs:Resource".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdf:Property".freeze
     property :range,
       comment: %(A range of the subject property.).freeze,
       domain: "rdf:Property".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "range".freeze,
       range: "rdfs:Class".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdf:Property".freeze
     property :seeAlso,
       comment: %(Further information about the subject resource.).freeze,
       domain: "rdfs:Resource".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "seeAlso".freeze,
       range: "rdfs:Resource".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdf:Property".freeze
     property :subClassOf,
       comment: %(The subject is a subclass of a class.).freeze,
       domain: "rdfs:Class".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "subClassOf".freeze,
       range: "rdfs:Class".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdf:Property".freeze
     property :subPropertyOf,
       comment: %(The subject is a subproperty of a property.).freeze,
       domain: "rdf:Property".freeze,
+      isDefinedBy: "rdfs:".freeze,
       label: "subPropertyOf".freeze,
       range: "rdf:Property".freeze,
-      isDefinedBy: %(rdfs:).freeze,
       type: "rdf:Property".freeze
   end
 end

data/lib/rdf/vocab/rdfv.rb

@@ -5,9 +5,130 @@ require 'rdf'
 module RDF
   # @!parse
   #   # Vocabulary for <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+  #   #
+  #   # This is the RDF Schema for the RDF vocabulary terms in the RDF Namespace, defined in RDF 1.1 Concepts.
   #   class RDFV < RDF::StrictVocabulary
+  #     # The class of containers of alternatives.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :Alt
+  #
+  #     # The class of unordered containers.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :Bag
+  #
+  #     # A class representing a compound literal.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :CompoundLiteral
+  #
+  #     # The class of RDF Lists.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :List
+  #
+  #     # The class of RDF properties.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :Property
+  #
+  #     # The class of ordered containers.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :Seq
+  #
+  #     # The class of RDF statements.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :Statement
+  #
+  #     # The direction component of a CompoundLiteral.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :direction
+  #
+  #     # The first item in the subject RDF list.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :first
+  #
+  #     # The object of the subject RDF statement.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :object
+  #
+  #     # The language component of a CompoundLiteral.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :language
+  #
+  #     # The predicate of the subject RDF statement.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :predicate
+  #
+  #     # The rest of the subject RDF list after the first item.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :rest
+  #
+  #     # The subject of the subject RDF statement.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :subject
+  #
+  #     # The subject is an instance of a class.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :type
+  #
+  #     # Idiomatic property used for structured values.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :value
+  #
+  #     # The datatype of RDF literals storing fragments of HTML content.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :HTML
+  #
+  #     # The datatype of RDF literals storing JSON content.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :JSON
+  #
+  #     # The class of plain (i.e. untyped) literal values, as used in RIF and OWL 2.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :PlainLiteral
+  #
+  #     # The datatype of XML literal values.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :XMLLiteral
+  #
+  #     # The datatype of language-tagged string values.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :langString
+  #
+  #     # RDF/XML node element.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :Description
+  #
+  #     # RDF/XML attribute creating a Reification.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :ID
+  #
+  #     # RDF/XML attribute declaring subject.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :about
+  #
+  #     # RDF/XML literal datatype.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :datatype
+  #
+  #     # RDF/XML container membership list element.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :li
+  #
+  #     # The empty list, with no items in it. If the rest of a list is nil then the list has no more items in it.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :nil
+  #
+  #     # RDF/XML Blank Node identifier.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :nodeID
+  #
+  #     # Parse type for RDF/XML, either Collection, Literal or Resource.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :parseType
+  #
+  #     # RDF/XML attribute declaring object.
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :resource
   #   end
-  class RDFV < RDF::StrictVocabulary("http://www.w3.org/1999/02/22-rdf-syntax-ns#")
+  RDFV = Class.new(RDF::StrictVocabulary("http://www.w3.org/1999/02/22-rdf-syntax-ns#")) do
 
     class << self
       def name; "RDF"; end
@@ -33,6 +154,12 @@ module RDF
       isDefinedBy: %(rdf:).freeze,
       subClassOf: "rdfs:Container".freeze,
       type: "rdfs:Class".freeze
+    term :CompoundLiteral,
+      comment: %(A class representing a compound literal.).freeze,
+      label: "CompoundLiteral".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      subClassOf: "rdfs:Class".freeze,
+      type: "rdfs:Class".freeze
     term :List,
       comment: %(The class of RDF Lists.).freeze,
       label: "List".freeze,
@@ -59,6 +186,13 @@ module RDF
       type: "rdfs:Class".freeze
 
     # Property definitions
+    property :direction,
+      comment: %(The direction component of a CompoundLiteral.).freeze,
+      domain: "rdf:CompoundLiteral".freeze,
+      label: "direction".freeze,
+      range: "rdfs:Resource".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      type: "rdf:Property".freeze
     property :first,
       comment: %(The first item in the subject RDF list.).freeze,
       domain: "rdf:List".freeze,
@@ -73,6 +207,13 @@ module RDF
       range: "rdfs:Resource".freeze,
       isDefinedBy: %(rdf:).freeze,
       type: "rdf:Property".freeze
+    property :language,
+      comment: %(The language component of a CompoundLiteral.).freeze,
+      domain: "rdf:CompoundLiteral".freeze,
+      label: "language".freeze,
+      range: "rdfs:Resource".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      type: "rdf:Property".freeze
     property :predicate,
       comment: %(The predicate of the subject RDF statement.).freeze,
       domain: "rdf:Statement".freeze,
@@ -117,6 +258,11 @@ module RDF
       "rdfs:seeAlso": %(http://www.w3.org/TR/rdf11-concepts/#section-html).freeze,
       subClassOf: "rdfs:Literal".freeze,
       type: "rdfs:Datatype".freeze
+    property :JSON,
+      comment: %(The datatype of RDF literals storing JSON content.).freeze,
+      label: "JSON".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      type: "rdfs:Datatype".freeze
     term :PlainLiteral,
       comment: %(The class of plain \(i.e. untyped\) literal values, as used in RIF and OWL 2).freeze,
       label: "PlainLiteral".freeze,

data/lib/rdf/vocab/writer.rb

@@ -1,5 +1,6 @@
 require 'rdf'
 require 'rdf/vocabulary'
+require 'cgi'
 
 module RDF
   ##
@@ -84,7 +85,7 @@ module RDF
             on: ["--extra URIEncodedJSON"],
             description: "URI Encoded JSON representation of extra data"
           ) do |arg|
-            ::JSON.parse(::URI.decode(arg)).inject({}) do |m1, (term, defs)|
+            ::JSON.parse(::CGI.unescape(arg)).inject({}) do |m1, (term, defs)|
               d1 = defs.inject({}) {|m, (k,v)| m.merge(k.to_sym => v)}
               m1.merge(term.to_sym => d1)
             end
@@ -145,11 +146,29 @@ module RDF
           module #{module_name}
             # @!parse
             #   # Vocabulary for <#{base_uri}>
-            #   class #{class_name} < RDF::#{"Strict" if strict}Vocabulary
-            #   end
-            class #{class_name} < RDF::#{"Strict" if strict}Vocabulary("#{base_uri}")
+            #   #
           ).gsub(/^          /, '')
 
+        if vocab.ontology
+          ont_doc = []
+          [:"dc:title", :"dc11:title", :label, :comment, :"dc:description", :"dc11:description"].each do |attr|
+            next unless vocab.ontology.attributes[attr]
+            Array(vocab.ontology.attributes[attr]).each do |v|
+              ont_doc << "  #   # " + v.to_s.gsub(/\n/, ' ')
+            end
+          end
+          @output.puts ont_doc.join("\n  #   #\n") unless ont_doc.empty?
+          # Version Info
+          Array(vocab.ontology.attributes[:"owl:versionInfo"]).each do |vers|
+            @output.puts "  #   # @version #{vers}"
+          end
+          # See Also
+          Array(vocab.ontology.attributes[:"rdfs:seeAlso"]).each do |see|
+            @output.puts "  #   # @see #{see}"
+          end
+        end
+        @output.puts %(  #   class #{class_name} < RDF::#{"Strict" if strict}Vocabulary)
+
         # Split nodes into Class/Property/Datatype/Other
         term_nodes = {
           ontology: {},
@@ -181,6 +200,26 @@ module RDF
           term_nodes[kind][name] = term.attributes
         end
 
+        # Yard attribute information for terms
+        term_nodes.each do |tt, ttv|
+          next if tt == :ontology
+          ttv.each do |name, attributes|
+            # Only document terms that can be accessed like a Ruby attribute
+            next unless name.to_s.match?(/^[_[:alpha:]](?:\w*)[!?=]?$/)
+            @output.puts(Array(attributes[:comment]).map do |comment|
+              "  #     # #{comment.to_s.gsub(/\n/, ' ')}"
+            end.join("\n  #     #\n")) if attributes[:comment]
+            @output.puts "  #     # @return [RDF::Vocabulary::Term]"
+            @output.puts "  #     attr_reader :#{name}"
+            @output.puts "  #"
+          end
+        end
+
+        # End of yard preamble
+        @output.puts "  #   end"
+        @output.puts %(  #{class_name} = Class.new(RDF::#{"Strict" if strict}Vocabulary("#{base_uri}")) do)
+
+        # Output term definitions
         {
           ontology: "Ontology definition",
           class: "Class definitions",