Remove pruneBlankNodeIdentifiers and just use processingMode.

Author: gkellogg

lib/json/ld/api.rb

@@ -72,10 +72,7 @@ class API
     # @option options [Boolean, String, RDF::URI] :flatten
     #   If set to a value that is not `false`, the JSON-LD processor must modify the output of the Compaction Algorithm or the Expansion Algorithm by coalescing all properties associated with each subject via the Flattening Algorithm. The value of `flatten must` be either an _IRI_ value representing the name of the graph to flatten, or `true`. If the value is `true`, then the first graph encountered in the input document is selected and flattened.
     # @option options [String] :processingMode
-    #   Processing mode, json-ld-1.0 or json-ld-1.1. Also can have other values:
-    #
-    #   * json-ld-1.1-expand-frame – special frame expansion mode.
-    #
+    #   Processing mode, json-ld-1.0 or json-ld-1.1.
     #   If `processingMode` is not specified, a mode of `json-ld-1.0` or `json-ld-1.1` is set, the context used for `expansion` or `compaction`.
     # @option options [Boolean] :rename_bnodes (true)
     #   Rename bnodes as part of expansion, or keep them the same.
@@ -321,7 +318,6 @@ def self.flatten(input, context, expanded: false, **options)
     # @option options [Boolean] :omitDefault (false)
     #   a flag specifying that properties that are missing from the JSON-LD input should be omitted from the output.
     # @option options [Boolean] :expanded Input is already expanded
-    # @option options [Boolean] :pruneBlankNodeIdentifiers (true) removes blank node identifiers that are only used once.
     # @option options [Boolean] :omitGraph does not use `@graph` at top level unless necessary to describe multiple objects, defaults to `true` if processingMode is 1.1, otherwise `false`.
     # @yield jsonld
     # @yieldparam [Hash] jsonld
@@ -342,7 +338,6 @@ def self.frame(input, frame, expanded: false, **options)
         requireAll:                 true,
         omitDefault:                false,
         omitGraph:                  false,
-        pruneBlankNodeIdentifiers:  true,
         documentLoader:             method(:documentLoader)
       }.merge(options)
 
@@ -399,7 +394,7 @@ def self.frame(input, frame, expanded: false, **options)
         frame(framing_state, framing_state[:subjects].keys.sort, (expanded_frame.first || {}), parent: result, **options)
 
         # Count blank node identifiers used in the document, if pruning
-        if options[:pruneBlankNodeIdentifiers]
+        unless @options[:processingMode] == 'json-ld-1.0'
           bnodes_to_clear = count_blank_node_identifiers(result).collect {|k, v| k if v == 1}.compact
           result = prune_bnodes(result, bnodes_to_clear)
         end

spec/frame_spec.rb

@@ -667,7 +667,8 @@
               "name": "Test 0001"
             }]
           }]
-        })
+        }),
+        processingMode: 'json-ld-1.1'
       },
       "library" => {
         frame: %({
@@ -1133,7 +1134,8 @@
               "@type": "Class",
               "preserve": {}
             }]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         },
         "Frame default graph if outer @graph is used" => {
           frame: %({
@@ -1166,7 +1168,8 @@
                 }
               }
             }]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         },
         "Merge one graph and preserve another" => {
           frame: %({
@@ -1212,7 +1215,8 @@
                 }
               }
             }]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         },
         "Merge one graph and deep preserve another" => {
           frame: %({
@@ -1262,7 +1266,8 @@
                 }
               }
             }]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         },
         "library" => {
           frame: %({
@@ -1318,7 +1323,8 @@
                 }
               }
             ]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         }
       }.each do |title, params|
         it title do
@@ -1328,8 +1334,8 @@
     end
   end
 
-  describe "pruneBlankNodeIdentifiers" do
-    it "preserves single-use bnode identifiers if option set to false" do
+  describe "prune blank nodes" do
+    it "preserves single-use bnode identifiers if @version 1.0" do
       do_frame(
         input: %({
           "@context": {
@@ -1378,8 +1384,7 @@
               }
             }
           ]
-        }),
-        prune: false
+        })
       )
     end
   end
@@ -1477,7 +1482,7 @@
       do_frame(input: input, frame: frame, output: expected)
     end
 
-    it "framing with @container: @graph assumes pruneBnodeIdentifiers" do
+    it "framing with @version: 1.1 prunes identifiers" do
       input = JSON.parse %({
         "@context": {
           "@version": 1.1,
@@ -1527,17 +1532,17 @@
           }
         ]
       })
-      do_frame(input: input, frame: frame, output: expected)
+      do_frame(input: input, frame: frame, output: expected, processingMode: 'json-ld-1.1')
     end
   end
 
   def do_frame(params)
     begin
-      input, frame, output, prune = params[:input], params[:frame], params[:output], params.fetch(:prune, true)
+      input, frame, output, processingMode = params[:input], params[:frame], params[:output], params.fetch(:processingMode, 'json-ld-1.0')
       input = ::JSON.parse(input) if input.is_a?(String)
       frame = ::JSON.parse(frame) if frame.is_a?(String)
       output = ::JSON.parse(output) if output.is_a?(String)
-      jld = JSON::LD::API.frame(input, frame, logger: logger, pruneBlankNodeIdentifiers: prune)
+      jld = JSON::LD::API.frame(input, frame, logger: logger, processingMode: processingMode)
       expect(jld).to produce(output, logger)
     rescue JSON::LD::JsonLdError => e
       fail("#{e.class}: #{e.message}\n" +