rdf 3.1.8 → 3.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2becf1b8beb0505402d0b4d2a6f7795cca3657bc579ffac31f3b6037d34e550
-  data.tar.gz: 14b57058dab38a7f7a23df435b83ce8e45c56c51ef718a107e1f1fedb6939a63
+  metadata.gz: 0a8a5a69a203cf83628099c927675bbc4abe122bd8568bb69fa06bae0cbcb94b
+  data.tar.gz: eba5377c635a6b05c25cd2b88107521c494d557dbfde6c0de5dbe52646ee1401
 SHA512:
-  metadata.gz: 685797b5318d90aeba5755a88cc4aa0acc37b69bcc209d579d52910f0940cdf93d2b453cb3b60a0779cfadda80a2bc050afad2d18b276d973b21e6f1e3f79317
-  data.tar.gz: a13b21146dfa64967464026e99d80bff9f6b472f4ef7d8079ee53a7e80d80f8577b4b7deee9b60643697354e6b42d093b4229d21978f93b5c65b4a2fa050270f
+  metadata.gz: 51af08617cb541333344b88a968c2d5699439baa7a4263154f7ccbdce06b635491b1cb93b9fb0e4dbca8711d9b71926ff22b60ab92f3f0cad9e205f86d1a3177
+  data.tar.gz: 8abc461f8937d46d3e75634764bc8bbaaf6f54ba07e39fa94c1400b62a59f20436ffd07c50a428aea7c2a01e292acbedb8f94bd5d07560e2523a00fef19174d1

data/README.md

@@ -7,9 +7,29 @@ This is a pure-Ruby library for working with [Resource Description Framework
 
 [![Gem Version](https://badge.fury.io/rb/rdf.png)](https://badge.fury.io/rb/rdf)
 [![Build Status](https://github.com/ruby-rdf/rdf/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf/actions?query=workflow%3ACI)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
+## Table of contents
+
+1. [Features](#features)
+2. [Differences between RDF 1.0 and RDF 1.1](#differences-between-rdf-1-0-and-rdf-1-1)
+3. [Tutorials](#tutorials)
+4. [Command Line](#command-line)
+5. [Examples](#examples)
+6. [Reader/Writer convenience methods](#reader/writer-convenience-methods)
+7. [RDF* (RDFStar)](#rdf*-(rdfstar))
+8. [Documentation](#documentation)
+9. [Dependencies](#dependencies)
+10. [Installation](#installation)
+11. [Download](#download)
+12. [Resources](#resources)
+13. [Mailing List](#mailing-list)
+14. [Authors](#authors)
+15. [Contributors](#contributors)
+16. [Contributing](#contributing)
+17. [License](#license)
+
 ## Features
 
 * 100% pure Ruby with minimal dependencies and no bloat.
@@ -41,7 +61,7 @@ middleware.
 
 See {RDF::Util::File} for configuring other mechanisms for retrieving resources.
 
-### Term caching and configuration.
+### Term caching and configuration
 
 RDF.rb uses a weak-reference cache for storing internalized versions of URIs and Nodes. This is particularly useful for Nodes as two nodes are equivalent only if they're the same node.
 
@@ -76,7 +96,7 @@ the 1.1 release of RDF.rb:
 * {RDF::Util::File.open\_file} now performs redirects and manages `base_uri` based on W3C recommendations:
   * `base_uri` is set to the original URI if a status 303 is provided, otherwise any other redirect will set `base_uri` to the redirected location.
   * `base_uri` is set to the content of the `Location` header if status is _success_.
-* Additionally, {RDF::Util::File.open\_file} sets the result encoding from `charset` if provided, defaulting to `UTF-8`. Other access methods include `last_modified` and `content_type`, 
+* Additionally, {RDF::Util::File.open\_file} sets the result encoding from `charset` if provided, defaulting to `UTF-8`. Other access methods include `last_modified` and `content_type`,
 * {RDF::StrictVocabulary} added with an easy way to keep vocabulary definitions up to date based on their OWL or RDFS definitions. Most vocabularies are now StrictVocabularies meaning that an attempt to resolve a particular term in that vocabulary will error if the term is not defined in the vocabulary.
 * New vocabulary definitions have been added for [ICal](http://www.w3.org/2002/12/cal/icaltzd#), [Media Annotations (MA)](http://www.w3.org/ns/ma-ont#), [Facebook OpenGraph (OG)](http://ogp.me/ns#), [PROV](http://www.w3.org/ns/prov#), [SKOS-XL (SKOSXL)](http://www.w3.org/2008/05/skos-xl#), [Data Vocabulary (V)](http://rdf.data-vocabulary.org/), [VCard](http://www.w3.org/2006/vcard/ns#), [VOID](http://rdfs.org/ns/void#http://rdfs.org/ns/void#), [Powder-S (WDRS)](http://www.w3.org/2007/05/powder-s#), and [XHV](http://www.w3.org/1999/xhtml/vocab#).
 
@@ -89,6 +109,7 @@ Notably, {RDF::Queryable#query} and {RDF::Query#execute} are now completely symm
 * [Getting started with RDF and SPARQL using 4store and RDF.rb](https://www.jenitennison.com/blog/node/152)
 
 ## Command Line
+
 When installed, RDF.rb includes a `rdf` shell script which acts as a wrapper to perform a number of different
 operations on RDF files using available readers and writers.
 
@@ -112,7 +133,7 @@ Different RDF gems will augment the `rdf` script with more capabilities, which m
     require 'rdf/ntriples'
     graph = RDF::Graph.new << [:hello, RDF::RDFS.label, "Hello, world!"]
     graph.dump(:ntriples)
-    
+
 or
 
     RDF::Writer.open("hello.nt") { |writer| writer << graph }
@@ -121,7 +142,7 @@ or
 
     require 'rdf/ntriples'
     graph = RDF::Graph.load("https://ruby-rdf.github.com/rdf/etc/doap.nt")
-    
+
 or
 
     RDF::Reader.open("https://ruby-rdf.github.com/rdf/etc/doap.nt") do |reader|
@@ -131,19 +152,20 @@ or
     end
 
 ### Reading RDF data in other formats
+
 {RDF::Reader.open} and {RDF::Repository.load} use a number of mechanisms to determine the appropriate reader
 to use when loading a file. The specific format to use can be forced using, e.g. `format: :ntriples`
 option where the specific format symbol is determined by the available readers. Both also use
 MimeType or file extension, where available.
 
     require 'rdf/nquads'
-    
+
     graph = RDF::Graph.load("https://ruby-rdf.github.com/rdf/etc/doap.nq", format: :nquads)
 
 A specific sub-type of Reader can also be invoked directly:
 
     require 'rdf/nquads'
-    
+
     RDF::NQuads::Reader.open("https://ruby-rdf.github.com/rdf/etc/doap.nq") do |reader|
       reader.each_statement do |statement|
         puts statement.inspect
@@ -157,6 +179,7 @@ be detected from filename or other options, or that more than one format is iden
 match will be used to read the input.
 
 ### Writing RDF data using other formats
+
 {RDF::Writer.open}, {RDF::Enumerable#dump}, {RDF::Writer.dump} take similar options to {RDF::Reader.open} to determine the
 appropriate writer to use.
 
@@ -176,6 +199,7 @@ A specific sub-type of Writer can also be invoked directly:
     File.open("hello.nq", "w") {|f| f << repo.dump(:nquads)}
 
 ## Reader/Writer convenience methods
+
 {RDF::Enumerable} implements `to_{format}` for each available instance of {RDF::Reader}.
 For example, if `rdf/turtle` is loaded, this allows the following:
 
@@ -195,7 +219,7 @@ Note that no prefixes are loaded automatically, however they can be provided as
 ### Querying RDF data using basic graph patterns (BGPs)
 
     require 'rdf/ntriples'
-    
+
     graph = RDF::Graph.load("https://ruby-rdf.github.com/rdf/etc/doap.nt")
     query = RDF::Query.new({
       person: {
@@ -204,7 +228,7 @@ Note that no prefixes are loaded automatically, however they can be provided as
         FOAF.mbox => :email,
       }
     }, **{})
-    
+
     query.execute(graph) do |solution|
       puts "name=#{solution.name} email=#{solution.email}"
     end
@@ -451,7 +475,6 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
   which you will be asked to agree to on the first commit to a repo within the organization.
   Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.
 
-
 ## License
 
 This is free and unencumbered public domain software. For more information,
@@ -492,4 +515,4 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [JSON::LD]:         https://ruby-rdf.github.com/json-ld
 [RestClient]:       https://rubygems.org/gems/rest-client
 [RestClient Components]: https://rubygems.org/gems/rest-client-components
-[Rack::Cache]:      https://rtomayko.github.io/rack-cache/
+[Rack::Cache]:      https://rtomayko.github.io/rack-cache/

data/VERSION

@@ -1 +1 @@
-3.1.8
+3.1.13

data/lib/rdf/cli.rb

@@ -8,9 +8,26 @@ begin
   require 'linkeddata'
 rescue LoadError
   # Silently load without linkeddata, but try some others
-  %w(microdata n3 rdfa rdfxml reasoner tabular trig trix turtle vocab xsd json/ld ld/patch).each do |ser|
+  %w(
+     json/ld
+     ld/patch
+     rdf/microdata
+     rdf/n3
+     rdf/ordered_repo
+     rdf/rdfa
+     rdf/rdfxml
+     rdf/reasoner
+     rdf/tabular
+     rdf/trig
+     rdf/trix
+     rdf/turtle
+     rdf/vocab
+     rdf/xsd
+     shacl
+     shex
+  ).each do |ser|
     begin
-      require ser.include?('/') ? ser : "rdf/#{ser}"
+      require ser
     rescue LoadError
     end
   end
@@ -239,8 +256,7 @@ module RDF
         lambda: ->(argv, opts) do
           writer_class = RDF::Writer.for(opts[:output_format]) || RDF::NTriples::Writer
           out = opts[:output]
-          opts = opts.merge(prefixes: {})
-          writer_opts = opts.merge(standard_prefixes: true)
+          writer_opts = {prefixes: {}, standard_prefixes: true}.merge(opts)
           writer_class.new(out, **writer_opts) do |writer|
             writer << repository
           end
@@ -316,7 +332,7 @@ module RDF
 
           # Add format-specific reader options
           reader.options.each do |cli_opt|
-            next if options.options.has_key?(cli_opt.symbol)
+            next if options.options.key?(cli_opt.symbol)
             on_args = cli_opt.on || []
             on_args << cli_opt.description if cli_opt.description
             options.on(*on_args) do |opt_arg|
@@ -338,7 +354,7 @@ module RDF
 
           # Add format-specific writer options
           writer.options.each do |cli_opt|
-            next if options.options.has_key?(cli_opt.symbol)
+            next if options.options.key?(cli_opt.symbol)
             on_args = cli_opt.on || []
             on_args << cli_opt.description if cli_opt.description
             options.on(*on_args) do |opt_arg|
@@ -402,7 +418,7 @@ module RDF
       end
 
       cli_opts.each do |cli_opt|
-        next if opts.has_key?(cli_opt.symbol)
+        next if opts.key?(cli_opt.symbol)
         on_args = cli_opt.on || []
         on_args << cli_opt.description if cli_opt.description
         options.on(*on_args) do |arg|
@@ -457,7 +473,7 @@ module RDF
     # @param  [Array<String>] args
     # @param  [IO] output
     # @param  [OptionParser] option_parser
-    # @param [Hash{Symbol => Hash{Symbol => Array[String]}}] messages used for confeying non primary-output which is structured.
+    # @param [Hash{Symbol => Hash{Symbol => Array[String]}}] messages used for conveying non primary-output which is structured.
     # @param  [Hash{Symbol => Object}] options
     # @return [Boolean]
     def self.exec(args, output: $stdout, option_parser: nil, messages: {}, **options)
@@ -506,10 +522,12 @@ module RDF
       options[:output_format] = options[:output_format].to_sym if options[:output_format]
 
       # Allow repository to be set via option.
-      @repository = options[:repository] ||
-        (options[:ordered] ?
-          [].extend(RDF::Enumerable, RDF::Queryable) :
-          RDF::Repository.new)
+      # If RDF::OrderedRepo is present, use it if the `ordered` option is specified, otherwise extend an Array.
+      @repository = options[:repository] || case
+        when RDF.const_defined?(:OrderedRepo) then RDF::OrderedRepo.new
+        when options[:ordered] then [].extend(RDF::Enumerable, RDF::Queryable)
+        else RDF::Repository.new
+      end
 
       # Parse input files if any command requires it
       if cmds.any? {|c| COMMANDS[c.to_sym][:parse]}
@@ -517,6 +535,8 @@ module RDF
         count = 0
         self.parse(args, **options) do |reader|
           reader.each_statement {|st| @repository << st}
+          # Remember prefixes from reading
+          options[:prefixes] ||= reader.prefixes
         end
         secs = Time.new - start
         options[:logger].info "Parsed #{repository.count} statements with #{@readers.join(', ')} in #{secs} seconds @ #{count/secs} statements/second."

data/lib/rdf/mixin/enumerable.rb

@@ -12,15 +12,15 @@ module RDF
   #   enumerable.count
   #
   # @example Checking whether a specific statement exists
-  #   enumerable.has_statement?(RDF::Statement(subject, predicate, object))
-  #   enumerable.has_triple?([subject, predicate, object])
-  #   enumerable.has_quad?([subject, predicate, object, graph_name])
+  #   enumerable.statement?(RDF::Statement(subject, predicate, object))
+  #   enumerable.triple?([subject, predicate, object])
+  #   enumerable.quad?([subject, predicate, object, graph_name])
   #
   # @example Checking whether a specific value exists
-  #   enumerable.has_subject?(RDF::URI("https://rubygems.org/gems/rdf"))
-  #   enumerable.has_predicate?(RDF::RDFS.label)
-  #   enumerable.has_object?(RDF::Literal("A Ruby library for working with Resource Description Framework (RDF) data.", language: :en))
-  #   enumerable.has_graph?(RDF::URI("http://ar.to/#self"))
+  #   enumerable.subject?(RDF::URI("https://rubygems.org/gems/rdf"))
+  #   enumerable.predicate?(RDF::RDFS.label)
+  #   enumerable.object?(RDF::Literal("A Ruby library for working with Resource Description Framework (RDF) data.", language: :en))
+  #   enumerable.graph?(RDF::URI("http://ar.to/#self"))
   #
   # @example Enumerating all statements
   #   enumerable.each_statement do |statement|
@@ -127,14 +127,25 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` contains the given RDF statement.
+    # @overload statement?
+    #   Returns `false` indicating this is not an RDF::Statemenet.
+    #   @return [Boolean]
+    #   @see RDF::Value#statement?
+    # @overload statement?(statement)
+    #   Returns `true` if `self` contains the given RDF statement.
     #
-    # @param  [RDF::Statement] statement
-    # @return [Boolean]
-    def has_statement?(statement)
-      !enum_statement.find { |s| s.eql?(statement) }.nil?
+    #   @param  [RDF::Statement] statement
+    #   @return [Boolean]
+    def statement?(*args)
+      case args.length
+      when 0 then false
+      when 1
+        args.first && !enum_statement.find { |s| s.eql?(args.first) }.nil?        
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
-    alias_method :include?, :has_statement?
+    alias_method :has_statement?, :statement?
+    alias_method :include?, :statement?
 
     ##
     # Iterates the given block for each RDF statement.
@@ -194,9 +205,10 @@ module RDF
     #
     # @param  [Array(RDF::Resource, RDF::URI, RDF::Term)] triple
     # @return [Boolean]
-    def has_triple?(triple)
+    def triple?(triple)
       triples.include?(triple)
     end
+    alias_method :has_triple?, :triple?
 
     ##
     # Iterates the given block for each RDF triple.
@@ -255,9 +267,10 @@ module RDF
     #
     # @param  [Array(RDF::Resource, RDF::URI, RDF::Term, RDF::Resource)] quad
     # @return [Boolean]
-    def has_quad?(quad)
+    def quad?(quad)
       quads.include?(quad)
     end
+    alias_method :has_quad?, :quad?
 
     ##
     # Iterates the given block for each RDF quad.
@@ -321,9 +334,10 @@ module RDF
     #
     # @param  [RDF::Resource] value
     # @return [Boolean]
-    def has_subject?(value)
+    def subject?(value)
       enum_subject.include?(value)
     end
+    alias_method :has_subject?, :subject?
 
     ##
     # Iterates the given block for each unique RDF subject term.
@@ -386,9 +400,10 @@ module RDF
     #
     # @param  [RDF::URI] value
     # @return [Boolean]
-    def has_predicate?(value)
+    def predicate?(value)
       enum_predicate.include?(value)
     end
+    alias_method :has_predicate?, :predicate?
 
     ##
     # Iterates the given block for each unique RDF predicate term.
@@ -451,9 +466,10 @@ module RDF
     #
     # @param  [RDF::Term] value
     # @return [Boolean]
-    def has_object?(value)
+    def object?(value)
       enum_object.include?(value)
     end
+    alias_method :has_object?, :object?
 
     ##
     # Iterates the given block for each unique RDF object term.
@@ -511,7 +527,7 @@ module RDF
     def terms(unique: true)
       unless unique
         enum_statement.
-          map(&:to_quad).
+          map(&:terms).
           flatten.
           compact
       else
@@ -520,14 +536,24 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` contains the given RDF subject term.
+    # @overload term?
+    #   Returns `false` indicating this is not an RDF::Statemenet.
+    #   @see RDF::Value#statement?
+    #   @return [Boolean]
+    # @overload term?(value)
+    #   Returns `true` if `self` contains the given RDF subject term.
     #
-    # @param  [RDF::Resource] value
-    # @return [Boolean]
-    # @since 2.0
-    def has_term?(value)
-      enum_term.include?(value)
+    #   @param  [RDF::Resource] value
+    #   @return [Boolean]
+    #   @since 2.0
+    def term?(*args)
+      case args.length
+      when 0 then super
+      when 1 then args.first && enum_term.include?(args.first)
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
+    alias_method :has_term?, :term?
 
     ##
     # Iterates the given block for each unique RDF term (subject, predicate, object, or graph_name).
@@ -551,8 +577,8 @@ module RDF
       if block_given?
         values = {}
         each_statement do |statement|
-          statement.to_quad.each do |value|
-            unless value.nil? || values.include?(value.hash)
+          statement.terms.each do |value|
+            unless values.include?(value.hash)
               values[value.hash] = true
               yield value
             end
@@ -595,9 +621,10 @@ module RDF
     # @param  [RDF::Resource, false] graph_name
     #   Use value `false` to query for the default graph_name
     # @return [Boolean]
-    def has_graph?(graph_name)
+    def graph?(graph_name)
       enum_statement.any? {|s| s.graph_name == graph_name}
     end
+    alias_method :has_graph?, :graph?
 
     ##
     # Limits statements to be from a specific graph.

data/lib/rdf/mixin/mutable.rb

@@ -122,7 +122,7 @@ module RDF
 
       statements.each do |statement|
         if (statement = Statement.from(statement))
-          if statement.has_object?
+          if statement.object?
             delete_insert([[statement.subject, statement.predicate, nil]], [statement])
           else
             delete([statement.subject, statement.predicate, nil])

data/lib/rdf/model/dataset.rb

@@ -104,7 +104,7 @@ module RDF
     # @private
     # @see RDF::Enumerable#supports?
     def supports?(feature)
-      return true if [:graph_name, :rdfstar].include?(feature)
+      return true if %i(graph_name rdfstar).include?(feature)
       super
     end