diver_down 0.0.1.alpha8 → 0.0.1.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b6dec73d4653351d9d352e2576d572e3e16617d4b93b7fac88d1f92346f0d6d
-  data.tar.gz: '0429bc45357cdf12327e0960b379d65df8ffe6d345c23b99600b3ab9e9d02f98'
+  metadata.gz: 45734000dad7ab44ca75037957b39dc6caae34d1189864f563ec251453972db8
+  data.tar.gz: bf21e0f1faeaa051f6fc4e001ff0544570994fc98d8cc75da92c8fd5f6e5d294
 SHA512:
-  metadata.gz: 012d06bc87393013c42a7b6033507845c7efe36f654058a8afcde1e7b2f229d6b33e45e66e4465ac770c07b69a500adec6ef80e8da98c9ea2414f40f79a8ebc4
-  data.tar.gz: 391c6a56bc9440b60b59eab6a05dfca33095d41a4c1ed7353661ff387f4f227c80865504c51e961c5d512e6cd2caec4d7147547b3ab7dcf54cd7f4d5f250d056
+  metadata.gz: 3060ddaba43ef6d91c01e9eb5b9ede908a61629e563d2dfef6b2775a59843cd3cd4e34c0505320ffc035e04459dc00744cf0dc58f8302de812a7b15d2b6b357c
+  data.tar.gz: bb258e2b3e308848e9debee4acd34930dbe375bc07ec639daeac97d24ff514f4e03a8f3b2cee8717ffb29d10b3600a97a645a9104b3481b4153c2f8ab0ce7ad9

data/lib/diver_down/trace/session.rb

@@ -46,6 +46,10 @@ module DiverDown
           next if TracePoint == tp.defined_class
 
           case tp.event
+          when :b_call
+            call_stack.push
+          when :b_return
+            call_stack.pop
           when :call, :c_call
             # puts "#{tp.method_id} #{tp.path}:#{tp.lineno}"
             if call_stack.ignored?

data/lib/diver_down/trace/tracer.rb

@@ -3,9 +3,18 @@
 module DiverDown
   module Trace
     class Tracer
+      DEFAULT_TRACE_EVENTS = %i[
+        call
+        return
+        c_call
+        c_return
+        b_call
+        b_return
+      ].freeze
+
       # @return [Array<Symbol>]
       def self.trace_events
-        @trace_events || %i[call c_call return c_return]
+        @trace_events || DEFAULT_TRACE_EVENTS
       end
 
       # @param events [Array<Symbol>]

data/lib/diver_down/trace.rb

@@ -11,16 +11,12 @@ module DiverDown
     require 'diver_down/trace/redefine_ruby_methods'
     require 'diver_down/trace/ignored_method_ids'
 
-    @trace_events = %i[
-      call c_call return c_return
-    ]
-
     # Trace only Ruby-implemented methods because tracing C-implemented methods is very slow
     # Override Ruby only with the minimal set of methods needed to trace dependencies.
     #
     # @return [void]
     def self.trace_only_ruby_world!(map = DiverDown::Trace::RedefineRubyMethods::DEFAULT_METHODS)
-      DiverDown::Trace::Tracer.trace_events = %i[call return]
+      DiverDown::Trace::Tracer.trace_events = DiverDown::Trace::Tracer::DEFAULT_TRACE_EVENTS - %i[c_call c_return]
       DiverDown::Trace::RedefineRubyMethods.redefine_c_methods(map)
     end
   end

data/lib/diver_down/version.rb

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

data/lib/diver_down/web/action.rb

@@ -33,12 +33,19 @@ module DiverDown
         end
         # rubocop:enable Style/HashEachMethods
 
+        classified_sources_count = source_names.count { @module_store.classified?(_1) }
+
         json(
           sources: source_names.sort.map do |source_name|
             {
               source_name:,
+              memo: @module_store.get_memo(source_name),
+              modules: @module_store.get_modules(source_name).map do |module_name|
+                { module_name: }
+              end,
             }
-          end
+          end,
+          classified_sources_count:
         )
       end
 
@@ -50,7 +57,7 @@ module DiverDown
         # rubocop:disable Style/HashEachMethods
         @store.each do |_, definition|
           definition.sources.each do |source|
-            modules = @module_store.get(source.source_name)
+            modules = @module_store.get_modules(source.source_name)
             module_set.add(modules) unless modules.empty?
           end
         end
@@ -77,7 +84,7 @@ module DiverDown
         # rubocop:disable Style/HashEachMethods
         @store.each do |_, definition|
           definition.sources.each do |source|
-            source_module_names = @module_store.get(source.source_name)
+            source_module_names = @module_store.get_modules(source.source_name)
 
             next unless source_module_names[0..module_names.size - 1] == module_names
 
@@ -102,6 +109,7 @@ module DiverDown
           sources: source_names.sort.map do |source_name|
             {
               source_name:,
+              memo: @module_store.get_memo(source_name),
             }
           end,
           related_definitions: related_definitions.map do |definition|
@@ -131,7 +139,7 @@ module DiverDown
               definition_group: definition.definition_group,
               title: definition.title,
               sources_count: definition.sources.size,
-              unclassified_sources_count: definition.sources.reject { @module_store.include?(_1.source_name) }.size,
+              unclassified_sources_count: definition.sources.reject { @module_store.classified?(_1.source_name) }.size,
             }
           end,
           pagination: pagination.to_h
@@ -189,7 +197,8 @@ module DiverDown
             sources: definition.sources.map do
               {
                 source_name: _1.source_name,
-                modules: @module_store.get(_1.source_name).map do |module_name|
+                memo: @module_store.get_memo(_1.source_name),
+                modules: @module_store.get_modules(_1.source_name).map do |module_name|
                   { module_name: }
                 end,
               }
@@ -240,11 +249,12 @@ module DiverDown
                          []
                        else
                          source = DiverDown::Definition::Source.combine(*found_sources)
-                         @module_store.get(source.source_name)
+                         @module_store.get_modules(source.source_name)
                        end
 
         json(
           source_name:,
+          memo: @module_store.get_memo(source_name),
           modules: module_names.map do
             { module_name: _1 }
           end,
@@ -281,7 +291,28 @@ module DiverDown
         end
 
         if found_source
-          @module_store.set(source_name, modules)
+          @module_store.set_modules(source_name, modules)
+          @module_store.flush
+
+          json({})
+        else
+          not_found
+        end
+      end
+
+      # POST /api/sources/:source_name/memo.json
+      #
+      # @param source_name [String]
+      # @param memo [String]
+      def set_memo(source_name, memo)
+        found_source = @store.any? do |_, definition|
+          definition.sources.any? do |source|
+            source.source_name == source_name
+          end
+        end
+
+        if found_source
+          @module_store.set_memo(source_name, memo)
           @module_store.flush
 
           json({})

data/lib/diver_down/web/definition_to_dot.rb

@@ -31,7 +31,7 @@ module DiverDown
           private
 
           def source_to_h
-            modules = module_store.get(data.source_name).map do
+            modules = module_store.get_modules(data.source_name).map do
               {
                 module_name: _1,
               }
@@ -41,6 +41,7 @@ module DiverDown
               id:,
               type: 'source',
               source_name: data.source_name,
+              memo: module_store.get_memo(data.source_name),
               modules:,
             }
           end
@@ -185,11 +186,11 @@ 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 = module_store.get(source.source_name)
+          source_modules = module_store.get_modules(source.source_name)
           next if source_modules.empty?
 
           source.dependencies.each do |dependency|
-            dependency_modules = module_store.get(dependency.source_name)
+            dependency_modules = module_store.get_modules(dependency.source_name)
             next if dependency_modules.empty?
 
             dependency_map[source_modules][dependency_modules].push(dependency)
@@ -268,7 +269,7 @@ module DiverDown
 
       def render_sources
         by_modules = definition.sources.group_by do |source|
-          module_store.get(source.source_name)
+          module_store.get_modules(source.source_name)
         end
 
         # Remove duplicated prefix modules
@@ -326,8 +327,8 @@ module DiverDown
       def insert_dependencies(source)
         source.dependencies.each do
           attributes = {}
-          ltail = module_label(*module_store.get(source.source_name))
-          lhead = module_label(*module_store.get(_1.source_name))
+          ltail = module_label(*module_store.get_modules(source.source_name))
+          lhead = module_label(*module_store.get_modules(_1.source_name))
 
           if @compound && (ltail || lhead)
             # Rendering of dependencies between modules is done only once

data/lib/diver_down/web/module_store.rb

@@ -6,6 +6,7 @@ module DiverDown
   class Web
     class ModuleStore
       BLANK_ARRAY = [].freeze
+      BLANK_MEMO = ''
       BLANK_RE = /\A\s*\z/
 
       private_constant(:BLANK_RE)
@@ -17,22 +18,42 @@ module DiverDown
 
       # @param source_name [String]
       # @param module_names [Array<String>]
-      def set(source_name, module_names)
-        @store[source_name] = module_names.dup.reject do
+      def set_modules(source_name, module_names)
+        source = (@store[source_name] ||= {})
+
+        source[:modules] = module_names.dup.reject do
           BLANK_RE.match?(_1)
         end.freeze
       end
 
       # @param source_name [String]
       # @return [Array<Module>]
-      def get(source_name)
-        @store[source_name] || BLANK_ARRAY
+      def get_modules(source_name)
+        return BLANK_ARRAY unless @store.key?(source_name)
+
+        @store[source_name][:modules] || BLANK_ARRAY
+      end
+
+      # @param source_name [String]
+      # @param memo [String]
+      # @return [void]
+      def set_memo(source_name, memo)
+        source = (@store[source_name] ||= {})
+        source[:memo] = memo.strip
+      end
+
+      # @param source_name [String]
+      # @return [String]
+      def get_memo(source_name)
+        return BLANK_MEMO unless @store.key?(source_name)
+
+        @store[source_name][:memo] || BLANK_MEMO
       end
 
       # @param source_name [String]
       # @return [Boolean]
-      def include?(source_name)
-        get(source_name).any?
+      def classified?(source_name)
+        get_modules(source_name).any?
       end
 
       # @return [Hash]

data/lib/diver_down/web.rb

@@ -53,7 +53,7 @@ module DiverDown
       in ['GET', %r{\A/api/modules\.json\z}]
         action.modules
       in ['GET', %r{\A/api/modules/(?<module_names>.+)\.json\z}]
-        module_names = Regexp.last_match[:module_names].split('/')
+        module_names = CGI.unescape(Regexp.last_match[:module_names]).split('/')
         action.module(module_names)
       in ['GET', %r{\A/api/definitions/(?<bit_id>\d+)\.json\z}]
         bit_id = Regexp.last_match[:bit_id].to_i
@@ -68,6 +68,10 @@ module DiverDown
         source = Regexp.last_match[:source]
         modules = request.params['modules'] || []
         action.set_modules(source, modules)
+      in ['POST', %r{\A/api/sources/(?<source>[^/]+)/memo.json\z}]
+        source = Regexp.last_match[:source]
+        memo = request.params['memo'] || ''
+        action.set_memo(source, memo)
       in ['GET', %r{\A/api/pid\.json\z}]
         action.pid
       in ['GET', %r{\A/api/initialization_status\.json\z}]