rdf_context 0.4.3 → 0.4.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.4.4
+* Namespace usage cleanup
+* When serializing graph to RDF/XML, create namespaces as necessary.
+* rename bin/reddy to bin/rdf_context
+
 === 0.4.3
 * Coverage tests
 

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/bin/{reddy → rdf_context}

@@ -7,7 +7,7 @@ class Parse
   def parse(file, base_uri)
     puts "Parse: #{file}" if $quiet
     parser = case file
-    when /\.nt$/ then N3Parser.new
+    when /\.(nt|n3)$/ then N3Parser.new
     when /\.x?html/ then RdfaParser.new
     else RdfXmlParser.new
     end

data/lib/rdf_context/graph.rb

@@ -119,6 +119,17 @@ module RdfContext
       )
       rdf_attrs = extended_bindings.values.inject({}) { |hash, ns| hash.merge(ns.xmlns_attr => ns.uri.to_s)}
       uri_bindings = extended_bindings.values.inject({}) { |hash, ns| hash.merge(ns.uri.to_s => ns.prefix)}
+      
+      # Add bindings for predicates not already having bindings
+      tmp_ns = "ns0"
+      predicates.each do |p|
+        unless uri_bindings.has_key?(p.base)
+          uri_bindings[p.base] = tmp_ns
+          rdf_attrs["xmlns:#{tmp_ns}"] = p.base
+          tmp_ns = tmp_ns.succ
+        end
+      end
+      
       xml.instruct!
       xml.rdf(:RDF, rdf_attrs) do
         # Add statements for each subject

data/lib/rdf_context/nokogiri_hacks.rb

@@ -2,7 +2,7 @@ require 'nokogiri'
 class Nokogiri::XML::Node
   # URI of namespace + node_name
   def uri
-    ns = self.namespace ? self.namespace.href : XML_NS.uri.to_s
+    ns = self.namespace ? self.namespace.href : RdfContext::XML_NS.uri.to_s
     RdfContext::URIRef.new(ns + self.node_name)
   end
 end

data/lib/rdf_context/rdfxmlparser.rb

@@ -484,8 +484,7 @@ module RdfContext
         raise InvalidPredicate.new(warn) if @strict
         return false
       end
-      !CORE_SYNTAX_TERMS.include?(attr.uri.to_s) &&
-      attr.namespace.href != XML_NS.uri.to_s
+      !CORE_SYNTAX_TERMS.include?(attr.uri.to_s) && attr.namespace && attr.namespace.href != XML_NS.uri.to_s
     end
     
     # Check Node Element name

data/lib/rdf_context/uriref.rb

@@ -36,13 +36,25 @@ module RdfContext
       return URIRef.new(input_uri, self.to_s)
     end
     
+    # short_name of URI for creating QNames.
+    #   "#{base]{#short_name}}" == uri
     def short_name
-      if @uri.fragment()
-        return @uri.fragment()
+      @short_name ||= if @uri.fragment()
+        @uri.fragment()
       elsif @uri.path.split("/").last.class == String and @uri.path.split("/").last.length > 0
-        return @uri.path.split("/").last
+        @uri.path.split("/").last
       else
-        return false
+        false
+      end
+    end
+    
+    # base of URI for creating QNames.
+    #   "#{base]{#short_name}}" == uri
+    def base
+      @base ||= begin
+        uri_base = @uri.to_s
+        sn = short_name.to_s
+        uri_base[0, uri_base.length - sn.length]
       end
     end
   
@@ -64,13 +76,12 @@ module RdfContext
   
     # Output URI as QName using URI binding
     def to_qname(uri_binding = {})
-      uri_base = @uri.to_s
-      sn = short_name.to_s
-      uri_base = uri_base[0, uri_base.length - sn.length]
+      sn = self.short_name
+      uri_base = self.base
       if uri_binding.has_key?(uri_base)
         "#{uri_binding[uri_base]}:#{sn}"
       else
-        raise ParserException, "Couldn't find QName for #{@uri}"
+        raise ParserException, "Couldn't find QName for #{@uri}, base: #{uri_base}"
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdf_context
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -08:00
-default_executable: reddy
+date: 2010-01-03 00:00:00 -08:00
+default_executable: rdf_context
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -85,7 +85,7 @@ dependencies:
 description: "    RdfContext parses RDF/XML, RDFa and N3-rdf into a Graph object. It also serializes RDF/XML and N-Triples from the Graph.\n\n      * Fully compliant RDF/XML parser.\n      * Fully compliant XHTML/RDFa 1.0 parser.\n      * N3-rdf parser\n      * N-Triples and RDF/XML serializer\n      * Graph serializes into RDF/XML and N-Triples.\n      * ConjunctiveGraph, named Graphs and contextual storage modules.\n    \n    Install with 'gem install rdf_context'\n"
 email: gregg@kellogg-assoc.com
 executables: 
-- reddy
+- rdf_context
 extensions: []
 
 extra_rdoc_files: 
@@ -100,7 +100,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/reddy
+- bin/rdf_context
 - lib/rdf_context.rb
 - lib/rdf_context/bnode.rb
 - lib/rdf_context/conjunctive_graph.rb