Don't pass namer as option to create_node_map, as it is an instance variable.

Author: gkellogg

lib/json/ld/api.rb

@@ -252,7 +252,7 @@ def self.flatten(input, context, options = {})
 
         # Initialize node map to a JSON object consisting of a single member whose key is @default and whose value is an empty JSON object.
         graphs = {'@default' => {}}
-        create_node_map(value, graphs, '@default', namer)
+        create_node_map(value, graphs)
 
         default_graph = graphs['@default']
         graphs.keys.kw_sort.reject {|k| k == '@default'}.each do |graph_name|
@@ -355,7 +355,7 @@ def self.frame(input, frame, options = {})
 
         # Get framing nodes from expanded input, replacing Blank Node identifiers as necessary
         old_dbg, @options[:debug] = @options[:debug], nil
-        create_node_map(value, framing_state[:graphs], '@merged', namer)
+        create_node_map(value, framing_state[:graphs], '@merged')
         @options[:debug] = old_dbg
         framing_state[:subjects] = framing_state[:graphs]['@merged']
         debug(".frame") {"subjects: #{framing_state[:subjects].to_json(JSON_STATE) rescue 'malformed json'}"}
@@ -415,7 +415,7 @@ def self.toRdf(input, options = {}, &block)
 
         # Generate _nodeMap_
         graphs = {'@default' => {}}
-        create_node_map(expanded_input, graphs, '@default', namer)
+        create_node_map(expanded_input, graphs)
         debug(".toRdf") {"node map: #{graphs.to_json(JSON_STATE) rescue 'malformed json'}"}
 
         # Start generating statements

lib/json/ld/flatten.rb

@@ -12,24 +12,21 @@ module Flatten
     #   map of nodes
     # @param [String] graph
     #   The name of the currently active graph that the processor should use when processing.
-    # @param [JSON::LD::BlankNodeNamer] namer
-    #   The UniqueNamer for assigning blank node names
     # @param [String] name
     #   The name assigned to the current input if it is a bnode
     # @param [Array] list
     #   List to append to, nil for none
     def create_node_map(input,
                         graphs,
                         graph = '@default',
-                        namer = BlankNodeNamer.new('b'),
                         name  = nil,
                         list  = nil)
       depth do
         debug("node_map") {"graph: #{graph}, input: #{input.inspect}, name: #{name}"}
         case input
         when Array
           # If input is an array, process each entry in input recursively by passing item for input, node map, active graph, active subject, active property, and list.
-          input.map {|o| create_node_map(o, graphs, graph, namer, nil,list)}
+          input.map {|o| create_node_map(o, graphs, graph, nil, list)}
         when Hash
           type = input['@type']
           if value?(input)
@@ -66,7 +63,7 @@ def create_node_map(input,
                   items.each do |item|
                     item_name = item['@id']
                     item_name = namer.get_name(item_name) if blank_node?(item_name)
-                    create_node_map(item, graphs, graph, namer, item_name)
+                    create_node_map(item, graphs, graph, item_name)
                     add_value(graphs[graph][item_name],
                               reverse_property,
                               referenced_node,
@@ -77,7 +74,7 @@ def create_node_map(input,
               when '@graph'
                 graphs[name] ||= {}
                 g = graph == '@merged' ? graph : name
-                create_node_map(objects, graphs, g, namer)
+                create_node_map(objects, graphs, g)
               when /^@(?!type)/
                 # copy non-@type keywords
                 if property == '@index' && subject['@index']
@@ -103,15 +100,15 @@ def create_node_map(input,
 
                     # add reference and recurse
                     add_value(subject, property, {'@id' => id}, property_is_array: true, allow_duplicate: false)
-                    create_node_map(o, graphs, graph, namer, id)
+                    create_node_map(o, graphs, graph, id)
                   when list?(o)
                     olist = []
-                    create_node_map(o['@list'], graphs, graph, namer, name, olist)
+                    create_node_map(o['@list'], graphs, graph, name, olist)
                     o = {'@list' => olist}
                     add_value(subject, property, o, property_is_array: true, allow_duplicate: true)
                   else
                     # handle @value
-                    create_node_map(o, graphs, graph, namer, name)
+                    create_node_map(o, graphs, graph, name)
                     add_value(subject, property, o, property_is_array: true, allow_duplicate: false)
                   end
                 end