js_dependency 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61cec11e64fc475a0fb7838b11abf8ab6a1a0d8cfab0929e475eff2fcbef6c0
-  data.tar.gz: 461e0b8503aec5ab25f7b3508ae420af41f72022e39a4e1388a8ae8217858ac1
+  metadata.gz: 8a4e8c31528eb944e9acf98aaf37710cffb27728f6e5c9b7337f85dcf5a3ca13
+  data.tar.gz: fb428fe8a8eca603ebef72f19771d8b8d94235d782ccb301e2de7bb11da0a004
 SHA512:
-  metadata.gz: c2e5483e130e608b4a21741ffccf44db1f812a6096b9f4c5df419cb97029f340c9c8ba770542133d528a213720f924282e9cd72bfd6cc135606904a594c20ed1
-  data.tar.gz: ae67a36c93fdb56ddc5a59c6244d78b7c58f08399d72a725a6d655e945f518c2a14f517c6253dde5cf26516c1cf30a5834ac77cc752e0a67a51301c13d2576e2
+  metadata.gz: 7531ac4e27d5ec92a7efeea5e13051baed6471d7b059c622bd2aa21885a9d09bfcf9767c99bc59812adf1de6b333e60374518a888a7f3ef704d64a0d827ac812
+  data.tar.gz: 818a5e4210088a3f3d240a18d437909842c46619636e0c38cac1ffd3444659812e2b3a13dfe10b98f39bc4561fb8f52594696374159215f8d4bd29214f436cd1

data/.rubocop_todo.yml

@@ -1,22 +1,27 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-08-13 05:13:43 UTC using RuboCop version 1.34.1.
+# on 2022-08-13 15:05:03 UTC using RuboCop version 1.35.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 2
+Lint/UselessAssignment:
+  Exclude:
+    - 'spec/js_dependency_spec.rb'
+
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 29
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 15
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
   Max: 19
@@ -26,19 +31,14 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 15
 
-# Offense count: 1
-Style/MultilineBlockChain:
-  Exclude:
-    - 'lib/js_dependency/mermaid/root.rb'
-
-# Offense count: 8
+# Offense count: 18
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 183
+  Max: 187

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.3.12] - 2022-08-14
+
+- Add rspec test.
+- Fix script tag contents extraction if script tag has `src` like `<script src="">` .
+
 ## [0.3.11] - 2022-08-13
 
 - Add target_paths options in configuration file to use array.

data/Gemfile

@@ -10,6 +10,7 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "codecov", require: false, group: "test"
+gem "debug", ">= 1.0.0"
 gem "rubocop", "~> 1.21"
 gem "simplecov", require: false, group: :test
 gem "yarn"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    js_dependency (0.3.11)
+    js_dependency (0.3.12)
       pathname
       thor
       yaml
@@ -14,8 +14,14 @@ GEM
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
+    debug (1.5.0)
+      irb (>= 1.3.6)
+      reline (>= 0.2.7)
     diff-lcs (1.5.0)
     docile (1.4.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     json (2.6.2)
     parallel (1.22.1)
     parser (3.1.2.1)
@@ -30,6 +36,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -94,6 +102,7 @@ PLATFORMS
 
 DEPENDENCIES
   codecov
+  debug (>= 1.0.0)
   js_dependency!
   rake (~> 13.0)
   rspec (~> 3.0)

data/lib/js_dependency/extractor/extract_script_tag.rb

@@ -15,6 +15,10 @@ module JsDependency
           list << Regexp.last_match(1)
         end
 
+        scripts += str.gsub(%r{<script.+src=".+">(.+)</script>}m).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+
         scripts.uniq.sort.join("\n")
       end
 

data/lib/js_dependency/mermaid/nodes_link.rb

@@ -26,10 +26,32 @@ module JsDependency
         mermaid_str(@child, level)
       end
 
+      # @param [String] src_path
+      # @return [JsDependency::Mermaid::NodesLink]
+      def relative_path_from(src_path)
+        NodesLink.new(
+          relative_parent_path(src_path),
+          relative_child_path(src_path)
+        )
+      end
+
       private
 
+      # @param [String] src_path
+      # @return [String]
+      def relative_parent_path(src_path)
+        parent.exist? ? parent.realpath.relative_path_from(Pathname.new(src_path).realpath.to_s).to_s : parent.to_s
+      end
+
+      # @param [String] src_path
+      # @return [String]
+      def relative_child_path(src_path)
+        child.exist? ? child.realpath.relative_path_from(Pathname.new(src_path).realpath.to_s).to_s : child.to_s
+      end
+
       # @param [Pathname] pathname
       # @param [Integer] level
+      # @return [String]
       def mermaid_str(pathname, level = 0)
         "#{parse(pathname).join("_")}[\"#{parse(pathname, level).join("/")}\"]"
       end

data/lib/js_dependency/mermaid/root.rb

@@ -5,6 +5,7 @@ module JsDependency
   module Mermaid
     class Root
       attr_accessor :orientation
+      attr_reader :list
 
       # @param [String] orientation
       def initialize(orientation = "LR")
@@ -35,18 +36,14 @@ module JsDependency
       # @return [Array<String>]
       def export_nodes(name_level: 1, src_path: nil)
         nodes_links = if src_path
-                        src_pathname = Pathname.new(src_path).realpath
-                        @list.map do |nodes_link|
-                          NodesLink.new(nodes_link.parent.exist? ? nodes_link.parent.relative_path_from(src_pathname.to_s) : nodes_link.parent.to_s,
-                                        nodes_link.child.exist? ? nodes_link.child.relative_path_from(src_pathname.to_s) : nodes_link.child.to_s)
-                        end
+                        @list.map { |nodes_link| nodes_link.relative_path_from(src_path) }
                       else
                         @list
                       end
-        nodes_links.uniq do |link|
-          "#{link.parent}__#{link.child}"
-        end.sort_by { |link| "#{link.parent}__#{link.child}" }.map do |link|
-          "#{link.parent_module_name(name_level)} --> #{link.child_module_name(name_level)}"
+        nodes_links = nodes_links.uniq { |nodes_link| "#{nodes_link.parent}__#{nodes_link.child}" }
+        nodes_links = nodes_links.sort_by { |nodes_link| "#{nodes_link.parent}__#{nodes_link.child}" }
+        nodes_links.map do |nodes_link|
+          "#{nodes_link.parent_module_name(name_level)} --> #{nodes_link.child_module_name(name_level)}"
         end
       end
     end

data/lib/js_dependency/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsDependency
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/lib/js_dependency.rb

@@ -71,7 +71,7 @@ module JsDependency
       nodes += mermaid_root.export_nodes(name_level: name_level, src_path: src_path)
     end
 
-    output = (["flowchart LR"] + nodes.uniq + styles.uniq).join("\n")
+    output = "#{(["flowchart LR"] + nodes.uniq + styles.uniq).join("\n")}\n"
     output_pathname&.write(output)
     output
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js_dependency
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - junara