rdf-rdfxml 1.1.0p0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6998ff50cd28297520f5141f5b4bd06afc7208eb
+  data.tar.gz: 6b446b7d8d586debd5063f9a8e5c728c4f4a7e9e
+SHA512:
+  metadata.gz: 011b3251a3f25d692dc46bca35cfab75982e223b87904c6aac4d48628e7b9cace7afac59377a696a3921be52f60003a0f26b0581a3b1f4b57eb29c89c714a09e
+  data.tar.gz: 32ee1dc0dda497897e6e9d3aa1d1abe4030af232574233297d12f626d4c8d59fdf476cf2cca311d5bd9432f7909d507a009bf166c45b0c1b2160b2a3b525ed54

data/README.md

@@ -1,21 +1,25 @@
 # RDF::RDFXML reader/writer 
 
-[RDF/XML][RDF/XML] parser for [RDF.rb][RDF.rb].
+[RDF/XML][] reader/writer for [RDF.rb][].
 
 [![Gem Version](https://badge.fury.io/rb/rdf-rdfxml.png)](http://badge.fury.io/rb/rdf-rdfxml)
 [![Build Status](https://secure.travis-ci.org/ruby-rdf/rdf-rdfxml.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-rdfxml)
 
 ## DESCRIPTION
 
-RDF::RDFXML is an [RDF/XML][RDF/XML] reader/writer for Ruby using the [RDF.rb][RDF.rb] library suite.
+RDF::RDFXML is an [RDF/XML][RDF/XML] reader/writer for [Ruby][] using the [RDF.rb][RDF.rb] library suite.
 
 ## FEATURES
-RDF::RDFXML parses [RDF/XML][RDF/XML] into statements or triples and serializes triples, statements or graphs.
+RDF::RDFXML parses [RDF/XML][] into statements or triples and serializes triples, statements or graphs. It also serializes graphs to [RDF/XML][].
 
-Fully compliant [RDF/XML][RDF/XML] parser and serializer.
+Fully compliant [RDF/XML][] parser and serializer.
 
 Install with `gem install rdf-rdfxml`
 
+* 100% free and unencumbered [public domain](http://unlicense.org/) software.
+* Implements a complete parser for [RDF/XML][].
+* Compatible with Ruby >= 1.9.2.
+
 ## Usage:
 Instantiate a parser and parse source, specifying type and base-URL
 
@@ -25,13 +29,22 @@ Instantiate a parser and parse source, specifying type and base-URL
       end
     end
 
+Define `xml:base` and `xmlns` definitions, and use for serialization using `:base_uri` an `:prefixes` options.
+
+Canonicalize and validate using `:canonicalize` and `:validate` options.
+
+Write a graph to a file:
+
+    RDF::RDFXML::Writer.open("etc/test.ttl") do |writer|
+       writer << graph
+    end
+
 ## Dependencies
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5.9)
-* Does not run properly on jRuby due to [Nokogiri][] issues.
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.0)
 
 ## Documentation
-Full documentation available on [RubyForge](http://rubydoc.info/github/ruby-rdf/rdf-rdfxml/master/frames)
+Full documentation available on [Rubydoc.info][RDF/XML doc])
 
 ### Principle Classes
 * {RDF::RDFXML}
@@ -42,22 +55,14 @@ Full documentation available on [RubyForge](http://rubydoc.info/github/ruby-rdf/
 ### Additional vocabularies
 * {RDF::XML}
 
-### Patches
-* {Array}
-* {RDF::Queryable}
-* {Nokogiri::XML::Node}
-
 ## TODO
-* Add support for LibXML and REXML bindings, and use the best available
 * Consider a SAX-based parser for improved performance
-* jRuby integration awaiting improvements in Nokogiri
 
 ## Resources
 * [RDF.rb][RDF.rb]
 * [RDF/XML][RDF/XML]
-* [Distiller](http://distiller.kellogg-assoc)
-* [Documentation](http://rubygems.org/gems/rdf-rdfxml)
-* [History](file:file.History.html)
+* [Distiller](http://rdf.greggkellogg.net)
+* [Documentation][RDF/XML doc]
 * [RDF Tests](http://www.w3.org/2000/10/rdf-tests/rdfcore/allTestCases.html)
 
 ## Author
@@ -67,6 +72,7 @@ Full documentation available on [RubyForge](http://rubydoc.info/github/ruby-rdf/
 * [Nicholas Humfrey](http://github.com/njh) - <http://njh.me/>
 
 ## Contributing
+This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
 
 * Do your best to adhere to the existing coding conventions and idioms.
 * Don't use hard tabs, and don't leave trailing whitespace on any line.
@@ -87,13 +93,16 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
 ## FEEDBACK
 
-* gregg@kellogg-assoc.com
+* gregg@greggkellogg.net
 * <http://rubygems.org/rdf-rdfxml>
 * <http://github.com/ruby-rdf/rdf-rdfxml>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-[RDF.rb]:   http://rubygems.org/gems/rdf
-[RDF/XML]:  http://www.w3.org/TR/REC-rdf-syntax/  "RDF/XML Syntax Specification"
-[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
+[Ruby]:         http://ruby-lang.org/
+[RDF]:          http://www.w3.org/RDF/
+[RDF.rb]:       http://rubygems.org/gems/rdf
+[RDF/XML]:      http://www.w3.org/TR/REC-rdf-syntax/  "RDF/XML Syntax Specification"
+[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
+[RDF/XML doc]:  http://rubydoc.info/github/ruby-rdf/rdf-rdfxml/master/frames

data/VERSION

@@ -1 +1 @@
-1.1.0p0
+1.1.0

data/lib/rdf/rdfxml/format.rb

@@ -38,6 +38,11 @@ module RDF::RDFXML
     def self.detect(sample)
       sample.match(/<(\w+:)?(RDF)/)
     end
+
+    # Override name of format
+    def self.name
+      "RDF/XML"
+    end
   end
 
   # Aliases for RDF::Format

data/lib/rdf/rdfxml/reader/nokogiri.rb

@@ -215,6 +215,7 @@ module RDF::RDFXML
           
           # Otherwise, default is utf-8
           options[:encoding] ||= 'utf-8'
+          options[:encoding] = options[:encoding].to_s if options[:encoding]
 
           ::Nokogiri::XML.parse(input, base_uri.to_s, options[:encoding]) do |config|
             config.noent

data/lib/rdf/rdfxml/reader.rb

@@ -76,13 +76,10 @@ module RDF::RDFXML
         mappings = {}
 
         # look for xmlns
-        element.namespaces.each do |attr_name,attr_value|
-          abbr, prefix = attr_name.to_s.split(":")
-          if abbr == "xmlns"
-            attr_value = self.base.to_s + attr_value if attr_value.match(/^\#/)
-            mappings[prefix] = attr_value
-            cb.call(prefix, attr_value) if block_given?
-          end
+        element.namespaces.each do |prefix, value|
+          value = base.join(value)
+          mappings[prefix] = value
+          cb.call(prefix, value) if block_given?
         end
         mappings
       end
@@ -196,7 +193,7 @@ module RDF::RDFXML
         ec = EvaluationContext.new(base_uri, root, @graph) do |prefix, value|
           prefix(prefix, value)
         end
-        
+
         nodeElement(root, ec)
       else
         rdf_nodes.each do |node|
@@ -204,10 +201,10 @@ module RDF::RDFXML
           # XXX Skip this element if it's contained within another rdf:RDF element
 
           # Extract base, lang and namespaces from parents to create proper evaluation context
-          ec = EvaluationContext.new(base_uri, nil, @graph) do |prefix, value|
+          ec = EvaluationContext.new(base_uri, nil, @graph)
+          ec.extract_from_ancestors(node) do |prefix, value|
             prefix(prefix, value)
           end
-          ec.extract_from_ancestors(node)
           node.children.each {|el|
             next unless el.elem?
             raise "el must be a proxy not a #{el.class}" unless el.is_a?(@implementation::NodeProxy)

data/lib/rdf/rdfxml/writer/haml_templates.rb

@@ -0,0 +1,86 @@
+# Default HAML templates used for generating RDF/XML output from the writer
+module RDF::RDFXML
+  class Writer
+    # The default set of HAML templates used for RDFa code generation
+   BASE_HAML = {
+     :identifier => "base", 
+      # Document
+      # Locals: lang, title, prefix, base, subjects
+      # Yield: subjects.each
+      :doc => %q(
+        = %(<?xml version='1.0' encoding='utf-8' ?>)
+        - if stylesheet
+          = %(<?xml-stylesheet type="text/xsl" href="#{stylesheet}"?>)
+        %rdf:RDF{prefix_attrs.merge("xml:lang" => lang, "xml:base" => base)}
+          - subjects.each do |subject|
+            != yield(subject)
+      ),
+
+      # Output for non-leaf resources
+      # Note that @about may be omitted for Nodes that are not referenced
+      #
+      # If _rel_ and _resource_ are not nil, the tag will be written relative
+      # to a previous subject. If _element_ is :li, the tag will be written
+      # with <li> instead of <div>.
+      #
+      # Locals: subject, typeof, predicates, rel, element, inlist, attr_props
+      # Yield: predicates.each
+      :subject => %q(
+        - first_type, *types = typeof.to_s.split(' ')
+        - (types.unshift(first_type); first_type = nil) if first_type && (first_type.include?('/') || first_type.start_with?('_:'))
+        - first_type ||= get_qname(RDF.Description)
+        - first_type = first_type[1..-1] if first_type.to_s.start_with?(":")
+        - attr_props = attr_props.merge(get_qname(RDF.nodeID) => subject.id) if subject.node? && ref_count(subject) > 1
+        - attr_props = attr_props.merge(get_qname(RDF.about) => relativize(subject)) if subject.uri?
+        - haml_tag(first_type, attr_props) do
+          - types.each do |type|
+            - expanded_type = expand_curie(type)
+            - if expanded_type.start_with?('_:')
+              - haml_tag(get_qname(RDF.type), "rdf:nodeID" => expanded_type[2..-1])
+            -else
+              - haml_tag(get_qname(RDF.type), "rdf:resource" => expanded_type)
+          - predicates.each do |p|
+            = yield(p)
+      ),
+
+      # Output for single-valued properties
+      # Locals: predicate, object, inlist
+      # Yields: object
+      # If nil is returned, render as a leaf
+      # Otherwise, render result
+      :property_value => %q(
+      - if res = yield(object)
+        - haml_tag(property) do
+          = res
+      - elsif object.literal? && object.datatype == RDF.XMLLiteral
+        - haml_tag(property, :"<", "rdf:parseType" => "Literal") do
+          = object.value
+      - elsif object.literal?
+        - haml_tag(property, :"<", "xml:lang" => object.language, "rdf:datatype" => (object.datatype unless object.plain?)) do
+          = object.value
+      - elsif object.node?
+        - haml_tag(property, :"/", "rdf:nodeID" => object.id)
+      - else
+        - haml_tag(property, :"/", "rdf:resource" => relativize(object))
+      ),
+
+      # Outpust for a list
+      # Locals: predicate, list
+      # Yields: object
+      # If nil is returned, render as a leaf
+      # Otherwise, render result
+      :collection => %q(
+        - haml_tag(property, get_qname(RDF.parseType) => "Collection") do
+          - list.each do |object|
+            - if res = yield(object)
+              = res
+            - elsif object.node?
+              - haml_tag(get_qname(RDF.Description), :"/", "rdf:nodeID" => (object.id if ref_count(object) > 1))
+            - else
+              - haml_tag(get_qname(RDF.Description), :"/", "rdf:about" => relativize(object))
+      ),
+    }
+    HAML_TEMPLATES = {:base => BASE_HAML}
+    DEFAULT_HAML = BASE_HAML
+  end
+end