rdf_context 0.5.2 → 0.5.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.5.3
+* Fix bug in XML serializer when type is a BNode.
+* Undo change in 0.5.2 to remove old binding based on equivalent URI to equivalent prefix.
+* Undo change form 0.5.1 to make BNode.new("") a named identifier. Required for RDFa test 0088.
+
 === 0.5.2
 * Remove old binding for a namespace URI creating a new binding
 

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/bin/rdf_context

@@ -13,7 +13,7 @@ class Parse
     output = parser.graph.serialize(:format => $format.to_sym, :base => base_uri)
     puts output unless $quiet
 
-    puts parser.debug.join("\n\t") if $verbose
+    puts parser.debug.to_a.join("\n\t") if $verbose
   rescue RdfException => e
     puts "Parse failure: #{e.message}"
     puts parser.debug if $verbose && parser

data/lib/rdf_context/bnode.rb

@@ -16,7 +16,7 @@ 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.to_s.empty?
+      if identifier.nil?
         @identifier = generate_bn_identifier
       elsif identifier.match(/n?bn\d+[a-z]+(N\w+)?$/)
         @identifier = context[identifier] || identifier

data/lib/rdf_context/n3parser.rb

@@ -50,6 +50,7 @@ module RdfContext
       add_debug("namesspace", "'#{prefix}' <#{uri}>")
       uri = @default_ns.uri if uri == '#'
       @graph.bind(Namespace.new(uri, prefix))
+      add_debug("namesspace", "ns = #{@graph.nsbinding.inspect}")
     end
 
     def process_statements(document)
@@ -177,20 +178,26 @@ module RdfContext
     end
 
     def process_expression(expression)
-      add_debug(*expression.info("process_expression"))
       if expression.respond_to?(:pathitem) && expression.respond_to?(:expression)
+        add_debug(*expression.info("process_expression(pathitem && expression)"))
         process_path(expression)  # Returns last object in chain
       elsif expression.respond_to?(:uri)
+        add_debug(*expression.info("process_expression(uri)"))
         process_uri(expression.uri)
       elsif expression.respond_to?(:localname)
+        add_debug(*expression.info("process_expression(localname)"))
         build_uri(expression)
       elsif expression.respond_to?(:anonnode)
+        add_debug(*expression.info("process_expression(anonnode)"))
         process_anonnode(expression)
       elsif expression.respond_to?(:literal)
+        add_debug(*expression.info("process_expression(literal)"))
         process_literal(expression)
       elsif expression.respond_to?(:numericliteral)
+        add_debug(*expression.info("process_expression(numericliteral)"))
         process_numeric_literal(expression)
       elsif expression.respond_to?(:boolean)
+        add_debug(*expression.info("process_expression(boolean)"))
         barename = expression.text_value.to_s
         if @keywords && !@keywords.include?(barename)
           build_uri(barename)
@@ -198,6 +205,7 @@ module RdfContext
           Literal.typed(barename.delete("@"), XSD_NS.boolean)
         end
       elsif expression.respond_to?(:barename)
+        add_debug(*expression.info("process_expression(barename)"))
         barename = expression.text_value.to_s
         
         # Should only happen if @keywords is defined, and text_value is not a defined keyword
@@ -210,6 +218,7 @@ module RdfContext
           build_uri(barename)
         end
       else
+        add_debug(*expression.info("process_expression(else)"))
         build_uri(expression)
       end
     end
@@ -325,8 +334,13 @@ module RdfContext
       prefix = expression.respond_to?(:nprefix) ? expression.nprefix.text_value.to_s : ""
       localname = expression.localname.text_value if expression.respond_to?(:localname)
       localname ||= (expression.respond_to?(:text_value) ? expression.text_value : expression).to_s.sub(/^:/, "")
+      localname = nil if localname.empty? # In N3/Turtle "_:" is not named
 
-#      add_debug(*expression.info("build_uri(#{prefix.inspect}, #{localname.inspect})"))
+      if expression.respond_to?(:info)
+        add_debug(*expression.info("build_uri(#{prefix.inspect}, #{localname.inspect})"))
+      else
+        add_debug("", "build_uri(#{prefix.inspect}, #{localname.inspect})")
+      end
 
       uri = if @graph.nsbinding[prefix]
         @graph.nsbinding[prefix] + localname.to_s.rdf_escape

data/lib/rdf_context/serializer/xml_serializer.rb

@@ -35,7 +35,7 @@ module RdfContext
       preprocess
 
       predicates = @graph.predicates.uniq
-      possible = predicates | @graph.objects.uniq
+      possible = predicates + @graph.objects.uniq
       namespaces = {}
       required_namespaces = {}
       possible.each do |res|
@@ -100,10 +100,11 @@ module RdfContext
         puts "subject: #{subject.to_n3}, props: #{properties.inspect}" if $DEBUG
 
         rdf_type, *rest = properties.fetch(RDF_TYPE.to_s, [])
-        properties[RDF_TYPE.to_s] = rest
         if rdf_type.is_a?(URIRef)
           element = get_qname(rdf_type)
+          properties[RDF_TYPE.to_s] = rest
           if rdf_type.namespace && @default_ns && rdf_type.namespace.uri == @default_ns.uri
+            properties[RDF_TYPE.to_s] = rest
             element = rdf_type.short_name
           end
         end

data/lib/rdf_context/store/abstract_sql_store.rb

@@ -507,7 +507,7 @@ module RdfContext
     # Bind namespace to store, returns bound namespace
     def bind(namespace)
       # Remove existing bindings for the same URI
-      executeSQL("DELETE FROM #{namespace_binds} WHERE uri=?", namespace.uri)
+      executeSQL("DELETE FROM #{namespace_binds} WHERE prefix=?", namespace.prefix)
       executeSQL("INSERT INTO #{namespace_binds} VALUES (?, ?)", namespace.prefix, namespace.uri)
       # May throw exception, should be handled in driver-specific class
 

data/lib/rdf_context/store/abstract_store.rb

@@ -35,10 +35,11 @@ module RdfContext
 
     # Bind namespace to store, returns bound namespace
     def bind(namespace)
+      puts "bind #{namespace.inspect}"
       # Over-write an empty prefix
       uri = namespace.uri.to_s
       @uri_binding.delete(uri)
-      @nsbinding.delete_if {|prefix, ns| ns.uri.to_s == uri}
+      @nsbinding.delete_if {|prefix, ns| namespace.prefix == prefix}
 
       @uri_binding[uri] = namespace
       @nsbinding[namespace.prefix.to_s] = namespace

data/spec/bnode_spec.rb

@@ -44,10 +44,16 @@ describe "Blank nodes" do
     BNode.new(bn.to_s).should == bn
   end
 
+  describe "which has a nil identifier" do
+    subject { BNode.new("", @context) }
+    it "should not be the same as an anonymous identifier" do should_not == BNode.new end
+    it "should not be the same as another nil identifier" do should_not == BNode.new(nil, @context) end
+  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
-    it "should not be the same as another blank identifier" do should_not == BNode.new("", @context) end
+    it "should be the same as another blank identifier" do should == BNode.new("", @context) end
   end
 
   describe "which are anonymous" do

data/spec/xml_serializer_spec.rb

@@ -332,12 +332,20 @@ describe "XML Serializer" do
       bn = BNode.new("a")
       @graph.add_triple(bn, DC_NS.title, "foo")
       @graph.add_triple(bn, OWL_NS.equals, bn)
-        check_xpaths(
-          serialize(:attributes => :untyped, :base => "http://release/"),
-          "/rdf:RDF/rdf:Description/@dc:title" => "foo",
-          "/rdf:RDF/rdf:Description/@rdf:nodeID" => /Na$/,
-          "/rdf:RDF/rdf:Description/owl:equals/@rdf:nodeID" => /Na$/
-        )
+      check_xpaths(
+        serialize(:attributes => :untyped, :base => "http://release/"),
+        "/rdf:RDF/rdf:Description/@dc:title" => "foo",
+        "/rdf:RDF/rdf:Description/@rdf:nodeID" => /Na$/,
+        "/rdf:RDF/rdf:Description/owl:equals/@rdf:nodeID" => /Na$/
+      )
+    end
+    
+    it "should replicate rdfcore/rdfms-seq-representation" do
+      @graph.parse(%(
+        <http://example.org/eg#eric> a [ <http://example.org/eg#intersectionOf> (<http://example.org/eg#Person> <http://example.org/eg#Male>)] .
+      ))
+      graph2 = Graph.new
+      graph2.parse(serialize(:format => :xml)).should be_equivalent_graph(@graph)
     end
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: rdf_context
 dependencies: 
 - !ruby/object:Gem::Dependency