rdf-reasoner 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f519d63f62d46294c8c459b62ffa5cc0ec678f2c
-  data.tar.gz: 8987fe2050be4cf328b5749df311f15e514fba2d
+  metadata.gz: fbd3173e701cc40466c211a064bc71f2e55a45f0
+  data.tar.gz: 7bd3c6390427adc2029daae1ecf40b487c2a1cf0
 SHA512:
-  metadata.gz: 6fbea5eecc04728ae65f46d9aca05dd5abb1324cc9296bc1e173c3f65dd4f227486ce4664a0bfdd0a8b35fcc3d334f154e87603cd2a1a200f325bf428196d877
-  data.tar.gz: 92ba7bd1e699fe8b1c97d1c835c9b4f37667621abfb937be6aac2274c6721a77a086b5a6d692f86dc3c744bce64aee40fc247c0ea5cdee6164fb452929d1db46
+  metadata.gz: ecd33982a775129086f110caa4ade5986ae23c107107157660cf74f0bdc26987fa214e58dd3b07a0a737fc3076d112fb82b1fdc9efb4028579ee98fd5b74fa86
+  data.tar.gz: 188c9804dc37c080cc792a8d12ff2d13f42242ed28c4d3a313a9e700f0fe2611495b0d23ce6c628b2e483fedb99e4a408b451204f64897b607cca30190d3512d

data/README.md

@@ -98,10 +98,13 @@ Domain and Range entailment include specific rules for schema.org vocabularies.
       end
     end
 
+## Command-Line interface
+The `rdf` command-line interface is extended with `entail` and `lint` commands. `Entail` can be used in combination, with `serialize` to generate an output graph representation including entailed triples.
+
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.0)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
+* [Ruby](http://ruby-lang.org/) (>= 2.2.2)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.1.1)
 
 ## Mailing List
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+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/owl.rb

@@ -50,7 +50,7 @@ module RDF::Reasoner
         if self.predicate == RDF.type
           if term = (RDF::Vocabulary.find_term(self.object) rescue nil)
             term._entail_equivalentClass do |t|
-              statements << RDF::Statement(self.to_hash.merge(object: t))
+              statements << RDF::Statement(self.to_h.merge(object: t, inferred: true))
             end
           end
         end
@@ -89,7 +89,7 @@ module RDF::Reasoner
         statements = []
         if term = (RDF::Vocabulary.find_term(self.predicate) rescue nil)
           term._entail_equivalentProperty do |t|
-            statements << RDF::Statement(self.to_hash.merge(predicate: t))
+            statements << RDF::Statement(self.to_h.merge(predicate: t, inferred: true))
           end
         end
         statements.each {|s| yield s} if block_given?

data/lib/rdf/reasoner/rdfs.rb

@@ -58,7 +58,7 @@ module RDF::Reasoner
         if self.predicate == RDF.type
           if term = (RDF::Vocabulary.find_term(self.object) rescue nil)
             term._entail_subClassOf do |t|
-              statements << RDF::Statement(self.to_hash.merge(object: t))
+              statements << RDF::Statement(self.to_h.merge(object: t, inferred: true))
             end
           end
           #$stderr.puts("subClassf(#{self.predicate.pname}): #{statements.map(&:object).map {|r| r.respond_to?(:pname) ? r.pname : r.to_ntriples}}}")
@@ -127,7 +127,7 @@ module RDF::Reasoner
         statements = []
         if term = (RDF::Vocabulary.find_term(self.predicate) rescue nil)
           term._entail_subPropertyOf do |t|
-            statements << RDF::Statement(self.to_hash.merge(predicate: t))
+            statements << RDF::Statement(self.to_h.merge(predicate: t, inferred: true))
           end
           #$stderr.puts("subPropertyOf(#{self.predicate.pname}): #{statements.map(&:object).map {|r| r.respond_to?(:pname) ? r.pname : r.to_ntriples}}}")
         end
@@ -146,7 +146,7 @@ module RDF::Reasoner
         statements = []
         if term = (RDF::Vocabulary.find_term(self.predicate) rescue nil)
           term.domain.each do |t|
-            statements << RDF::Statement(self.to_hash.merge(predicate: RDF.type, object: t))
+            statements << RDF::Statement(self.to_h.merge(predicate: RDF.type, object: t, inferred: true))
           end
         end
         #$stderr.puts("domain(#{self.predicate.pname}): #{statements.map(&:object).map {|r| r.respond_to?(:pname) ? r.pname : r.to_ntriples}}}")
@@ -165,7 +165,7 @@ module RDF::Reasoner
         statements = []
         if object.resource? && term = (RDF::Vocabulary.find_term(self.predicate) rescue nil)
           term.range.each do |t|
-            statements << RDF::Statement(self.to_hash.merge(subject: self.object, predicate: RDF.type, object: t))
+            statements << RDF::Statement(self.to_h.merge(subject: self.object, predicate: RDF.type, object: t, inferred: true))
           end
         end
         #$stderr.puts("range(#{self.predicate.pname}): #{statements.map(&:object).map {|r| r.respond_to?(:pname) ? r.pname : r.to_ntriples}}")
@@ -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

@@ -27,13 +27,7 @@ module RDF::Reasoner
       domains = Array(self.domainIncludes) - [RDF::OWL.Thing]
 
       # Fully entailed types of the resource
-      types = options.fetch(:types) do
-        queryable.query(:subject => resource, :predicate => RDF.type).
-          map {|s| (t = (RDF::Vocabulary.find_term(s.object) rescue nil)) && t.entail(:subClassOf)}.
-          flatten.
-          uniq.
-          compact
-      end unless domains.empty?
+      types = entailed_types(resource, queryable, options) unless domains.empty?
 
       # Every domain must match some entailed type
       resource_acceptable = Array(types).empty? || domains.any? {|d| types.include?(d)}
@@ -109,13 +103,13 @@ module RDF::Reasoner
               resource.datatype == RDF::XSD.anyURI ||
               resource.plain? && RDF::Literal::AnyURI.new(resource.value).valid?
             else
-              # If this is an XSD range, look for appropriate literal
+              # If may be an XSD range, look for appropriate literal
               if range.start_with?(RDF::XSD.to_s)
                 if resource.datatype == RDF::URI(range)
                   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
@@ -127,28 +121,14 @@ module RDF::Reasoner
           true # Special case for schema boolean resources
         elsif ranges.include?(RDF::Vocab::SCHEMA.URL) && resource.uri?
           true # schema:URL matches URI resources
-        elsif ranges.include?(RDF::Vocab::SCHEMA.Text) && resource.uri?
+        elsif ranges == [RDF::Vocab::SCHEMA.Text] && resource.uri?
           # Allowed if resource is untyped
-          # Fully entailed types of the resource
-          types = options.fetch(:types) do
-            queryable.query(:subject => resource, :predicate => RDF.type).
-              map {|s| (t = (RDF::Vocabulary.find_term(s.object) rescue nil)) && t.entail(:subClassOf)}.
-              flatten.
-              uniq.
-              compact
-          end
-          types.empty?
+          entailed_types(resource, queryable, options).empty?
         elsif literal_range?(ranges)
           false # If resource isn't literal, this is a range violation
         else
           # Fully entailed types of the resource
-          types = options.fetch(:types) do
-            queryable.query(:subject => resource, :predicate => RDF.type).
-              map {|s| (t = (RDF::Vocabulary.find_term(s.object) rescue nil)) && t.entail(:subClassOf)}.
-              flatten.
-              uniq.
-              compact
-          end
+          types = entailed_types(resource, queryable, options)
 
           # Every range must match some entailed type
           resource_acceptable = Array(types).empty? || ranges.any? {|d| types.include?(d)}
@@ -191,6 +171,18 @@ module RDF::Reasoner
 
     def self.included(mod)
     end
+
+    private
+    # Fully entailed types
+    def entailed_types(resource, queryable, options = {})
+      options.fetch(:types) do
+        queryable.query(subject: resource, predicate: RDF.type).
+          map {|s| (t = (RDF::Vocabulary.find_term(s.object) rescue nil)) && t.entail(:subClassOf)}.
+          flatten.
+          uniq.
+          compact
+      end
+    end
   end
 
   # Extend the Term with this methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-reasoner
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,126 +16,126 @@ dependencies:
     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-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'
-  type: :runtime
+        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
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -176,9 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: RDFS/OWL Reasoner for RDF.rb
 test_files: []
-has_rdoc: false