rdf-n3 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5082274015223c285074d961b1de134d76a9e4b4174ec70cabb326161609ec8
-  data.tar.gz: a8df856b348d43664a99d1ce183da15082cb803b271eafd6f98abf3b8ac2f0eb
+  metadata.gz: 0b8ad4f6d7ca32219722ad7a0c73be390e31f4f1e8f743f3602bdfd4e0b2227d
+  data.tar.gz: a10d3b799d6dd79edb57c9e30842f20ec173dcdb5cce1bb82ed0cf658223171e
 SHA512:
-  metadata.gz: 561febe8dde9ad892eab9eda2cdf957c1d79c350be900a35c487ee6d3362c780aa5eee9868ba07c2c66d201f4f2a16a5bb0bb7853c366d2ab9b1593e50b25b0b
-  data.tar.gz: c15291bf10df5b98eb5f02f859b2c5d00d25b145f9effcf7c256b6a0d2edce32b1a66e9254308d6674131a84322fa33068bb9c661236b8c1ee26468ca26ee8fc
+  metadata.gz: 29ec8639b1e5471a19f15108ddacc23c3c5e5e2df3e8684a488f346d49eeb00cf2741dfbe76c22ee54dbbee6e60b002471f16a84573d5981bef556cb75f78073
+  data.tar.gz: 3793b5d2e0fa7c488af872c57e6ebc136e123554d734ab64c5e19e20aa0cc87d886f17346937505705c709d5aba296fa2ba61d14fa5ac65f164d05a81598dbae

data/README.md

@@ -1,7 +1,7 @@
 # RDF::N3 reader/writer and reasoner
 Notation-3 reader/writer for [RDF.rb][RDF.rb] .
 
-[![Gem Version](https://badge.fury.io/rb/rdf-n3.png)](https://badge.fury.io/rb/rdf-n3)
+[![Gem Version](https://badge.fury.io/rb/rdf-n3.svg)](https://badge.fury.io/rb/rdf-n3)
 [![Build Status](https://github.com/ruby-rdf/rdf-n3/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-n3/actions?query=workflow%3ACI)
 [![Coverage Status](https://coveralls.io/repos/github/ruby-rdf/rdf-n3/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-n3?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
@@ -159,6 +159,27 @@ Reasoning is discussed in the [Design Issues][] document.
   * `time:timeZone`               (See {RDF::N3::Algebra::Time::Timezone})
   * `time:year`                   (See {RDF::N3::Algebra::Time::Year})
 
+## Parser features
+
+### Chaining with `iriPropertyList`
+
+Adds a proposed syntactic extension for _subject embedding_ similar to a `blankNodePropertyList`. An `iriPropertyList` begins with `[ id _id_`, instead of a simple `[`. This sets _id_ as the **subject** to be used for the following `propertyList`. This provides a mechanisms similar to [JSON-LD Embedding](https://www.w3.org/TR/json-ld11/#embedding).
+
+    @prefix dc: <http://purl.org/dc/terms/>.
+    @prefix : <http://example.org/nd#>.
+
+    :SummerReadingList a :OrderedListOfBooks ;
+      :toRead (
+        [id :mobyDick dc:title "Moby Dick"; :setting :WhaleIntestines ]
+        [
+          id :jaws
+          dc:title "Jaws";
+          :setting :Beach
+        ]
+      ).
+  
+Note that the _id_ used in the `iriPropertyList` is not delimited by a `;`
+  
 ### Formulae / Quoted Graphs
 
 N3 Formulae are introduced with the `{ statement-list }` syntax. A given formula is assigned an `RDF::Node` instance, which is also used as the graph_name for `RDF::Statement` instances provided to `RDF::N3::Reader#each_statement`. For example, the following N3 generates the associated statements:
@@ -193,14 +214,14 @@ Formulae are typically used to query the knowledge-base, which is set from the b
 Blank nodes associated with rdf:List statements used as part of a built-in are made _non-distinguished_ existential variables, and patters containing these variables become optional. If they are not bound as part of the query, the implicitly are bound as the original blank nodes defined within the formula, which allows for both constant list arguments, list arguments that contain variables, or arguments which are variables expanding to lists.
 
 ## Dependencies
-* [Ruby](https://ruby-lang.org/) (>= 2.6)
-* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
-* [EBNF][EBNF gem] (~> 2.2)
-* [SPARQL][SPARQL gem] (~> 3.1)
-* [SXP][SXP gem] (~> 1.2)
+* [Ruby](https://ruby-lang.org/) (>= 3.0)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.3)
+* [EBNF][EBNF gem] (~> 2.4)
+* [SPARQL][SPARQL gem] (~> 3.3)
+* [SXP][SXP gem] (~> 1.3)
 
 ## Documentation
-Full documentation available on [RubyDoc.info](https://rubydoc.info/github/ruby-rdf/rdf-n3)
+Full documentation available on [RubyDoc.info](https://ruby-rdf.github.io/rdf-n3)
 
 ### Principle Classes
 * {RDF::N3}
@@ -220,7 +241,7 @@ Full documentation available on [RubyDoc.info](https://rubydoc.info/github/ruby-
 ## Resources
 * [RDF.rb][RDF.rb]
 * [Distiller](http://rdf.greggkellogg.net/distiller)
-* [Documentation](https://rubydoc.info/github/ruby-rdf/rdf-n3/)
+* [Documentation](https://ruby-rdf.github.io/rdf-n3/)
 * [History](file:file.History.html)
 * [Notation-3][N3]
 * [Team Submission][]
@@ -262,7 +283,7 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 * <https://github.com/ruby-rdf/rdf-n3>
 * <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-[RDF::Turtle]:            https://ruby-rdf.github.com/rdf-turtle/
+[RDF::Turtle]:            https://ruby-rdf.github.io/rdf-turtle/
 [Design Issues]:        https://www.w3.org/DesignIssues/Notation3.html "Notation-3 Design Issues"
 [Team Submission]:  https://www.w3.org/TeamSubmission/n3/
 [Turtle]:                     https://www.w3.org/TR/turtle/
@@ -274,7 +295,7 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [W3C N3 Community Group]: https://www.w3.org/community/n3-dev/
 [N3]:                       https://w3c.github.io/N3/spec/
 [PEG]:                    https://en.wikipedia.org/wiki/Parsing_expression_grammar
-[RDF.rb]:                https://ruby-rdf.github.com/rdf
-[EBNF gem]:         https://ruby-rdf.github.com/ebnf
-[SPARQL gem]:     https://ruby-rdf.github.com/sparql
-[SXP gem]:            https://ruby-rdf.github.com/sxp
+[RDF.rb]:                https://ruby-rdf.github.io/rdf
+[EBNF gem]:         https://ruby-rdf.github.io/ebnf
+[SPARQL gem]:     https://ruby-rdf.github.io/sparql
+[SXP gem]:            https://ruby-rdf.github.io/sxp

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/lib/rdf/n3/algebra/str/concatenation.rb

@@ -11,7 +11,7 @@ module RDF::N3::Algebra::Str
     ##
     # The string:concatenation operator takes a list of terms cast to strings and either binds the result of concatenating them to the output variable, removes a solution that does equal the literal object.
     #
-    # List entries are stringified using {SPARQL::Algebra::Expression.cast}.
+    # List entries are stringified using [SPARQL::Algebra::Expression.cast](https://ruby-rdf.github.io/sparql/SPARQL/Algebra/Expression#cast-class_method).
     #
     # @param [RDF::N3::List] list
     # @return [RDF::Term]

data/lib/rdf/n3/algebra/time/day.rb

@@ -18,8 +18,7 @@ module RDF::N3::Algebra::Time
       case position
       when :subject
         return nil unless resource.literal?
-        resource = resource.as_datetime
-        RDF::Literal(resource.object.strftime("%d").to_i)
+        resource.as_datetime.day
       when :object
         return nil unless resource.literal? || resource.variable?
         resource

data/lib/rdf/n3/algebra/time/hour.rb

@@ -18,8 +18,7 @@ module RDF::N3::Algebra::Time
       case position
       when :subject
         return nil unless resource.literal?
-        resource = resource.as_datetime
-        RDF::Literal(resource.object.strftime("%H").to_i)
+        resource.as_datetime.hours
       when :object
         return nil unless resource.literal? || resource.variable?
         resource

data/lib/rdf/n3/algebra/time/in_seconds.rb

@@ -21,9 +21,8 @@ module RDF::N3::Algebra::Time
         when RDF::Query::Variable
           resource
         when RDF::Literal
-          resource = resource.as_datetime
           # Subject evaluates to seconds from the epoc
-          RDF::Literal::Integer.new(resource.object.strftime("%s"))
+          RDF::Literal::Integer.new(resource.as_datetime.object.strftime("%s"))
         else
           nil
         end

data/lib/rdf/n3/algebra/time/minute.rb

@@ -18,8 +18,7 @@ module RDF::N3::Algebra::Time
       case position
       when :subject
         return nil unless resource.literal?
-        resource = resource.as_datetime
-        RDF::Literal(resource.object.strftime("%M").to_i)
+        resource.as_datetime.minutes
       when :object
         return nil unless resource.literal? || resource.variable?
         resource

data/lib/rdf/n3/algebra/time/month.rb

@@ -18,8 +18,7 @@ module RDF::N3::Algebra::Time
       case position
       when :subject
         return nil unless resource.literal?
-        resource = resource.as_datetime
-        RDF::Literal(resource.object.strftime("%m").to_i)
+        resource.as_datetime.month
       when :object
         return nil unless resource.literal? || resource.variable?
         resource

data/lib/rdf/n3/algebra/time/second.rb

@@ -18,8 +18,7 @@ module RDF::N3::Algebra::Time
       case position
       when :subject
         return nil unless resource.literal?
-        resource = resource.as_datetime
-        RDF::Literal(resource.object.strftime("%S").to_i)
+        RDF::Literal(resource.as_datetime.seconds.to_i)
       when :object
         return nil unless resource.literal? || resource.variable?
         resource

data/lib/rdf/n3/algebra/time/timezone.rb

@@ -18,8 +18,7 @@ module RDF::N3::Algebra::Time
       case position
       when :subject
         return nil unless resource.literal?
-        resource = resource.as_datetime
-        RDF::Literal(resource.object.strftime("%Z"))
+        resource.as_datetime.tz
       when :object
         return nil unless resource.literal? || resource.variable?
         resource

data/lib/rdf/n3/algebra/time/year.rb

@@ -18,8 +18,7 @@ module RDF::N3::Algebra::Time
       case position
       when :subject
         return nil unless resource.literal?
-        resource = resource.as_datetime
-        RDF::Literal(resource.object.strftime("%Y").to_i)
+        resource.as_datetime.year
       when :object
         return nil unless resource.literal? || resource.variable?
         resource

data/lib/rdf/n3/format.rb

@@ -17,7 +17,10 @@ module RDF::N3
   #
   # @see https://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
-    content_type     'text/n3',             extension: :n3, aliases: %w(text/rdf+n3;q=0.2 application/rdf+n3;q=0.2)
+    content_type     'text/n3',
+                     extension: :n3,
+                     aliases: %w(text/rdf+n3;q=0.2 application/rdf+n3;q=0.2),
+                     uri: 'http://www.w3.org/ns/formats/N3'
     content_encoding 'utf-8'
 
     reader { RDF::N3::Reader }

data/lib/rdf/n3/reader.rb

@@ -46,7 +46,7 @@ module RDF::N3
 
     ##
     # N3 Reader options
-    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
+    # @see https://ruby-rdf.github.io/rdf/RDF/Reader#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(
@@ -181,6 +181,7 @@ module RDF::N3
 
     # @!parse none
     terminal(:ANON,                             ANON)
+    terminal(:IPLSTART,                         IPLSTART)
     terminal(:BLANK_NODE_LABEL,                 BLANK_NODE_LABEL)
     terminal(:IRIREF,                           IRIREF, unescape:  true)
     terminal(:DOUBLE,                           DOUBLE)
@@ -311,6 +312,9 @@ module RDF::N3
       prod(:triples, %w{.}) do
         error("read_triples", "Unexpected end of file") unless token = @lexer.first
         subject = case token.type || token.value
+        when IPLSTART
+          # iriPropertyList predicateObjectList? 
+          read_iriPropertyList || error("Failed to parse iriPropertyList", production: :triples, token: @lexer.first)
         when '['
           # blankNodePropertyList predicateObjectList? 
           read_blankNodePropertyList || error("Failed to parse blankNodePropertyList", production: :triples, token: @lexer.first)
@@ -435,6 +439,7 @@ module RDF::N3
             read_quickVar ||
             read_collection ||
             read_blankNodePropertyList ||
+            read_iriPropertyList ||
             read_literal ||
             read_formula
           end
@@ -523,6 +528,28 @@ module RDF::N3
       end
     end
 
+    ##
+    # Read a iriPropertyList
+    #
+    #     [21] iriPropertyList ::= IPLSTART iri predicateObjectList ']'
+    #
+    # @return [RDF::Node]
+    def read_iriPropertyList
+      token = @lexer.first
+      if token.type == :IPLSTART
+        prod(:iriPropertyList, %{]}) do
+          @lexer.shift
+          progress("iriPropertyList", depth: options[:depth], token: token)
+          node = read_iri
+          debug("iriPropertyList: subject", depth: options[:depth]) {node.to_sxp}
+          read_predicateObjectList(node)
+          error("iriPropertyList", "Expected closing ']'") unless @lexer.first === ']'
+          @lexer.shift
+          node
+        end
+      end
+    end
+
     ##
     # Read a collection (`RDF::List`)
     #

data/lib/rdf/n3/refinements.rb

@@ -173,6 +173,32 @@ module RDF::N3::Refinements
 
   refine ::RDF::Graph do
     # Allow a graph to be treated as a term in a statement.
-    include ::RDF::Term
+
+    ##
+    # @overload term?
+    #   Returns `true` if `self` is a {RDF::Term}.
+    #
+    #   @return [Boolean]
+    # @overload term?(name)
+    #   Returns `true` if `self` contains the given RDF subject term.
+    #
+    #   @param  [RDF::Resource] value
+    #   @return [Boolean]
+    def term?(*args)
+      case args.length
+      when 0 then true
+      when 1 then false
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
+    end
+
+    ##
+    # Returns itself.
+    #
+    # @return [RDF::Value]
+    def to_term
+      statements.map(&:terms)
+      self
+    end
   end
 end

data/lib/rdf/n3/terminals.rb

@@ -64,6 +64,9 @@ module RDF::N3
     # 25
     STRING_LITERAL_LONG_QUOTE        = /"""(?:(?:"|"")?(?:[^"\\]|#{ECHAR}|#{UCHAR}))*"""/um.freeze
 
+    # 33
+    IPLSTART             = /\[\s*id/um.freeze
+
     # 28t
     PREFIX               = /@?prefix/ui.freeze
     # 29t

data/lib/rdf/n3/writer.rb

@@ -63,7 +63,7 @@ module RDF::N3
 
     ##
     # N3 Writer options
-    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
+    # @see https://ruby-rdf.github.io/rdf/RDF/Writer#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(

data/lib/rdf/n3.rb

@@ -14,7 +14,7 @@ module RDF
   #     end
   #   end
   #
-  # @see http://www.rubydoc.info/github/ruby-rdf/rdf/
+  # @see https://ruby-rdf.github.io/rdf/
   # @see https://www.w3.org/TR/REC-rdf-syntax/
   #
   # @author [Gregg Kellogg](http://greggkellogg.net/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-n3
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ebnf
@@ -17,140 +17,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rdf-trig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -284,10 +284,15 @@ files:
 - lib/rdf/n3/version.rb
 - lib/rdf/n3/vocab.rb
 - lib/rdf/n3/writer.rb
-homepage: https://ruby-rdf.github.com/rdf-n3
+homepage: https://ruby-rdf.github.io/rdf-n3
 licenses:
 - Unlicense
-metadata: {}
+metadata:
+  documentation_uri: https://ruby-rdf.github.io/rdf-n3
+  bug_tracker_uri: https://github.com/ruby-rdf/rdf-n3/issues
+  homepage_uri: https://github.com/ruby-rdf/rdf-n3
+  mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
+  source_code_uri: https://github.com/ruby-rdf/rdf-n3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -296,14 +301,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Notation3 reader/writer and reasoner for RDF.rb.