diver_down 0.0.1.alpha16 → 0.0.1.alpha18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a43fc4236cb489ca44a9105db9ad3750f53a2929a9153db564e20d3f4e2fee
-  data.tar.gz: 589ab5cce7bfdee343a4c3d967a7aece57ff1d389d3700af222579c450a13a42
+  metadata.gz: 8bf67c52d7bafe08d7dfd22e48f2fedcec23c2d5410da3968d6e697edeaeb68b
+  data.tar.gz: 7319431059c715b0d83cf7b577522d47115ff1fe7d77ac04faa543355468f024
 SHA512:
-  metadata.gz: eda67006560b775d12e582afa991b789d727f2d947ad82cab470408690ab682133c34d433309467ae67637472de1cc82f246e6618c4cbc36f2a5e7f8d6bb555f
-  data.tar.gz: e116e4edbcd125c4a56e8641cbda5b6427ce4c6beaa86935a1339fabb9ff3db14d6bd9319538cf2643d270d1b8ee6019b74bc70089e14820511f05c7578f2079
+  metadata.gz: 659ab2212ababae04182c7cdf23d56dfb79877aeab7ae4ff419c417f56602fc6c446bdf94ce338944abf28b6f01b720ba3cb595bb7006d9f6cf3479ceb785869
+  data.tar.gz: 71118322b5bb69d6014f72f545957bd401de06ef5f695fec7273a0465f34fce3cdfb699e4130d263c4fc1031475549f1b137f53ceeef894f2840212669308401

data/exe/diver_down_web

@@ -6,6 +6,7 @@ require 'rack/contrib'
 require 'diver_down'
 require 'diver_down-web'
 require 'optparse'
+require 'tempfile'
 
 options = {}
 option_parser = OptionParser.new do |opts|

data/lib/diver_down/trace/ignored_method_ids.rb

@@ -3,34 +3,41 @@
 module DiverDown
   module Trace
     class IgnoredMethodIds
+      VALID_VALUE = %i[
+        single
+        all
+      ].freeze
+
       def initialize(ignored_methods)
         # Ignore all methods in the module
-        # Hash{ Module => Boolean }
+        # Hash{ Module => Symbol }
         @ignored_modules = {}
 
         # Ignore all methods in the class
-        # Hash{ Module => Hash{ Symbol => Boolean } }
+        # Hash{ Module => Hash{ Symbol => Symbol } }
         @ignored_class_method_id = Hash.new { |h, k| h[k] = {} }
 
         # Ignore all methods in the instance
-        # Hash{ Module => Hash{ Symbol => Boolean } }
+        # Hash{ Module => Hash{ Symbol => Symbol } }
         @ignored_instance_method_id = Hash.new { |h, k| h[k] = {} }
 
-        ignored_methods.each do |ignored_method|
+        ignored_methods.each do |ignored_method, value|
+          raise ArgumentError, "Invalid value: #{value}. valid values are #{VALID_VALUE}" unless VALID_VALUE.include?(value)
+
           if ignored_method.include?('.')
             # instance method
             class_name, method_id = ignored_method.split('.')
             mod = DiverDown::Helper.constantize(class_name)
-            @ignored_class_method_id[mod][method_id.to_sym] = true
+            @ignored_class_method_id[mod][method_id.to_sym] = value
           elsif ignored_method.include?('#')
             # class method
             class_name, method_id = ignored_method.split('#')
             mod = DiverDown::Helper.constantize(class_name)
-            @ignored_instance_method_id[mod][method_id.to_sym] = true
+            @ignored_instance_method_id[mod][method_id.to_sym] = value
           else
             # module
             mod = DiverDown::Helper.constantize(ignored_method)
-            @ignored_modules[mod] = true
+            @ignored_modules[mod] = value
           end
         end
       end
@@ -38,14 +45,14 @@ module DiverDown
       # @param mod [Module]
       # @param is_class [Boolean] class is true, instance is false
       # @param method_id [Symbol]
-      # @return [Boolean]
-      def ignored?(mod, is_class, method_id)
-        ignored_module?(mod) || ignored_method?(mod, is_class, method_id)
+      # @return [Symbol, false] VALID_VALUE
+      def ignored(mod, is_class, method_id)
+        ignored_module(mod) || ignored_method(mod, is_class, method_id)
       end
 
       private
 
-      def ignored_module?(mod)
+      def ignored_module(mod)
         unless @ignored_modules.key?(mod)
           dig_superclass(mod)
         end
@@ -53,7 +60,7 @@ module DiverDown
         @ignored_modules.fetch(mod)
       end
 
-      def ignored_method?(mod, is_class, method_id)
+      def ignored_method(mod, is_class, method_id)
         store = if is_class
                   # class methods
                   @ignored_class_method_id
@@ -96,10 +103,8 @@ module DiverDown
         end
 
         # Convert nil to boolean
-        ignored = !!ignored
-
         stack.each do
-          @ignored_modules[_1] = ignored
+          @ignored_modules[_1] = ignored || false
         end
       end
 
@@ -125,10 +130,8 @@ module DiverDown
         end
 
         # Convert nil to boolean
-        ignored = !!ignored
-
         stack.each do
-          store[_1][method_id] = ignored
+          store[_1][method_id] = ignored || false
         end
       end
     end

data/lib/diver_down/trace/session.rb

@@ -38,13 +38,15 @@ module DiverDown
       private
 
       def build_trace_point
-        call_stack = DiverDown::Trace::CallStack.new
+        call_stacks = {}
 
         TracePoint.new(*DiverDown::Trace::Tracer.trace_events) do |tp|
           # Skip the trace of the library itself
           next if tp.path&.start_with?(DiverDown::LIB_DIR)
           next if TracePoint == tp.defined_class
 
+          call_stack = call_stacks[Thread.current] ||= DiverDown::Trace::CallStack.new
+
           case tp.event
           when :b_call
             call_stack.push
@@ -64,9 +66,12 @@ module DiverDown
               next
             end
 
-            if !@ignored_method_ids.nil? && @ignored_method_ids.ignored?(mod, DiverDown::Helper.module?(tp.self), tp.method_id)
-              # If this method is ignored, the call stack is ignored until the method returns.
-              call_stack.push(ignored: true)
+            ignored = @ignored_method_ids.ignored(mod, DiverDown::Helper.module?(tp.self), tp.method_id) if @ignored_method_ids
+
+            if ignored
+              # If ignored is :all, the call stack is ignored until the method returns.
+              # If ignored is :single, the call stack is ignored only current call.
+              call_stack.push(ignored: ignored == :all)
               next
             end
 

data/lib/diver_down/trace/tracer.rb

@@ -24,7 +24,7 @@ module DiverDown
 
       # @param module_set [DiverDown::Trace::ModuleSet, Array<Module, String>]
       # @param caller_paths [Array<String>, nil] if nil, trace all files
-      # @param ignored_method_ids [Array<String>]
+      # @param ignored_method_ids [Hash{ String => Symbol }, nil]
       # @param filter_method_id_path [#call, nil] filter method_id.path
       # @param module_set [DiverDown::Trace::ModuleSet, nil] for optimization
       def initialize(module_set: {}, caller_paths: nil, ignored_method_ids: nil, filter_method_id_path: nil)

data/lib/diver_down/version.rb

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

data/lib/diver_down/web/action.rb

@@ -21,9 +21,8 @@ module DiverDown
       def initialize(store:, metadata:)
         @store = store
         @metadata = metadata
-        @source_alias_resolver = DiverDown::Web::SourceAliasResolver.new(@metadata.source_alias)
-        @module_dependency_map = nil
-        @module_dependency_map_cache_id = nil
+
+        reload
       end
 
       # GET /api/source_aliases.json
@@ -125,6 +124,7 @@ module DiverDown
                 {
                   source_name: dependency.source_name,
                   module: @metadata.source(dependency.source_name).module,
+                  dependency_type: @metadata.source(source.source_name).dependency_type(dependency.source_name),
                   method_ids: dependency.method_ids.sort.map do |method_id|
                     {
                       context: method_id.context,
@@ -145,13 +145,7 @@ module DiverDown
                 {
                   source_name: dependency.source_name,
                   module: @metadata.source(dependency.source_name).module,
-                  method_ids: dependency.method_ids.sort.map do |method_id|
-                    {
-                      context: method_id.context,
-                      name: method_id.name,
-                      paths: method_id.paths.sort,
-                    }
-                  end,
+                  dependency_type: @metadata.source(source.source_name).dependency_type(dependency.source_name),
                 }
               end,
             }
@@ -192,6 +186,44 @@ module DiverDown
         )
       end
 
+      # POST /api/modules/:from_module/dependency_types/:to_module.json
+      def update_module_dependency_type(from_module, to_module, dependency_type)
+        module_dependency_map = fetch_module_dependency_map
+
+        unless module_dependency_map.key?(from_module) && module_dependency_map.key?(to_module)
+          return not_found
+        end
+
+        module_dependency = module_dependency_map.fetch(from_module)
+        module_dependency.sources.each do |source|
+          source_metadata = @metadata.source(source.source_name)
+
+          source.dependencies.each do |dependency|
+            next unless @metadata.source(dependency.source_name).module == to_module
+
+            source_metadata.update_dependency_type(dependency.source_name, dependency_type)
+          end
+        end
+
+        @metadata.flush
+
+        json({})
+      end
+
+      # POST /api/sources/:from_source_name/dependency_types/:to_source_name.json
+      def update_source_dependency_type(from_source_name, to_source_name, dependency_type)
+        source = @metadata.source(from_source_name)
+
+        begin
+          source.update_dependency_type(to_source_name, dependency_type)
+        rescue ArgumentError => e
+          return json_error(e.message)
+        end
+
+        @metadata.flush
+        json({})
+      end
+
       # GET /api/pid.json
       def pid
         json(
@@ -327,6 +359,7 @@ module DiverDown
         if found_source
           @metadata.source(source_name).module = modulee
           @metadata.flush
+          reload
 
           json({})
         else
@@ -348,6 +381,7 @@ module DiverDown
         if found_source
           @metadata.source(source_name).memo = memo
           @metadata.flush
+          reload
 
           json({})
         else
@@ -355,6 +389,13 @@ module DiverDown
         end
       end
 
+      # @return [Array[Integer, Hash, Array]]
+      def reload_cache
+        @metadata.reload
+        reload
+        json({})
+      end
+
       # @return [Array[Integer, Hash, Array]]
       def not_found
         [404, { 'content-type' => 'text/plain' }, ['not found']]
@@ -445,6 +486,12 @@ module DiverDown
 
         @module_dependency_map
       end
+
+      def reload
+        @source_alias_resolver = DiverDown::Web::SourceAliasResolver.new(@metadata.source_alias)
+        @module_dependency_map = nil
+        @module_dependency_map_cache_id = nil
+      end
     end
   end
 end

data/lib/diver_down/web/definition_module_dependencies.rb

@@ -64,11 +64,9 @@ module DiverDown
             end
 
             # Add source reverse dependencies
-            definition_source = dependency_module_dependency.source_reverse_dependency_map[dependency.source_name] ||= DiverDown::Definition::Source.new(source_name: dependency.source_name)
-            definition_dependency = definition_source.find_or_build_dependency(source.source_name)
-            dependency.method_ids.each do |method_id|
-              definition_dependency.find_or_build_method_id(name: method_id.name, context: method_id.context).add_path(*method_id.paths)
-            end
+            # NOTE: Reverse dependencies's method_ids are not added because they are difficult to understand and not used.
+            definition_source = dependency_module_dependency.source_reverse_dependency_map[source.source_name] ||= DiverDown::Definition::Source.new(source_name: source.source_name)
+            definition_source.find_or_build_dependency(dependency.source_name)
           end
         end
 

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

@@ -9,13 +9,16 @@ module DiverDown
         private_constant(:BLANK_MEMO)
         private_constant(:BLANK_RE)
 
-        attr_reader :memo, :module
+        DEPENDENCY_TYPES = %w[valid invalid todo ignore].freeze
+
+        attr_reader :memo, :module, :dependency_types
 
         # @param source_name [String]
         # NOTE: `module` is a reserved keyword in Ruby
-        def initialize(memo: BLANK_MEMO, modulee: nil)
+        def initialize(memo: BLANK_MEMO, modulee: nil, dependency_types: {})
           @memo = memo
           @module = modulee
+          @dependency_types = dependency_types
         end
 
         # @param memo [String]
@@ -34,6 +37,35 @@ module DiverDown
                     end
         end
 
+        # @param to_source [String]
+        # @return [String, nil]
+        def dependency_type(to_source)
+          @dependency_types[to_source]
+        end
+
+        # @param dependency_types [Hash]
+        # @return [void]
+        def dependency_types=(dependency_types)
+          @dependency_types.clear
+
+          dependency_types.each do |to_source, dependency_type|
+            update_dependency_type(to_source, dependency_type)
+          end
+        end
+
+        # @param to_source [String]
+        # @param dependency_type [String]
+        # @return [void]
+        def update_dependency_type(to_source, dependency_type)
+          if dependency_type.to_s.empty?
+            @dependency_types.delete(to_source)
+          else
+            raise ArgumentError, "invalid dependency_type: #{dependency_type}" unless DEPENDENCY_TYPES.include?(dependency_type)
+
+            @dependency_types[to_source] = dependency_type
+          end
+        end
+
         # @return [Boolean]
         def module?
           !@module.nil?
@@ -45,15 +77,10 @@ module DiverDown
 
           hash[:memo] = memo unless memo == BLANK_MEMO
           hash[:module] = @module unless @module.nil?
+          hash[:dependency_types] = @dependency_types unless @dependency_types.empty?
 
           hash
         end
-
-        private
-
-        def by_source_name(source_name)
-          @store[source_name] ||= {}
-        end
       end
     end
   end

data/lib/diver_down/web/metadata.rb

@@ -6,12 +6,12 @@ module DiverDown
       require 'diver_down/web/metadata/source_metadata'
       require 'diver_down/web/metadata/source_alias'
 
-      attr_reader :source_alias
+      attr_reader :path, :source_alias
 
       # @param path [String]
       def initialize(path)
         @path = path
-        load
+        reload
       end
 
       # @param source_name [String]
@@ -41,25 +41,20 @@ module DiverDown
         File.write(@path, to_h.to_yaml)
       end
 
-      private
-
-      def load
+      # Reload metadata from file
+      # @return [void]
+      def reload
         @source_map = Hash.new { |h, source_name| h[source_name] = DiverDown::Web::Metadata::SourceMetadata.new }
         @source_alias = DiverDown::Web::Metadata::SourceAlias.new
 
-        loaded = YAML.load_file(@path)
+        loaded = YAML.load_file(@path) if File.exist?(@path)
 
         return if loaded.nil?
 
-        # NOTE: This is for backward compatibility. It will be removed in the future.
-        (loaded[:sources] || loaded || []).each do |source_name, source_hash|
+        loaded[:sources]&.each do |source_name, source_hash|
           source(source_name).memo = source_hash[:memo] if source_hash[:memo]
-
-          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
+          source(source_name).module = source_hash[:module] if source_hash[:module]
+          source(source_name).dependency_types = source_hash[:dependency_types] if source_hash[:dependency_types]
         end
 
         loaded[:source_alias]&.each do |alias_name, source_names|

data/lib/diver_down/web.rb

@@ -78,6 +78,8 @@ module DiverDown
       in ['GET', %r{\A/api/sources/(?<source>[^/]+)\.json\z}]
         source = Regexp.last_match[:source]
         @action.source(source)
+      in ['GET', %r{\A/api/reload\.json\z}]
+        @action.reload_cache
       in ['POST', %r{\A/api/sources/(?<source>[^/]+)/module.json\z}]
         source = Regexp.last_match[:source]
         modulee = request.params['module'] || ''
@@ -86,6 +88,18 @@ module DiverDown
         source = Regexp.last_match[:source]
         memo = request.params['memo'] || ''
         @action.set_memo(source, memo)
+      in ['POST', %r{\A/api/modules/(?<from_module>[^/]+)/dependency_types/(?<to_module>[^/]+)\.json\z}]
+        from_module = CGI.unescape(Regexp.last_match[:from_module])
+        to_module = CGI.unescape(Regexp.last_match[:to_module])
+        dependency_type = request.params['dependency_type']
+
+        @action.update_module_dependency_type(from_module, to_module, dependency_type)
+      in ['POST', %r{\A/api/sources/(?<from_source>[^/]+)/dependency_types/(?<to_source>[^/]+)\.json\z}]
+        from_source = Regexp.last_match[:from_source]
+        to_source = Regexp.last_match[:to_source]
+        dependency_type = request.params['dependency_type']
+
+        @action.update_source_dependency_type(from_source, to_source, dependency_type)
       in ['GET', %r{\A/api/pid\.json\z}]
         @action.pid
       in ['GET', %r{\A/api/initialization_status\.json\z}]