diver_down 0.0.1.alpha17 → 0.0.1.alpha18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2f7ed8cc7afd42927d7456860430b3349c9a597925bfbf50a8510da47051dc
-  data.tar.gz: 6f204f7954c88becbedf9a04983a4be8b195ac4ef45d2e7dc8ec50f5d80094de
+  metadata.gz: 8bf67c52d7bafe08d7dfd22e48f2fedcec23c2d5410da3968d6e697edeaeb68b
+  data.tar.gz: 7319431059c715b0d83cf7b577522d47115ff1fe7d77ac04faa543355468f024
 SHA512:
-  metadata.gz: 7653069f6d81577ce96f4b4488d194e625562056f98dbf366b87700fa50eb1444ae0eea53ef6307c9879a326e0962c6bb1f654bdf1220d9983166422a092a0a0
-  data.tar.gz: 6449971ce4909626c376a1f36efc233b3995f05f6d3bed73dab792791fc645be56e02425578b3bd3e7d29c66b1b4b702609af7de46ada16bcea6a262e27e0cc3
+  metadata.gz: 659ab2212ababae04182c7cdf23d56dfb79877aeab7ae4ff419c417f56602fc6c446bdf94ce338944abf28b6f01b720ba3cb595bb7006d9f6cf3479ceb785869
+  data.tar.gz: 71118322b5bb69d6014f72f545957bd401de06ef5f695fec7273a0465f34fce3cdfb699e4130d263c4fc1031475549f1b137f53ceeef894f2840212669308401

data/lib/diver_down/version.rb

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

data/lib/diver_down/web/action.rb

@@ -124,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,
@@ -144,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,
             }
@@ -191,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(

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

@@ -54,6 +54,7 @@ module DiverDown
         loaded[:sources]&.each do |source_name, source_hash|
           source(source_name).memo = source_hash[:memo] if source_hash[:memo]
           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

@@ -88,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}]