rdf-rdfa 0.3.18 → 0.3.19

data/VERSION

@@ -1 +1 @@
-0.3.18
+0.3.19

data/lib/rdf/rdfa/expansion.rb

@@ -76,6 +76,23 @@ module RDF::RDFa
       graph
     end
 
+    ##
+    # Perform reference folding on the resulting default graph.
+    #
+    # For all objects of type rdfa:Prototype that are the target of an rdfa:ref property, load the IRI into a repository.
+    #
+    # Subsequently, remove reference rdfa:Prototype objects.
+    #
+    # @return [RDF::Graph]
+    # @see [HTML+RDFa](http://www.w3.org/TR/rdfa-in-html/#rdfa-reference-folding)
+    def fold_references
+      graph = RDF::Graph.new << self
+
+      add_debug("fold") {"Loaded #{graph.size} triples into default graph"}
+
+      fold(graph)
+    end
+
     def rule(name, &block)
       Rule.new(name, block)
     end
@@ -192,6 +209,9 @@ module RDF::RDFa
         antecedent :x, RDF.type, :c2
         consequent :x, RDF.type, :c1
       end,
+    ]
+
+    FOLDING_RULES = [
       Rule.new("rdfa-ref") do
         antecedent :x, RDF::RDFA.ref, :PR
         antecedent :PR, RDF.type, RDF::RDFA.Prototype
@@ -210,6 +230,7 @@ module RDF::RDFa
         consequent :PR, :p, :y
       end,
     ]
+
     ##
     # Perform OWL entailment rules on repository
     # @param [RDF::Repository] repo
@@ -233,18 +254,37 @@ module RDF::RDFa
         repo.insert(*to_add)
       end
 
+      add_debug("entailment", "final count: #{count}")
+      repo
+    end
+
+    ##
+    # Perform RDFa folding rules on repository
+    # @param [RDF::Graph] graph
+    # @return [RDF::Graph]
+    def fold(graph)
+      to_add = []
+
+      FOLDING_RULES.each do |rule|
+        rule.execute(graph) do |statement|
+          add_debug("fold(#{rule.name})") {statement.inspect}
+          to_add << statement
+        end
+      end
+        
+      graph.insert(*to_add)
+
       # Remove statements matched by removal rules
       to_remove = []
       REMOVAL_RULES.each do |rule|
-        rule.execute(repo) do |statement|
+        rule.execute(graph) do |statement|
           add_debug("removal(#{rule.name})") {statement.inspect}
           to_remove << statement
         end
       end
-      repo.delete(*to_remove)
+      graph.delete(*to_remove)
 
-      add_debug("entailment", "final count: #{count}")
-      repo
+      graph
     end
   end
 end

data/lib/rdf/rdfa/reader.rb

@@ -249,6 +249,8 @@ module RDF::RDFa
     #   One of :nokogiri or :rexml. If nil/unspecified uses :nokogiri if available, :rexml otherwise.
     # @option options [Boolean]  :vocab_expansion (false)
     #   whether to perform OWL2 expansion on the resulting graph
+    # @option options [Boolean]  :reference_folding (true)
+    #   whether to perform RDFa reference folding on the resulting graph
     # @option options [:xml, :xhtml1, :xhtml5, :html4, :html5, :svg] :host_language (:html5)
     #   Host Language
     # @option options [:"rdfa1.0", :"rdfa1.1"] :version (:"rdfa1.1")
@@ -270,6 +272,7 @@ module RDF::RDFa
     def initialize(input = $stdin, options = {}, &block)
       super do
         @debug = options[:debug]
+        @options = {:reference_folding => true}.merge(@options)
         
         @options[:rdfagraph] = case @options[:rdfagraph]
         when String, Symbol then @options[:rdfagraph].to_s.split(',').map(&:strip).map(&:to_sym)
@@ -348,9 +351,15 @@ module RDF::RDFa
     def each_statement(&block)
 
       if @options[:vocab_expansion]
+        # Process vocabulary expansion after normal processing
         @options[:vocab_expansion] = false
         expand.each_statement(&block)
         @options[:vocab_expansion] = true
+      elsif @options[:reference_folding]
+        # Process reference folding after normal processing
+        @options[:reference_folding] = false
+        fold_references.each_statement(&block)
+        @options[:reference_folding] = true
       else
         @callback = block
 
@@ -512,8 +521,10 @@ module RDF::RDFa
     def add_triple(node, subject, predicate, object, context = nil)
       statement = RDF::Statement.new(subject, predicate, object)
       add_error(node, "statement #{RDF::NTriples.serialize(statement)} is invalid") unless statement.valid?
-      add_info(node, "statement: #{RDF::NTriples.serialize(statement)}")
-      @callback.call(statement) if @options[:rdfagraph].include?(:output)
+      if subject && predicate && object # Basic sanity checking
+        add_info(node, "statement: #{RDF::NTriples.serialize(statement)}")
+        @callback.call(statement) if @options[:rdfagraph].include?(:output)
+      end
     end
 
     # Parsing an RDFa document (this is *not* the recursive method)
@@ -752,7 +763,22 @@ module RDF::RDFa
       language = element.language || language
       language = nil if language.to_s.empty?
       add_debug(element) {"HTML5 [3.2.3.3] lang: #{language.inspect}"} if language
-    
+
+      # From HTML5, if the property attribute and the rel and/or rev attribute exists on the same element, the non-CURIE and non-URI rel and rev values are ignored. If, after this, the value of rel and/or rev becomes empty, then the processor must act as if the respective attribute is not present.
+      if [:html5, :xhtml5].include?(@host_language) && attrs[:property] && (attrs[:rel] || attrs[:rev])
+        old_rel, old_rev = attrs[:rel], attrs[:rev]
+        if old_rel
+          attrs[:rel] = (attrs[:rel]).split(/\s+/m).select {|r| !r.index(':').nil?}.join(" ")
+          attrs.delete(:rel) if attrs[:rel].empty?
+          add_debug(element) {"HTML5: @rel was #{old_rel}, now #{attrs[:rel]}"}
+        end
+        if old_rev
+          attrs[:rev] = (attrs[:rev]).split(/\s+/m).select {|r| !r.index(':').nil?}.join(" ")
+          attrs.delete(:rev) if attrs[:rev].empty?
+          add_debug(element) {"HTML5: @rev was #{old_rev}, now #{attrs[:rev]}"}
+        end
+      end
+
       # rels and revs
       rels = process_uris(element, attrs[:rel], evaluation_context, base,
                           :uri_mappings => uri_mappings,
@@ -806,7 +832,7 @@ module RDF::RDFa
 
           # if the @typeof attribute is present, set typed resource to new subject
           typed_resource = new_subject if attrs[:typeof]
-        else
+        else # rdfa1.1
           # If the current element contains no @rel or @rev attribute, then the next step is to establish a value for new subject.
           # This step has two possible alternatives.
           #  1. If the current element contains the @property attribute, but does not contain the @content or the @datatype attributes, then
@@ -875,7 +901,7 @@ module RDF::RDFa
               # if no URI is provided, then first check to see if the element is the head or body element.
               # If it is, then act as if the new subject is set to the parent object.
               evaluation_context.parent_object
-            elsif element == root && base
+            elsif element == root
               # if the element is the root element of the document, then act as if there is an empty @about present,
               # and process it according to the rule for @about, above;
               uri(base)
@@ -888,8 +914,8 @@ module RDF::RDFa
               evaluation_context.parent_object
             end
 
-            # if @typeof is present, set the typed resource to the value of new subject</code>
-            typed_resource ||= new_subject if attrs[:typeof]
+            # If @typeof is present then typed resource is set to the resource obtained from the first match from the following rules:
+            typed_resource = new_subject if attrs[:typeof]
           end
         end
 
@@ -1315,7 +1341,7 @@ module RDF::RDFa
         if uri
           add_debug(element) {"process_uri: #{value} => safeCURIE => <#{uri}>"}
         else
-          add_warning(element, "#{value} not matched as a safeCURIE")
+          add_warning(element, "#{value} not matched as a safeCURIE", RDF::RDFA.UnresolvedCURIE)
         end
         uri
       elsif options[:term_mappings] && TERM_REGEXP.match(value.to_s) && restrictions.include?(:term)
@@ -1378,7 +1404,7 @@ module RDF::RDFa
       end
 
       # Finally, if there is no local default vocabulary, the term has no associated URI and must be ignored.
-      add_warning(element, "Term #{value} is not defined")
+      add_warning(element, "Term #{value} is not defined", RDF::RDFA.UnresolvedTerm)
       nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -125,13 +125,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: spira
+  name: json-ld
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement