mj 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1315dc125dadf7c6af6dfdaba6b81c52afd1aea322676a050d01ff6b3af6cd12
-  data.tar.gz: 975b749f8c67d2e9380c6b4df17b457e9e88f04ebbb3e74539b27b9816cb17c2
+  metadata.gz: ff905fc5978244944098033bf6ecfb671f1130c336e2f77c19beefab3c927dfe
+  data.tar.gz: 0560a8a156cb45bc2e8c459b021e721118e304abf55e92d25039cd9c9277ee24
 SHA512:
-  metadata.gz: 7dc77ebcfe8f3b8b02972b027cba9a820f3efade191fd925ed53d25ad3500eba4ce17054028fe828575a23b12696205cb8933dd2a26bb2d81648d2dd7355302c
-  data.tar.gz: 63b69114fa66a7ccfdbe81f3d4e10a3d8bf873adef015a76e7f7e460e2df1ab630f949f14b6d5e7ff0bd031f43192f2e813fa06878cc547e12f8b44705554af6
+  metadata.gz: b20134878fb83b50a0d9dda518dfc81500af893f522616605835e1ee2f6d78bbe824a9302d07131926d799bf308ee463efbfa9a0b4d37dce793fd2ab614c91d8
+  data.tar.gz: 30f12048aa54fa5070895859a99f0ffdd66bf35962d82e98952fc889b8a23afd9f4b650a89bea6645f28434210b173d90460196ab20a72f93fe68368cc50d87d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mj (0.2.0)
+    mj (0.4.1)
       thor (~> 1.2.1)
 
 GEM

data/lib/mj/alternative_file/candidate.rb

@@ -6,9 +6,10 @@ module Mj
       attr_reader :path
       attr_reader :type
 
-      def initialize(path:, type:)
+      def initialize(path:, type:, metadata: {})
         @path = path
         @type = type
+        @metadata = metadata || {}
       end
 
       def exist?
@@ -22,6 +23,31 @@ module Mj
 
         other.path == path && other.type == type
       end
+
+      def to_s(debug: false)
+        parts = [path]
+
+        if debug
+          parts.push("(#{metadata})")
+        end
+
+        parts.join
+      end
+
+      private
+
+      def metadata
+        data = {
+          type: type,
+          exists: exist?
+        }
+
+        @metadata.keys.sort.each do |key|
+          data[key] = @metadata[key]
+        end
+
+        data.map { |k, v| "#{k}:#{v}" }.join(",")
+      end
     end
   end
 end

data/lib/mj/alternative_file/current_file.rb

@@ -41,6 +41,10 @@ module Mj
         to_s.start_with?(*args)
       end
 
+      def end_with?(*args)
+        to_s.end_with?(*args)
+      end
+
       def without_prefix(prefix)
         sub(/^#{prefix}/, "")
       end

data/lib/mj/alternative_file/resolvers/base.rb

@@ -5,17 +5,23 @@ module Mj
     module Resolvers
       class Base
         def resolve(file)
-          [].tap do |alternatives|
+          [].tap do |candidates|
             if apply_to?(file)
-              create_alternatives(file, alternatives)
+              add_candidates(file, candidates)
             end
           end
         end
 
         private
 
-        def create_candidate(path, type)
-          AlternativeFile::Candidate.new(path: path, type: type)
+        def add_candidate(path, type, to:)
+          candidate = AlternativeFile::Candidate.new(
+            path: path.to_s,
+            type: type.to_s,
+            metadata: { resolved_by: self.class.name }
+          )
+
+          to.push(candidate)
         end
 
         def apply_to?(_file)

data/lib/mj/alternative_file/resolvers/ruby/rails_controller_resolver.rb

@@ -17,31 +17,29 @@ module Mj
             )
           end
 
-          def create_alternatives(file, alternatives)
+          def add_candidates(file, candidates)
             if file.start_with?("app/controllers")
-              add_controller_test(file, alternatives, "spec")
-              add_controller_test(file, alternatives, "test")
-              add_integration_test(file, alternatives, "spec")
-              add_integration_test(file, alternatives, "test")
+              add_controller_test(file, candidates, "spec")
+              add_controller_test(file, candidates, "test")
+              add_integration_test(file, candidates, "spec")
+              add_integration_test(file, candidates, "test")
               return
             end
 
-            resolve_controller(file, alternatives)
+            resolve_controller(file, candidates)
           end
 
-          def add_integration_test(file, alternatives, type)
+          def add_integration_test(file, candidates, type)
             path = file.without_prefix("app/controllers").without_suffix(".rb").trim_slashes
-            alternative = create_candidate("#{type}/integration/#{path}_#{type}.rb", "integration_#{type}")
-            alternatives.push(alternative)
+            add_candidate("#{type}/integration/#{path}_#{type}.rb", "integration_#{type}", to: candidates)
           end
 
-          def add_controller_test(file, alternatives, type)
+          def add_controller_test(file, candidates, type)
             path = file.without_prefix("app/controllers").without_suffix(".rb").trim_slashes
-            alternative = create_candidate("#{type}/controllers/#{path}_#{type}.rb", "controller_#{type}")
-            alternatives.push(alternative)
+            add_candidate("#{type}/controllers/#{path}_#{type}.rb", "controller_#{type}", to: candidates)
           end
 
-          def resolve_controller(file, alternatives)
+          def resolve_controller(file, candidates)
             controller_path = file.sub("test/integration", "app/controllers")
               .sub("spec/integration", "app/controllers")
               .sub("spec/controllers", "app/controllers")
@@ -50,7 +48,7 @@ module Mj
               .sub("_test.rb", ".rb")
               .to_s
 
-            alternatives.push(create_candidate(controller_path, "controller"))
+            add_candidate(controller_path, "controller", to: candidates)
           end
         end
       end

data/lib/mj/alternative_file/resolvers/ruby/rails_resolver.rb

@@ -11,11 +11,14 @@ module Mj
             file.extension == "rb"
           end
 
-          def create_alternatives(file, alternatives)
+          def add_candidates(file, candidates)
             ruby_file = Ruby::RubyFile.new(file)
-            alternatives.push(create_candidate("app/#{ruby_file.class_path}.rb", "model"))
-            alternatives.push(create_candidate("spec/#{ruby_file.class_path}_spec.rb", "spec"))
-            alternatives.push(create_candidate("test/#{ruby_file.class_path}_test.rb", "minitest"))
+            add_candidate("app/#{ruby_file.class_path}.rb", :model, to: candidates)
+            add_candidate("spec/#{ruby_file.class_path}_spec.rb", :spec, to: candidates)
+            add_candidate("test/#{ruby_file.class_path}_test.rb", :minitest, to: candidates)
+
+            # lib files
+            add_candidate("lib/#{ruby_file.class_path}.rb", "lib", to: candidates)
           end
         end
       end

data/lib/mj/alternative_file/resolvers/ruby/ruby_file.rb

@@ -8,6 +8,7 @@ module Mj
           def class_path
             path_without_extension
               .without_prefix("app")
+              .without_prefix("lib")
               .without_prefix("spec")
               .without_suffix("_spec")
               .without_suffix("_test")

data/lib/mj/alternative_file/resolvers/ruby/view_component_resolver.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Mj
+  module AlternativeFile
+    module Resolvers
+      module Ruby
+        class ViewComponentResolver < Resolvers::Base
+          private
+
+          def apply_to?(file)
+            file.end_with?(
+              "component.rb",
+              "component.html.erb",
+              "component_test.rb",
+              "component_spec.rb"
+            )
+          end
+
+          def add_candidates(file, candidates)
+            if file.extension == "rb"
+              return resolve_template(file, candidates)
+            end
+
+            resolve_component_class(file, candidates)
+          end
+
+          def resolve_template(file, candidates)
+            file = file.sub(/_component(_test|_spec)?.rb$/, "_component.html.erb")
+            file = file.sub(/^(spec|test)/, "app")
+            add_candidate(file, "component_template", to: candidates)
+          end
+
+          def resolve_component_class(file, candidates)
+            file_name = file.sub(/_component.html.erb$/, "_component.rb")
+            add_candidate(file_name, "component_class", to: candidates)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mj/alternative_file/thor_command.rb

@@ -8,6 +8,7 @@ require_relative "resolver"
 require_relative "resolvers/base"
 require_relative "resolvers/ruby/rails_resolver"
 require_relative "resolvers/ruby/rails_controller_resolver"
+require_relative "resolvers/ruby/view_component_resolver"
 require_relative "resolvers/ruby/ruby_file"
 
 module Mj
@@ -16,6 +17,7 @@ module Mj
       desc "list <reference-file>", "List all alternative files"
       option :types, type: :string, banner: "<comma-separated-types>", aliases: :t
       option :exists, type: :boolean, banner: "files that exist", aliases: :e
+      option :debug, type: :boolean, banner: "print debug information", aliases: :d
       def list(reference_file)
         file = CurrentFile.new(reference_file)
         print_candidates(resolve(file))
@@ -24,6 +26,7 @@ module Mj
       desc "next <reference-file>", "Next alternative file"
       option :types, type: :string, banner: "<comma-separated-types>", aliases: :t
       option :exists, type: :boolean, banner: "files that exist", aliases: :e
+      option :debug, type: :boolean, banner: "print debug information", aliases: :d
       def next(reference_file)
         file = CurrentFile.new(reference_file)
         candidate = resolve(file).after(file)
@@ -33,6 +36,7 @@ module Mj
       desc "prev <reference-file>", "Previous alternative file"
       option :types, type: :string, banner: "<comma-separated-types>", aliases: :t
       option :exists, type: :boolean, banner: "files that exist", aliases: :e
+      option :debug, type: :boolean, banner: "print debug information", aliases: :d
       def prev(reference_file)
         file = CurrentFile.new(reference_file)
         candidate = resolve(file).before(file)
@@ -43,15 +47,17 @@ module Mj
         @resolvers ||= AlternativeFile::Resolver.new.tap do |resolvers|
           resolvers.add(Resolvers::Ruby::RailsResolver.new)
           resolvers.add(Resolvers::Ruby::RailsControllerResolver.new)
+          resolvers.add(Resolvers::Ruby::ViewComponentResolver.new)
         end
       end
 
       private
 
       def print_candidates(candidates)
-        $stdout.puts candidates.map(&:path).join(" ")
+        $stdout.puts candidates.map { |i| i.to_s(debug: options[:debug]) }.join(" ")
       end
 
+      # rubocop:disable Metrics/MethodLength
       def resolve(file)
         candidates = self.class.resolvers.resolve(file)
 
@@ -63,8 +69,13 @@ module Mj
           candidates = candidates.existing
         end
 
-        candidates.unique
+        unless options[:debug]
+          candidates = candidates.unique
+        end
+
+        candidates
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/mj/cli.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
+require_relative "version"
 require_relative "alternative_file/thor_command"
 
 module Mj
@@ -9,7 +10,12 @@ module Mj
       true
     end
 
-    desc "alternative_file", "lists alternative files"
+    desc "version", "Prints the version"
+    def version
+      puts Mj::VERSION
+    end
+
+    desc "alternative_file", "Lists alternative files"
     subcommand "alternative_file", AlternativeFile::ThorCommand
   end
 end

data/lib/mj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,6 +53,7 @@ files:
 - lib/mj/alternative_file/resolvers/ruby/rails_controller_resolver.rb
 - lib/mj/alternative_file/resolvers/ruby/rails_resolver.rb
 - lib/mj/alternative_file/resolvers/ruby/ruby_file.rb
+- lib/mj/alternative_file/resolvers/ruby/view_component_resolver.rb
 - lib/mj/alternative_file/thor_command.rb
 - lib/mj/cli.rb
 - lib/mj/version.rb