rdf-reasoner 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beba6739c5b868b8257113fbe7cbb61f2dd5888d
-  data.tar.gz: 32ad2d774c51959bb48ed65f45543db13b671678
+  metadata.gz: f1980413b4fbf92e655601081fbc493d9a5dcb77
+  data.tar.gz: 545ce25a9e024691ee7b8d7e0166921bfa0f876a
 SHA512:
-  metadata.gz: b212c36158e528f01379f54661c0bd6a3ff120daa7bf4a80cd9a6d3d08c2d8ed6b951221b8bae67d9f114852dd823e45773ce227ecdcc538c24b511f1d75923d
-  data.tar.gz: f7bf9b01e3551ca0ed1a502821415098e9d5116c4dc34f82557db68761a6b253110835df41cf118cd4b5e3de978594d0e88a99c9aba345f2b8aada030420f825
+  metadata.gz: e4e95ad17224135fee1f801455eaa802a277efb82227f9d4837f3eccdeeb6b5a3c7c5a4f9686ca6dbed50afd3ea67dd625d30150b2299ff15ac56d45fef4f883
+  data.tar.gz: 19fb975b67c1e0aaff517e98f9513c42b6ca618272d8d862fbcc44b104ad62f33fc2442ae9d835ac70dc724bc24ba6d9ccd55ddc061e1d0e56798a781477ddd5

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rdf/reasoner/schema.rb

@@ -125,6 +125,21 @@ module RDF::Reasoner
           end
         elsif %w(True False).map {|v| RDF::SCHEMA[v]}.include?(resource) && ranges.include?(RDF::SCHEMA.Boolean)
           true # Special case for schema boolean resources
+        elsif ranges.include?(RDF::SCHEMA.URL) && resource.uri?
+          true # schema:URL matches URI resources
+        elsif ranges.include?(RDF::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?
+        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
@@ -156,7 +171,24 @@ module RDF::Reasoner
         true
       end
     end
-  
+
+    # Are all ranges literal?
+    # @param [Array<RDF::UR>] ranges
+    # @return [Boolean]
+    def literal_range?(ranges)
+      ranges.all? do |range|
+        case range
+        when RDF::RDFS.Literal, RDF::SCHEMA.Text, RDF::SCHEMA.Boolean, RDF::SCHEMA.Date,
+             RDF::SCHEMA.DateTime, RDF::SCHEMA.Time, RDF::SCHEMA.URL,
+             RDF::SCHEMA.Number, RDF::SCHEMA.Float, RDF::SCHEMA.Integer
+          true
+        else
+          # If this is an XSD range, look for appropriate literal
+          range.start_with?(RDF::XSD.to_s)
+        end
+      end
+    end
+
     def self.included(mod)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-reasoner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: RDFS/OWL Reasoner for RDF.rb