deps_grapher 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31d04a84f91bd795f6c19d70a9de853963cd02d298cadb8cceaf68fae288e10e
-  data.tar.gz: 284e8006b5cd05e76e8446ca6732048267ee7e234d13d3320589c7e2bb79b38c
+  metadata.gz: 48a2d2dd4c46e98e2283e13a37b9f692691ebab1cd8a95eba9ad4a590471c2be
+  data.tar.gz: 9d783c9c65c71ebbd7c49f88f09b30e8e107b9690c5c82bd01160d800cf3a700
 SHA512:
-  metadata.gz: 261f74611a3ac886afd45c7ec1487dcd4db6bb83ede88f6aadf70b1f338725b989bf546b6f0476cffb35251791ebc426c57ab5e887e2b129a82fe8511b625566
-  data.tar.gz: 752589ecdbc90718919f0fcdeefe18e75aa0cced56532aa7ed01f2bf220e4cfc26f0f79d0b3051d6d4016f9f5893a049518b3fe955eb77157c4acbffaa22aa7f
+  metadata.gz: 16aab351cbb8a09355b69c6cd5b010011a7f06b1f0327867f75042d302a704f94cb0ba0fffd9ed34871eadcf0ba41bcb62a6620752c7ae3614214e9f0cdb1a0e
+  data.tar.gz: 4cb34be594f84381ee1882ad0d7cf611a0f200ed9089d67ae6b242fab65e9d3da2a9f5df0db3131bbc41095d5e45512477eee320e93da6e41d2cb62ae7eb8bda

data/CHANGELOG.md

@@ -1,3 +1,7 @@
-## [1.0.0] - 2024-03-22
+## [1.0.1] - 2024-03-26
+- Fixed a cache issue
+- Fixed an issue that `__FILE__` or `__dir__` is nil in the configuration file
+
+## [1.0.0] - 2024-03-25
 
 - Initial release

data/lib/deps_grapher/configuration.rb

@@ -12,6 +12,7 @@ module DepsGrapher
     class_attribute :target_path # target class name on graph
     class_attribute :clean, default: false
     class_attribute :logger
+    class_attribute :cache_key
     class_attribute :cache_dir, default: File.expand_path(File.join("..", "..", "tmp", "deps_grapher", "cache"), __dir__)
     class_attribute :cache_ttl, default: 60 * 5 # 5 minutes
     class_attribute :output_dir, default: File.expand_path(File.join("..", "..", "tmp", "deps_grapher", "graph"), __dir__)
@@ -75,11 +76,9 @@ module DepsGrapher
 
       content = File.read file
 
-      cache_key = Digest::MD5.hexdigest(content)
+      self.cache_key = Digest::MD5.hexdigest content
 
-      SourceCache::Registry.with_cache cache_key do
-        DSL.new(self).instance_eval content
-      end
+      DSL.new(self).instance_eval content, file
 
       return unless dump
 

data/lib/deps_grapher/input.rb

@@ -9,32 +9,34 @@ module DepsGrapher
     def files
       FileUtils.rm_rf File.dirname(config.cache_dir) if config.clean
 
-      set_layers_visibility!
-      extract_files_from_layers
-    end
+      layer_visibilities = config.visualizer_options[:layers]
 
-    private
+      files = []
 
-    attr_reader :config
+      SourceCache::Registry.with_cache config.cache_key do |restored|
+        config.layers.each_value do |layer|
+          name = layer.name
+          source = layer.source
 
-    def set_layers_visibility!
-      layer_visibility = config.visualizer_options[:layers]
+          layer.visible = layer_visibilities.include? name
 
-      config.layers.each_value do |layer|
-        layer.visible = layer_visibility.include? layer.name
-      end
-    end
+          SourceCache.register! name, source unless restored
 
-    def extract_files_from_layers
-      config.layers.values.select(&:visible).each_with_object([]) do |layer, files|
-        source = layer.source
+          next unless layer.visible
 
-        source.files.each do |file|
-          next if file == config.path
+          source.files.each do |file|
+            next if file == config.path
 
-          files << file
+            files << file
+          end
         end
       end
+
+      files
     end
+
+    private
+
+    attr_reader :config
   end
 end

data/lib/deps_grapher/layer.rb

@@ -36,8 +36,6 @@ module DepsGrapher
       source.files.each do |file|
         Registry.register file, self
       end
-
-      SourceCache.register! name, source
     end
 
     def source(&block)

data/lib/deps_grapher/source_cache/registry.rb

@@ -26,35 +26,30 @@ module DepsGrapher
         end
 
         def with_cache(key)
-          restore_cache! key
-          yield
-          persist_cache! key
-        end
-
-        def persist_cache!(key)
           cache_file = DepsGrapher.cache_file key
-          cache_file.write @registry
+          restore_cache! cache_file
+          yield @cache_restoration
+          persist_cache! cache_file
         end
 
-        def restore_cache!(key)
-          cache_file = DepsGrapher.cache_file key
+        private
+
+        def restore_cache!(cache_file)
           loaded = cache_file.read
 
           unless loaded
-            @restored_cache = false
+            @cache_restoration = false
             return
           end
 
           @registry = loaded
-          @restored_cache = true
+          @cache_restoration = true
         end
 
-        def restored_cache?
-          @restored_cache
+        def persist_cache!(cache_file)
+          cache_file.write @registry
         end
 
-        private
-
         def registry
           @registry ||= {}
         end

data/lib/deps_grapher/source_cache.rb

@@ -21,8 +21,6 @@ module DepsGrapher
     end
 
     def register!
-      return if Registry.restored_cache?
-
       class_name_extractor = ClassNameExtractor.new do |class_name, location|
         @cache_by_const_name[class_name] = location
         @cache_by_location[location] ||= class_name

data/lib/deps_grapher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DepsGrapher
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deps_grapher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - jk-es335
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport