RubyGems - rdf-rdfa - Versions diffs - 0.3.12 → 0.3.13 - Mend

rdf-rdfa 0.3.12 → 0.3.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/README +69 -2
data/VERSION +1 -1
data/lib/rdf/rdfa.rb +1 -1
data/lib/rdf/rdfa/context.rb +1 -1
data/lib/rdf/rdfa/reader.rb +66 -9
data/lib/rdf/rdfa/reader/nokogiri.rb +28 -0
data/lib/rdf/rdfa/reader/rexml.rb +26 -1
data/lib/rdf/rdfa/writer.rb +2 -2
data/lib/rdf/rdfa/writer/haml_templates.rb +1 -1
metadata +32 -32

data/README CHANGED Viewed

@@ -161,6 +161,72 @@ This is an alternate way of adding data using the `@value` property. Similar to
 The `data` element is described in the WHATWG version of the [HTML5 spec](http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#the-data-element).
 This is related to [RDFa ISSUE-113](http://www.w3.org/2010/02/rdfa/track/issues/113)
+### Support for embedded RDF/XML
+If the document includes embedded RDF/XML, as is the case with many SVG documents, and the RDF::RDFXML gem is installed, the reader will add extracted triples to the default graph.
+For example:
+    <?xml version="1.0" encoding="UTF-8"?>
+    <svg width="12cm" height="4cm" viewBox="0 0 1200 400"
+        xmlns:dc="http://purl.org/dc/terms/"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xml:base="http://example.net/"
+        xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny">
+      <desc property="dc:description">A yellow rectangle with sharp corners.</desc>
+      <metadata>
+        <rdf:RDF>
+          <rdf:Description rdf:about="">
+            <dc:title>Test 0304</dc:title>
+          </rdf:Description>
+        </rdf:RDF>
+      </metadata>
+      <!-- Show outline of canvas using 'rect' element -->
+      <rect x="1" y="1" width="1198" height="398"
+            fill="none" stroke="blue" stroke-width="2"/>
+      <rect x="400" y="100" width="400" height="200"
+            fill="yellow" stroke="navy" stroke-width="10"  />
+    </svg>
+generates the following turtle:
+    @prefix dc: <http://purl.org/dc/terms/> .
+  	<http://example.net/> dc:title "Test 0304" ;
+  	  dc:description "A yellow rectangle with sharp corners." .
+### Support for embedded N-Triples or Turtle
+If the document includes a `&lt;script&gt;` element having an `@type` attribute whose value matches that of a loaded RDF reader (text/ntriples and text/turtle are loaded if they are availble), the data will be extracted and added to the default graph.
+Additionally, if the `&lt;script&gt;` element has an `@id` attribute, the triples will be placed into a graph named by appending the value of `@id` as a frament of the base IRI of the input document. For example:
+    <html>
+      <body>
+        <script type="text/turtle" id="graph1"><![CDATA[
+           @prefix foo:  <http://www.example.com/xyz#> .
+           @prefix gr:   <http://purl.org/goodrelations/v1#> .
+           @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
+           @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+           foo:myCompany
+             a gr:BusinessEntity ;
+             rdfs:seeAlso <http://www.example.com/xyz> ;
+             gr:hasLegalName "Hepp Industries Ltd."^^xsd:string .
+        ]]></script>
+      </body>
+    </html>
+generates the following TriG:
+    @prefix gr: <http://purl.org/goodrelations/v1#> .
+    @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+    <http://www.example.com/xyz#graph1> {
+      <http://www.example.com/xyz#myCompany> a gr:BusinessEntity ;
+        rdfs:seeAlso <http://www.example.com/xyz> ;
+        gr:hasLegalName "Hepp Industries Ltd." .
+    }
 ## Usage
 ### Reading RDF data in the RDFa format
@@ -338,7 +404,8 @@ Full documentation available on [Rubydoc.info][RDFa doc]
 * {RDF::RDFa::Reader}
   * {RDF::RDFa::Reader::Nokogiri}
   * {RDF::RDFa::Reader::REXML}
-* {RDF::RDFa::Profile}
+* {RDF::RDFa::Context}
+* {RDF::RDFa::Expansion}
 * {RDF::RDFa::Writer}
 ### Additional vocabularies
@@ -393,7 +460,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 * <http://github.com/ruby-rdf/rdf-rdfa>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
-[RDF.rb]:           http://rdf.rubyforge.org/
+[RDF.rb]:           http://rubygems.org/gems/rdf
 [YARD]:             http://yardoc.org/
 [YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.3.12
1	+ 0.3.13

data/lib/rdf/rdfa.rb CHANGED Viewed

@@ -15,7 +15,7 @@ module RDF
   #     end
   #   end
   #
-  # @see http://rdf.rubyforge.org/
+  # @see http://rubygems.org/gems/rdf
   # @see http://www.w3.org/TR/rdfa-syntax/#s_model RDFa 1.0
   # @see http://www.w3.org/TR/2012/CR-rdfa-core-20120313/
   # @see http://www.w3.org/TR/2012/CR-xhtml-rdfa-20120313/

data/lib/rdf/rdfa/context.rb CHANGED Viewed

@@ -149,7 +149,7 @@ module RDF::RDFa
     ##
     # Extract vocabulary, prefix mappings and terms from a enumerable object into an instance
     #
-    # @param [RDF::Enumerable, Enumerator] queryable
+    # @param [RDF::Enumerable, Enumerator] enumerable
     # @return [void] ignored
     def parse(enumerable)
       STDERR.puts("process_context: parse context <#{uri}>") if RDF::RDFa.debug?

data/lib/rdf/rdfa/reader.rb CHANGED Viewed

@@ -333,6 +333,7 @@ module RDF::RDFa
     # @yieldparam [RDF::Statement] statement
     # @return [void]
     def each_statement(&block)
       if @options[:vocab_expansion]
         @options[:vocab_expansion] = false
         expand.each_statement(&block)
@@ -349,7 +350,61 @@ module RDF::RDFa
         end
         # parse
+        return unless @root
         parse_whole_document(@doc, RDF::URI(base_uri))
+        def extract_script(el, input, type, options, &block)
+          add_debug(el, "script element of type #{type}")
+          begin
+            # Formats don't exist unless they've been required
+            case type
+            when 'application/rdf+xml' then require 'rdf/rdfxml'
+            when 'text/ntriples' then require 'rdf/ntriples'
+            when 'text/turtle' then require 'text/turtle'
+            end
+          rescue
+          end
+          if reader = RDF::Reader.for(:content_type => type)
+            add_debug(el, "=> reader #{reader.to_sym}")
+            reader.new(input, options).each(&block)
+          end
+        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?
+          extract_script(@root, @doc, "application/rdf+xml", @options) do |statement|
+            block.call(statement)
+          end
+        end
+#        # Look for Embedded RDF/XML
+#        unless @root.xpath("//rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#").empty?
+#          extract_script(@root, @doc, "application/rdf+xml", @options) do |statement|
+#            block.call(statement)
+#          end
+#        end
+        # Look for Embedded scripts
+        @root.css("script[type]") do |el|
+          ctx = RDF::URI(el.attribute("id")) if el.attribute("id")
+          type = el.attribute("type")
+          extract_script(el, el.inner_text, type, @options) do |statement|
+            statement.context = ctx if ctx
+            block.call(statement)
+          end
+        end
+        # Just incase root is a <script> element
+        if @root.name == 'script' && type = root.attribute('type')
+          ctx = RDF::URI(@root.attribute("id")) if @root.attribute("id")
+          extract_script(@root, @root.inner_text, type, @options) do |statement|
+            statement.context = ctx if ctx
+            block.call(statement)
+          end
+        end
       end
     end
@@ -382,8 +437,8 @@ module RDF::RDFa
     # Add debug event to debug array, if specified
     #
-    # @param [#display_path, #to_s] node:: XML Node or string for showing context
-    # @param [String] message::
+    # @param [#display_path, #to_s] node XML Node or string for showing context
+    # @param [String] message
     # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
     def add_debug(node, message = "")
       return unless ::RDF::RDFa.debug? || @debug
@@ -439,15 +494,17 @@ module RDF::RDFa
       end
     end
+    ##
     # add a statement, object can be literal or URI or bnode
+    # Yields {RDF::Statement} to the saved callback
     #
-    # @param [#display_path, #to_s] node:: XML Node or string for showing context
-    # @param [RDF::URI, RDF::BNode] subject:: the subject of the statement
-    # @param [RDF::URI] predicate:: the predicate of the statement
-    # @param [URI, RDF::BNode, RDF::Literal] object:: the object of the statement
-    # @return [RDF::Statement]:: Added statement
-    # @raise [RDF::ReaderError]:: Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
-    def add_triple(node, subject, predicate, object)
+    # @param [#display_path, #to_s] node XML Node or string for showing context
+    # @param [RDF::Resource] subject the subject of the statement
+    # @param [RDF::URI] predicate the predicate of the statement
+    # @param [RDF::Value] object the object of the statement
+    # @param [RDF::Value] context the context of the statement
+    # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
+    def add_triple(node, subject, predicate, object, context = nil)
       statement = RDF::Statement.new(subject, predicate, object)
       add_info(node, "statement: #{RDF::NTriples.serialize(statement)}")
       @callback.call(statement) if @options[:rdfagraph].include?(:output) && statement.valid?

data/lib/rdf/rdfa/reader/nokogiri.rb CHANGED Viewed

@@ -91,6 +91,34 @@ module RDF::RDFa
           NodeSetProxy.new(@node.children, self)
         end
+        # Ancestors of this element, in order
+        def ancestors
+          @ancestors ||= parent ? parent.ancestors + [parent] : []
+        end
+        ##
+        # Inner text of an element. Decode Entities
+        #
+        # @return [String]
+        #def inner_text
+        #  coder = HTMLEntities.new
+        #  coder.decode(@node.inner_text)
+        #end
+        def attribute_nodes
+          @attribute_nodes ||= NodeSetProxy.new(@node.attribute_nodes, self)
+        end
+        def xpath(*args)
+          @node.xpath(*args).map do |n|
+            # Get node ancestors
+            parent = n.ancestors.reverse.inject(nil) do |p,node|
+              NodeProxy.new(node, p)
+            end
+            NodeProxy.new(n, parent)
+          end
+        end
         ##
         # Proxy for everything else to @node
         def method_missing(method, *args)

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

@@ -94,6 +94,11 @@ module RDF::RDFa
           NodeSetProxy.new(@node.children, self)
         end
+        # Ancestors of this element, in order
+        def ancestors
+          @ancestors ||= parent ? parent.ancestors + [parent] : []
+        end
         ##
         # Inner text of an element
         #
@@ -123,13 +128,33 @@ module RDF::RDFa
           @node.is_a?(::REXML::Element)
         end
+        def attribute_nodes
+          @attribute_nodes ||= NodeSetProxy.new(@node.children.select {|n| n.is_a?(::REXML::Attribute)}, self)
+        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
+        # Simple case for <script>
+        def css(path)
+          xpath("//script[@type]")
+        end
         ##
         # Proxy for everything else to @node
         def method_missing(method, *args)
           @node.send(method, *args)
         end
       end
       ##
       # NodeSet proxy
       class NodeSetProxy

data/lib/rdf/rdfa/writer.rb CHANGED Viewed

@@ -642,7 +642,7 @@ module RDF::RDFa
     # Haml rendering helper. Return CURIE for the literal datatype, if the literal is a typed literal.
     #
-    # @param [RDF::Resource] resource
+    # @param [RDF::Resource] literal
     # @return [String, nil]
     # @raise [RDF::WriterError]
     def get_dt_curie(literal)
@@ -835,7 +835,7 @@ module RDF::RDFa
     # Add debug event to debug array, if specified
     #
-    # @param [String] message::
+    # @param [String] message
     # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
     def add_debug(message = "")
       return unless ::RDF::RDFa.debug? || @debug

data/lib/rdf/rdfa/writer/haml_templates.rb CHANGED Viewed

@@ -172,7 +172,7 @@ module RDF::RDFa
             - subjects.each do |subject|
               != yield(subject)
             %footer
-              %p= "Written by <a href='http://rdf.rubyforge.org/rdfa'>RDF::RDFa</a> version #{RDF::RDFa::VERSION}"
+              %p= "Written by <a href='http://rubygems.org/gems/rdf-rdfa'>RDF::RDFa</a> version #{RDF::RDFa::VERSION}"
       ),
       # Output for non-leaf resources

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
   prerelease:
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000Z
+date: 2012-05-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70222279575740 !ruby/object:Gem::Requirement
+  requirement: &70096958854220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70222279575740
+  version_requirements: *70096958854220
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70222279575260 !ruby/object:Gem::Requirement
+  requirement: &70096958853760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70222279575260
+  version_requirements: *70096958853760
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &70222279574780 !ruby/object:Gem::Requirement
+  requirement: &70096958853260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70222279574780
+  version_requirements: *70096958853260
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70222279574300 !ruby/object:Gem::Requirement
+  requirement: &70096958852780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70222279574300
+  version_requirements: *70096958852780
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70222279573780 !ruby/object:Gem::Requirement
+  requirement: &70096958852240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.4.4
   type: :development
   prerelease: false
-  version_requirements: *70222279573780
+  version_requirements: *70096958852240
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70222279573320 !ruby/object:Gem::Requirement
+  requirement: &70096958851780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 0.2.8
   type: :development
   prerelease: false
-  version_requirements: *70222279573320
+  version_requirements: *70096958851780
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: &70222279572820 !ruby/object:Gem::Requirement
+  requirement: &70096958851320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *70222279572820
+  version_requirements: *70096958851320
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &70222279572240 !ruby/object:Gem::Requirement
+  requirement: &70096958850860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *70222279572240
+  version_requirements: *70096958850860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70222279571660 !ruby/object:Gem::Requirement
+  requirement: &70096958850320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70222279571660
+  version_requirements: *70096958850320
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &70222279571120 !ruby/object:Gem::Requirement
+  requirement: &70096958849800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 0.3.2
   type: :development
   prerelease: false
-  version_requirements: *70222279571120
+  version_requirements: *70096958849800
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70222279570640 !ruby/object:Gem::Requirement
+  requirement: &70096958849340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70222279570640
+  version_requirements: *70096958849340
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70222279570180 !ruby/object:Gem::Requirement
+  requirement: &70096958848840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70222279570180
+  version_requirements: *70096958848840
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: &70222279569420 !ruby/object:Gem::Requirement
+  requirement: &70096958848340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70222279569420
+  version_requirements: *70096958848340
 - !ruby/object:Gem::Dependency
   name: sparql
-  requirement: &70222279568920 !ruby/object:Gem::Requirement
+  requirement: &70096958833200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *70222279568920
+  version_requirements: *70096958833200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70222279568440 !ruby/object:Gem::Requirement
+  requirement: &70096958832640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70222279568440
+  version_requirements: *70096958832640
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
   suite.
 email: public-rdf-ruby@w3.org