degem 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ca5d0f8ec44263d688f664f508c95477f5740aba98449817d1aee6728516c6c
-  data.tar.gz: 7dd84507228188120a8ee904e648fedc0116c639f83ba6c57f445a2d5267c69a
+  metadata.gz: 683ca7f47acea423692062935b4ccd5285e5aa764a12883a4f34237af7be248a
+  data.tar.gz: 1a9a8e898b9f4afcd1668b65a0ebc2b7928a84efa6c31e263c237114fa0a2069
 SHA512:
-  metadata.gz: bee7cac14068642532355b2b88e205b1ebadc35ee8e8f6f31fea257079295e0cae4733d0f59cba95ddea9bc0404bf62cfc641790a98d0ae203630633cfdbeb2b
-  data.tar.gz: de01fdf89638fcb8bbbbc267a731e55197442fdaeb26d3b80567811b9f79accfac9a78fe07056b7ea0b993afe025acbbb2a8a80948ee0b78cc51dd89cdd3ed4c
+  metadata.gz: b8e874de8d90b2a2e833b1685938ce9302426c3af5acf8e60bcf26cb0dab994a1520173269a366969018e69fb1abba74f1c4900235a0f7051739073a3962f70d
+  data.tar.gz: 6c19cd8a7e75ef66396e4dc209a14b77765e323804952769cd30a0d9267abb15bf9388ab58ee3f22002320585bb211f80d9d0e86163c7ac0a6b50e992b046cb6

data/lib/degem/find_unused.rb

@@ -11,7 +11,7 @@ module Degem
 
     def call
       rubygems = gemfile.rubygems.reject { _1.name == "degem" }
-      rubygems = reject_railties(rubygems) if rails?
+      rubygems = reject_railties(rubygems) if gemfile.rails?
       reject_used(rubygems)
     end
 
@@ -20,9 +20,7 @@ module Degem
     attr_reader :gemfile_path
 
     def reject_railties(rubygems)
-      rubygems
-        .reject { _1.name == "rails" }
-        .reject { _1.consts.grep(/Rails::Railtie|Rails::Engine/).any? }
+      rubygems.reject(&:rails?).reject(&:railtie?)
     end
 
     def reject_used(rubygems)
@@ -53,9 +51,5 @@ module Degem
     def gemfile
       @gemfile ||= ParseGemfile.new(@gem_specification).call(gemfile_path)
     end
-
-    def rails?
-      @rails ||= gemfile.rails?
-    end
   end
 end

data/lib/degem/gemfile.rb

@@ -15,7 +15,7 @@ module Degem
     end
 
     def rails?
-      @rails ||= rubygems.map(&:name).include?("rails")
+      !!rubygems.find(&:rails?)
     end
 
     private

data/lib/degem/parse_ruby.rb

@@ -22,14 +22,19 @@ module Degem
   class Visitor < Prism::Visitor
     def initialize
       @requires = Set.new
-      @consts = Set.new
+      @paths = Set.new
+      @classes = Set.new
+      @modules = Set.new
       @path = nil
       @stack = []
       super
     end
 
     def requires = @requires.to_a
-    def consts = @consts.to_a
+    def consts = (@paths.union(@classes).union(@modules)).to_a
+    def paths = @paths.to_a
+    def classes = @classes.to_a
+    def modules = @modules.to_a
     attr_writer :path
 
     def visit_call_node(node)
@@ -40,24 +45,26 @@ module Degem
     def visit_module_node(node)
       @stack.push(node)
       super
-      @consts.add(@stack.map(&:name).join("::"))
+      @modules.add(@stack.map(&:name).join("::"))
       @stack.pop
     end
 
     def visit_class_node(node)
       @stack.push(node)
       super
-      @consts.add(@stack.map(&:name).join("::"))
       @stack.pop
+      *modules, klass = node.constant_path.full_name_parts rescue [[], node.name]
+      @modules.add((@stack.map(&:name) + modules).join("::")) if modules.any?
+      @classes.add((@stack.map(&:name) + modules + [klass]).join("::"))
     end
 
     def visit_constant_path_node(node)
-      consts_from(node).each { @consts.add(_1) }
+      paths_from(node).each { @paths.add(_1) }
       super
     end
 
     def visit_constant_read_node(node)
-      @consts.add(node.name.to_s) unless @stack.find { _1.constant_path == node }
+      @paths.add(node.name.to_s) unless @stack.find { _1.constant_path == node }
       super
     end
 
@@ -83,7 +90,7 @@ module Degem
       acc
     end
 
-    def consts_from(node)
+    def paths_from(node)
       from_ancestor_to(node)
         .filter_map { _1.respond_to?(:name) ? _1.name.to_s : nil }
         .tap { _1.singleton_class.include(Scan) }

data/lib/degem/rubygem.rb

@@ -9,8 +9,12 @@ module Degem
       super(rubygem)
     end
 
-    def consts
-      parsed.consts
+    def rails?
+      name == "rails"
+    end
+
+    def railtie?
+      parsed.consts.grep(/Rails::Railtie|Rails::Engine/).any?
     end
 
     def own_consts
@@ -25,7 +29,9 @@ module Degem
         *name.split("-").each_cons(2).to_a.map(&:join)
       ]
 
-      consts.filter { |const| variations.any? { |variation| const.downcase == variation.downcase } }
+      parsed.classes + (parsed.modules + parsed.paths).filter do |const|
+        variations.any? { |variation| const.downcase == variation.downcase }
+      end
     end
 
     private
@@ -34,7 +40,7 @@ module Degem
       @parsed ||=
         begin
           gem_path = @gem_specification.find_by_name(name).full_gem_path
-          paths = Dir.glob(File.join(gem_path, "**/*.rb"))
+          paths = Dir.glob(File.join(gem_path, "**", "lib", "**/*.rb"))
           ParseRuby.new.call(paths)
         end
     end

data/lib/degem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Degem
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: degem
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - 3v0k4
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism