Finish 3.3.2

Author: gkellogg

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', 3.1, 3.2, ruby-head, jruby]
+        ruby: ['3.0', 3.1, 3.2, 3.3, ruby-head, jruby]
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
@@ -39,7 +39,7 @@ jobs:
         run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES
       - name: Coveralls GitHub Action
         uses: coverallsapp/github-action@v2
-        if: "matrix.ruby == '3.0'"
+        if: "matrix.ruby == '3.3'"
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
   wintests:
@@ -48,12 +48,12 @@ jobs:
     runs-on: windows-latest
     env:
       CI: true
-      ALLOW_FAILURES: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'jruby' || matrix.ruby == '3.1' }}
+      ALLOW_FAILURES: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'jruby' }}
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - 3.1
+          - 3.2
     steps:
       - name: Clone repository
         uses: actions/checkout@v3

CHANGES.md

@@ -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/

README.md

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

VERSION

@@ -2,8 +2,9 @@ ntriplesDoc       ::= triple? (EOL triple)* EOL?
 triple            ::= subject predicate object '.'
 subject           ::= IRIREF | BLANK_NODE_LABEL | quotedTriple
 predicate         ::= IRIREF
-object            ::= IRIREF | BLANK_NODE_LABEL | literal | quotedTriple
+object            ::= IRIREF | BLANK_NODE_LABEL | literal | tripleTerm | quotedTriple
 literal           ::= STRING_LITERAL_QUOTE ('^^' IRIREF | LANG_DIR )?
+tripleTerm        ::= '<<' subject predicate object '>>'
 quotedTriple      ::= '<<' subject predicate object '>>'
 
 @terminals

etc/n-triples.ebnf

@@ -83,7 +83,8 @@ def to_a
     #   * `: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

lib/rdf/mixin/enumerable.rb

@@ -146,6 +146,8 @@ def query_execute(query, **options, &block)
     #
     # 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

lib/rdf/mixin/queryable.rb

@@ -127,10 +127,11 @@ def insert_graph(graph)
     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)

lib/rdf/mixin/writable.rb

@@ -104,7 +104,8 @@ def isolation_level
     # @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
 

lib/rdf/model/dataset.rb

@@ -305,8 +305,9 @@ def query_pattern(pattern, **options, &block)
     # @private
     # @see RDF::Mutable#insert
     def insert_statement(statement)
-      if statement.embedded? && !@data.supports?(: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? &&  !@data.supports?(:base_direction)
         raise ArgumentError, "Graph does not support directional languaged-tagged strings"