Keep triples generated through nested collections.

Author: gkellogg

lib/ld/patch/parser.rb

@@ -231,6 +231,8 @@ class Parser
 
         current[:resource] = current[:collection].subject
       end
+
+      (input[:triples] ||= []).concat(current[:triples]) if current[:triples]
       input[:subject] = current[:resource] || current[:iri]
     end
 
@@ -269,7 +271,7 @@ class Parser
     end
 
     production(:blankNodePropertyList) do |input, current, callback|
-      input[:resource] = current[:subject]
+      input[:subject] = input[:resource] = current[:subject]
       (input[:triples] ||= []).concat(current[:triples]) if current[:triples]
     end
 
@@ -282,6 +284,7 @@ class Parser
     production(:collection) do |input, current, callback|
       # Create an RDF list
       objects = current[:object_list]
+      (input[:triples] ||= []).concat(current[:triples]) if current[:triples]
       input[:collection] = RDF::List[*objects]
     end
 
@@ -545,7 +548,11 @@ def bnode(id = nil)
           @options[:anon_base] = @options[:anon_base].succ
         end
         # Don't use provided ID to avoid aliasing issues when re-serializing the graph, when the bnode identifiers are re-used
-        (@bnode_cache ||= {})[id.to_s] ||= RDF::Node.new 
+        (@bnode_cache ||= {})[id.to_s] ||= begin
+          new_bnode = RDF::Node.new
+          new_bnode.lexical = "_:#{id}"
+          new_bnode
+        end
       end
     end
 
@@ -589,4 +596,14 @@ def literal(value, options = {})
       RDF::Literal.new(value, options.merge(validate: validate?))
     end
   end
-end
+end
+
+
+# Update RDF::Node to set lexical representation of BNode
+##
+# Extensions for RDF::URI
+class RDF::Node
+  # Original lexical value of this URI to allow for round-trip serialization.
+  def lexical=(value); @lexical = value; end
+  def lexical; @lexical; end
+end

spec/algebra_spec.rb

@@ -140,6 +140,18 @@
         <http://example/#> <http://example.org/vocab#preferredLanguages> _:a .
       )
     },
+    "nested_collection" => {
+      data: %(<http://example.org/something> <http://example.org/completely> <http://example.org/different> .),
+      patch: %(Add {<http://a.example/s> <http://a.example/p> ((1)) .} .),
+      result: %(
+        <http://a.example/s> <http://a.example/p> _:outerEl1 .
+        _:outerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:innerEl1 .
+        _:innerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
+        _:innerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+        _:outerEl1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+        <http://example.org/something> <http://example.org/completely> <http://example.org/different> .
+      )
+    }
   }.each do |name, props|
     it name do
       graph = RDF::Graph.new << RDF::NTriples::Reader.new(props[:data])