shex 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e10c5d06f3b45a96dc3f2437680bde6eb406fad42c44efce5102d2d763da3281
-  data.tar.gz: 70afaf45c7d88efb782e85d3de232ec48484d2d69683070920ab1b905e94d790
+  metadata.gz: 0d91d9cf7282456c7a61fba4c17609eda22851232c5bfe7be75518c0bb1ea354
+  data.tar.gz: b465b287f74cd1efaa8788ad80a9a0e4ee78e89d6a8ea061445de526f8b78edf
 SHA512:
-  metadata.gz: c5b825dd6fe24fc3ceaee231942756eecb30883650dfb67aa8ae590e5a089a795211b51afac134f8e8ed62161b6a2de13dd2e787da810fd05c771bd29af77481
-  data.tar.gz: 1f6c4189937468a6c0e7505a16f7e8f432beb8f308645c6ef96609f9e570eef30504fd5eac969f156bfd9f5cd95b814f51940b514dc4e024e32d084228e6a28d
+  metadata.gz: 695c099ae0fb5899086f50296293610c3f6f1a82a361ed5da953fd1495cc38a538a26048fcdf8b329a6313e7e81abd1e102883523ad12c3b5e360cdcee0686df
+  data.tar.gz: 7dd2fe93e6cf93b1afca58d09d79ea318d71314759e0b790b524fe58fdee7bd5954d2950ea67cee69b1953b25bc612d54a9a6bcb0b7ef74c0061555f61f68700

data/README.md

@@ -2,12 +2,10 @@
 
 This is a pure-Ruby library for working with the [Shape Expressions Language][ShExSpec] to validate the shape of [RDF][] graphs.
 
-<https://ruby-rdf.github.com/shex>
-
 [![Gem Version](https://badge.fury.io/rb/shex.png)](https://badge.fury.io/rb/shex)
-[![Build Status](https://travis-ci.org/ruby-rdf/shex.png?branch=master)](https://travis-ci.org/ruby-rdf/shex)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/shex/badge.svg)](https://coveralls.io/r/ruby-rdf/shex)
-[![Join the chat at https://gitter.im/ruby-rdf/rdf](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ruby-rdf/rdf?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://github.com/ruby-rdf/shex/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/shex/actions?query=workflow%3ACI)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/shex/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/shex?branch=develop)
+[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 [![DOI](https://zenodo.org/badge/74419330.svg)](https://zenodo.org/badge/latestdoi/74419330)
 
 ## Features
@@ -18,7 +16,7 @@ This is a pure-Ruby library for working with the [Shape Expressions Language][Sh
 
 ## Description
 
-The ShEx gem implements a [ShEx][ShExSpec] Shape Expression engine.
+The ShEx gem implements a [ShEx][ShExSpec] Shape Expression engine version 2.0.
 
 * `ShEx::Parser` parses ShExC and ShExJ formatted documents generating executable operators which can be serialized as [S-Expressions](https://en.wikipedia.org/wiki/S-expression).
 * `ShEx::Algebra` executes operators against Any `RDF::Graph`, including compliant [RDF.rb][].
@@ -195,6 +193,7 @@ The result of parsing either ShExC or ShExJ is the creation of a set of executab
 
 * [Ruby](https://ruby-lang.org/) (>= 2.4)
 * [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
+* [SPARQL gem](https://rubygems.org/gems/sparql) (~> 3.1)
 
 ## Installation
 
@@ -245,14 +244,19 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
   enough, be assured we will eventually add you in there.
 * Do note that in order for us to merge any non-trivial changes (as a rule
   of thumb, additions larger than about 15 lines of code), we need an
-  explicit [public domain dedication][PDD] on record from you.
+  explicit [public domain dedication][PDD] on record from you,
+  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,
 see <https://unlicense.org/> or the accompanying {file:LICENSE} file.
 
-[ShExSpec]:     https://shex.io/shex-semantics/
+[ShExSpec]:     http://shex.io/shex-semantics-20170713/
 [RDF]:          https://www.w3.org/RDF/
 [RDF.rb]:       https://rubydoc.info/github/ruby-rdf/rdf
 [EBNF]:         https://rubygems.org/gems/ebnf
+[YARD]:         https://yardoc.org/
+[YARD-GS]:      https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:              https://unlicense.org/#unlicensing-contributions

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/etc/doap.ttl

@@ -9,11 +9,11 @@
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
 
 <https://rubygems.org/gems/shex> a doap:Project, earl:TestSubject, earl:Software ;
-  doap:name          "ShEx.rb" ;
+  doap:name          "ShEx" ;
   doap:homepage      <https://ruby-rdf.github.com/shex> ;
   doap:license       <https://unlicense.org/1.0/> ;
-  doap:shortdesc     "ShEx is a Shape Expression engine for Ruby."@en ;
-  doap:description   "ShEx is an Shape Expression engine for the RDF.rb library suite."@en ;
+  doap:shortdesc     "ShEx is a Shape Expression engine for Ruby RDF.rb."@en ;
+  doap:description   "ShEx is an Shape Expression engine for the Ruby RDF.rb library suite."@en ;
   doap:created       "2016-12-09"^^xsd:date ;
   doap:programming-language "Ruby" ;
   doap:implements    <http://shex.io/shex-semantics/> ;
@@ -27,8 +27,6 @@
   doap:maintainer    <https://greggkellogg.net/foaf#me> ;
   doap:documenter    <https://greggkellogg.net/foaf#me> ;
   foaf:maker         <https://greggkellogg.net/foaf#me> ;
-  dc:title           "ShEx.rb" ;
-  dc:description     "ShEx is an Shape Expression engine for the RDF.rb library suite."@en ;
   dc:date            "2016-12-09"^^xsd:date ;
   dc:creator         <https://greggkellogg.net/foaf#me> ;
   dc:isPartOf        <https://rubygems.org/gems/rdf> .

data/lib/shex/algebra/operator.rb

@@ -335,7 +335,7 @@ module ShEx::Algebra
         end
       end
 
-      new(*operands, options.merge(id: id))
+      new(*operands, **options.merge(id: id))
     end
 
     def json_type

data/lib/shex/algebra/shape.rb

@@ -36,8 +36,8 @@ module ShEx::Algebra
       # neigh(G, n) is the neighbourhood of the node n in the graph G.
       #
       #    neigh(G, n) = arcsOut(G, n) ∪ arcsIn(G, n)
-      arcs_in = schema.graph.query(object: focus).to_a.sort_by(&:to_sxp)
-      arcs_out = schema.graph.query(subject: focus).to_a.sort_by(&:to_sxp)
+      arcs_in = schema.graph.query({object: focus}).to_a.sort_by(&:to_sxp)
+      arcs_out = schema.graph.query({subject: focus}).to_a.sort_by(&:to_sxp)
       neigh = (arcs_in + arcs_out).uniq
 
       # `matched` is the subset of statements which match `expression`.

data/lib/shex/format.rb

@@ -4,8 +4,8 @@ module ShEx
   ##
   # ShEx format specification. Note that this format does not define any readers or writers.
   #
-  # @example Obtaining an LD Patch format class
-  #     RDF::Format.for(:shex)           #=> LD::Patch::Format
+  # @example Obtaining an ShEx format class
+  #     RDF::Format.for(:shex)           #=> ShEx::Format
   #     RDF::Format.for("etc/foaf.shex")
   #     RDF::Format.for(file_name:      "etc/foaf.shex")
   #     RDF::Format.for(file_extension: "shex")

data/lib/shex/parser.rb

@@ -256,7 +256,7 @@ module ShEx
     def shape_or(input, data)
       input.merge!(data.dup.keep_if {|k, v| [:closed, :extraPropertySet, :codeDecl].include?(k)})
       expression = if Array(data[:shapeExpression]).length > 1
-        Algebra::Or.new(*data[:shapeExpression], {})
+        Algebra::Or.new(*data[:shapeExpression])
       else
         Array(data[:shapeExpression]).first
       end
@@ -282,7 +282,7 @@ module ShEx
       end
 
       expression = if expressions.length > 1
-        Algebra::And.new(*expressions, {})
+        Algebra::And.new(*expressions)
       else
         expressions.first
       end
@@ -341,7 +341,7 @@ module ShEx
       expression = case expression.length
       when 0 then nil
       when 1 then expression.first
-      else        Algebra::And.new(*expression, {})
+      else        Algebra::And.new(*expression)
       end
 
       (input[:shapeExpression] ||= []) << expression if expression
@@ -389,7 +389,7 @@ module ShEx
       attrs += Array(data[:numericFacet])
       attrs += Array(data[:stringFacet])
 
-      input[:nodeConstraint] = Algebra::NodeConstraint.new(*attrs.compact, {})
+      input[:nodeConstraint] = Algebra::NodeConstraint.new(*attrs.compact)
     end
 
     # [25]    nonLitNodeConstraint  ::= nonLiteralKind stringFacet*
@@ -401,7 +401,7 @@ module ShEx
       attrs += Array(data[:nonLiteralKind])
       attrs += Array(data[:stringFacet])
 
-      input[:nodeConstraint] = Algebra::NodeConstraint.new(*attrs.compact, {})
+      input[:nodeConstraint] = Algebra::NodeConstraint.new(*attrs.compact)
     end
 
     # [26]    nonLiteralKind        ::= "IRI" | "BNODE" | "NONLITERAL"
@@ -469,7 +469,7 @@ module ShEx
       attrs += Array(data[:annotation])
       attrs += Array(data[:codeDecl])
 
-      input[:shape] = Algebra::Shape.new(*attrs, {})
+      input[:shape] = Algebra::Shape.new(*attrs)
     end
     private :shape_definition
 
@@ -482,7 +482,7 @@ module ShEx
     # [37]    oneOfTripleExpr           ::= groupTripleExpr ('|' groupTripleExpr)*
     production(:oneOfTripleExpr) do |input, data, callback|
       expression = if Array(data[:tripleExpression]).length > 1
-        Algebra::OneOf.new(*data[:tripleExpression], {})
+        Algebra::OneOf.new(*data[:tripleExpression])
       else
         Array(data[:tripleExpression]).first
       end
@@ -492,7 +492,7 @@ module ShEx
     # [40]    groupTripleExpr            ::= unaryTripleExpr (';' unaryTripleExpr?)*
     production(:groupTripleExpr) do |input, data, callback|
       expression = if Array(data[:tripleExpression]).length > 1
-        Algebra::EachOf.new(*data[:tripleExpression], {})
+        Algebra::EachOf.new(*data[:tripleExpression])
       else
         Array(data[:tripleExpression]).first
       end
@@ -545,7 +545,7 @@ module ShEx
       attrs += Array(data[:codeDecl])
       attrs += Array(data[:annotation])
 
-      input[:tripleExpression] = Algebra::TripleConstraint.new(*attrs, {}) unless attrs.empty?
+      input[:tripleExpression] = Algebra::TripleConstraint.new(*attrs) unless attrs.empty?
     end
 
     # [46]    cardinality            ::= '*' | '+' | '?' | REPEAT_RANGE
@@ -666,7 +666,7 @@ module ShEx
 
     # [60]    codeDecl              ::= '%' iri (CODE | "%")
     production(:codeDecl) do |input, data, callback|
-      (input[:codeDecl] ||= []) <<  Algebra::SemAct.new(*[data[:iri], data[:code]].compact, {})
+      (input[:codeDecl] ||= []) <<  Algebra::SemAct.new(*[data[:iri], data[:code]].compact)
     end
 
     # [13t]   literal               ::= rdfLiteral | numericLiteral | booleanLiteral
@@ -941,7 +941,7 @@ module ShEx
         "options: #{options.inspect}, " +
         "validate: #{validate?.inspect}, "
       end
-      RDF::Literal.new(value, options.merge(validate: validate?))
+      RDF::Literal.new(value, **options.merge(validate: validate?))
     end
   end # class Parser
 end # module ShEx

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shex
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
 description: Implements ShExC and ShEx JSON.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -225,7 +225,7 @@ licenses:
 - Unlicense
 metadata:
   yard.run: yri
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -240,8 +240,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Implementation of Shape Expressions (ShEx) for RDF.rb
 test_files: []