rdf 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8fae3119c03f76ca92e7759d025bb1c17ed55db
-  data.tar.gz: fe07f4c9ee59e359c2f4826555a39a52897e0733
+  metadata.gz: de76661c91cfe6934a56ffc4843225db1982f01e
+  data.tar.gz: 15dbc5ff81961081d5e9c91b95ac222e37bc4ada
 SHA512:
-  metadata.gz: bbac6da5b9ab5e564e5ca23f47d1d50bd4933a9d8590bf4ff59a8b5d6652630fa02f7741c309624f4e03e531667bdaaf258420efc85c63ed3230ab4bdbe8f337
-  data.tar.gz: 50b338b350ff2b1cc8039a86891b1ec3f3c4b62d17fb7ea7cbd17ef3e223f6e0de27a9f98509e7f6d1e5b52d61c1fb77db4a2000d1dbecea6243597e3a409d70
+  metadata.gz: bbc0759e1e4031c5bd43344a19eba2b65d13850ec5af6a0dba61f54578d2f50abe97bcc0bbccf98f0df9b07426b07abd4339457b1985bbbbce2a08da871258f2
+  data.tar.gz: 0fc669f56a1aa53d6fae0df894014b862525a4e5620dd61c06e59224959ddedcbb3c293f156f6ba4d014f7127646d64493e9b24203c010136b412f2be8a465f8

data/VERSION

@@ -1 +1 @@
-1.1.14
+1.1.15

data/lib/rdf/model/graph.rb

@@ -27,7 +27,7 @@ module RDF
   #   require 'rdf/trig'  # for TriG support
   #
   #   repository = graph = RDF::Repository.load("https://raw.githubusercontent.com/ruby-rdf/rdf-trig/develop/etc/doap.trig", format: :trig))
-  #   graph = RDF::Graph.new(data: repository, context: RDF::URI("http://greggkellogg.net/foaf#me"))
+  #   graph = RDF::Graph.new(RDF::URI("http://greggkellogg.net/foaf#me"), data: repository)
   class Graph
     include RDF::Value
     include RDF::Countable

data/lib/rdf/model/list.rb

@@ -72,10 +72,10 @@ module RDF
         # An empty list with explicit subject and value initializers
         @subject = RDF.nil
         first, *values = Array(values)
-        if first
+        if first || values.length > 0
           # Intantiate the list from values, and insert the first value using subject.
           values.reverse_each {|value| self.unshift(value)}
-          graph.insert RDF::Statement(subject, RDF.first, first)
+          graph.insert RDF::Statement(subject, RDF.first, first || RDF.nil)
           graph.insert RDF::Statement(subject, RDF.rest, @subject)
         end
         @subject = subject
@@ -234,16 +234,89 @@ module RDF
     end
 
     ##
-    # Returns the element at `index`.
-    #
-    # @example
-    #   RDF::List[1, 2, 3][0]                   #=> RDF::Literal(1)
-    #
-    # @param  [Integer] index
-    # @return [RDF::Term]
-    # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000417
-    def [](index)
-      at(index)
+    # Element Assignment — Sets the element at `index`, or replaces a subarray from the `start` index for `length` elements, or replaces a subarray specified by the `range` of indices.
+    #
+    # If indices are greater than the current capacity of the array, the array grows automatically. Elements are inserted into the array at `start` if length is zero.
+    #
+    # Negative indices will count backward from the end of the array. For `start` and `range` cases the starting index is just before an element.
+    #
+    # An `IndexError` is raised if a negative index points past the beginning of the array.
+    #
+    # (see #unshift).
+    #
+    # @example
+    #     a = RDF::List.new
+    #     a[4] = "4";                 #=> [rdf:nil, rdf:nil, rdf:nil, rdf:nil, "4"]
+    #     a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", rdf:nil, "4"]
+    #     a[1..2] = [ 1, 2 ]          #=> ["a", 1, 2, rdf:nil, "4"]
+    #     a[0, 2] = "?"               #=> ["?", 2, rdf:nil, "4"]
+    #     a[0..2] = "A"               #=> ["A", "4"]
+    #     a[-1]   = "Z"               #=> ["A", "Z"]
+    #     a[1..-1] = nil              #=> ["A", rdf:nil]
+    #     a[1..-1] = []               #=> ["A"]
+    #     a[0, 0] = [ 1, 2 ]          #=> [1, 2, "A"]
+    #     a[3, 0] = "B"               #=> [1, 2, "A", "B"]
+    #
+    # @overload []=(index, term)
+    #   Replaces the element at `index` with `term`. 
+    #   @param [Integer] index
+    #   @param [RDF::Term] term
+    #     A non-RDF::Term is coerced to a Literal.
+    #   @return [RDF::Term]
+    #   @raise [IndexError]
+    #
+    # @overload []=(start, length, value)
+    #   Replaces a subarray from the `start` index for `length` elements with `value`. Value is a {RDF::Term}, Array of {RDF::Term}, or {RDF::List}.
+    #   @param [Integer] start
+    #   @param [Integer] length
+    #   @param [RDF::Term, Array<RDF::Term>, RDF::List] value
+    #     A non-RDF::Term is coerced to a Literal.
+    #   @return [RDF::Term, RDF::List]
+    #   @raise [IndexError]
+    #
+    # @overload []=(range, value)
+    #   Replaces a subarray from the `start` index for `length` elements with `value`. Value is a {RDF::Term}, Array of {RDF::Term}, or {RDF::List}.
+    #   @param [Range] range
+    #   @param [RDF::Term, Array<RDF::Term>, RDF::List] value
+    #     A non-RDF::Term is coerced to a Literal.
+    #   @return [RDF::Term, RDF::List]
+    #   @raise [IndexError]
+    # @since 1.1.15
+    def []=(*args)
+      start, length = 0, 0
+
+      ary = self.to_a
+
+      value = case args.last
+      when Array then args.last
+      when RDF::List then args.last.to_a
+      else [args.last]
+      end
+
+      ret = case args.length
+      when 3
+        start, length = args[0], args[1]
+        ary[start, length] = value
+      when 2
+        case args.first
+        when Integer
+          raise ArgumentError, "Index form of []= takes a single term" if args.last.is_a?(Array)
+          ary[args.first] = args.last.is_a?(RDF::List) ? args.last.subject : args.last
+        when Range
+          ary[args.first] = value
+        else
+          raise ArgumentError, "Index form of must use an integer or range"
+        end
+      else
+        raise ArgumentError, "List []= takes one or two index values"
+      end
+
+      # Clear the list and create a new list using the existing subject
+      subject = @subject unless ary.empty? || @subject == RDF.nil
+      self.clear
+      new_list = RDF::List.new(subject, @graph, ary)
+      @subject = new_list.subject
+      ret # Returns inserted values
     end
 
     ##
@@ -252,7 +325,7 @@ module RDF
     # @example
     #   RDF::List[].unshift(1).unshift(2).unshift(3) #=> RDF::List[3, 2, 1]
     #
-    # @param  [RDF::Term, Array<RDF::Term>] value
+    # @param  [RDF::Term, Array<RDF::Term>, RDF::List] value
     #   A non-RDF::Term is coerced to a Literal
     # @return [RDF::List]
     # @see    http://www.ruby-doc.org/core-1.9.3/Array.html#method-i-unshift
@@ -342,6 +415,20 @@ module RDF
       self
     end
 
+    ##
+    # Compares this list to `other` using eql? on each component.
+    #
+    # @example
+    #   RDF::List[1, 2, 3].eql? RDF::List[1, 2, 3]  #=> true
+    #   RDF::List[1, 2, 3].eql? [1, 2, 3]           #=> true
+    #
+    # @param  [RDF::List] other
+    # @return [Integer]
+    # @see    http://ruby-doc.org/core-2.2.2/Array.html#method-i-3C-3D-3E
+    def eql?(other)
+      to_a.eql? other.to_a # TODO: optimize this
+    end
+
     ##
     # Compares this list to `other` for sorting purposes.
     #
@@ -421,6 +508,7 @@ module RDF
         else raise ArgumentError, "wrong number of arguments (#{argc} for 2)"
       end
     end
+    alias :[] :slice
 
     ##
     # @private

data/lib/rdf/model/statement.rb

@@ -103,7 +103,6 @@ module RDF
       @subject   = case @subject
         when nil      then nil
         when Symbol   then Node.intern(@subject)
-        when Term     then @subject
         when Value    then @subject.to_term
         else          raise ArgumentError, "expected subject to be nil or a term, was #{@subject.inspect}"
       end
@@ -111,7 +110,6 @@ module RDF
       @object    = case @object
         when nil    then nil
         when Symbol then Node.intern(@object)
-        when Term   then @object
         when Value  then @object.to_term
         else Literal.new(@object)
       end

data/lib/rdf/util/file.rb

@@ -68,7 +68,8 @@ module RDF; module Util
       # @option options [Boolean] :verify_none (false)
       #   Don't verify SSL certificates
       # @return [RemoteDocument, Object] A {RemoteDocument}. If a block is given, the result of evaluating the block is returned.
-      def self.open_url base_uri, options
+      # @raise [IOError] if not found
+      def self.open_url(base_uri, options)
         raise NoMethodError.new("#{self.inspect} does not implement required method `open_url` for ", "open_url")
       end
     end
@@ -84,7 +85,8 @@ module RDF; module Util
       # @param [String] base_uri to open
       # @param  [Hash{Symbol => Object}] options
       # @return [RemoteDocument, Object] A {RemoteDocument}. If a block is given, the result of evaluating the block is returned.
-      def self.open_url base_uri, options
+      # @raise [IOError] if not found
+      def self.open_url(base_uri, options)
         ssl_verify = options[:verify_none] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
 
         # If RestClient is loaded, prefer it
@@ -106,7 +108,8 @@ module RDF; module Util
             remote_document = RemoteDocument.new(response.body, document_options)
           when 300..399
             # Document base is redirected location
-            base_uri = response.headers[:location].to_s
+            # Location may be relative
+            base_uri = ::URI.join(base_uri, response.headers[:location].to_s).to_s
             response.follow_redirection(request, res, &blk)
           else
             raise IOError, "<#{base_uri}>: #{response.code}"
@@ -123,7 +126,8 @@ module RDF; module Util
       # @param [String] base_uri to open
       # @param  [Hash{Symbol => Object}] options
       # @return [RemoteDocument, Object] A {RemoteDocument}. If a block is given, the result of evaluating the block is returned.
-      def self.open_url base_uri, options
+      # @raise [IOError] if not found
+      def self.open_url(base_uri, options)
         ssl_verify = options[:verify_none] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
 
         redirect_count = 0
@@ -167,7 +171,8 @@ module RDF; module Util
                 # Follow redirection
                 raise IOError, "Too many redirects" if (redirect_count += 1) > max_redirects
 
-                parsed_url = ::URI.parse(response["Location"])
+                # Location may be relative
+                parsed_url = ::URI.join(base_uri, response["Location"])
 
                 base_uri = parsed_url.to_s
               else
@@ -206,7 +211,7 @@ module RDF; module Util
       # @param [String] base_uri to open
       # @param  [Hash{Symbol => Object}] options
       # @return [RemoteDocument, Object] A {RemoteDocument}.
-      def self.open_url base_uri, options
+      def self.open_url(base_uri, options)
         response = conn.get do |req|
           req.url base_uri
           headers(options).each do |k,v|
@@ -233,7 +238,7 @@ module RDF; module Util
       end
     end
 
-    class <<self
+    class << self
       ##
       # Set the HTTP adapter
       # @see .http_adapter
@@ -252,7 +257,7 @@ module RDF; module Util
       #      adapters have been configured
       # @return [HttpAdapter]
       # @since 1.2
-      def http_adapter use_net_http = false
+      def http_adapter(use_net_http = false)
         if use_net_http
           NetHttpAdapter
         else
@@ -305,6 +310,7 @@ module RDF; module Util
     # @return [RemoteDocument, Object] A {RemoteDocument}. If a block is given, the result of evaluating the block is returned.
     # @yield [ RemoteDocument] A {RemoteDocument} for local files
     # @yieldreturn [Object] returned from open_file
+    # @raise [IOError] if not found
     def self.open_file(filename_or_url, options = {}, &block)
       filename_or_url = $1 if filename_or_url.to_s.match(/^file:(.*)$/)
       remote_document = nil
@@ -318,17 +324,21 @@ module RDF; module Util
         format = RDF::Format.for(filename_or_url.to_s)
         content_type = format ? format.content_type.first : 'text/plain'
         # Open as a file, passing any options
-        Kernel.open(filename_or_url, "r:utf-8", options) do |file|
-          document_options = {
-            base_uri:     filename_or_url.to_s,
-            charset:      file.external_encoding,
-            code:         200,
-            content_type: content_type,
-            last_modified:file.mtime,
-            headers:      {'Content-Type' => content_type, 'Last-Modified' => file.mtime.xmlschema}
-          }
+        begin
+          Kernel.open(filename_or_url, "r:utf-8", options) do |file|
+            document_options = {
+              base_uri:     filename_or_url.to_s,
+              charset:      file.external_encoding,
+              code:         200,
+              content_type: content_type,
+              last_modified:file.mtime,
+              headers:      {'Content-Type' => content_type, 'Last-Modified' => file.mtime.xmlschema}
+            }
 
-          remote_document = RemoteDocument.new(file.read, document_options)
+            remote_document = RemoteDocument.new(file.read, document_options)
+          end
+        rescue Errno::ENOENT => e
+          raise IOError, e.message
         end
       end
 

data/lib/rdf/vocab/schema.rb

@@ -306,7 +306,7 @@ module RDF
     term :BlogPosting,
       comment: %(A blog post.).freeze,
       label: "BlogPosting".freeze,
-      subClassOf: "schema:Article".freeze,
+      subClassOf: "schema:SocialMediaPosting".freeze,
       type: "rdfs:Class".freeze
     term :BloodTest,
       comment: %(A medical test performed on a sample of a patient's blood.).freeze,
@@ -400,6 +400,11 @@ module RDF
       label: "Brewery".freeze,
       subClassOf: "schema:FoodEstablishment".freeze,
       type: "rdfs:Class".freeze
+    term :Bridge,
+      comment: %(A bridge.).freeze,
+      label: "Bridge".freeze,
+      subClassOf: "schema:CivicStructure".freeze,
+      type: "rdfs:Class".freeze
     term :BroadcastChannel,
       comment: %(A unique instance of a BroadcastService on a CableOrSatelliteService lineup.).freeze,
       label: "BroadcastChannel".freeze,
@@ -413,7 +418,7 @@ module RDF
     term :BroadcastService,
       comment: %(A delivery service through which content is provided via broadcast over the air or online.).freeze,
       label: "BroadcastService".freeze,
-      subClassOf: "schema:Thing".freeze,
+      subClassOf: "schema:Service".freeze,
       type: "rdfs:Class".freeze
     term :BuddhistTemple,
       comment: %(A Buddhist temple.).freeze,
@@ -830,7 +835,7 @@ module RDF
     term :DateTime,
       comment: %(A combination of date and time of day in the form [-]CCYY-MM-DDThh:mm:ss[Z|\(+|-\)hh:mm] \(see Chapter 5.4 of ISO 8601\).).freeze,
       label: "DateTime".freeze,
-      type: "rdfs:Class".freeze
+      type: ["rdfs:Class".freeze, "schema:DataType".freeze]
     term :DatedMoneySpecification,
       comment: %(A DatedMoneySpecification represents monetary values with optional start and end dates. For example, this could represent an employee's salary over a specific period of time.).freeze,
       label: "DatedMoneySpecification".freeze,
@@ -957,6 +962,11 @@ module RDF
       label: "DiscoverAction".freeze,
       subClassOf: "schema:FindAction".freeze,
       type: "rdfs:Class".freeze
+    term :DiscussionForumPosting,
+      comment: %(A posting to a discussion forum.).freeze,
+      label: "DiscussionForumPosting".freeze,
+      subClassOf: "schema:SocialMediaPosting".freeze,
+      type: "rdfs:Class".freeze
     term :DislikeAction,
       comment: %(The act of expressing a negative sentiment about the object. An agent dislikes an object \(a proposition, topic or theme\) with participants.).freeze,
       label: "DislikeAction".freeze,
@@ -1507,6 +1517,11 @@ module RDF
       label: "InteractAction".freeze,
       subClassOf: "schema:Action".freeze,
       type: "rdfs:Class".freeze
+    term :InteractionCounter,
+      comment: %(A summary of how users have interacted with this CreativeWork. In most cases, authors will use a subtype to specify the specific type of interaction.).freeze,
+      label: "InteractionCounter".freeze,
+      subClassOf: "schema:StructuredValue".freeze,
+      type: "rdfs:Class".freeze
     term :InternetCafe,
       comment: %(An internet cafe.).freeze,
       label: "InternetCafe".freeze,
@@ -1640,6 +1655,11 @@ module RDF
       label: "LiteraryEvent".freeze,
       subClassOf: "schema:Event".freeze,
       type: "rdfs:Class".freeze
+    term :LiveBlogPosting,
+      comment: %(A blog post intended to provide a rolling textual coverage of an ongoing event through continuous updates.).freeze,
+      label: "LiveBlog".freeze,
+      subClassOf: "schema:BlogPosting".freeze,
+      type: "rdfs:Class".freeze
     term :LocalBusiness,
       comment: %(A particular physical business or branch of an organization. Examples of LocalBusiness include a restaurant, a particular branch of a restaurant chain, a branch of a bank, a medical practice, a club, a bowling alley, etc.).freeze,
       label: "LocalBusiness".freeze,
@@ -2329,6 +2349,11 @@ module RDF
       label: "PaymentMethod".freeze,
       subClassOf: "schema:Enumeration".freeze,
       type: "rdfs:Class".freeze
+    term :PaymentStatusType,
+      comment: %(A specific payment status. For example, PaymentDue, PaymentComplete, etc.).freeze,
+      label: "PaymentStatusType".freeze,
+      subClassOf: "schema:Enumeration".freeze,
+      type: "rdfs:Class".freeze
     term :PeopleAudience,
       comment: %(A set of characteristics belonging to people, e.g. who compose an item's target audience.).freeze,
       label: "PeopleAudience".freeze,
@@ -2728,6 +2753,11 @@ module RDF
       label: "ReplyAction".freeze,
       subClassOf: "schema:CommunicateAction".freeze,
       type: "rdfs:Class".freeze
+    term :Report,
+      comment: %(A Report generated by governmental or non-governmental organization.).freeze,
+      label: "Report".freeze,
+      subClassOf: "schema:Article".freeze,
+      type: "rdfs:Class".freeze
     term :ReportedDoseSchedule,
       comment: %(A patient-reported or observed dosing schedule for a drug or supplement.).freeze,
       label: "ReportedDoseSchedule".freeze,
@@ -2938,6 +2968,11 @@ module RDF
       label: "SocialEvent".freeze,
       subClassOf: "schema:Event".freeze,
       type: "rdfs:Class".freeze
+    term :SocialMediaPosting,
+      comment: %(A post to a social media platform, including blog posts, tweets, Facebook posts, etc.).freeze,
+      label: "SocialMediaPosting".freeze,
+      subClassOf: "schema:Article".freeze,
+      type: "rdfs:Class".freeze
     term :SoftwareApplication,
       comment: %(A software application.).freeze,
       label: "SoftwareApplication".freeze,
@@ -3263,6 +3298,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserBlocks".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :UserCheckins,
@@ -3270,6 +3306,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserCheckins".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :UserComments,
@@ -3278,6 +3315,7 @@ module RDF
       ).freeze,
       "dc:source" => %(http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_rNews).freeze,
       label: "UserComments".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :UserDownloads,
@@ -3285,6 +3323,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserDownloads".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :UserInteraction,
@@ -3292,6 +3331,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserInteraction".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:Event".freeze,
       type: "rdfs:Class".freeze
     term :UserLikes,
@@ -3299,6 +3339,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserLikes".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :UserPageVisits,
@@ -3306,6 +3347,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserPageVisits".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :UserPlays,
@@ -3313,6 +3355,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserPlays".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :UserPlusOnes,
@@ -3320,6 +3363,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserPlusOnes".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :UserTweets,
@@ -3327,6 +3371,7 @@ module RDF
           <a href="/Action">Action</a>-based vocabulary, alongside types such as <a href="/Comment">Comment</a>.
       ).freeze,
       label: "UserTweets".freeze,
+      "schema:supersededBy" => %(schema:InteractionCounter).freeze,
       subClassOf: "schema:UserInteraction".freeze,
       type: "rdfs:Class".freeze
     term :Vehicle,
@@ -3539,7 +3584,7 @@ module RDF
       rangeIncludes: "schema:PaymentMethod".freeze,
       type: "rdf:Property".freeze
     property :acceptsReservations,
-      comment: %(Indicates whether a FoodEstablishment accepts reservations. Values can be Boolean, an URL at which reservations can be made or \(for backwards compatibility\) the strings <code>Yes</code> or <code>No</code>.).freeze,
+      comment: %(Indicates whether a FoodEstablishment accepts reservations. Values can be Boolean, a URL at which reservations can be made or \(for backwards compatibility\) the strings <code>Yes</code> or <code>No</code>.).freeze,
       domainIncludes: "schema:FoodEstablishment".freeze,
       label: "acceptsReservations".freeze,
       rangeIncludes: ["schema:Text".freeze, "schema:URL".freeze, "schema:Boolean".freeze],
@@ -3742,6 +3787,7 @@ Note: Publishers should be aware that applications designed to use specific sche
       domainIncludes: "schema:Person".freeze,
       label: "affiliation".freeze,
       rangeIncludes: "schema:Organization".freeze,
+      subPropertyOf: "schema:memberOf".freeze,
       type: "rdf:Property".freeze
     property :agent,
       comment: %(The direct performer or driver of the action \(animate or inanimate\). e.g. *John* wrote a book.).freeze,
@@ -4642,7 +4688,7 @@ Note: You can use <a href="minValue">minValue</a> and <a href="maxValue">maxValu
       rangeIncludes: "schema:URL".freeze,
       type: "rdf:Property".freeze
     property :codeSampleType,
-      comment: %(Full \(compile ready\) solution, code snippet, inline code, scripts, template.).freeze,
+      comment: %(What type of code sample: full \(compile ready\) solution, code snippet, inline code, scripts, template.).freeze,
       domainIncludes: "schema:SoftwareSourceCode".freeze,
       label: "codeSampleType".freeze,
       rangeIncludes: "schema:Text".freeze,
@@ -4895,6 +4941,18 @@ Note: You can use <a href="minValue">minValue</a> and <a href="maxValue">maxValu
       "schema:supersededBy" => %(schema:exerciseCourse).freeze,
       subPropertyOf: "schema:location".freeze,
       type: "rdf:Property".freeze
+    property :coverageEndTime,
+      comment: %(The time when the live blog will stop covering the Event. Note that coverage may continue after the Event concludes.).freeze,
+      domainIncludes: "schema:LiveBlogPosting".freeze,
+      label: "coverageEndTime".freeze,
+      rangeIncludes: "schema:DateTime".freeze,
+      type: "rdf:Property".freeze
+    property :coverageStartTime,
+      comment: %(The time when the live blog will begin covering the Event. Note that coverage may begin before the Event's start time. The LiveBlogPosting may also be created before coverage begins.).freeze,
+      domainIncludes: "schema:LiveBlogPosting".freeze,
+      label: "coverageStartTime".freeze,
+      rangeIncludes: "schema:DateTime".freeze,
+      type: "rdf:Property".freeze
     property :creator,
       comment: %(The creator/author of this CreativeWork. This is the same as the Author property for CreativeWork.).freeze,
       domainIncludes: ["schema:CreativeWork".freeze, "schema:UserComments".freeze],
@@ -5697,7 +5755,7 @@ Note that Event uses startDate/endDate instead of startTime/endTime, even when d
       comment: %(Size of the application / package \(e.g. 18MB\). In the absence of a unit \(MB, KB etc.\), KB will be assumed.).freeze,
       domainIncludes: "schema:SoftwareApplication".freeze,
       label: "fileSize".freeze,
-      rangeIncludes: "schema:Integer".freeze,
+      rangeIncludes: "schema:Text".freeze,
       type: "rdf:Property".freeze
     property :firstPerformance,
       comment: %(The date and place the work was first performed.).freeze,
@@ -5891,7 +5949,7 @@ Note 3: Often, the absolute value is useful only when related to driving speed \
       comment: %(Genre of the creative work or group.).freeze,
       domainIncludes: ["schema:CreativeWork".freeze, "schema:MusicGroup".freeze],
       label: "genre".freeze,
-      rangeIncludes: "schema:Text".freeze,
+      rangeIncludes: ["schema:Text".freeze, "schema:URL".freeze],
       type: "rdf:Property".freeze
     property :geo,
       comment: %(The geo coordinates of the place.).freeze,
@@ -6262,6 +6320,25 @@ Note 3: Often, the absolute value is useful only when related to driving speed \
     property :interactionCount,
       comment: %(This property is deprecated, alongside the UserInteraction types on which it depended.).freeze,
       label: "interactionCount".freeze,
+      "schema:supersededBy" => %(schema:interactionStatistic).freeze,
+      type: "rdf:Property".freeze
+    property :interactionService,
+      comment: %(The WebSite or SoftwareApplication where the interactions took place.).freeze,
+      domainIncludes: "schema:InteractionCounter".freeze,
+      label: "interactionService".freeze,
+      rangeIncludes: ["schema:SoftwareApplication".freeze, "schema:WebSite".freeze],
+      type: "rdf:Property".freeze
+    property :interactionStatistic,
+      comment: %(The number of interactions for the CreativeWork using the WebSite or SoftwareApplication. The most specific child type of InteractionCounter should be used.).freeze,
+      domainIncludes: "schema:CreativeWork".freeze,
+      label: "interactionStatistic".freeze,
+      rangeIncludes: "schema:InteractionCounter".freeze,
+      type: "rdf:Property".freeze
+    property :interactionType,
+      comment: %(The Action representing the type of interaction. For up votes, +1s, etc. use <a href="/LikeAction";>LikeAction</a>. For down votes use <a href="/DislikeAction">DislikeAction</a>. Otherwise, use the most specific Action.).freeze,
+      domainIncludes: "schema:InteractionCounter".freeze,
+      label: "interactionType".freeze,
+      rangeIncludes: "schema:Action".freeze,
       type: "rdf:Property".freeze
     property :interactivityType,
       comment: %(The predominant mode of learning supported by the learning resource. Acceptable values are 'active', 'expositive', or 'mixed'.).freeze,
@@ -6281,7 +6358,7 @@ Note 3: Often, the absolute value is useful only when related to driving speed \
       label: "inverseOf".freeze,
       rangeIncludes: "schema:Property".freeze,
       type: "rdf:Property".freeze
-    property :isAcccessibleForFree,
+    property :isAccessibleForFree,
       comment: %(A flag to signal that the publication is accessible for free.).freeze,
       domainIncludes: "schema:PublicationEvent".freeze,
       label: "isAccessibleForFree".freeze,
@@ -6581,6 +6658,12 @@ Note 3: Often, the absolute value is useful only when related to driving speed \
       label: "line".freeze,
       rangeIncludes: "schema:Text".freeze,
       type: "rdf:Property".freeze
+    property :liveBlogUpdate,
+      comment: %(An update to the LiveBlog.).freeze,
+      domainIncludes: "schema:LiveBlogPosting".freeze,
+      label: "liveBlogUpdate".freeze,
+      rangeIncludes: "schema:BlogPosting".freeze,
+      type: "rdf:Property".freeze
     property :location,
       comment: %(The location of the event, organization or action.).freeze,
       domainIncludes: ["schema:Organization".freeze, "schema:Event".freeze, "schema:Action".freeze],
@@ -6632,6 +6715,13 @@ Note 3: Often, the absolute value is useful only when related to driving speed \
       label: "lyricist".freeze,
       rangeIncludes: "schema:Person".freeze,
       type: "rdf:Property".freeze
+    property :lyrics,
+      comment: %(The words in the song.).freeze,
+      "dc:source" => %(http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#MBZ).freeze,
+      domainIncludes: "schema:MusicComposition".freeze,
+      label: "lyrics".freeze,
+      rangeIncludes: "schema:CreativeWork".freeze,
+      type: "rdf:Property".freeze
     property :mainContentOfPage,
       comment: %(Indicates if this web page element is the main subject of the page.).freeze,
       domainIncludes: "schema:WebPage".freeze,
@@ -6648,31 +6738,7 @@ Note 3: Often, the absolute value is useful only when related to driving speed \
     property :mainEntityOfPage,
       comment: %(Indicates a page \(or other CreativeWork\) for which this thing is the main entity being described.
       <br /><br />
-      Many \(but not all\) pages have a fairly clear primary topic, some entity or thing that the page describes. For
-      example a restaurant's home page might be primarily about that Restaurant, or an event listing page might
-      represent a single event. The mainEntity and mainEntityOfPage properties allow you to explicitly express the relationship
-      between the page and the primary entity.
-      <br /><br />
-
-      Related properties include sameAs, about, and url.
-      <br /><br />
-
-      The sameAs and url properties are both similar to mainEntityOfPage. The url property should be reserved to refer to more
-      official or authoritative web pages, such as the item’s official website. The sameAs property also relates a thing
-      to a page that indirectly identifies it. Whereas sameAs emphasises well known pages, the mainEntityOfPage property
-      serves more to clarify which of several entities is the main one for that page.
-      <br /><br />
-
-      mainEntityOfPage can be used for any page, including those not recognized as authoritative for that entity. For example,
-      for a product, sameAs might refer to a page on the manufacturer’s official site with specs for the product, while
-      mainEntityOfPage might be used on pages within various retailers’ sites giving details for the same product.
-      <br /><br />
-
-      about is similar to mainEntity, with two key differences. First, about can refer to multiple entities/topics,
-      while mainEntity should be used for only the primary one. Second, some pages have a primary entity that itself
-      describes some other entity. For example, one web page may display a news article about a particular person.
-      Another page may display a product review for a particular product. In these cases, mainEntity for the pages
-      should refer to the news article or review, respectively, while about would more properly refer to the person or product.
+      See <a href="/docs/datamodel.html#mainEntityBackground">background notes</a> for details.
       ).freeze,
       domainIncludes: "schema:Thing".freeze,
       inverseOf: "schema:mainEntity".freeze,
@@ -6953,7 +7019,7 @@ Typical unit code\(s\): KMT for kilometers, SMI for statute miles).freeze,
       rangeIncludes: "schema:Muscle".freeze,
       type: "rdf:Property".freeze
     property :netWorth,
-      comment: %(The total financial value of the organization or person as calculated by subtracting assets from liabilities.).freeze,
+      comment: %(The total financial value of the person as calculated by subtracting assets from liabilities.).freeze,
       domainIncludes: "schema:Person".freeze,
       label: "netWorth".freeze,
       rangeIncludes: "schema:PriceSpecification".freeze,
@@ -7295,8 +7361,9 @@ Typical unit code\(s\): C62).freeze,
       rangeIncludes: "schema:Question".freeze,
       type: "rdf:Property".freeze
     property :parentOrganization,
-      comment: %(The larger organization that this local business is a branch of, if any.).freeze,
-      domainIncludes: "schema:LocalBusiness".freeze,
+      comment: %(The larger organization that this organization is a branch of, if any.).freeze,
+      domainIncludes: "schema:Organization".freeze,
+      inverseOf: "schema:subOrganization".freeze,
       label: "parentOrganization".freeze,
       rangeIncludes: "schema:Organization".freeze,
       type: "rdf:Property".freeze
@@ -7403,6 +7470,13 @@ Typical unit code\(s\): C62).freeze,
       domainIncludes: ["schema:Order".freeze, "schema:Invoice".freeze],
       label: "paymentDue".freeze,
       rangeIncludes: "schema:DateTime".freeze,
+      "schema:supersededBy" => %(schema:paymentDueDate).freeze,
+      type: "rdf:Property".freeze
+    property :paymentDueDate,
+      comment: %(The date that payment is due.).freeze,
+      domainIncludes: ["schema:Order".freeze, "schema:Invoice".freeze],
+      label: "paymentDueDate".freeze,
+      rangeIncludes: "schema:DateTime".freeze,
       type: "rdf:Property".freeze
     property :paymentMethod,
       comment: %(The name of the credit card or other method of payment for the order.).freeze,
@@ -7420,7 +7494,7 @@ Typical unit code\(s\): C62).freeze,
       comment: %(The status of payment; whether the invoice has been paid or not.).freeze,
       domainIncludes: "schema:Invoice".freeze,
       label: "paymentStatus".freeze,
-      rangeIncludes: "schema:Text".freeze,
+      rangeIncludes: ["schema:Text".freeze, "schema:PaymentStatusType".freeze],
       type: "rdf:Property".freeze
     property :paymentUrl,
       comment: %(The URL for sending a payment.).freeze,
@@ -7874,7 +7948,7 @@ Standards bodies should promote a standard prefix for the identifiers of propert
       comment: %(The publisher of the creative work.).freeze,
       domainIncludes: "schema:CreativeWork".freeze,
       label: "publisher".freeze,
-      rangeIncludes: "schema:Organization".freeze,
+      rangeIncludes: ["schema:Organization".freeze, "schema:Person".freeze],
       type: "rdf:Property".freeze
     property :publishingPrinciples,
       comment: %(Link to page describing the editorial principles of the organization primarily responsible for the creation of the CreativeWork.).freeze,
@@ -8170,6 +8244,12 @@ Standards bodies should promote a standard prefix for the identifiers of propert
       label: "replyToUrl".freeze,
       rangeIncludes: "schema:URL".freeze,
       type: "rdf:Property".freeze
+    property :reportNumber,
+      comment: %(The number or other unique designator assigned to a Report by the publishing organization.).freeze,
+      domainIncludes: "schema:Report".freeze,
+      label: "reportNumber".freeze,
+      rangeIncludes: "schema:Text".freeze,
+      type: "rdf:Property".freeze
     property :representativeOfPage,
       comment: %(Indicates whether this image is representative of the content of the page.).freeze,
       domainIncludes: "schema:ImageObject".freeze,
@@ -8362,7 +8442,7 @@ Standards bodies should promote a standard prefix for the identifiers of propert
       rangeIncludes: "schema:URL".freeze,
       type: "rdf:Property".freeze
     property :sampleType,
-      comment: %(Full \(compile ready\) solution, code snippet, inline code, scripts, template.).freeze,
+      comment: %(What type of sample: full \(compile ready\) solution, code snippet, inline code, scripts, template.).freeze,
       domainIncludes: "schema:SoftwareSourceCode".freeze,
       label: "sampleType".freeze,
       rangeIncludes: "schema:Text".freeze,
@@ -8387,7 +8467,7 @@ Standards bodies should promote a standard prefix for the identifiers of propert
       rangeIncludes: "schema:DateTime".freeze,
       type: "rdf:Property".freeze
     property :schemaVersion,
-      comment: %(Indicates \(by URL or string\) a particular version of a schema used in some CreativeWork. For example, a document could declare a schemaVersion using an URL such as http://schema.org/version/2.0/ if precise indication of schema version was required by some application. ).freeze,
+      comment: %(Indicates \(by URL or string\) a particular version of a schema used in some CreativeWork. For example, a document could declare a schemaVersion using a URL such as http://schema.org/version/2.0/ if precise indication of schema version was required by some application. ).freeze,
       domainIncludes: "schema:CreativeWork".freeze,
       label: "schemaVersion".freeze,
       rangeIncludes: ["schema:URL".freeze, "schema:Text".freeze],
@@ -8579,6 +8659,12 @@ Standards bodies should promote a standard prefix for the identifiers of propert
       label: "servingSize".freeze,
       rangeIncludes: "schema:Text".freeze,
       type: "rdf:Property".freeze
+    property :sharedContent,
+      comment: %(A CreativeWork such as an image, video, or audio clip shared as part of this psting.).freeze,
+      domainIncludes: "schema:SocialMediaPosting".freeze,
+      label: "sharedContent".freeze,
+      rangeIncludes: "schema:CreativeWork".freeze,
+      type: "rdf:Property".freeze
     property :sibling,
       comment: %(A sibling of the person.).freeze,
       domainIncludes: "schema:Person".freeze,
@@ -8855,6 +8941,7 @@ Note that Event uses startDate/endDate instead of startTime/endTime, even when d
     property :subOrganization,
       comment: %(A relationship between two organizations where the first includes the second, e.g., as a subsidiary. See also: the more specific 'department' property.).freeze,
       domainIncludes: "schema:Organization".freeze,
+      inverseOf: "schema:parentOrganization".freeze,
       label: "subOrganization".freeze,
       rangeIncludes: "schema:Organization".freeze,
       type: "rdf:Property".freeze
@@ -9250,7 +9337,7 @@ Note that Event uses startDate/endDate instead of startTime/endTime, even when d
       rangeIncludes: "schema:URL".freeze,
       type: "rdf:Property".freeze
     property :urlTemplate,
-      comment: %(An url template \(RFC6570\) that will be used to construct the target of the execution of the action.).freeze,
+      comment: %(A url template \(RFC6570\) that will be used to construct the target of the execution of the action.).freeze,
       domainIncludes: "schema:EntryPoint".freeze,
       label: "urlTemplate".freeze,
       rangeIncludes: "schema:Text".freeze,
@@ -9261,6 +9348,12 @@ Note that Event uses startDate/endDate instead of startTime/endTime, even when d
       label: "usedToDiagnose".freeze,
       rangeIncludes: "schema:MedicalCondition".freeze,
       type: "rdf:Property".freeze
+    property :userInteractionCount,
+      comment: %(The number of interactions for the CreativeWork using the WebSite or SoftwareApplication.).freeze,
+      domainIncludes: "schema:InteractionCounter".freeze,
+      label: "userInteractionCount".freeze,
+      rangeIncludes: "schema:Integer".freeze,
+      type: "rdf:Property".freeze
     property :usesDevice,
       comment: %(Device used to perform the test.).freeze,
       domainIncludes: "schema:MedicalTest".freeze,
@@ -9435,7 +9528,7 @@ Typical unit code\(s\): C62 for persons ).freeze,
       type: "rdf:Property".freeze
     property :videoFormat,
       comment: %(The type of screening or video broadcast used \(e.g. IMAX, 3D, SD, HD, etc.\).).freeze,
-      domainIncludes: ["schema:ScreeningEvent".freeze, "schema:TelevisionStation".freeze],
+      domainIncludes: ["schema:ScreeningEvent".freeze, "schema:BroadcastEvent".freeze, "schema:BroadcastService".freeze],
       label: "videoFormat".freeze,
       rangeIncludes: "schema:Text".freeze,
       type: "rdf:Property".freeze
@@ -10147,6 +10240,26 @@ Typical unit code\(s\): C62 for persons ).freeze,
       comment: %(Patients.).freeze,
       label: "Patient".freeze,
       type: "schema:MedicalAudience".freeze
+    term :PaymentAutomaticallyApplied,
+      comment: %(An automatic payment system is in place and will be used.).freeze,
+      label: "PaymentAutomaticallyApplied".freeze,
+      type: "schema:PaymentStatusType".freeze
+    term :PaymentComplete,
+      comment: %(The payment has been received and processed.).freeze,
+      label: "PaymentComplete".freeze,
+      type: "schema:PaymentStatusType".freeze
+    term :PaymentDeclined,
+      comment: %(The payee received the payment, but it was declined for some reason.).freeze,
+      label: "PaymentDeclined".freeze,
+      type: "schema:PaymentStatusType".freeze
+    term :PaymentDue,
+      comment: %(The payment is due, but still within an acceptable time to be received.).freeze,
+      label: "PaymentDue".freeze,
+      type: "schema:PaymentStatusType".freeze
+    term :PaymentPastDue,
+      comment: %(The payment is due and considered late.).freeze,
+      label: "PaymentPastDue".freeze,
+      type: "schema:PaymentStatusType".freeze
     term :Pediatric,
       comment: %(A specific branch of medical science that specializes in the care of infants, children and adolescents.).freeze,
       label: "Pediatric".freeze,

data/lib/rdf/vocabulary.rb

@@ -59,6 +59,16 @@ module RDF
   #   foaf.knows    #=> RDF::URI("http://xmlns.com/foaf/0.1/knows")
   #   foaf[:name]   #=> RDF::URI("http://xmlns.com/foaf/0.1/name")
   #   foaf['mbox']  #=> RDF::URI("http://xmlns.com/foaf/0.1/mbox")
+  # 
+  # @example Method calls are converted to the typical RDF camelcase convention
+  #   foaf = RDF::Vocabulary.new("http://xmlns.com/foaf/0.1/")
+  #   foaf.family_name    #=> RDF::URI("http://xmlns.com/foaf/0.1/familyName")
+  #   owl.same_as         #=> RDF::URI("http://www.w3.org/2002/07/owl#sameAs")
+  #   # []-style access is left as is
+  #   foaf['family_name'] #=> RDF::URI("http://xmlns.com/foaf/0.1/family_name")
+  #   foaf[:family_name]  #=> RDF::URI("http://xmlns.com/foaf/0.1/family_name")
+  #
+  #
   #
   # @example Generating RDF from a vocabulary definition
   #   graph = RDF::Graph.new << RDF::RDFS.to_enum
@@ -399,6 +409,7 @@ module RDF
       end
 
       def method_missing(property, *args, &block)
+        property = RDF::Vocabulary.camelize(property.to_s)
         if %w(to_ary).include?(property.to_s)
           super
         elsif args.empty? && !to_s.empty?
@@ -409,6 +420,7 @@ module RDF
       end
 
     private
+
       def props; @properties ||= {}; end
     end
 
@@ -472,6 +484,7 @@ module RDF
     end
 
     def method_missing(property, *args, &block)
+      property = self.class.camelize(property.to_s)
       if %w(to_ary).include?(property.to_s)
         super
       elsif args.empty?
@@ -481,6 +494,12 @@ module RDF
       end
     end
 
+    def self.camelize(str)
+      str.split('_').inject([]) do |buffer, e| 
+        buffer.push(buffer.empty? ? e : e.capitalize)
+      end.join
+    end
+
   private
 
     @@subclasses = [::RDF] # @private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement