rdf_context 0.4.5 → 0.4.6

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.4.6
+* Added Graph#uri_mapping and AbstractStore#uri_mapping for uri => Namespace mappings in graph
+* Fix BNode creation from existing identifier (named or un-named)
+* Graph#destroy removes graph context from store without configuration, and removes store storage with configuration
+* Added Triple#to_n3 and URIRef#to_n3
+* Added AbstractStore#uri_binding to give uri => namespace mapping from all store classes.
+
 === 0.4.5
 * Order includes to remove platform dependencies on load requirements.
 * Fix XML Comparison matcher

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/rdf_context/bnode.rb

@@ -16,9 +16,11 @@ module RdfContext
     # @param [String] identifier:: Legal NCName or nil for a named BNode
     # @param [Hash] context:: Context used to store named BNodes
     def initialize(identifier = nil, context = {})
-      if identifier != nil && self.valid_id?(identifier)
-        identifier = identifier.sub(/nbn\d+[a-z]+N/, '')  # creating a named BNode from a named BNode
-        # Generate a name if it's blank. Always prepend "named" to avoid generation overlap
+      if identifier.nil?
+        @identifier = generate_bn_identifier
+      elsif identifier.match(/n?bn\d+[a-z]+(N\w+)?$/)
+        @identifier = context[identifier] || identifier
+      elsif self.valid_id?(identifier)
         @identifier = context[identifier] ||= generate_bn_identifier(identifier)
       else
         @identifier = generate_bn_identifier
@@ -42,14 +44,7 @@ module RdfContext
     def to_n3
       "_:#{self.identifier}"
     end
-
-    ## 
-    # Exports the BNode in N-Triples form.
-    #
-    # Syonym for to_n3
-    def to_ntriples
-      self.to_n3
-    end
+    alias_method :to_ntriples, :to_n3
 
     # Output URI as resource reference for RDF/XML
     #
@@ -66,8 +61,12 @@ module RdfContext
     
     # Compare BNodes. BNodes are equivalent if they have the same identifier
     def eql?(other)
-      other.class == self.class &&
-      other.identifier == self.identifier
+      case other
+      when BNode
+        other.identifier == self.identifier
+      else
+        self.identifier == other.to_s
+      end
     end
     alias_method :==, :eql?
     
@@ -75,7 +74,7 @@ module RdfContext
     def hash; self.to_s.hash; end
     
     def inspect
-      "[bn:#{identifier}]"
+      "#{self.class}[#{self.to_n3}]"
     end
     
     protected

data/lib/rdf_context/graph.rb

@@ -59,8 +59,14 @@ module RdfContext
     def nsbinding; @store.nsbinding; end
 
     # Destroy the store identified by _configuration_ if supported
+    # If configuration is nil, remove the graph context
     def destroy(configuration = nil)
-      @store.destroy(configuration)
+      if configuration
+        @store.destroy(configuration)
+      else
+        @store.remove(Triple.new(nil, nil, nil), self)
+      end
+      
       self.freeze
     end
 
@@ -120,13 +126,18 @@ module RdfContext
         "xml"   => XML_NS
       )
       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)}
+      uri_bindings = self.uri_binding.merge(
+        RDF_NS.uri.to_s => RDF_NS,
+        RDFS_NS.uri.to_s => RDFS_NS,
+        XHV_NS.uri.to_s => XHV_NS,
+        XML_NS.uri.to_s => XML_NS
+      )
       
       # 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
+          uri_bindings[p.base] = Namespace.new(p.base, tmp_ns)
           rdf_attrs["xmlns:#{tmp_ns}"] = p.base
           tmp_ns = tmp_ns.succ
         end
@@ -171,9 +182,12 @@ module RdfContext
       @store.bind(namespace)
     end
 
-    # List of namespace bindings, as a hash
+    # Hash of prefix => Namespace bindings
     def nsbinding; @store.nsbinding; end
     
+    # Hash of uri => Namespace bindings
+    def uri_binding; @store.uri_binding; end
+    
     # Namespace for prefix
     def namespace(prefix); @store.namespace(prefix); end
 

data/lib/rdf_context/literal.rb

@@ -35,10 +35,6 @@ module RdfContext
         end
       end
       
-      def inspect
-        to_s()
-      end
-      
       def self.the_null_encoding
         @the_null_encoding ||= Null.new(nil)
       end
@@ -314,6 +310,10 @@ module RdfContext
     end
     alias_method :to_ntriples, :to_n3
 
+    def inspect
+      "#{self.class}[#{self.to_n3}]"
+    end
+    
     # Output literal in TriX format
     def to_trix
       encoding.format_as_trix(@contents, @lang)
@@ -324,7 +324,7 @@ module RdfContext
     # ==== Example
     #  Encoding.the_null_encoding.xml_args("foo", "en-US") => ["foo", {"xml:lang" => "en-US"}]
     def xml_args
-      encoding.xml_args( @contents, @lang)
+      encoding.xml_args(@contents, @lang)
     end
 
     # Is this an XMLLiteral?

data/lib/rdf_context/n3parser.rb

@@ -9,9 +9,9 @@ module RdfContext
 
     # Parse N3 document from a string or input stream to closure or graph.
     #
-    # Optionally, the stream may be a Nokogiri::HTML::Document or Nokogiri::XML::Document
-    # With a block, yeilds each statement with URIRef, BNode or Literal elements
-    # 
+    # If the parser is called with a block, triples are passed to the block rather
+    # than added to the graph.
+    #
     # @param [String] n3_str:: the Notation3/Turtle string
     # @param [String] uri:: the URI of the document
     # @param [Hash] options:: Options include the following

data/lib/rdf_context/namespace.rb

@@ -18,10 +18,10 @@ module RdfContext
     #
     # @author Tom Morris, Pius Uzamere
     def initialize(uri, prefix, fragment = nil)
+      prefix = prefix.to_s
       @uri = URIRef.new(uri) unless uri.is_a?(URIRef)
       @fragment = fragment
       @fragment = uri.to_s.match(/\#$/) ? true : false if fragment.nil?
-      prefix = nil if prefix.to_s.empty?
       if prefix_valid?(prefix)
         @prefix = prefix
       else
@@ -61,7 +61,7 @@ module RdfContext
 
     # Output xmlns attribute name
     def xmlns_attr
-      prefix.nil? ? "xmlns" : "xmlns:#{prefix}"
+      prefix.empty? ? "xmlns" : "xmlns:#{prefix}"
     end
     
     # Output namespace definition as a hash

data/lib/rdf_context/parser.rb

@@ -39,6 +39,9 @@ module RdfContext
     
     # Parse RDF document from a string or input stream to closure or graph.
     #
+    # If the parser is called with a block, triples are passed to the block rather
+    # than added to the graph.
+    #
     # Virtual Class, prototype for Parser subclass.
     #
     # @param  [IO, String] stream:: the RDF IO stream, string, Nokogiri::HTML::Document or Nokogiri::XML::Document
@@ -96,7 +99,7 @@ module RdfContext
       when /\.(nt|n3|txt)$/    then :n3
       else
         # Got to look into the file to see
-        if stream.is_a?(IO)
+        if stream.is_a?(IO) || stream.is_a?(StringIO)
           stream.rewind
           string = stream.read(1000)
           stream.rewind
@@ -133,6 +136,9 @@ module RdfContext
 
     # add a triple, object can be literal or URI or bnode
     #
+    # If the parser is called with a block, triples are passed to the block rather
+    # than added to the graph.
+    #
     # @param [Nokogiri::XML::Node, any] node:: XML Node or string for showing context
     # @param [URIRef, BNode] subject:: the subject of the triple
     # @param [URIRef] predicate:: the predicate of the triple

data/lib/rdf_context/rdfaparser.rb

@@ -49,6 +49,9 @@ module RdfContext
 
     # Parse XHTML+RDFa document from a string or input stream to closure or graph.
     #
+    # If the parser is called with a block, triples are passed to the block rather
+    # than added to the graph.
+    #
     # Optionally, the stream may be a Nokogiri::HTML::Document or Nokogiri::XML::Document
     # With a block, yeilds each statement with URIRef, BNode or Literal elements
     #

data/lib/rdf_context/rdfxmlparser.rb

@@ -98,8 +98,10 @@ module RdfContext
 
     # Parse RDF/XML document from a string or input stream to closure or graph.
     #
+    # If the parser is called with a block, triples are passed to the block rather
+    # than added to the graph.
+    #
     # Optionally, the stream may be a string or Nokogiri::XML::Document
-    # With a block, yeilds each statement with URIRef, BNode or Literal elements
     # 
     # @param [IO] stream:: the RDF/XML IO stream, string or Nokogiri::XML::Document
     # @param [String] uri:: the URI of the document
@@ -116,6 +118,8 @@ module RdfContext
       else   Nokogiri::XML.parse(stream, uri.to_s)
       end
       
+      raise ParserException, "Synax errors:\n#{@doc.errors}" unless @doc.errors.empty?
+      
       @id_mapping = Hash.new
 
       raise ParserException, "Empty document" if @doc.nil? || @doc.root.nil?
@@ -196,6 +200,12 @@ module RdfContext
         # Determine the content type of this property element
         text_nodes = child.children.select {|e| e.text? && !e.blank?}
         element_nodes = child.children.select(&:element?)
+        add_debug(child, "#{text_nodes.length} text nodes, #{element_nodes.length} element nodes")
+        if element_nodes.length > 1
+          element_nodes.each do |node|
+            add_debug(child, "  node: #{node.to_s}")
+          end
+        end
 
         # List expansion
         predicate = ec.li_next(predicate) if predicate == RDF_NS.li
@@ -245,12 +255,12 @@ module RdfContext
         resourceAttr = resourceAttr.rdf_escape if resourceAttr
         nodeID = nodeID_check(el, nodeID.rdf_escape) if nodeID
 
-        add_debug(el, "attrs: #{attrs.inspect}")
-        add_debug(el, "datatype: #{datatype}") if datatype
-        add_debug(el, "parseType: #{parseType}") if parseType
-        add_debug(el, "resource: #{resourceAttr}") if resourceAttr
-        add_debug(el, "nodeID: #{nodeID}") if nodeID
-        add_debug(el, "id: #{id}") if id
+        add_debug(child, "attrs: #{attrs.inspect}")
+        add_debug(child, "datatype: #{datatype}") if datatype
+        add_debug(child, "parseType: #{parseType}") if parseType
+        add_debug(child, "resource: #{resourceAttr}") if resourceAttr
+        add_debug(child, "nodeID: #{nodeID}") if nodeID
+        add_debug(child, "id: #{id}") if id
         
         if attrs.empty? && datatype.nil? && parseType.nil? && element_nodes.length == 1
           # Production resourcePropertyElt

data/lib/rdf_context/store/abstract_sql_store.rb

@@ -512,6 +512,7 @@ module RdfContext
       @namespaceCache ||= {}
       @namespaceUriCache ||= {}
       @nsbinding = nil
+      @uri_binding = nil
       @namespaceCache[namespace.prefix] = namespace
       @namespaceUriCache[namespace.uri.to_s] = namespace.prefix
       namespace
@@ -521,14 +522,14 @@ module RdfContext
     def namespace(prefix)
       @namespaceCache ||= {}
       @namespaceUriCache ||= {}
-      unless @namespaceCache.has_key?(prefix)
+      unless @namespaceCache.has_key?(prefix.to_s)
         @namespaceCache[prefix] = nil
-        executeSQL("SELECT uri FROM #{namespace_binds} WHERE prefix=?", prefix) do |row|
-          @namespaceCache[prefix] = Namespace.new(row[0], prefix)
-          @namespaceUriCache[row[0].to_s] = prefix
+        executeSQL("SELECT uri FROM #{namespace_binds} WHERE prefix=?", prefix.to_s) do |row|
+          @namespaceCache[prefix.to_s] = Namespace.new(row[0], prefix.to_s)
+          @namespaceUriCache[row[0].to_s] = prefix.to_s
         end
       end
-      @namespaceCache[prefix]
+      @namespaceCache[prefix.to_s]
     end
     
     # Prefix for namespace
@@ -546,18 +547,30 @@ module RdfContext
       @namespaceUriCache[uri.to_s]
     end
 
-    # List of namespace bindings, as a hash
+    # Hash of prefix => Namespace bindings
     def nsbinding
       unless @nsbinding.is_a?(Hash)
         @nsbinding = {}
+        @uri_binding = {}
         executeSQL("SELECT prefix, uri FROM #{namespace_binds}") do |row|
-          @nsbinding[row[0]] = Namespace.new(row[1], row[0])
+          prefix, uri = row
+          namespace = Namespace.new(uri, prefix)
+          @nsbinding[prefix] = namespace
+          # Over-write an empty prefix
+          @uri_binding[uri] = namespace unless prefix.to_s.empty?
+          @uri_binding[uri] ||= namespace
         end
         @nsbinding
       end
       @nsbinding
     end
     
+    # Hash of uri => Namespace bindings
+    def uri_binding
+      nsbinding
+      @uri_binding
+    end
+    
     # Transactional interfaces
     def commit; @db.commit; end
 

data/lib/rdf_context/store/abstract_store.rb

@@ -1,12 +1,12 @@
 module RdfContext
   # Abstract storage module, superclass of other storage classes
   class AbstractStore
-    attr_reader :nsbinding, :identifier
+    attr_reader :nsbinding, :uri_binding, :identifier
     
     def initialize(identifier = nil, configuration = {})
       @nsbinding = {}
       # Reverse namespace binding
-      @prefix = {}
+      @uri_binding = {}
       
       @identifier = identifier || BNode.new
     end
@@ -34,18 +34,21 @@ module RdfContext
 
     # Bind namespace to store, returns bound namespace
     def bind(namespace)
-      @prefix[namespace.uri.to_s] = namespace.prefix
-      @nsbinding[namespace.prefix] ||= namespace
+      # Over-write an empty prefix
+      uri = namespace.uri.to_s
+      @uri_binding[uri] = namespace unless namespace.prefix.to_s.empty?
+      @uri_binding[uri] ||= namespace
+      @nsbinding[namespace.prefix.to_s] ||= namespace
     end
 
     # Namespace for prefix
     def namespace(prefix)
-      @nsbinding[prefix]
+      @nsbinding[prefix.to_s]
     end
     
     # Prefix for namespace
     def prefix(namespace)
-      namespace.is_a?(Namespace) ? @prefix[namespace.uri.to_s] : @prefix[namespace]
+      namespace.is_a?(Namespace) ? @uri_binding[namespace.uri.to_s].prefix : @uri_binding[namespace].prefix
     end
     
     # Get all BNodes with usage count used within graph

data/lib/rdf_context/store/memory_store.rb

@@ -74,7 +74,7 @@ module RdfContext
       oi = resource_to_int(triple.object) || gen_key(triple.object)
       ci = resource_to_int(context) || gen_key(context)
     
-      #puts "add: #{si}, #{pi}, #{oi}, #{ci}" if $DEBUG
+      puts "add: #{si}, #{pi}, #{oi}, #{ci}" if $DEBUG
       set_nested_index(@cspo, ci, si, pi, oi)
       set_nested_index(@cpos, ci, pi, oi, si)
       set_nested_index(@cosp, ci, oi, si, pi)

data/lib/rdf_context/triple.rb

@@ -36,16 +36,17 @@ module RdfContext
       @patern
     end
     
-    # Serialize Triple to N-Triples
-    def to_ntriples
+    # Serialize Triple to N3
+    def to_n3
       raise RdfException.new("Can't serialize patern triple") if is_patern?
       @subject.to_ntriples + " " + @predicate.to_ntriples + " " + @object.to_ntriples + " ."
     end
+    alias_method :to_ntriples, :to_n3
     
     def to_s; self.to_ntriples; end
     
     def inspect
-      [@subject, @predicate, @object, @patern].inspect
+      "#{self.class}[#{self.to_n3}]"
     end
 
     # Is the predicate of this statment rdf:type?

data/lib/rdf_context/uriref.rb

@@ -3,6 +3,7 @@ require 'net/http'
 module RdfContext
   class URIRef
     attr_accessor :uri
+    attr_reader   :namespace
     
     # Create a URIRef from a URI  or a fragment and a URI
     #
@@ -70,19 +71,20 @@ module RdfContext
       @uri.to_s
     end
   
-    def to_ntriples
+    def to_n3
       "<" + @uri.to_s + ">"
     end
+    alias_method :to_ntriples, :to_n3
   
     # Output URI as QName using URI binding
     def to_qname(uri_binding = {})
-      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}, base: #{uri_base}"
-      end
+      @namespace ||= uri_binding[self.base]
+      raise RdfException, "Couldn't find QName for #{@uri}" unless @namespace
+      "#{@namespace.prefix}:#{self.short_name}"
+    end
+    
+    def inspect
+      "#{self.class}[#{self.to_n3}]"
     end
     
     # Output URI as resource reference for RDF/XML

data/spec/bnode_spec.rb

@@ -34,6 +34,16 @@ describe "Blank nodes" do
     end
   end
 
+  it "should accept valid bnode identifier" do
+    bn = BNode.new
+    BNode.new(bn.to_s).should == bn
+  end
+
+  it "should accept valid named bnode identifier" do
+    bn = BNode.new("foo")
+    BNode.new(bn.to_s).should == bn
+  end
+
   describe "which has a blank identifier" do
     subject { BNode.new("", @context) }
     it "should not be the same as an anonymous identifier" do should_not == BNode.new end

data/spec/uriref_spec.rb

@@ -72,11 +72,14 @@ describe "URI References" do
   end
 
   it "should create QName from URI with namespace" do
-    uri = URIRef.new("http://example.org/foo#bar")
-    uri.to_qname("http://example.org/foo#" => "ex").should == "ex:bar"
+    ex = Namespace.new("http://example.org/foo#", "ex")
+    foaf = Namespace.new("http://xmlns.com/foaf/0.1/", "foaf")
+
+    uri = ex.bar
+    uri.to_qname(ex.uri.to_s => ex).should == "ex:bar"
     
-    uri = URIRef.new("http://xmlns.com/foaf/0.1/knows")
-    uri.to_qname("http://xmlns.com/foaf/0.1/" => "foaf").should == "foaf:knows"
+    uri = foaf.knows
+    uri.to_qname(foaf.uri.to_s => foaf).should == "foaf:knows"
   end
   
   it "should create resource hash for RDF/XML" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdf_context
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -08:00
+date: 2010-01-15 00:00:00 -08:00
 default_executable: rdf_context
 dependencies: 
 - !ruby/object:Gem::Dependency