rdf-reasoner 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b64147d73a5e38f5925417e9f090176cc01dfa1
-  data.tar.gz: cd4660566c88ac7074beec70172b92a6fd220706
+  metadata.gz: 201995bd765a1158f571d6bdbcebecbcfa2e83f8
+  data.tar.gz: 871c90ef242de061b0fd882c1f37f6d9a68bf55d
 SHA512:
-  metadata.gz: a8eb0b42cbfae2278cf3fe2c3b15aa9c6a985b600e9ab8b79f4b7feb3c6adcd7e89da0df91a6d5717a41d01aa650672c3f6e243f16028f206ac5bb49ec54e6dc
-  data.tar.gz: 35f93debd3072386883f6cdda9761a8aac60158f008ddd058c07420dae06f8d5f2883b5dde1bbab1b72204ef0a58c30afc238e124dba305aed12cf1be88b01ef
+  metadata.gz: 0ca78b48855476fa1a699afc8268bd324d837a1c1f107e768aae4959112da154f66f06ed7013a6b3327f96785589cd10edb6c8f6889f1101ca64f2210a0bed42
+  data.tar.gz: b104515116a9e39c6596c6fbe1d4b52d211db551f5c4f76452e171c90216890920a85d83fd81907d658913d88395345b0869616a357445e4557b55962e5129fe

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/rdf/reasoner.rb

@@ -10,7 +10,7 @@ module RDF
   module Reasoner
     autoload :OWL,     'rdf/reasoner/owl'
     autoload :RDFS,    'rdf/reasoner/rdfs'
-    autoload :SCHEMA,  'rdf/reasoner/schema'
+    autoload :Schema,  'rdf/reasoner/schema'
     autoload :VERSION, 'rdf/reasoner/version'
 
     ##

data/lib/rdf/reasoner/rdfs.rb

@@ -38,7 +38,7 @@ module RDF::Reasoner
     # Return inferred subClassOf relationships by recursively applying to named super classes to get a complete set of classes in the ancestor chain of this class
     # @private
     def _entail_subClassOf
-      raise RDF::Reasoner::Error, "#{self} Can't entail subClassOf" unless class?
+      return Array(self) unless class? && respond_to?(:subClassOf)
       subClassOf_cache[self] ||= begin
         (Array(self.subClassOf).map {|c| c._entail_subClassOf rescue c}.flatten + Array(self)).compact
       end
@@ -48,18 +48,21 @@ module RDF::Reasoner
     # Return inferred subClass relationships by recursively applying to named sub classes to get a complete set of classes in the descendant chain of this class
     # @private
     def _entail_subClass
-      raise RDF::Reasoner::Error, "#{self} Can't entail subClass" unless class?
+      return Array(self) unless class?
       descendant_cache[self] ||= begin
         (Array(self.subClass).map {|c| c._entail_subClass rescue c}.flatten + Array(self)).compact
       end
     end
 
     ##
-    # Get the immediate subclasses of this class
+    # Get the immediate subclasses of this class.
+    #
+    # This iterates over terms defined in the vocabulary of this term, as well as the vocabularies imported by this vocabulary.
+    
     # @return [Array<RDF::Vocabulary::Term>]
     def subClass
       raise RDF::Reasoner::Error, "#{self} Can't entail subClass" unless class?
-      subClass_cache[self] ||= ::RDF::Vocabulary.map do |v|
+      subClass_cache[self] ||= ([self.vocab] + self.vocab.imported_from).map do |v|
         Array(v.properties).select {|p| p.class? && Array(p.subClassOf).include?(self)}
       end.flatten.compact
     end
@@ -68,7 +71,7 @@ module RDF::Reasoner
     # Return inferred subPropertyOf relationships by recursively applying to named super classes to get a complete set of classes in the ancestor chain of this class
     # @private
     def _entail_subPropertyOf
-      raise RDF::Reasoner::Error, "#{self} Can't entail subPropertyOf" unless property?
+      return Array(self) unless property? && respond_to?(:subPropertyOf)
       subPropertyOf_cache[self] ||= begin
         (Array(self.subPropertyOf).map {|c| c._entail_subPropertyOf rescue c}.flatten + Array(self)).compact
       end
@@ -87,7 +90,7 @@ module RDF::Reasoner
     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]
+        domains = Array(self.domain) - [RDF::OWL.Thing, RDF::RDFS.Resource]
 
         # Fully entailed types of the resource
         types = options.fetch(:types) do
@@ -117,7 +120,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]).empty?
+      if respond_to?(:range) && !(ranges = Array(self.range) - [RDF::OWL.Thing, RDF::RDFS.Resource]).empty?
         if resource.literal?
           ranges.all? do |range|
             case range
@@ -140,6 +143,12 @@ module RDF::Reasoner
               uniq.
               compact
           end
+
+          # If any type is a class, add rdfs:Class
+          if types.any? {|t| t.is_a?(RDF::Vocabulary::Term) && t.class?} && !types.include?(RDF::RDFS.Class)
+            types << RDF::RDFS.Class
+          end
+
           # Every range must match some entailed type
           Array(types).empty? || ranges.all? {|d| types.include?(d)}
         end

data/lib/rdf/reasoner/schema.rb

@@ -8,7 +8,26 @@ module RDF::Reasoner
   # Rules for generating RDFS entailment triples
   #
   # Extends `RDF::Vocabulary::Term` with specific entailment capabilities
-  module SCHEMA
+  module Schema
+    # See http://www.pelagodesign.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
+    #
+    # 
+    ISO_8601 =  %r(^
+      # Year
+      ([\+-]?\d{4}(?!\d{2}\b))
+      # Month
+      ((-?)((0[1-9]|1[0-2])
+            (\3([12]\d|0[1-9]|3[01]))?
+          | W([0-4]\d|5[0-2])(-?[1-7])?
+          | (00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))
+          ([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)
+                 ([\.,]\d+(?!:))?)?
+                (\17[0-5]\d([\.,]\d+)?)?
+                ([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?
+          )?
+      )?
+    $)x.freeze
+
     # domain_includes accessor
     # @return [Array<RDF::Vocabulary::Term>]
     def domain_includes
@@ -28,6 +47,8 @@ module RDF::Reasoner
     #
     # Note that this is different than standard entailment, which simply asserts that the resource has every type in the domain, but this is more useful to check if published data is consistent with the vocabulary definition.
     #
+    # If `resource` is of type `schema:Role`, `resource` is domain acceptable if any other resource references `resource` using this property.
+    #
     # @param [RDF::Resource] resource
     # @param [RDF::Queryable] queryable
     # @param [Hash{Symbol => Object}] options
@@ -47,12 +68,19 @@ module RDF::Reasoner
       end unless domains.empty?
 
       # Every domain must match some entailed type
-      Array(types).empty? || domains.any? {|d| types.include?(d)}
+      resource_acceptable = Array(types).empty? || domains.any? {|d| types.include?(d)}
+
+      # Resource may still be acceptable if types include schema:Role, and any any other resource references `resource` using this property
+      resource_acceptable ||
+        types.include?(RDF::SCHEMA.Role) &&
+          !queryable.query(predicate: self, object: resource).empty?
     end
 
     ##
     # Schema.org requires that if the property has a range, and the resource has a type that some type matches some range. If the resource is a datatyped Literal, and the range includes a datatype, the resource must be consistent with that.
     #
+    # If `resource` is of type `schema:Role`, it is range acceptable if it has the same property with an acceptable value.
+    #
     # Also, a plain literal (or schema:Text) is always compatible with an object range.
     #
     # @param [RDF::Resource] resource
@@ -72,9 +100,13 @@ module RDF::Reasoner
               [RDF::SCHEMA.Boolean, RDF::XSD.boolean].include?(resource.datatype) ||
               resource.simple? && RDF::Literal::Boolean.new(resource.value).valid?
             when RDF::SCHEMA.Date
-              resource.datatype == RDF::SCHEMA.Date ||
-              resource.is_a?(RDF::Literal::Date) ||
-              resource.simple? && RDF::Literal::Date.new(resource.value).valid?
+              # Schema.org date based on ISO 8601, mapped to appropriate XSD types for validation
+              case resource
+              when RDF::Literal::Date, RDF::Literal::Time, RDF::Literal::DateTime, RDF::Literal::Duration
+                resource.valid?
+              else
+                ISO_8601.match(resource.value)
+              end
             when RDF::SCHEMA.DateTime
               resource.datatype == RDF::SCHEMA.DateTime ||
               resource.is_a?(RDF::Literal::DateTime) ||
@@ -132,8 +164,17 @@ module RDF::Reasoner
               uniq.
               compact
           end
+
           # Every range must match some entailed type
-          Array(types).empty? || ranges.any? {|d| types.include?(d)}
+          resource_acceptable = Array(types).empty? || ranges.any? {|d| types.include?(d)}
+
+          # Resource may still be acceptable if it has the same property with an acceptable value
+          resource_acceptable ||
+            types.include?(RDF::SCHEMA.Role) &&
+              queryable.query(subject: resource, predicate: self).any? do |stmt|
+                acc = self.range_compatible_schema?(stmt.object, queryable)
+                acc
+              end
         end
       else
         true
@@ -145,5 +186,5 @@ module RDF::Reasoner
   end
 
   # Extend the Term with this methods
-  ::RDF::Vocabulary::Term.send(:include, SCHEMA)
+  ::RDF::Vocabulary::Term.send(:include, Schema)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-reasoner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -19,7 +19,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.4.1
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement