diver_down 0.0.1.alpha14 → 0.0.1.alpha15

data/lib/diver_down/web/definition_to_dot.rb

@@ -7,7 +7,6 @@ module DiverDown
   class Web
     class DefinitionToDot
       ATTRIBUTE_DELIMITER = ' '
-      MODULE_DELIMITER = '::'
 
       # Between modules is prominently distanced
       MODULE_MINLEN = 3
@@ -31,18 +30,12 @@ module DiverDown
           private
 
           def source_to_h
-            modules = metadata.source(data.source_name).modules.map do
-              {
-                module_name: _1,
-              }
-            end
-
             {
               id:,
               type: 'source',
               source_name: data.source_name,
               memo: metadata.source(data.source_name).memo,
-              modules:,
+              module: metadata.source(data.source_name).module,
             }
           end
 
@@ -68,11 +61,7 @@ module DiverDown
             {
               id:,
               type: 'module',
-              modules: data.map do
-                {
-                  module_name: _1,
-                }
-              end,
+              module: data,
             }
           end
         end
@@ -100,13 +89,13 @@ module DiverDown
 
         # @param module_names [Array<String>]
         # @return [String]
-        def issue_modules_id(module_names)
-          issued_metadata = @to_h.values.find { _1.type == :module && _1.data == module_names }
+        def issue_module_id(modulee)
+          issued_metadata = @to_h.values.find { _1.type == :module && _1.data == modulee }
 
           if issued_metadata
             issued_metadata.id
           else
-            build_dot_metadata_and_return_id(:module, module_names)
+            build_dot_metadata_and_return_id(:module, modulee)
           end
         end
 
@@ -186,60 +175,45 @@ module DiverDown
         dependency_map = Hash.new { |h, k| h[k] = Hash.new { |hi, ki| hi[ki] = [] } }
 
         definition.sources.sort_by(&:source_name).each do |source|
-          source_modules = metadata.source(source.source_name).modules
-          next if source_modules.empty?
+          source_module = metadata.source(source.source_name).module
+          next if source_module.nil?
 
           source.dependencies.each do |dependency|
-            dependency_modules = metadata.source(dependency.source_name).modules
-            next if dependency_modules.empty?
+            dependency_module = metadata.source(dependency.source_name).module
+            next if dependency_module.nil?
 
-            dependency_map[source_modules][dependency_modules].push(dependency)
+            dependency_map[source_module][dependency_module].push(dependency)
           end
         end
 
         # Remove duplicated prefix modules
-        # from [["A"], ["A", "B"], ["A", "C"], ["D"]] to { "A" => { "B" => {}, "C" => {} }, "D" => {} }
-        uniq_modules = [*dependency_map.keys, *dependency_map.values.map(&:keys).flatten(1)].uniq
-        uniq_modules.reject! do |modules|
-          modules.empty? ||
-            uniq_modules.any? { _1[0..modules.size - 1] == modules && _1.length > modules.size }
-        end
-
-        uniq_modules.each do |specific_module_names|
-          buf = swap_io do
-            indexes = (0..(specific_module_names.length - 1)).to_a
-
-            chain_yield(indexes) do |index, next_proc|
-              module_names = specific_module_names[0..index]
-              module_name = specific_module_names[index]
-
-              io.puts %(subgraph "#{escape_quote(module_label(module_names))}" {)
-              io.indented do
-                io.puts %(id="#{@dot_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: @dot_metadata_store.issue_modules_id(module_names))})
-
-                next_proc&.call
-              end
-              io.puts '}'
-            end
+        uniq_modules = [*dependency_map.keys, *dependency_map.values.map(&:keys).flatten].uniq.sort
+        uniq_modules.reject!(&:nil?)
+
+        uniq_modules.each do |modulee|
+          io.puts %(subgraph "#{escape_quote(module_label(modulee))}" {)
+          io.indented do
+            io.puts %(id="#{@dot_metadata_store.issue_module_id(modulee)}")
+            io.puts %(label="#{escape_quote(modulee)}")
+            io.puts %("#{escape_quote(modulee)}" #{build_attributes(label: modulee, id: @dot_metadata_store.issue_module_id(modulee))})
           end
-
-          io.write buf.string
+          io.puts '}'
         end
 
-        dependency_map.each do |from_modules, h|
-          h.each do |to_modules, all_dependencies|
+        dependency_map.keys.sort_by(&:to_s).each do |from_module|
+          dependency_map.fetch(from_module).keys.sort_by(&:to_s).each do |to_module|
+            all_dependencies = dependency_map.fetch(from_module).fetch(to_module)
+
             # Do not render standalone source
             # Do not render self-dependency
-            next if from_modules.empty? || to_modules.empty? || from_modules == to_modules
+            next if from_module.nil? || to_module.empty? || from_module == to_module
 
             dependencies = DiverDown::Definition::Dependency.combine(*all_dependencies)
 
             dependencies.each do
               attributes = {}
-              ltail = module_label(*from_modules)
-              lhead = module_label(*to_modules)
+              ltail = module_label(from_module)
+              lhead = module_label(to_module)
 
               # Already rendered dependencies between modules
               # Add the dependency to the edge of the compound
@@ -259,7 +233,7 @@ module DiverDown
                 minlen: MODULE_MINLEN
               )
 
-              io.write(%("#{escape_quote(from_modules[-1])}" -> "#{escape_quote(to_modules[-1])}"))
+              io.write(%("#{escape_quote(from_module)}" -> "#{escape_quote(to_module)}"))
               io.write(%( #{build_attributes(**attributes)}), indent: false) unless attributes.empty?
               io.write("\n")
             end
@@ -268,46 +242,38 @@ module DiverDown
       end
 
       def render_sources
-        # Hash{ modules => sources }
-        # Hash{ Array<String> => Array<DiverDown::Definition::Source> }
-        by_modules = definition.sources.group_by do |source|
-          metadata.source(source.source_name).modules
+        # Hash{ module => sources }
+        # Hash{ String => Array<DiverDown::Definition::Source> }
+        by_module = definition.sources.group_by do |source|
+          metadata.source(source.source_name).module
         end
 
         # Render subgraph for each module and its sources second
-        nested_modules = array_to_hash(by_modules.keys.uniq.sort)
-        render_nested_modules_sources(by_modules, nested_modules)
-
-        # Render dependencies last
-        definition.sources.sort_by(&:source_name).each do |source|
-          insert_dependencies(source)
-        end
-      end
-
-      def render_nested_modules_sources(by_modules, nested_modules, prefix = [])
-        nested_modules.each do |module_name, next_nested_modules|
-          module_names = prefix + [module_name].compact
-          sources = (by_modules[module_names] || []).sort_by(&:source_name)
+        by_module.keys.sort_by(&:to_s).each do |modulee|
+          sources = by_module.fetch(modulee).sort_by(&:source_name)
 
-          if module_name.nil?
+          if modulee.nil?
             sources.each do |source|
               io.puts build_source_node(source)
             end
           else
-            io.puts %(subgraph "#{escape_quote(module_label(module_names))}" {)
+            io.puts %(subgraph "#{escape_quote(module_label(modulee))}" {)
             io.indented do
-              io.puts %(id="#{@dot_metadata_store.issue_modules_id(module_names)}")
-              io.puts %(label="#{escape_quote(module_name)}")
+              io.puts %(id="#{@dot_metadata_store.issue_module_id(modulee)}")
+              io.puts %(label="#{escape_quote(modulee)}")
 
               sources.each do |source|
                 io.puts build_source_node(source)
               end
-
-              render_nested_modules_sources(by_modules, next_nested_modules, module_names)
             end
             io.puts '}'
           end
         end
+
+        # Render dependencies last
+        definition.sources.sort_by(&:source_name).each do |source|
+          insert_dependencies(source)
+        end
       end
 
       def build_source_node(source)
@@ -317,8 +283,8 @@ module DiverDown
       def insert_dependencies(source)
         source.dependencies.each do
           attributes = {}
-          ltail = module_label(*metadata.source(source.source_name).modules)
-          lhead = module_label(*metadata.source(_1.source_name).modules)
+          ltail = module_label(metadata.source(source.source_name).module)
+          lhead = module_label(metadata.source(_1.source_name).module)
 
           if @compound && (ltail || lhead)
             # Rendering of dependencies between modules is done only once
@@ -343,7 +309,8 @@ module DiverDown
             )
           else
             attributes.merge!(
-              id: @dot_metadata_store.issue_dependency_id(_1)
+              id: @dot_metadata_store.issue_dependency_id(_1),
+              minlen: MODULE_MINLEN
             )
           end
 
@@ -401,37 +368,15 @@ module DiverDown
         @io = old_io
       end
 
-      def module_label(*modules)
-        return if modules.empty?
+      def module_label(modulee)
+        return if modulee.nil?
 
-        "cluster_#{modules.join(MODULE_DELIMITER)}"
+        "cluster_#{modulee}"
       end
 
       def escape_quote(string)
         string.to_s.gsub(/"/, '\"')
       end
-
-      # from [["A"], ["A", "B"], ["A", "C"], ["D"]] to { "A" => { "B" => {}, "C" => {} }, "D" => {} }
-      def array_to_hash(array)
-        hash = {}
-        array.each do |sub_array|
-          current_hash = hash
-
-          if sub_array.empty?
-            current_hash[nil] = {}
-          else
-            sub_array.each_with_index do |element, index|
-              if index == sub_array.length - 1
-                current_hash[element] = {}
-              else
-                current_hash[element] ||= {}
-                current_hash = current_hash[element]
-              end
-            end
-          end
-        end
-        hash
-      end
     end
   end
 end

data/lib/diver_down/web/metadata/source_metadata.rb

@@ -6,17 +6,16 @@ module DiverDown
       class SourceMetadata
         BLANK_MEMO = ''
         BLANK_RE = /\A\s*\z/
-        BLANK_ARRAY = [].freeze
         private_constant(:BLANK_MEMO)
         private_constant(:BLANK_RE)
-        private_constant(:BLANK_ARRAY)
 
-        attr_reader :memo, :modules
+        attr_reader :memo, :module
 
         # @param source_name [String]
-        def initialize(memo: BLANK_MEMO, modules: BLANK_ARRAY)
+        # NOTE: `module` is a reserved keyword in Ruby
+        def initialize(memo: BLANK_MEMO, modulee: nil)
           @memo = memo
-          @modules = modules
+          @module = modulee
         end
 
         # @param memo [String]
@@ -25,17 +24,19 @@ module DiverDown
           @memo = memo.strip
         end
 
-        # @param module_names [Array<String>]
+        # @param modulee [String, nil]
         # @return [void]
-        def modules=(module_names)
-          @modules = module_names.reject do
-            BLANK_RE.match?(_1)
-          end.freeze
+        def module=(modulee)
+          @module = if modulee.nil? || BLANK_RE.match?(modulee)
+                      nil
+                    else
+                      modulee.strip
+                    end
         end
 
         # @return [Boolean]
-        def modules?
-          @modules.any?
+        def module?
+          !@module.nil?
         end
 
         # @return [Hash]
@@ -43,7 +44,7 @@ module DiverDown
           hash = {}
 
           hash[:memo] = memo unless memo == BLANK_MEMO
-          hash[:modules] = modules unless modules.empty?
+          hash[:module] = @module unless @module.nil?
 
           hash
         end

data/lib/diver_down/web/metadata.rb

@@ -54,7 +54,12 @@ module DiverDown
         # NOTE: This is for backward compatibility. It will be removed in the future.
         (loaded[:sources] || loaded || []).each do |source_name, source_hash|
           source(source_name).memo = source_hash[:memo] if source_hash[:memo]
-          source(source_name).modules = source_hash[:modules] if source_hash[:modules]
+
+          if source_hash[:modules].is_a?(Array)
+            source(source_name).module = source_hash[:modules][0]
+          elsif source_hash[:module]
+            source(source_name).module = source_hash[:module]
+          end
         end
 
         loaded[:source_alias]&.each do |alias_name, source_names|

data/lib/diver_down/web.rb

@@ -15,22 +15,28 @@ module DiverDown
     require 'diver_down/web/indented_string_io'
     require 'diver_down/web/definition_store'
     require 'diver_down/web/definition_loader'
+    require 'diver_down/web/definition_module_dependencies'
     require 'diver_down/web/source_alias_resolver'
-    require 'diver_down/web/module_sources_filter'
+    require 'diver_down/web/definition_filter'
 
     # For development
     autoload :DevServerMiddleware, 'diver_down/web/dev_server_middleware'
 
+    # @return [DiverDown::Web::DefinitionStore]
+    def self.store
+      @store ||= DiverDown::Web::DefinitionStore.new
+    end
+
     # @param definition_dir [String]
     # @param metadata [DiverDown::Web::Metadata]
     # @param store [DiverDown::Web::DefinitionStore]
-    def initialize(definition_dir:, metadata:, store: DiverDown::Web::DefinitionStore.new)
-      @store = store
+    def initialize(definition_dir:, metadata:)
       @metadata = metadata
       @files_server = Rack::Files.new(File.join(WEB_DIR))
 
       definition_files = ::Dir["#{definition_dir}/**/*.{yml,yaml,msgpack,json}"].sort
       @total_definition_files_size = definition_files.size
+      @action = nil
 
       load_definition_files_on_thread(definition_files)
     end
@@ -39,11 +45,14 @@ module DiverDown
     # @return [Array[Integer, Hash, Array]]
     def call(env)
       request = Rack::Request.new(env)
-      action = DiverDown::Web::Action.new(store: @store, metadata: @metadata, request:)
+
+      if @action&.store.object_id != self.class.store.object_id
+        @action = DiverDown::Web::Action.new(store: self.class.store, metadata: @metadata)
+      end
 
       case [request.request_method, request.path]
       in ['GET', %r{\A/api/definitions\.json\z}]
-        action.definitions(
+        @action.definitions(
           page: request.params['page']&.to_i || 1,
           per: request.params['per']&.to_i || 100,
           title: request.params['title'] || '',
@@ -51,51 +60,48 @@ module DiverDown
           definition_group: request.params['definition_group'] || ''
         )
       in ['GET', %r{\A/api/sources\.json\z}]
-        action.sources
+        @action.sources
       in ['GET', %r{\A/api/modules\.json\z}]
-        action.modules
-      in ['GET', %r{\A/api/modules/(?<module_names>.+)\.json\z}]
-        module_names = CGI.unescape(Regexp.last_match[:module_names]).split('/')
-        action.module(module_names)
-      in ['GET', %r{\A/api/module_definitions/(?<modules>.+)\.json\z}]
-        modules = CGI.unescape(Regexp.last_match[:modules]).split('/')
-        compound = request.params['compound'] == '1'
-        concentrate = request.params['concentrate'] == '1'
-        only_module = request.params['only_module'] == '1'
-        action.module_definition(compound, concentrate, only_module, modules)
+        @action.modules
+      in ['GET', %r{\A/api/modules/(?<modulee>[^/]+)\.json\z}]
+        modulee = CGI.unescape(Regexp.last_match[:modulee])
+        @action.module(modulee)
       in ['GET', %r{\A/api/definitions/(?<bit_id>\d+)\.json\z}]
         bit_id = Regexp.last_match[:bit_id].to_i
         compound = request.params['compound'] == '1'
         concentrate = request.params['concentrate'] == '1'
         only_module = request.params['only_module'] == '1'
-        action.combine_definitions(bit_id, compound, concentrate, only_module)
+        remove_internal_sources = request.params['remove_internal_sources'] == '1'
+        focus_modules = request.params['focus_modules'] || []
+        modules = request.params['modules'] || []
+        @action.combine_definitions(bit_id, compound, concentrate, only_module, remove_internal_sources, focus_modules, modules)
       in ['GET', %r{\A/api/sources/(?<source>[^/]+)\.json\z}]
         source = Regexp.last_match[:source]
-        action.source(source)
-      in ['POST', %r{\A/api/sources/(?<source>[^/]+)/modules.json\z}]
+        @action.source(source)
+      in ['POST', %r{\A/api/sources/(?<source>[^/]+)/module.json\z}]
         source = Regexp.last_match[:source]
-        modules = request.params['modules'] || []
-        action.set_modules(source, modules)
+        modulee = request.params['module'] || ''
+        @action.set_module(source, modulee)
       in ['POST', %r{\A/api/sources/(?<source>[^/]+)/memo.json\z}]
         source = Regexp.last_match[:source]
         memo = request.params['memo'] || ''
-        action.set_memo(source, memo)
+        @action.set_memo(source, memo)
       in ['GET', %r{\A/api/pid\.json\z}]
-        action.pid
+        @action.pid
       in ['GET', %r{\A/api/initialization_status\.json\z}]
-        action.initialization_status(@total_definition_files_size)
+        @action.initialization_status(@total_definition_files_size)
       in ['GET', %r{\A/api/source_aliases\.json\z}]
-        action.source_aliases
+        @action.source_aliases
       in ['POST', %r{\A/api/source_aliases\.json\z}]
         alias_name = request.params['alias_name']
         old_alias_name = request.params['old_alias_name'] # NOTE: nillable
         source_names = request.params['source_names'] || []
 
-        action.update_source_alias(alias_name, old_alias_name, source_names)
+        @action.update_source_alias(alias_name, old_alias_name, source_names)
       in ['GET', %r{\A/assets/}]
         @files_server.call(env)
       in ['GET', /\.json\z/], ['POST', /\.json\z/]
-        action.not_found
+        @action.not_found
       else
         @files_server.call(env.merge('PATH_INFO' => '/index.html'))
       end
@@ -105,20 +111,29 @@ module DiverDown
 
     def load_definition_files_on_thread(definition_files)
       definition_loader = DiverDown::Web::DefinitionLoader.new
+      store = self.class.store
 
       Thread.new do
         loop do
           break if definition_files.empty?
 
+          # If store is changed in test, stop loading.
+          break if store != self.class.store
+
           definition_file = definition_files.shift
           definition = definition_loader.load_file(definition_file)
 
           # No needed to synchronize because this is executed on a single thread.
-          @store.set(definition)
+          store.set(definition)
         end
 
         # Cache combined_definition
-        @store.combined_definition
+        store.combined_definition
+
+        # For development
+        if ENV['DIVER_DOWN_DIR']
+          File.write(File.expand_path('../../tmp/combined_definition.yml', __dir__), store.combined_definition.to_h.to_yaml)
+        end
       end
     end
   end