rdf-reasoner 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 377e84cbd7ab81ee861446c9918634bc97bcfe25
-  data.tar.gz: b03ed57e310bc107a48923e391cef30344e64776
+SHA256:
+  metadata.gz: 23cf1038b49812deb6c2fb5095635f0fe97f415b4338f1f5f734dd9c53643995
+  data.tar.gz: 95755ad7c6c666a994ca7a89780214681f02727d517e836b3a8fe69e4bb07ce4
 SHA512:
-  metadata.gz: 4d0aeeec319bf740256541783eee1514fea11ae98d3a3ae26863fb85357e79e3630b18f0ce3adc5faac42663b9b0c9d742bec1ff1b268f7c8152691125018cc4
-  data.tar.gz: 6b8d37050cb611c36e70ea612542fdcf2b36375023bc5072f111f9a12387f9379b7131c7e06fb90243cd619f63a28826683fe5949cbb8e6dea6618df652a4639
+  metadata.gz: 6965cd311294b46d9b93a6a9be69da05538e59037efde845eae1c6ec626e8e01710026dc957746e31d1fb63413cffcf514c05832665c3c316d0d0cc15f45e90c
+  data.tar.gz: 91db92c27cb62d60a2f630be5343fb83704f532a64ba5bacbfd8c37fde2f024a9ab4422a6729a6d4abcb8e4334575f83dee30bf261c78f8132907c3efa2c4e5f

data/README.md

@@ -104,7 +104,7 @@ The `rdf` command-line interface is extended with `entail` and `lint` commands.
 ## Dependencies
 
 * [Ruby](http://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.1.1)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0)
 
 ## Mailing List
 

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/lib/rdf/reasoner/extensions.rb

@@ -2,7 +2,62 @@
 require 'rdf'
 
 module RDF
-  class Vocabulary::Term
+  class URI
+    class << self
+      @@entailments = {}
+
+      ##
+      # Add an entailment method. The method accepts no arguments, and returns or yields an array of values associated with the particular entailment method
+      # @param [Symbol] method
+      # @param [Proc] proc
+      def add_entailment(method, proc)
+        @@entailments[method] = proc
+      end
+    end
+
+    ##
+    # Perform an entailment on this term.
+    #
+    # @param [Symbol] method A registered entailment method
+    # @yield term
+    # @yieldparam [Term] term
+    # @return [Array<Term>]
+    def entail(method, &block)
+      self.send(@@entailments.fetch(method), &block)
+    end
+
+    ##
+    # Determine if the domain of a property term is consistent with the specified resource in `queryable`.
+    #
+    # @param [RDF::Resource] resource
+    # @param [RDF::Queryable] queryable
+    # @param [Hash{Symbol => Object}] options ({})
+    # @option options [Array<RDF::Vocabulary::Term>] :types
+    #   Fully entailed types of resource, if not provided, they are queried
+    def domain_compatible?(resource, queryable, options = {})
+      %w(owl rdfs schema).map {|r| "domain_compatible_#{r}?".to_sym}.all? do |meth|
+        !self.respond_to?(meth) || self.send(meth, resource, queryable, options)
+      end
+    end
+
+    ##
+    # Determine if the range of a property term is consistent with the specified resource in `queryable`.
+    #
+    # Specific entailment regimes should insert themselves before this to apply the appropriate semantic condition
+    #
+    # @param [RDF::Resource] resource
+    # @param [RDF::Queryable] queryable
+    # @param [Hash{Symbol => Object}] options ({})
+    # @option options [Array<RDF::Vocabulary::Term>] :types
+    #   Fully entailed types of resource, if not provided, they are queried
+    def range_compatible?(resource, queryable, options = {})
+      %w(owl rdfs schema).map {|r| "range_compatible_#{r}?".to_sym}.all? do |meth|
+        !self.respond_to?(meth) || self.send(meth, resource, queryable, options)
+      end
+    end
+  end
+
+  class Node
     class << self
       @@entailments = {}
 
@@ -187,6 +242,7 @@ module RDF
         if term && term.class?
           # Warn against using a deprecated term
           superseded = term.attributes[:'schema:supersededBy']
+          superseded = superseded.pname if superseded.respond_to?(:pname)
           (messages[:class] ||= {})[pname] = ["Term is superseded by #{superseded}"] if superseded
         else
           (messages[:class] ||= {})[pname] = ["No class definition found"] unless vocab.nil? || [RDF::RDFV, RDF::RDFS].include?(vocab)
@@ -211,6 +267,7 @@ module RDF
         if term && term.property?
           # Warn against using a deprecated term
           superseded = term.attributes[:'schema:supersededBy']
+          superseded = superseded.pname if superseded.respond_to?(:pname)
           (messages[:property] ||= {})[pname] = ["Term is superseded by #{superseded}"] if superseded
         else
           ((messages[:property] ||= {})[pname] ||= []) << "No property definition found" unless vocab.nil?
@@ -225,7 +282,7 @@ module RDF
           compact
 
         unless term.domain_compatible?(stmt.subject, self, types: resource_types[stmt.subject])
-          ((messages[:property] ||= {})[pname] ||= []) << if term.respond_to?(:domain)
+          ((messages[:property] ||= {})[pname] ||= []) << if !term.domain.empty?
            "Subject #{show_resource(stmt.subject)} not compatible with domain (#{Array(term.domain).map {|d| d.pname|| d}.join(',')})"
           else
             "Subject #{show_resource(stmt.subject)} not compatible with domainIncludes (#{term.domainIncludes.map {|d| d.pname|| d}.join(',')})"
@@ -240,7 +297,7 @@ module RDF
           compact if stmt.object.resource?
 
         unless term.range_compatible?(stmt.object, self, types: resource_types[stmt.object])
-          ((messages[:property] ||= {})[pname] ||= []) << if term.respond_to?(:range)
+          ((messages[:property] ||= {})[pname] ||= []) << if !term.range.empty?
            "Object #{show_resource(stmt.object)} not compatible with range (#{Array(term.range).map {|d| d.pname|| d}.join(',')})"
           else
             "Object #{show_resource(stmt.object)} not compatible with rangeIncludes (#{term.rangeIncludes.map {|d| d.pname|| d}.join(',')})"

data/lib/rdf/reasoner/owl.rb

@@ -4,7 +4,7 @@ module RDF::Reasoner
   ##
   # Rules for generating OWL entailment triples
   #
-  # Extends `RDF::Vocabulary::Term` and `RDF::Statement` with specific entailment capabilities
+  # Extends `RDF::URI` and `RDF::Statement` with specific entailment capabilities
   module OWL
     ##
     # @return [RDF::Util::Cache]
@@ -26,8 +26,8 @@ module RDF::Reasoner
     # @private
     def _entail_equivalentClass
       case self
-      when RDF::Vocabulary::Term
-        unless class? && respond_to?(:equivalentClass)
+      when RDF::URI, RDF::Node
+        unless class?
           yield self if block_given?
           return Array(self)
         end
@@ -66,8 +66,8 @@ module RDF::Reasoner
     # @private
     def _entail_equivalentProperty
       case self
-      when RDF::Vocabulary::Term
-        unless property? && respond_to?(:equivalentProperty)
+      when RDF::URI, RDF::Node
+        unless property?
           yield self if block_given?
           return Array(self)
         end
@@ -98,38 +98,14 @@ module RDF::Reasoner
       end
     end
 
-    ##
-    # EquivalentClass of this term, also populates reverse equivalents.
-    #
-    # When first called, this initializes a cache of reverse terms to terms where the the reverse term is listed as an equivalent of the original term.
-    #
-    # It returns the list of terms which are equivalent to this term however defined.
-    # @return [Array<RDF::Vocabulary::Term>]
-    def equivalentClass
-      raise RDF::Reasoner::Error, "#{self} Can't entail equivalentClass" unless class?
-      Array(self.attributes[:"owl:equivalentClass"]).map {|t| RDF::Vocabulary.expand_pname(t)}
-    end
-
-    ##
-    # EquivalentProperty of this term, also populates reverse equivalents.
-    #
-    # When first called, this initializes a cache of reverse terms to terms where the the reverse term is listed as an equivalent of the original term.
-    #
-    # It returns the list of terms which are equivalent to this term however defined.
-    # @return [Array<RDF::Vocabulary::Term>]
-    def equivalentProperty
-      raise RDF::Reasoner::Error, "#{self} Can't entail equivalentProperty" unless property?
-      Array(self.attributes[:"owl:equivalentProperty"]).map {|t| RDF::Vocabulary.expand_pname(t)}
-    end
-    
     def self.included(mod)
       mod.add_entailment :equivalentClass, :_entail_equivalentClass
       mod.add_entailment :equivalentProperty, :_entail_equivalentProperty
     end
   end
 
-  # Extend Term with these methods
-  ::RDF::Vocabulary::Term.send(:include, OWL)
+  # Extend URI with these methods
+  ::RDF::URI.send(:include, OWL)
 
   # Extend Statement with these methods
   ::RDF::Statement.send(:include, OWL)

data/lib/rdf/reasoner/rdfs.rb

@@ -4,7 +4,7 @@ module RDF::Reasoner
   ##
   # Rules for generating RDFS entailment triples
   #
-  # Extends `RDF::Vocabulary::Term` and `RDF::Statement` with specific entailment capabilities
+  # Extends `RDF::URI` and `RDF::Statement` with specific entailment capabilities
   module RDFS
     ##
     # @return [RDF::Util::Cache]
@@ -40,8 +40,8 @@ module RDF::Reasoner
     # @private
     def _entail_subClassOf
       case self
-      when RDF::Vocabulary::Term
-        unless class? && respond_to?(:subClassOf)
+      when RDF::URI, RDF::Node
+        unless class?
           yield self if block_given?
           return Array(self)
         end
@@ -75,7 +75,7 @@ module RDF::Reasoner
     # @private
     def _entail_subClass
       case self
-      when RDF::Vocabulary::Term
+      when RDF::URI, RDF::Node
         unless class?
           yield self if block_given?
           return Array(self)
@@ -110,8 +110,8 @@ module RDF::Reasoner
     # @private
     def _entail_subPropertyOf
       case self
-      when RDF::Vocabulary::Term
-        unless property? && respond_to?(:subPropertyOf)
+      when RDF::URI, RDF::Node
+        unless property?
           yield self if block_given?
           return Array(self)
         end
@@ -187,23 +187,19 @@ module RDF::Reasoner
     #   Fully entailed types of resource, if not provided, they are queried
     def domain_compatible_rdfs?(resource, queryable, options = {})
       raise RDF::Reasoner::Error, "#{self} can't get domains" unless property?
-      if respond_to?(:domain)
-        domains = Array(self.domain) - [RDF::OWL.Thing, RDF::RDFS.Resource]
+      domains = Array(self.domain) - [RDF::OWL.Thing, RDF::RDFS.Resource]
 
-        # 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?
+      # 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?
 
-        # Every domain must match some entailed type
-        Array(types).empty? || domains.all? {|d| types.include?(d)}
-      else
-        true
-      end
+      # Every domain must match some entailed type
+      Array(types).empty? || domains.all? {|d| types.include?(d)}
     end
 
     ##
@@ -218,7 +214,7 @@ module RDF::Reasoner
     #   Fully entailed types of resource, if not provided, they are queried
     def range_compatible_rdfs?(resource, queryable, options = {})
       raise RDF::Reasoner::Error, "#{self} can't get ranges" unless property?
-      if respond_to?(:range) && !(ranges = Array(self.range) - [RDF::OWL.Thing, RDF::RDFS.Resource]).empty?
+      if !(ranges = Array(self.range) - [RDF::OWL.Thing, RDF::RDFS.Resource]).empty?
         if resource.literal?
           ranges.all? do |range|
             if [RDF::RDFS.Literal, RDF.XMLLiteral, RDF.HTML].include?(range)
@@ -306,8 +302,8 @@ module RDF::Reasoner
     end
   end
 
-  # Extend Term with these methods
-  ::RDF::Vocabulary::Term.send(:include, RDFS)
+  # Extend URI with these methods
+  ::RDF::URI.send(:include, RDFS)
 
   # Extend Statement with these methods
   ::RDF::Statement.send(:include, RDFS)

data/lib/rdf/reasoner/schema.rb

@@ -7,7 +7,7 @@ module RDF::Reasoner
   ##
   # Rules for generating RDFS entailment triples
   #
-  # Extends `RDF::Vocabulary::Term` with specific entailment capabilities
+  # Extends `RDF::URI` with specific entailment capabilities
   module Schema
 
     ##
@@ -54,7 +54,7 @@ module RDF::Reasoner
     #   Fully entailed types of resource, if not provided, they are queried
     def range_compatible_schema?(resource, queryable, options = {})
       raise RDF::Reasoner::Error, "#{self} can't get ranges" unless property?
-      if respond_to?(:rangeIncludes) && !(ranges = Array(self.rangeIncludes) - [RDF::OWL.Thing]).empty?
+      if !(ranges = Array(self.rangeIncludes) - [RDF::OWL.Thing]).empty?
         if resource.literal?
           ranges.any? do |range|
             case range
@@ -185,6 +185,6 @@ module RDF::Reasoner
     end
   end
 
-  # Extend the Term with this methods
-  ::RDF::Vocabulary::Term.send(:include, Schema)
+  # Extend URI with this methods
+  ::RDF::URI.send(:include, Schema)
 end

metadata

@@ -1,117 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: rdf-reasoner
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: json-ld
+  name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rdf-turtle
+  name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,28 +120,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.12
 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
@@ -212,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: RDFS/OWL Reasoner for RDF.rb