rdf-reasoner 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e3d93ea967347ff094db2d1844e3447471a118
-  data.tar.gz: 7f5c88de9746a69ad9b492a977c9e2ce869c90f9
+  metadata.gz: fbd3173e701cc40466c211a064bc71f2e55a45f0
+  data.tar.gz: 7bd3c6390427adc2029daae1ecf40b487c2a1cf0
 SHA512:
-  metadata.gz: 5c79cca368ea71ed8362adaef2a9a68b75ea6bbf1ae58c5d2c98470fbfe7fae1f9127dc709ee5e8c2b027f946e98c1d3fdb4b4cfe12bad7e6e6c73ec4016ac99
-  data.tar.gz: a565dc38bb2d0c13f22d3da6a7f34e52347eb571f8f499930f1e1c65c62aea7af05c76b0d7d60b31d662c6c1def9ece0792a02bf6a43c8acbaf72f612aae1c73
+  metadata.gz: ecd33982a775129086f110caa4ade5986ae23c107107157660cf74f0bdc26987fa214e58dd3b07a0a737fc3076d112fb82b1fdc9efb4028579ee98fd5b74fa86
+  data.tar.gz: 188c9804dc37c080cc792a8d12ff2d13f42242ed28c4d3a313a9e700f0fe2611495b0d23ce6c628b2e483fedb99e4a408b451204f64897b607cca30190d3512d

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/rdf/reasoner/extensions.rb

@@ -178,7 +178,7 @@ module RDF
       messages = {}
 
       # Check for defined classes in known vocabularies
-      self.query(:predicate => RDF.type) do |stmt|
+      self.query(predicate: RDF.type) do |stmt|
         vocab = RDF::Vocabulary.find(stmt.object)
         term = (RDF::Vocabulary.find_term(stmt.object) rescue nil) if vocab
         pname = term ? term.pname : stmt.object.pname
@@ -200,6 +200,13 @@ module RDF
         term = (RDF::Vocabulary.find_term(stmt.predicate) rescue nil) if vocab
         pname = term ? term.pname : stmt.predicate.pname
 
+        # Must be a valid statement
+        begin
+          stmt.validate!
+        rescue
+          ((messages[:statement] ||= {})[pname] ||= []) << "Triple #{stmt.to_ntriples} is invalid"
+        end
+
         # Must be a defined property
         if term && term.property?
           # Warn against using a deprecated term
@@ -217,7 +224,7 @@ module RDF
           uniq.
           compact
 
-        unless term.domain_compatible?(stmt.subject, self, :types => resource_types[stmt.subject])
+        unless term.domain_compatible?(stmt.subject, self, types: resource_types[stmt.subject])
           ((messages[:property] ||= {})[pname] ||= []) << if term.respond_to?(:domain)
            "Subject #{show_resource(stmt.subject)} not compatible with domain (#{Array(term.domain).map {|d| d.pname|| d}.join(',')})"
           else
@@ -232,7 +239,7 @@ module RDF
           uniq.
           compact if stmt.object.resource?
 
-        unless term.range_compatible?(stmt.object, self, :types => resource_types[stmt.object])
+        unless term.range_compatible?(stmt.object, self, types: resource_types[stmt.object])
           ((messages[:property] ||= {})[pname] ||= []) << if term.respond_to?(:range)
            "Object #{show_resource(stmt.object)} not compatible with range (#{Array(term.range).map {|d| d.pname|| d}.join(',')})"
           else

data/lib/rdf/reasoner/rdfs.rb

@@ -192,7 +192,7 @@ module RDF::Reasoner
 
         # Fully entailed types of the resource
         types = options.fetch(:types) do
-          queryable.query(:subject => resource, :predicate => RDF.type).
+          queryable.query(subject: resource, predicate: RDF.type).
             map {|s| (t = (RDF::Vocabulary.find_term(s.object)) rescue nil) && t.entail(:subClassOf)}.
             flatten.
             uniq.
@@ -274,7 +274,7 @@ module RDF::Reasoner
         else
           # Fully entailed types of the resource
           types = options.fetch(:types) do
-            queryable.query(:subject => resource, :predicate => RDF.type).
+            queryable.query(subject: resource, predicate: RDF.type).
               map {|s| (t = (RDF::Vocabulary.find_term(s.object) rescue nil)) && t.entail(:subClassOf)}.
               flatten.
               uniq.

data/lib/rdf/reasoner/schema.rb

@@ -109,7 +109,7 @@ module RDF::Reasoner
                   true
                 else
                   # Valid if cast as datatype
-                  resource.plain? && RDF::Literal(resource.value, :datatype => RDF::URI(range)).valid?
+                  resource.plain? && RDF::Literal(resource.value, datatype: RDF::URI(range)).valid?
                 end
               else
                 # Otherwise, presume that the range refers to a typed resource. This is allowed if the value is a plain literal
@@ -176,7 +176,7 @@ module RDF::Reasoner
     # Fully entailed types
     def entailed_types(resource, queryable, options = {})
       options.fetch(:types) do
-        queryable.query(:subject => resource, :predicate => RDF.type).
+        queryable.query(subject: resource, predicate: RDF.type).
           map {|s| (t = (RDF::Vocabulary.find_term(s.object) rescue nil)) && t.entail(:subClassOf)}.
           flatten.
           uniq.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-reasoner
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,132 +16,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     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: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: Reasons over RDFS/OWL vocabularies to generate statements which are entailed
   based on base RDFS/OWL rules along with vocabulary information. It can also be used
   to ask specific questions, such as if a given object is consistent with the vocabulary