loose_erbs 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea8ec541c2125968aefd0a01e59febda8749e70a9a14b0ad4357167bd244fa02
-  data.tar.gz: 2c61f02374508721143bd510f840d2a87f3a928ec5b83df04e5eec54a005e228
+  metadata.gz: 44d3446a83d21a94d64e15ad5fc6cd41541d1593c38ea6ab9ef4e36ac52e1745
+  data.tar.gz: 8529f0d1f25cf62c318b13314fc2fa2ef2bbcf2516ec87f45102c84277426b20
 SHA512:
-  metadata.gz: 7a77cde39405160382448bc969e1ad9e8f9f1cbfd9e77d572f0e3f982d14ac3d860d6bd6f4b326b6ae1074ba9d09a91b053f632d2208c2f8109b08ef7e98958e
-  data.tar.gz: 9987b543cfcf9ea1c22e72ae59731753965da6213994762d4e8c311c139a3ce02d5fd4281c8de55e31e7df7062992e8e108d9cce45d8d938015605f71c0ba673
+  metadata.gz: 632d54cf79d18b1bf0a8ed8af9b24c2f19a0f5cfa5f545204a1d3c204596daa5724271684da3cf758dddaaf8588e5b27ed1c4f49635bebcb66d201f02f4d9683
+  data.tar.gz: 7281ceae45fb7f0d73a413d15592c9a9ec032af02b373e77497f7b5f87be450946f7e3825f20e572eadf362c374f02993b04a21d43cda645d5dbb78975e80f97

data/README.md

@@ -15,7 +15,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ## Usage
 
 ```shell
-$ loose_erbs --all
+$ loose_erbs --all --trees
 /home/hartley/test/dm/app/views/layouts/application.html.erb
 
 /home/hartley/test/dm/app/views/posts/edit.html.erb
@@ -29,6 +29,8 @@ $ loose_erbs --all
 
 /home/hartley/test/dm/app/views/posts/show.html.erb
 └── /home/hartley/test/dm/app/views/posts/_post.html.erb
+
+/home/hartley/test/dm/app/views/pwa/manifest.json.erb
 ```
 
 ## Development

data/exe/loose_erbs

@@ -3,4 +3,4 @@
 
 require "loose_erbs"
 
-LooseErbs::Cli.new(ARGV).run
+exit(LooseErbs::Cli.new(ARGV).run)

data/lib/loose_erbs/registry.rb

@@ -36,11 +36,18 @@ module LooseErbs
           return partial_path if @map.key? partial_path
         end
       else
-        # posts/post
         @view_paths.each do |view_path|
+          # DependencyTracker removes the _ from partial pathishs
+          # posts/post
           partial_path = Pathname.new(view_path).join(pathish).join("../_#{wrapper.basename}.html.erb").to_s
 
           return partial_path if @map.key? partial_path
+
+          # Using the raw RenderParser returns a pathish with the partial _
+          # components/_badge
+          partial_path = Pathname.new(view_path).join(pathish).join("../#{wrapper.basename}.html.erb").to_s
+
+          return partial_path if @map.key? partial_path
         end
       end
 

data/lib/loose_erbs/scanner.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module LooseErbs
+  class Scanner
+    singleton_class.attr_accessor :parser_class
+
+    self.parser_class = if defined?(ActionView::RenderParser::Default)
+      ActionView::RenderParser::Default
+    else
+      ActionView::RenderParser
+    end
+
+    def initialize(app = Rails.application)
+      @app = app
+    end
+
+    def renders
+      parsed_renders = []
+
+      each_file_in(helper_paths) do |helper_path|
+        parsed_renders.concat parsed_renders_in(helper_path)
+      end.uniq
+
+      parsed_renders
+    end
+
+    private
+      attr_reader :app
+
+      def helper_paths
+        app.paths["app/helpers"]
+      end
+
+      def each_file_in(paths, &block)
+        paths.each do |root_path|
+          Dir["#{Rails.root.join(root_path)}/**/*.rb"].each(&block)
+        end
+      end
+
+      def parsed_renders_in(file_path)
+        parser = self.class.parser_class.new(file_path, File.read(file_path))
+        parser.render_calls
+      end
+  end
+end

data/lib/loose_erbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LooseErbs
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/loose_erbs.rb

@@ -15,8 +15,7 @@ module LooseErbs
     ActionView::DependencyTracker::RipperTracker
   end
 
-  NoParentFilter = ->(node) { node.parents.empty? }
-  PartialFilter = ->(node) { Pathname.new(node.identifier).basename.to_s.start_with?("_") }
+  LooseFilter = ->(node) { node.loose? }
 
   RegexpIncludeFactory = ->(regexp) {
     ->(node) { node.identifier.match?(regexp) }
@@ -25,6 +24,18 @@ module LooseErbs
     ->(node) { !node.identifier.match?(regexp) }
   }
 
+  class FilterChain
+    def initialize(filters)
+      @filters = filters
+    end
+
+    def filter(elements)
+      @filters.reduce(elements) do |filtered_elements, filter|
+        filtered_elements.filter(&filter)
+      end
+    end
+  end
+
   class Cli
     def initialize(argv)
       @options = {}
@@ -35,23 +46,54 @@ module LooseErbs
     def run
       require File.expand_path("./config/environment")
 
-      Registry.new(ActionController::Base.view_paths).to_graph.print(filters)
+      nodes = registry.to_graph
+
+      unless options[:all]
+        used_erbs = scanner.renders.map { registry.lookup(_1) }.to_set
+
+        visitor = Graph::LooseVisitor.new
+        nodes.select { |node|
+          # assume regular templates are good until controller parsing is added
+          used_erbs.include?(node.identifier) || !node.partial?
+        }.each { _1.accept(visitor) }
+      end
+
+      nodes = FilterChain.new(filters).filter(nodes) unless filters.empty?
+
+      if options[:trees]
+        nodes.each(&:print_tree)
+
+        true
+      else
+        puts "\nLoose ERBs:" unless nodes.empty?
+        nodes.each(&:print)
+
+        nodes.empty?
+      end
     end
 
     private
       attr_reader :options
 
+      def registry
+        Registry.new(ActionController::Base.view_paths)
+      end
+
+      def scanner
+        Scanner.new
+      end
+
       def filters
         [
-          NoParentFilter,
+          LooseFilter,
           (RegexpIncludeFactory.call(options[:include]) if options[:include]),
           (RegexpExcludeFactory.call(options[:exclude]) if options[:exclude]),
-          (PartialFilter unless options[:all]),
         ].compact
       end
 
       def option_parser
         OptionParser.new do |parser|
+          parser.on("--trees", "Print files and their dependencies")
           parser.on("--all", "Print all files with no parents (defaults to only partials)")
           parser.on("--include [REGEXP]", Regexp, "Only print files that match [REGEXP]")
           parser.on("--exclude [REGEXP]", Regexp, "Do not print files that match [REGEXP]")
@@ -66,7 +108,7 @@ module LooseErbs
         @seen_nodes = Set.new
       end
 
-      def print
+      def print_tree
         while !@node_stack.empty?
           node, depth = @node_stack.pop
 
@@ -86,6 +128,16 @@ module LooseErbs
       end
     end
 
+    class LooseVisitor
+      def visit(node)
+        return unless node.loose?
+
+        node.not_loose!
+
+        node.children.each { visit(_1) }
+      end
+    end
+
     class Node
       attr_reader :children, :identifier, :parents
 
@@ -93,24 +145,45 @@ module LooseErbs
         @identifier = identifier
         @children = []
         @parents = []
+        @loose = true
+      end
+
+      def accept(visitor)
+        visitor.visit(self)
+      end
+
+      def loose?
+        @loose
+      end
+
+      def not_loose!
+        @loose = false
+      end
+
+      def partial?
+        Pathname.new(identifier).basename.to_s.start_with?("_")
+      end
+
+      def print
+        puts identifier
+      end
+
+      def print_tree
+        Printer.new(self).print_tree
       end
     end
 
+    include Enumerable
+
     def initialize(keys, registry)
       @node_map = keys.to_h { [_1, Node.new(_1)] }
       @registry = registry
 
-      nodes.each { process(_1) }
+      each { process(_1) }
     end
 
-    def print(filters)
-      nodes_to_print = nodes
-
-      filters.each do |filter|
-        nodes_to_print.filter!(&filter)
-      end
-
-      nodes_to_print.each { Printer.new(_1).print }
+    def each(&block)
+      nodes.each(&block)
     end
 
     private
@@ -141,3 +214,4 @@ module LooseErbs
 end
 
 require_relative "loose_erbs/registry"
+require_relative "loose_erbs/scanner"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loose_erbs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Hartley McGuire
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-01 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -39,6 +39,7 @@ files:
 - exe/loose_erbs
 - lib/loose_erbs.rb
 - lib/loose_erbs/registry.rb
+- lib/loose_erbs/scanner.rb
 - lib/loose_erbs/version.rb
 homepage: https://github.com/skipkayhil/loose_erbs
 licenses: