rdf-rdfa 1.1.4.1 → 1.1.5

data/VERSION

@@ -1 +1 @@
-1.1.4.1
+1.1.5

data/lib/rdf/rdfa/expansion.rb

@@ -1,70 +1,38 @@
+require 'rdf/aggregate_repo'
+
 module RDF::RDFa
   ##
   # The Expansion module performs a subset of OWL entailment rules on the base class,
   # which implementes RDF::Readable.
   module Expansion
-    ##
-    # Pre-processed vocabularies used to simplify loading of common vocabularies
-    COOKED_VOCAB_STATEMENTS = []
 
     ##
     # Perform vocabulary expansion on the resulting default graph.
     #
-    #   Vocabulary expansion relies on a sub-set of OWL entailment to add
-    #   triples to the default graph based on rules and property/class relationships
-    #   described in referenced vocabularies.
-    #
-    # For all objects that are the target of an rdfa:usesVocabulary property, load the IRI into
-    # a repository.
-    #
-    # Subsequently, perform OWL expansion using rules prp-spo1, prp-eqp1,
-    # prp-eqp2, cax-sco, cax-eqc1, and cax-eqc2 placing resulting triples into the default
-    # graph. Iterate on this step until no more triples are added.
-    #
-    # @example
-    #    scm-spo
-    #    {pq rdfs:subPropertyOf pw . pw rdfs:subPropertyOf p3} => {p1 rdfs:subPropertyOf p3}
-    #
-    #    rdprp-spo1fs7
-    #    {p1 rdfs:subPropertyOf p2 . x p1 y} => {x p2 y}
-    #
-    #    cax-sco
-    #    {c1 rdfs:subClassOf c2 . x rdf:type c1} => {x rdf:type c2}
-    #
-    #    scm-sco
-    #    {c1 rdfs:subClassOf c2 . c2 rdfs:subClassOf c3} => {c1 rdfs:subClassOf c3}
+    #   Vocabulary expansion uses the built-in reasoner using included vocabularies from RDF.rb.
     #
     # @param [RDF::Repository] repository
     # @see [OWL2 PROFILES](http://www.w3.org/TR/2009/REC-owl2-profiles-20091027/#Reasoning_in_OWL_2_RL_and_RDF_Graphs_using_Rules)
     def expand(repository)
-      count = repository.count
-      add_debug("expand") {"Repository has #{repository.size} statements"}
-      
-      # Vocabularies managed in vocab_repo, and copied to repo for processing.
-      # This allows for persistent storage of vocabularies
-      @@vocab_repo = @options[:vocab_repository] if @options.has_key?(:vocab_repository)
-      @@vocab_repo ||= RDF::Repository.new.insert(*COOKED_VOCAB_STATEMENTS)
-      
+      add_debug("expand") {"Repository has #{repository.count} statements"}
+
+      # Load missing vocabularies
       vocabs = repository.query(:predicate => RDF::RDFA.usesVocabulary).to_a.map(&:object)
-      vocabs.each do |vocab|
+      vocabs.map! do |vocab|
         begin
-          unless @@vocab_repo.has_context?(vocab)
-            add_debug("expand", "Load #{vocab}")
-            @@vocab_repo.load(vocab, :context => vocab)
-          end
+          # Create the name with a predictable name so that it is enumerated and can be found
+          v = RDF::Vocabulary.find(vocab) ||
+              RDF::Vocabulary.load(vocab, class_name: "D#{Digest::MD5.hexdigest vocab}")
         rescue Exception => e
           # indicate the warning if the vocabulary fails to laod
           add_warning("expand", "Error loading vocabulary #{vocab}: #{e.message}", RDF::RDFA.UnresolvedVocabulary)
+          nil
         end
-      end
-      
-      @@vocab_repo.each do |statement|
-        if vocabs.include?(statement.context)
-          repository << statement
-        end
-      end
+      end.compact
+
+      entailment(repository, vocabs)
+      add_debug("expand") {"Repository now has #{repository.count} statements"}
 
-      entailment(repository)
     end
 
     ##
@@ -223,9 +191,28 @@ module RDF::RDFa
     # Perform OWL entailment rules on repository
     # @param [RDF::Repository] repository
     # @return [RDF::Repository]
-    def entailment(repository)
+    def entailment(repository, vocabs)
       old_count = 0
 
+      # Create an aggregate repo containing base repository and relevant entailment rules from the included vocabularies
+      v_repo = RDF::Repository.new do |r|
+        vocabs.each do |v|
+          v.each_statement do |statement|
+            r << statement if [
+              RDF::OWL.equivalentProperty,
+              RDF::OWL.equivalentClass,
+              RDF::RDFS.subPropertyOf,
+              RDF::RDFS.subClassOf
+            ].include?(statement.predicate)
+          end
+        end
+      end
+
+      ag_repo = RDF::MergeGraph.new do
+        source repository, false
+        source v_repo, false
+      end
+
       # Continue as long as new statements are added to repository
       while old_count < (count = repository.count)
         #add_debug("entailment") {"old: #{old_count} count: #{count}"}
@@ -233,7 +220,7 @@ module RDF::RDFa
         to_add = []
 
         RULES.each do |rule|
-          rule.execute(repository) do |statement|
+          rule.execute(ag_repo) do |statement|
             #add_debug("entailment(#{rule.name})") {statement.inspect}
             to_add << statement
           end
@@ -241,8 +228,6 @@ module RDF::RDFa
         
         repository.insert(*to_add)
       end
-
-      add_debug("entailment", "final count: #{count}")
     end
 
     ##
@@ -281,6 +266,3 @@ module RDF::RDFa
     end
   end
 end
-
-# Load cooked vocabularies
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'expansion', '*')).each {|f| load f}

data/lib/rdf/rdfa/reader.rb

@@ -386,7 +386,7 @@ module RDF::RDFa
           end
         
           # Look for Embedded Turtle and RDF/XML
-          unless @root.xpath("//rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#").empty?
+          unless @root.xpath("//rdf:RDF", "rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#").empty?
             extract_script(@root, @doc, "application/rdf+xml", @options) do |statement|
               @repository << statement
             end

data/lib/rdf/rdfa/reader/rexml.rb

@@ -120,29 +120,41 @@ module RDF::RDFa
           @node.children.map(&:to_s).join
         end
 
+        def attribute_nodes
+          attrs = @node.attributes.dup.keep_if do |name, attr|
+            !name.start_with?('xmlns')
+          end
+          @attribute_nodes ||= (attrs.empty? ? attrs : NodeSetProxy.new(attrs, self))
+        end
+
         ##
         # Node type accessors
         #
         # @return [Boolean]
+        def text?
+          @node.is_a?(::REXML::Text)
+        end
+
         def element?
           @node.is_a?(::REXML::Element)
         end
 
-        def attribute_nodes
-          @attribute_nodes ||= NodeSetProxy.new(@node.children.select {|n| n.is_a?(::REXML::Attribute)}, self)
+        def blank?
+          @node.is_a?(::REXML::Text) && @node.empty?
         end
 
+        def to_s; @node.to_s; end
+
         def xpath(*args)
-          #NodeSetProxy.new(::REXML::XPath.match(@node, path, namespaces), self)
           ::REXML::XPath.match(@node, *args).map do |n|
-            # Get node ancestors
-            parent = n.ancestors.reverse.inject(nil) do |p,node|
-              NodeProxy.new(node, p)
-            end rescue nil
             NodeProxy.new(n, parent)
           end
         end
 
+        def at_xpath(*args)
+          xpath(*args).first
+        end
+
         # Simple case for <script>
         def css(path)
           xpath("//script[@type]")

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 1.1.4.1
+  version: 1.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Gregg
@@ -9,228 +10,258 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
+        version: '4.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
@@ -244,54 +275,45 @@ files:
 - README
 - UNLICENSE
 - VERSION
-- lib/rdf/rdfa.rb
-- lib/rdf/rdfa/context.rb
 - lib/rdf/rdfa/context/html.rb
 - lib/rdf/rdfa/context/xhtml.rb
 - lib/rdf/rdfa/context/xml.rb
+- lib/rdf/rdfa/context.rb
 - lib/rdf/rdfa/expansion.rb
-- lib/rdf/rdfa/expansion/cc.rb
-- lib/rdf/rdfa/expansion/dc.rb
-- lib/rdf/rdfa/expansion/doap.rb
-- lib/rdf/rdfa/expansion/foaf.rb
-- lib/rdf/rdfa/expansion/gr.rb
-- lib/rdf/rdfa/expansion/schema.rb
-- lib/rdf/rdfa/expansion/sioc.rb
-- lib/rdf/rdfa/expansion/skos.rb
-- lib/rdf/rdfa/expansion/skosxl.rb
-- lib/rdf/rdfa/expansion/v.rb
 - lib/rdf/rdfa/format.rb
 - lib/rdf/rdfa/patches/string_hacks.rb
-- lib/rdf/rdfa/reader.rb
 - lib/rdf/rdfa/reader/nokogiri.rb
 - lib/rdf/rdfa/reader/rexml.rb
+- lib/rdf/rdfa/reader.rb
 - lib/rdf/rdfa/version.rb
 - lib/rdf/rdfa/vocab.rb
-- lib/rdf/rdfa/writer.rb
 - lib/rdf/rdfa/writer/haml_templates.rb
+- lib/rdf/rdfa/writer.rb
+- lib/rdf/rdfa.rb
 homepage: http://ruby-rdf.github.com/rdf-rdfa
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfa
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: RDFa reader/writer for RDF.rb.
 test_files: []
 has_rdoc: false