diver_down 0.0.1.alpha5 → 0.0.1.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d5ffbc4ef413edc539a3334e4b705600a2662a37bb08a292787225ba810d875
-  data.tar.gz: 444f687a0aa2dbc3b6b91fa248d937f282a286bb6d8709a0ec9b04312fec942a
+  metadata.gz: 7d4a5bb567f1141aaa13b3d6aaf7e4201b005988a072cfd5c4de2e11a180c480
+  data.tar.gz: 5cf5455488b8944830f2f25fb7f26a1b4d21ed2d42ee1c2ea755138ba3aa40e3
 SHA512:
-  metadata.gz: 350384f94a2c60506fffe52d43bdd705bf048cf6d62dfdd60f3d315fe89e9647896f1b9fc6491dc5bfeccd475c970580bd1ee4599e843a79e8bfd17d4d1f0764
-  data.tar.gz: e16ffe92d2df53c258e7fc4a295411f7f35611334af421d9e78b7fcc1b9e7b77190cdf568ca3fd0fa82a0340cd04175e2bb631cdfee3467bfdc31eb6f687e7c8
+  metadata.gz: 79b39d0ecc4569ce41d26c24ae03d903c431a7cdc55c9c9fecbcbbfadc807edbdcab3c34481fde3b6d728791b780951ef1923afb37414f6403a3daa415537d73
+  data.tar.gz: '0800be880d27a2c61c8e7153bbea2c02ab8573d347a5b5cccd9325549e7284f2d8c4316b3fb794c9fa0c42ee47e9fa9d7df9d9a24efe4d106ba5d767c2d3c0a3'

data/lib/diver_down/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiverDown
-  VERSION = '0.0.1.alpha5'
+  VERSION = '0.0.1.alpha6'
 end

data/lib/diver_down/web/definition_to_dot.rb

@@ -161,7 +161,7 @@ module DiverDown
 
       # @return [String]
       def to_s
-        io.puts %(strict digraph "#{definition.title}" {)
+        io.puts %(strict digraph "#{escape_quote(definition.title)}" {)
         io.indented do
           io.puts('compound=true') if @compound
           io.puts('concentrate=true') if @concentrate
@@ -169,9 +169,7 @@ module DiverDown
           if @only_module
             render_only_modules
           else
-            definition.sources.sort_by(&:source_name).each do
-              insert_source(_1)
-            end
+            render_sources
           end
         end
         io.puts '}'
@@ -214,11 +212,11 @@ module DiverDown
               module_names = specific_module_names[0..index]
               module_name = specific_module_names[index]
 
-              io.puts %(subgraph "#{module_label(module_names)}" {)
+              io.puts %(subgraph "#{escape_quote(module_label(module_names))}" {)
               io.indented do
                 io.puts %(id="#{@metadata_store.issue_modules_id(module_names)}")
-                io.puts %(label="#{module_name}")
-                io.puts %("#{module_name}" #{build_attributes(label: module_name, id: @metadata_store.issue_modules_id(module_names))})
+                io.puts %(label="#{escape_quote(module_name)}")
+                io.puts %("#{escape_quote(module_name)}" #{build_attributes(label: module_name, id: @metadata_store.issue_modules_id(module_names))})
 
                 next_proc&.call
               end
@@ -260,7 +258,7 @@ module DiverDown
                 minlen: MODULE_MINLEN
               )
 
-              io.write(%("#{from_modules[-1]}" -> "#{to_modules[-1]}"))
+              io.write(%("#{escape_quote(from_modules[-1])}" -> "#{escape_quote(to_modules[-1])}"))
               io.write(%( #{build_attributes(**attributes)}), indent: false) unless attributes.empty?
               io.write("\n")
             end
@@ -268,13 +266,62 @@ module DiverDown
         end
       end
 
-      def insert_source(source)
-        if module_store.get(source.source_name).empty?
-          io.puts %("#{source.source_name}" #{build_attributes(label: source.source_name, id: @metadata_store.issue_source_id(source))})
-        else
-          insert_modules(source)
+      def render_sources
+        by_modules = definition.sources.group_by do |source|
+          module_store.get(source.source_name)
+        end
+
+        # Remove duplicated prefix modules
+        # from [["A"], ["A", "B"]] to [["A", "B"]]
+        uniq_modules = by_modules.keys.uniq
+        uniq_modules = uniq_modules.reject do |modules|
+          uniq_modules.any? { _1[0..modules.size - 1] == modules && _1.length > modules.size }
         end
 
+        uniq_modules.each do |full_modules|
+          # Render module and source
+          if full_modules.empty?
+            sources = by_modules[full_modules].sort_by(&:source_name)
+
+            sources.each do |source|
+              insert_source(source)
+              insert_dependencies(source)
+            end
+          else
+            buf = swap_io do
+              indexes = (0..(full_modules.length - 1)).to_a
+
+              chain_yield(indexes) do |index, next_proc|
+                module_names = full_modules[0..index]
+                module_name = module_names[-1]
+
+                io.puts %(subgraph "#{escape_quote(module_label(module_names))}" {)
+                io.indented do
+                  io.puts %(id="#{@metadata_store.issue_modules_id(module_names)}")
+                  io.puts %(label="#{escape_quote(module_name)}")
+
+                  sources = (by_modules[module_names] || []).sort_by(&:source_name)
+                  sources.each do |source|
+                    insert_source(source)
+                    insert_dependencies(source)
+                  end
+
+                  next_proc&.call
+                end
+                io.puts '}'
+              end
+            end
+
+            io.write buf.string
+          end
+        end
+      end
+
+      def insert_source(source)
+        io.puts %("#{escape_quote(source.source_name)}" #{build_attributes(label: source.source_name, id: @metadata_store.issue_source_id(source))})
+      end
+
+      def insert_dependencies(source)
         source.dependencies.each do
           attributes = {}
           ltail = module_label(*module_store.get(source.source_name))
@@ -307,40 +354,12 @@ module DiverDown
             )
           end
 
-          io.write(%("#{source.source_name}" -> "#{_1.source_name}"))
+          io.write(%("#{escape_quote(source.source_name)}" -> "#{escape_quote(_1.source_name)}"))
           io.write(%( #{build_attributes(**attributes)}), indent: false) unless attributes.empty?
           io.write("\n")
         end
       end
 
-      def insert_modules(source)
-        buf = swap_io do
-          all_module_names = module_store.get(source.source_name)
-          indexes = (0..(all_module_names.length - 1)).to_a
-
-          chain_yield(indexes) do |index, next_proc|
-            module_names = all_module_names[0..index]
-            module_name = module_names[-1]
-
-            io.puts %(subgraph "#{module_label(module_names)}" {)
-            io.indented do
-              io.puts %(id="#{@metadata_store.issue_modules_id(module_names)}")
-              io.puts %(label="#{module_name}")
-
-              if next_proc
-                next_proc.call
-              else
-                # last. equals indexes[-1] == index
-                io.puts %("#{source.source_name}" #{build_attributes(label: source.source_name, id: @metadata_store.issue_source_id(source))})
-              end
-            end
-            io.puts '}'
-          end
-        end
-
-        io.write buf.string
-      end
-
       def chain_yield(values, &block)
         *head, tail = values
 
@@ -363,7 +382,7 @@ module DiverDown
         attrs = attrs.reject { _2.nil? || _2 == '' }
         return if attrs.empty?
 
-        attrs_str = attrs.map { %(#{_1}="#{_2}") }.join(ATTRIBUTE_DELIMITER)
+        attrs_str = attrs.map { %(#{_1}="#{escape_quote(_2)}") }.join(ATTRIBUTE_DELIMITER)
 
         if _wrap
           "#{_wrap[0]}#{attrs_str}#{_wrap[1]}"
@@ -394,6 +413,10 @@ module DiverDown
 
         "cluster_#{modules.join(MODULE_DELIMITER)}"
       end
+
+      def escape_quote(string)
+        string.to_s.gsub(/"/, '\"')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diver_down
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha5
+  version: 0.0.1.alpha6
 platform: ruby
 authors:
 - alpaca-tc