shacl 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd8b2e322078d6c7126673e51557abbc932f0d73adf40746993fe17dc37b052
-  data.tar.gz: 9bdf6b6f5c5a5690021dc1ce567a0ef38b5fee7246ac25b04d8333de8e1736ca
+  metadata.gz: 3b8c0531333caf832e7bc49672c567cae4444736c389c569069b0abc24921a80
+  data.tar.gz: ba80d251ecbe6168a4f8aec684381a9c5121d35473c6b6a7ef5a521ec91873fe
 SHA512:
-  metadata.gz: 41394099ad2f1f10a36ba2e6d47412c214194ece2310388fcbf5981f91e8aaa5be05db05a15bdbadf4895f33c17aa815c96b65eda387f0cc052a3e56ad01c144
-  data.tar.gz: 795668e35a3493338b45c0e9021bd23a8b5901fe930f8365f3676ee3ab1dd6bd5ee3efb456ae3c3673e475f3ac53850dd7c107d6c11a84ccb294f33966082a53
+  metadata.gz: e4b437531b70b4e58802aabcc01cde88dee8297e54df9971400c0a7cb816d119f39848afcaa06fb5b295fa606383ab92b2dd3c41a624fea6c81f20897be13c09
+  data.tar.gz: 346ad2a174f973879e93b0b61890a0a1694673b8f9e104f4efda68781ca9337a0ba7fbc3e04f43ee8db172ce731791fffaeb54e6f3dfc6ff0d96d7d972258a12

data/README.md

@@ -4,7 +4,7 @@ This is a pure-Ruby library for working with the [Shape Constraint Language][SHA
 
 [![Gem Version](https://badge.fury.io/rb/shacl.png)](https://badge.fury.io/rb/shacl)
 [![Build Status](https://github.com/ruby-rdf/shacl/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/shacl/actions?query=workflow%3ACI)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/shacl/badge.svg)](https://coveralls.io/github/ruby-rdf/shacl)
+[![Coverage Status](https://coveralls.io/repos/github/ruby-rdf/shacl/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/shacl?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Features

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/etc/doap.ttl

@@ -10,11 +10,11 @@
 
 <https://rubygems.org/gems/shacl> a doap:Project, earl:TestSubject, earl:Software ;
   sh:shapesGraph     <doap-shacl.ttl>;
-  doap:name          "Ruby SHACL" ;
+  doap:name          "SHACL" ;
   doap:homepage      <https://ruby-rdf.github.com/shacl> ;
   doap:license       <https://unlicense.org/1.0/> ;
-  doap:shortdesc     "shacl is a Shapes Constraint engine for Ruby."@en ;
-  doap:description   "shacl is an Shape Constraint engine for the RDF.rb library suite."@en ;
+  doap:shortdesc     "SHACL is a Shapes Constraint engine for Ruby."@en ;
+  doap:description   "SHACL is a Shape Constraint engine for the Ruby RDF.rb library suite."@en ;
   doap:created       "2020-11-26"^^xsd:date ;
   doap:programming-language "Ruby" ;
   doap:implements    <https://www.w3.org/TR/shacl/> ;
@@ -28,8 +28,5 @@
   doap:maintainer    <https://greggkellogg.net/foaf#me> ;
   doap:documenter    <https://greggkellogg.net/foaf#me> ;
   foaf:maker         <https://greggkellogg.net/foaf#me> ;
-  dc:title           "Ruby SHACL" ;
-  dc:description     "shacl is an Shape Constraint engine for the RDF.rb library suite."@en ;
-  dc:date            "2020-11-26"^^xsd:date ;
   dc:creator         <https://greggkellogg.net/foaf#me> ;
   dc:isPartOf        <https://rubygems.org/gems/rdf> .

data/lib/shacl/algebra/node_shape.rb

@@ -43,7 +43,7 @@ module SHACL::Algebra
         shape_properties = shape_paths.select {|p| p.is_a?(RDF::URI)}
         shape_properties += Array(@options[:ignoredProperties])
 
-        closed_results = graph.query(subject: node).map do |statement|
+        closed_results = graph.query({subject: node}).map do |statement|
           next if shape_properties.include?(statement.predicate)
           not_satisfied(focus: node,
             value: statement.object,

data/lib/shacl/algebra/property_shape.rb

@@ -35,7 +35,7 @@ module SHACL::Algebra
 
       # Turn the `path` attribute into a SPARQL Property Path and evaluate to find related nodes.
       value_nodes = if path.is_a?(RDF::URI)
-        graph.query(subject: node, predicate: path).objects
+        graph.query({subject: node, predicate: path}).objects
       elsif path.evaluatable?
         path.execute(graph,
           subject: node,
@@ -100,7 +100,7 @@ module SHACL::Algebra
     # @param [Array<RDF::Term>] value_nodes
     # @return [Array<SHACL::ValidationResult>]
     def builtin_lessThan(property, node, path, value_nodes, **options)
-      terms = graph.query(subject: node, predicate: property).objects
+      terms = graph.query({subject: node, predicate: property}).objects
       compare(:<, terms, node, path, value_nodes,
               RDF::Vocab::SHACL.LessThanConstraintComponent, **options)
     end
@@ -113,7 +113,7 @@ module SHACL::Algebra
     # @param [Array<RDF::Term>] value_nodes
     # @return [Array<SHACL::ValidationResult>]
     def builtin_lessThanOrEquals(property, node, path, value_nodes, **options)
-      terms = graph.query(subject: node, predicate: property).objects
+      terms = graph.query({subject: node, predicate: property}).objects
       compare(:<=, terms, node, path, value_nodes,
               RDF::Vocab::SHACL.LessThanOrEqualsConstraintComponent, **options)
     end

data/lib/shacl/algebra/shape.rb

@@ -15,16 +15,16 @@ module SHACL::Algebra
     def targetNodes
       (Array(@options[:targetNode]) +
       Array(@options[:targetClass]).map do |cls|
-        graph.query(predicate: RDF.type, object: cls).subjects
+        graph.query({predicate: RDF.type, object: cls}).subjects
       end +
       Array(@options[:targetSubjectsOf]).map do |pred|
-        graph.query(predicate: pred).subjects
+        graph.query({predicate: pred}).subjects
       end +
       Array(@options[:targetObjectsOf]).map do |pred|
-        graph.query(predicate: pred).objects
+        graph.query({predicate: pred}).objects
       end + (
         Array(type).include?(RDF::RDFS.Class) ?
-          graph.query(predicate: RDF.type, object: id).subjects :
+          graph.query({predicate: RDF.type, object: id}).subjects :
           []
       )).flatten.uniq
     end
@@ -52,7 +52,7 @@ module SHACL::Algebra
     def builtin_class(types, node, path, value_nodes, **options)
       value_nodes.map do |n|
         has_type = n.resource? && begin
-          objects = graph.query(subject: n, predicate: RDF.type).objects
+          objects = graph.query({subject: n, predicate: RDF.type}).objects
           types.all? {|t| objects.include?(t)}
         end
         satisfy(focus: node, path: path,
@@ -110,7 +110,7 @@ module SHACL::Algebra
     # @return [Array<SHACL::ValidationResult>]
     def builtin_disjoint(properties, node, path, value_nodes, **options)
       disjoint_nodes = properties.map do |prop|
-        graph.query(subject: node, predicate: prop).objects
+        graph.query({subject: node, predicate: prop}).objects
       end.flatten.compact
       value_nodes.map do |n|
         has_value = disjoint_nodes.include?(n)
@@ -140,7 +140,7 @@ module SHACL::Algebra
     # @param [Array<RDF::Term>] value_nodes
     # @return [Array<SHACL::ValidationResult>]
     def builtin_equals(property, node, path, value_nodes, **options)
-      equal_nodes = graph.query(subject: node, predicate: property).objects
+      equal_nodes = graph.query({subject: node, predicate: property}).objects
       (value_nodes.map do |n|
         has_value = equal_nodes.include?(n)
         satisfy(focus: node, path: path,

data/lib/shacl/algebra/xone.rb

@@ -36,7 +36,7 @@ module SHACL::Algebra
       log_debug(NAME, depth: depth) {SXP::Generator.string({node: node}.to_sxp_bin)}
       num_conform = operands.inject(0) do |memo, op|
         results = op.conforms(node, depth: depth + 1, **options)
-        memo += (results.all?(&:conform?) ? 1 : 0)
+        memo += (results.flatten.all?(&:conform?) ? 1 : 0)
       end
       case num_conform
       when 0

data/lib/shacl/shapes.rb

@@ -35,7 +35,7 @@ module SHACL
       @loded_graphs = loaded_graphs
 
       import_count = 0
-      while (imports = graph.query(predicate: RDF::OWL.imports).map(&:object)).count > import_count
+      while (imports = graph.query({predicate: RDF::OWL.imports}).map(&:object)).count > import_count
         # Load each imported graph
         imports.each do |ref|
           graph.load(imports)
@@ -65,7 +65,7 @@ module SHACL
     # @raise [SHACL::Error]
     def self.from_queryable(queryable, **options)
       # Query queryable to find one ore more shapes graphs
-      graphs = queryable.query(predicate: RDF::Vocab::SHACL.shapesGraph).objects
+      graphs = queryable.query({predicate: RDF::Vocab::SHACL.shapesGraph}).objects
       graph = RDF::Graph.new do |g|
         graphs.each {|iri| g.load(iri)}
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shacl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -162,7 +162,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: Implements SHACL Core and SHACL-SPARQL within the RDF.rb ecosystem.
+description: SHACL is an Shape Constraint engine for the Ruby RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
 extensions: []
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Implementation of Shapes Constraint Language (SHACL) for RDF.rb