lib/dogviz/container.rb in dogviz-0.0.18 vs lib/dogviz/container.rb in dogviz-0.0.19

@@ -7,11 +7,11 @@
     include Common
     include Nominator
     include Parent
 
     attr_reader :parent
-    attr_reader :name, :id, :node, :render_id, :render_type, :render_options, :children
+    attr_reader :name, :id, :node, :render_type, :render_options, :children
 
     def initialize(parent, name, options = {})
       @children = []
       @by_name = Registry.new name
       @parent = parent
@@ -21,12 +21,13 @@
       @info = {}
 
       init_rollup options
 
       setup_render_attributes label: name
+      default_bounded_option(options)
 
-      @render_options = options.merge inherited_render_options
+      @render_options = options.merge(inherited_render_options)
 
       parent.register name, self
     end
 
     def register(name, thing)
@@ -54,35 +55,28 @@
 
     private
 
     def do_render_subgraph(renderer)
       @render_type = :subgraph
-      render_id = cluster_prefix + id
-      attributes = @attributes
-      @render_id = render_id
-      @subgraph = renderer.render_subgraph(parent, render_id, render_options, attributes)
+      @subgraph = renderer.render_subgraph(parent, id, render_options.merge(@attributes))
     end
 
     def do_render_node(renderer)
       @render_type = :node
-      @render_id = id
-      render_id = @render_id
-      attributes = @attributes
-      renderer.render_node(parent, render_id, render_options, attributes)
+      renderer.render_node(parent, id, render_options.merge(@attributes))
     end
 
     def init_rollup(options)
       @rollup = false
       rollup! if options[:rollup]
       options.delete(:rollup)
     end
 
-    def cluster_prefix
-      is_cluster = true
-      if @render_options.has_key? :cluster
-        is_cluster = @render_options[:cluster]
-        @render_options.delete :cluster
+    def default_bounded_option(options)
+      bounded = true
+      if options.has_key? :bounded
+        bounded = options[:bounded]
       end
-      cluster_prefix = (is_cluster ? 'cluster_' : '')
+      options[:bounded] = bounded
     end
   end
 end
\ No newline at end of file