RubyGems - rdf - Versions diffs - 3.3.1 → 3.3.2 - Mend

rdf 3.3.1 → 3.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91c05a681e616afeaa013c0b52fc1c86579e4ce92ac7bdf34432e13e0792579
-  data.tar.gz: 92cba1715c9d596487db504a6ad5ad1c8cf7ea6134aa7b316a6e0309b86f6db7
+  metadata.gz: b9b8e26b43854ef02542acbc81b88426f3b5989df1156e010bfb5250f3fb31c6
+  data.tar.gz: 7a4303eccec6cd20b29bcfcba87a9cffb36c3db7f7045bbd375264922e2a4a66
 SHA512:
-  metadata.gz: e38d2d520c333b02f657f0b99f0d1d517a45e2c582b5004e1e33b6153b1a33db8bb67e56b84276b6d5730361f768ad2aed9feaeee97239cd94708955214d04be
-  data.tar.gz: 7faa56d6a55c8bb5bd93ca41a5ae1f7b9cdeb55ebcd07266fb74af78750af2b7919dfb646e2e7d3a6971d11f10657cf1f9594977acbf4c4139c2946b7f40b604
+  metadata.gz: 31e5f916ecc25dddf44f6b6057311b784afa1a593b406e6ba1944481c3f5a2ac8f4de752a86d779d415e21c3292064c363bb9369c86ba8d401b0aebade755195
+  data.tar.gz: 68d96d55bc4a4ad89472b212db1b6e64a03f30936b0cc7cbc8e802505a133117c1fcf0a311f1a0f6b5c4e91255841f95cd7d4ef2963db665bb648d900aa2e05b

data/README.md CHANGED Viewed

@@ -265,9 +265,15 @@ A separate [SPARQL][SPARQL doc] gem builds on basic BGP support to provide full
     foaf[:name]   #=> RDF::URI("http://xmlns.com/foaf/0.1/name")
     foaf['mbox']  #=> RDF::URI("http://xmlns.com/foaf/0.1/mbox")
+## RDF-star CG
+[RDF.rb][] includes provisional support for [RDF-star][] with an N-Triples/N-Quads syntax for quoted triples in the _subject_ or _object_ position.
+Support for RDF-star quoted triples is now deprecated, use RDF 1.2 triple terms instead.
 ## RDF 1.2
-[RDF.rb][] includes provisional support for [RDF 1.2][] with an N-Triples/N-Quads syntax for quoted triples in the _subject_ or _object_ position.
+[RDF.rb][] includes provisional support for [RDF 1.2][] with an N-Triples/N-Quads syntax for triple terms in the _object_ position.
 [RDF.rb][] includes provisional support for [RDF 1.2][] directional language-tagged strings, which are literals of type `rdf:dirLangString` having both a `language` and `direction`.
 Internally, an `RDF::Statement` is treated as another resource, along with `RDF::URI` and `RDF::Node`, which allows an `RDF::Statement` to have a `#subject` or `#object` which is also an `RDF::Statement`.
@@ -394,6 +400,9 @@ from BNode identity (i.e., they each entail the other)
 * {RDF::RDFV}   - RDF Vocabulary (RDFV)
 * {RDF::XSD}    - XML Schema (XSD)
+## Change Log
+See [Release Notes on GitHub](https://github.com/ruby-rdf/rdf/releases)
 ## Dependencies
@@ -498,6 +507,7 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [SPARQL doc]:       https://ruby-rdf.github.io/sparql
 [RDF 1.0]:          https://www.w3.org/TR/2004/REC-rdf-concepts-20040210/
 [RDF 1.1]:          https://www.w3.org/TR/rdf11-concepts/
+[RDF-star]:         https://www.w3.org/2021/12/rdf-star.html
 [RDF 1.2]:          https://www.w3.org/TR/rdf12-concepts/
 [SPARQL 1.1]:       https://www.w3.org/TR/sparql11-query/
 [RDF.rb]:           https://ruby-rdf.github.io/

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 3.3.1
1	+ 3.3.2

data/lib/rdf/mixin/enumerable.rb CHANGED Viewed

@@ -83,7 +83,8 @@ module RDF
     #   * `:literal_equality' preserves [term-equality](https://www.w3.org/TR/rdf11-concepts/#dfn-literal-term-equality) for literals. Literals are equal only if their lexical values and datatypes are equal, character by character. Literals may be "inlined" to value-space for efficiency only if `:literal_equality` is `false`.
     #   * `:validity` allows a concrete Enumerable implementation to indicate that it does or does not support valididty checking. By default implementations are assumed to support validity checking.
     #   * `:skolemize` supports [Skolemization](https://www.w3.org/wiki/BnodeSkolemization) of an `Enumerable`. Implementations supporting this feature must implement a `#skolemize` method, taking a base URI used for minting URIs for BNodes as stable identifiers and a `#deskolemize` method, also taking a base URI used for turning URIs having that prefix back into the same BNodes which were originally skolemized.
-    #   * `:quoted_triples` supports RDF 1.2 quoted triples.
+    #   * `:rdf_full` supports RDF 1.2 Full profile, including support for embedded Triple Terms.
+    #   * `:quoted_triples` supports RDF-star quoted triples.
     #   * `:base_direction` supports RDF 1.2 directional language-tagged strings.
     #
     # @param  [Symbol, #to_sym] feature

data/lib/rdf/mixin/queryable.rb CHANGED Viewed

@@ -146,6 +146,8 @@ module RDF
     #
     # Patterns may also have embedded patterns as either a subject or object, recursively.
     #
+    # Patterns with a variable `graph_name` do not match the default graph.
+    #
     # When matching, match an embedded pattern against embedded statements, recursively. (see {RDF::Query::Pattern#eql?})
     #
     # @param  [RDF::Query::Pattern] pattern

data/lib/rdf/mixin/writable.rb CHANGED Viewed

@@ -127,10 +127,11 @@ module RDF
     def insert_statements(statements)
       each = statements.respond_to?(:each_statement) ? :each_statement : :each
       statements.__send__(each) do |statement|
-        if statement.embedded? && respond_to?(:supports?) && !supports?(:quoted_triples)
+        # FIXME: quoted triples are now deprecated
+        if statement.embedded? && respond_to?(:supports?) && !(supports?(:quoted_triples) || supports?(:rdf_full))
           raise ArgumentError, "Writable does not support quoted triples"
         end
-        if statement.object && statement.object.literal? && statement.object.direction? && !supports?(:base_direction)
+        if statement.object && statement.object.literal? && statement.object.direction? && respond_to?(:supports?) && !supports?(:base_direction)
           raise ArgumentError, "Writable does not support directional languaged-tagged strings"
         end
         insert_statement(statement)

data/lib/rdf/model/dataset.rb CHANGED Viewed

@@ -104,7 +104,8 @@ module RDF
     # @private
     # @see RDF::Enumerable#supports?
     def supports?(feature)
-      return true if %i(graph_name quoted_triples).include?(feature)
+      # FIXME: quoted triples are now deprecated
+      return true if %i(graph_name quoted_triples rdf_full).include?(feature)
       super
     end

data/lib/rdf/model/graph.rb CHANGED Viewed

@@ -305,8 +305,9 @@ module RDF
     # @private
     # @see RDF::Mutable#insert
     def insert_statement(statement)
-      if statement.embedded? && [email protected]?(:quoted_triples)
-        raise ArgumentError, "Graph does not support quoted triples"
+      # FIXME: quoted triples are now deprecated
+      if statement.embedded? && !(@data.supports?(:quoted_triples) || @data.supports?(:rdf_full))
+        raise ArgumentError, "Graph does not support the RDF Full profile"
       end
       if statement.object && statement.object.literal? && statement.object.direction? &&  [email protected]?(:base_direction)
         raise ArgumentError, "Graph does not support directional languaged-tagged strings"

data/lib/rdf/model/literal.rb CHANGED Viewed

@@ -194,7 +194,7 @@ module RDF
       @string   = @string.encode(Encoding::UTF_8).freeze if instance_variable_defined?(:@string)
       @object   = @string if instance_variable_defined?(:@string) && @object.is_a?(String)
       @language = language.to_s.downcase.to_sym if language
-      @direction = direction.to_s.downcase.to_sym if direction
+      @direction = direction.to_s.to_sym if direction
       @datatype = RDF::URI(datatype).freeze if datatype
       @datatype ||= self.class.const_get(:DATATYPE) if self.class.const_defined?(:DATATYPE)
       @datatype ||= if instance_variable_defined?(:@language) && @language &&
@@ -451,6 +451,16 @@ module RDF
       false
     end
+    ##
+    # Returns `true` if this is a language-tagged literal in the English
+    # language.
+    #
+    # @return [Boolean] `true` or `false`
+    # @since  3.3.2
+    def english?
+      /\Aen(?:-[A-Za-z]{2})?\z/ === language.to_s
+    end
     ##
     # Validates the value using {RDF::Value#valid?}, raising an error if the value is
     # invalid.

data/lib/rdf/model/statement.rb CHANGED Viewed

@@ -71,7 +71,8 @@ module RDF
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
     #   @option options [Boolean] :inferred used as a marker to record that this statement was inferred based on semantic relationships (T-Box).
-    #   @option options [Boolean] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement.
+    #   @option options [Boolean] :tripleTerm used as a marker to record that this statement appears as the object of another RDF::Statement.
+    #   @option options [Boolean] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement (deprecated).
     #   @return [RDF::Statement]
     #
     # @overload initialize(subject, predicate, object, **options)
@@ -84,7 +85,8 @@ module RDF
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
     #   @option options [Boolean] :inferred used as a marker to record that this statement was inferred based on semantic relationships (T-Box).
-    #   @option options [Boolean] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement.
+    #   @option options [Boolean] :tripleTerm used as a marker to record that this statement appears as the object of another RDF::Statement.
+    #   @option options [Boolean] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement (deprecated).
     #   @return [RDF::Statement]
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
       if subject.is_a?(Hash)
@@ -211,6 +213,13 @@ module RDF
     ##
     # @return [Boolean]
+    def tripleTerm?
+      !!@options[:tripleTerm]
+    end
+    ##
+    # @return [Boolean]
+    # @deprecated Quoted triples are now deprecated
     def quoted?
       !!@options[:quoted]
     end

data/lib/rdf/model/uri.rb CHANGED Viewed

@@ -70,10 +70,10 @@ module RDF
     IUSERINFO = Regexp.compile("(?:(?:#{IUNRESERVED})|(?:#{PCT_ENCODED})|(?:#{SUB_DELIMS})|:)*").freeze
     IAUTHORITY = Regexp.compile("(?:#{IUSERINFO}@)?#{IHOST}(?::#{PORT})?").freeze
-    IRELATIVE_PART = Regexp.compile("(?:(?://#{IAUTHORITY}(?:#{IPATH_ABEMPTY}))|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_NOSCHEME})|(?:#{IPATH_EMPTY}))").freeze
-    IRELATIVE_REF = Regexp.compile("^#{IRELATIVE_PART}(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
+    IRELATIVE_PART = Regexp.compile("//#{IAUTHORITY}(?:#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_NOSCHEME})|(?:#{IPATH_EMPTY})").freeze
+    IRELATIVE_REF = Regexp.compile("^(?:#{IRELATIVE_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
-    IHIER_PART = Regexp.compile("(?:(?://#{IAUTHORITY}#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_ROOTLESS})|(?:#{IPATH_EMPTY}))").freeze
+    IHIER_PART = Regexp.compile("//#{IAUTHORITY}(?:#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_ROOTLESS})|(?:#{IPATH_EMPTY})").freeze
     IRI = Regexp.compile("^#{SCHEME}:(?:#{IHIER_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
     # Split an IRI into it's component parts
@@ -1240,17 +1240,18 @@ module RDF
       query.to_s.split('&').
         inject(return_type == Hash ? {} : []) do |memo,kv|
           k,v = kv.to_s.split('=', 2)
-          next if k.to_s.empty?
-          k = CGI.unescape(k)
-          v = CGI.unescape(v) if v
-          if return_type == Hash
-            case memo[k]
-            when nil then memo[k] = v
-            when Array then memo[k] << v
-            else memo[k] = [memo[k], v]
+          unless k.to_s.empty?
+            k = CGI.unescape(k)
+            v = CGI.unescape(v) if v
+            if return_type == Hash
+              case memo[k]
+              when nil then memo[k] = v
+              when Array then memo[k] << v
+              else memo[k] = [memo[k], v]
+              end
+            else
+              memo << [k, v].compact
             end
-          else
-            memo << [k, v].compact
           end
           memo
         end

data/lib/rdf/model/value.rb CHANGED Viewed

@@ -197,19 +197,20 @@ module RDF
     alias_method :validate, :validate!
     ##
-    # Returns `true` if this Value starts with the given `string`.
+    # Returns `true` if this Value starts with any of the given strings.
     #
     # @example
     #   RDF::URI('http://example.org/').start_with?('http')     #=> true
     #   RDF::Node('_:foo').start_with?('_:bar')                 #=> false
     #   RDF::Litera('Apple').start_with?('Orange')              #=> false
+    #   RDF::Litera('Apple').start_with?('Orange', 'Apple')     #=> true
     #
-    # @param  [String, #to_s] string
+    # @param  [Array<#to_s>] *args Any number of strings to check against.
     # @return [Boolean] `true` or `false`
     # @see    String#start_with?
     # @since  0.3.0
-    def start_with?(string)
-      to_s.start_with?(string.to_s)
+    def start_with?(*args)
+      to_s.start_with?(*args.map(&:to_s))
     end
     alias_method :starts_with?, :start_with?

data/lib/rdf/nquads.rb CHANGED Viewed

@@ -71,9 +71,10 @@ module RDF
           begin
             unless blank? || read_comment
+              # FIXME: quoted triples are now deprecated
               subject   = read_uriref || read_node || read_quotedTriple || fail_subject
               predicate = read_uriref(intern: true) || fail_predicate
-              object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
+              object    = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple || fail_object
               graph_name    = read_uriref || read_node
               if validate? && !read_eos
                 log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)

data/lib/rdf/ntriples/reader.rb CHANGED Viewed

@@ -51,14 +51,14 @@ module RDF::NTriples
     # @see http://www.w3.org/TR/turtle/
     ##
     # Unicode regular expressions.
-    U_CHARS1         = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
-                         [\\u00C0-\\u00D6]|[\\u00D8-\\u00F6]|[\\u00F8-\\u02FF]|
-                         [\\u0370-\\u037D]|[\\u037F-\\u1FFF]|[\\u200C-\\u200D]|
-                         [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
-                         [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
-                       EOS
-    U_CHARS2         = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]").freeze
-    IRI_RANGE        = Regexp.compile("[[^<>\"{}\|\^`\\\\]&&[^\\x00-\\x20]]").freeze
+    U_CHARS1             = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
+                             [\\u00C0-\\u00D6]|[\\u00D8-\\u00F6]|[\\u00F8-\\u02FF]|
+                             [\\u0370-\\u037D]|[\\u037F-\\u1FFF]|[\\u200C-\\u200D]|
+                             [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
+                             [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
+                           EOS
+    U_CHARS2             = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]").freeze
+    IRI_RANGE            = Regexp.compile("[[^<>\"{}\|\^`\\\\]&&[^\\x00-\\x20]]").freeze
     PN_CHARS_BASE        = /[A-Z]|[a-z]|#{U_CHARS1}/.freeze
     PN_CHARS_U           = /_|#{PN_CHARS_BASE}/.freeze
@@ -70,8 +70,11 @@ module RDF::NTriples
     LANG_DIR             = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*(?:--[a-zA-Z]+)?)/.freeze
     STRING_LITERAL_QUOTE = /"((?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*)"/.freeze
-    ST_START              = /^<</.freeze
-    ST_END                = /^\s*>>/.freeze
+    TT_START              = /^<<\(/.freeze
+    TT_END                = /^\s*\)>>/.freeze
+    QT_START              = /^<</.freeze
+    QT_END                = /^\s*>>/.freeze
     # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar
     COMMENT               = /^#\s*(.*)$/.freeze
@@ -208,7 +211,7 @@ module RDF::NTriples
       begin
         read_statement
       rescue RDF::ReaderError
-        value = read_uriref || read_node || read_literal || read_quotedTriple
+        value = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple
         log_recover
         value
       end
@@ -226,7 +229,7 @@ module RDF::NTriples
           unless blank? || read_comment
             subject   = read_uriref || read_node || read_quotedTriple || fail_subject
             predicate = read_uriref(intern: true) || fail_predicate
-            object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
+            object    = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple || fail_object
             if validate? && !read_eos
               log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
@@ -242,12 +245,29 @@ module RDF::NTriples
     ##
     # @return [RDF::Statement]
+    def read_tripleTerm
+      if @options[:rdfstar] && match(TT_START)
+        subject   = read_uriref || read_node || fail_subject
+        predicate = read_uriref(intern: true) || fail_predicate
+        object    = read_uriref || read_node || read_literal || read_tripleTerm || fail_object
+        if !match(TT_END)
+          log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
+        end
+        RDF::Statement.new(subject, predicate, object, tripleTerm: true)
+      end
+    end
+    ##
+    # @return [RDF::Statement]
+    # @deprecated Quoted triples are now deprecated
     def read_quotedTriple
-      if @options[:rdfstar] && match(ST_START)
+      if @options[:rdfstar] && !match(TT_START) && match(QT_START)
+        warn "[DEPRECATION] RDF-star quoted triples are deprecated and will be removed in a future version.\n" +
+             "Called from #{Gem.location_of_caller.join(':')}"
         subject   = read_uriref || read_node || read_quotedTriple || fail_subject
         predicate = read_uriref(intern: true) || fail_predicate
         object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
-        if !match(ST_END)
+        if !match(QT_END)
           log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
         end
         RDF::Statement.new(subject, predicate, object, quoted: true)

data/lib/rdf/ntriples/writer.rb CHANGED Viewed

@@ -223,15 +223,28 @@ module RDF::NTriples
       format_triple(*statement.to_triple, **options)
     end
+    ##
+    # Returns the N-Triples representation of an RDF 1.2 triple term.
+    #
+    # @param  [RDF::Statement] statement
+    # @param  [Hash{Symbol => Object}] options ({})
+    # @return [String]
+    def format_tripleTerm(statement, **options)
+      "<<(%s %s %s)>>" % statement.to_a.map { |value| format_term(value, **options) }
+    end
     ##
     # Returns the N-Triples representation of an RDF-star quoted triple.
     #
     # @param  [RDF::Statement] statement
     # @param  [Hash{Symbol => Object}] options ({})
     # @return [String]
+    # @deprecated Quoted triples are now deprecated
     def format_quotedTriple(statement, **options)
+      # FIXME: quoted triples are now deprecated
       "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
     ##
     # Returns the N-Triples representation of a triple.
     #

data/lib/rdf/ntriples.rb CHANGED Viewed

@@ -15,7 +15,11 @@ module RDF
   #
   #     <https://rubygems.org/gems/rdf> <http://purl.org/dc/terms/title> "rdf" .
   #
-  # ## Quoted Triples
+  # ## Triple terms
+  #
+  # Supports statements as resources using `<<(s p o)>>`.
+  # ## Quoted Triples (Deprecated)
   #
   # Supports statements as resources using `<<s p o>>`.
   #

data/lib/rdf/query/pattern.rb CHANGED Viewed

@@ -23,7 +23,7 @@ module RDF; class Query
     #   @option options [Variable, URI, Symbol, nil]      :predicate (nil)
     #   @option options [Variable, Term, Symbol, nil]     :object    (nil)
     #   @option options [Variable, Resource, Symbol, nil, false] :graph_name   (nil)
-    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph.
+    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph. (See {RDF::Query#initialize})
     #   @option options [Boolean]            :optional  (false)
     #
     # @overload initialize(subject, predicate, object, options = {})
@@ -32,7 +32,7 @@ module RDF; class Query
     #   @param  [Variable, Termm, Symbol, nil]            object
     #   @param  [Hash{Symbol => Object}]          options
     #   @option options [Variable, Resource, Symbol, nil, false] :graph_name   (nil)
-    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph.
+    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph. (See {RDF::Query#initialize})
     #   @option options [Boolean]                 :optional  (false)
     #
     # @note {Statement} treats symbols as interned {Node} instances, in a {Pattern}, they are treated as {Variable}.

data/lib/rdf/query/variable.rb CHANGED Viewed

@@ -233,6 +233,8 @@ class RDF::Query
     # Returns `true` if this variable is equivalent to a given `other`
     # variable. Or, to another Term if bound, or to any other Term
     #
+    # @note when comparing against the default graph in an {RDF::Dataset}, `other` will be `false` and not be equal to an unbound variable.
+    #
     # @param  [Object] other
     # @return [Boolean] `true` or `false`
     # @since  0.3.0

data/lib/rdf/query.rb CHANGED Viewed

@@ -151,10 +151,9 @@ module RDF
     #   @option options [RDF::Query::Solutions] :solutions (Solutions.new)
     #   @option options [RDF::Resource, RDF::Query::Variable, false] :graph_name (nil)
     #     Default graph name for matching against queryable.
-    #     Named queries either match against a specifically named
+    #     Queries with a graph name match against a specifically named
     #     graphs if the name is an {RDF::Resource} or bound {RDF::Query::Variable}.
-    #     Names that are against unbound variables match either default
-    #     or named graphs.
+    #     Queries using an unbound variable as a graph name only match against named graphs, and will not match the default graph.
     #     The name of `false` will only match against the default graph.
     #   @option options [RDF::Resource, RDF::Query::Variable, false] :name (nil)
     #     Alias for `:graph_name`.
@@ -168,10 +167,9 @@ module RDF
     #   @param [RDF::Query::Solutions] solutions (Solutions.new)
     #   @param [RDF::Resource, RDF::Query::Variable, false] graph_name (false)
     #     Default graph name for matching against queryable.
-    #     Named queries either match against a specifically named
+    #     Queries with a graph name match against a specifically named
     #     graphs if the name is an {RDF::Resource} or bound {RDF::Query::Variable}.
-    #     Names that are against unbound variables match either default
-    #     or named graphs.
+    #     Queries using an unbound variable as a graph name only match against named graphs, and will not match the default graph.
     #     The name of `false` will only match against the default graph.
     #   @param [RDF::Resource, RDF::Query::Variable, false] name (false)
     #     Alias for `:graph_name`.
@@ -285,10 +283,9 @@ module RDF
     # @param [RDF::Query::Solutions] solutions (Solutions.new)
     # @param [RDF::Resource, RDF::Query::Variable, false] graph_name (nil)
     #   Default graph name for matching against queryable.
-    #   Named queries either match against a specifically named
+    #   Queries with a graph name match against a specifically named
     #   graphs if the name is an {RDF::Resource} or bound {RDF::Query::Variable}.
-    #   Names that are against unbound variables match either default
-    #   or named graphs.
+    #   Queries using an unbound variable as a graph name only match against named graphs, and will not match the default graph.
     #   The name of `false` will only match against the default graph.
     # @param [RDF::Resource, RDF::Query::Variable, false] name (nil)
     #   Alias for `:graph_name`.

data/lib/rdf/repository.rb CHANGED Viewed

@@ -182,6 +182,8 @@ module RDF
       when :validity         then @options.fetch(:with_validity, true)
       when :literal_equality then true
       when :atomic_write     then false
+      when :rdf_full         then false
+      # FIXME: quoted triples are now deprecated
       when :quoted_triples   then false
       when :base_direction   then false
       when :snapshots        then false
@@ -270,6 +272,7 @@ module RDF
         when :validity         then @options.fetch(:with_validity, true)
         when :literal_equality then true
         when :atomic_write     then true
+        when :rdf_full         then true
         when :quoted_triples   then true
         when :base_direction   then true
         when :snapshots        then true

data/lib/rdf/vocab/rdfv.rb CHANGED Viewed

@@ -72,6 +72,10 @@ module RDF
   #     # @return [RDF::Vocabulary::Term]
   #     # @attr_reader :value
   #
+  #     # Reification predicate
+  #     # @return [RDF::Vocabulary::Term]
+  #     # @attr_reader :reifies
+  #
   #     # The datatype of RDF literals storing fragments of HTML content.
   #     # @return [RDF::Vocabulary::Term]
   #     # @attr_reader :HTML
@@ -253,6 +257,12 @@ module RDF
       range: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
       isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
       type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
+    property :reifies,
+      comment: %(Property relating to a Triple Term.).freeze,
+      domain: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
+      label: "reifies".freeze,
+      isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze,
+      type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
     # Datatype definitions
     term :HTML,

data/lib/rdf/writer.rb CHANGED Viewed

@@ -518,7 +518,8 @@ module RDF
         when RDF::Literal   then format_literal(term, **options)
         when RDF::URI       then format_uri(term, **options)
         when RDF::Node      then format_node(term, **options)
-        when RDF::Statement then format_quotedTriple(term, **options)
+        # FIXME: quoted triples are now deprecated
+        when RDF::Statement then term.tripleTerm? ? format_tripleTerm(term, **options) : format_quotedTriple(term, **options)
         else nil
       end
     end
@@ -566,7 +567,7 @@ module RDF
     end
     ##
-    # Formats a referenced triple.
+    # Formats a referenced triple term.
     #
     # @example
     #     <<<s> <p> <o>>> <p> <o> .
@@ -576,8 +577,24 @@ module RDF
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
+    def format_tripleTerm(value, **options)
+      raise NotImplementedError.new("#{self.class}#format_tripleTerm") # override in subclasses
+    end
+    ##
+    # Formats a referenced quoted triple.
+    #
+    # @example
+    #     <<<s> <p> <o>>> <p> <o> .
+    #
+    # @param  [RDF::Statement] value
+    # @param  [Hash{Symbol => Object}] options = ({})
+    # @return [String]
+    # @raise  [NotImplementedError] unless implemented in subclass
+    # @abstract
+    # @deprecated Quoted Triples are now deprecated in favor of Triple Terms
     def format_quotedTriple(value, **options)
-      raise NotImplementedError.new("#{self.class}#format_statement") # override in subclasses
+      raise NotImplementedError.new("#{self.class}#format_quotedTriple") # override in subclasses
     end
   protected

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -46,6 +46,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
@@ -122,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -150,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: '3.23'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement