mj 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d956a04733940240dd116cbd23f2bce4f7489d98954b6eebf4bef7ad650265
-  data.tar.gz: bfd4982a65d4794f54c662fb62aed6952f35af192708984462aa286522a273df
+  metadata.gz: 79b064c1e86b2c881657f35989e852b5000e4677a1abf4636b2473974a5e115f
+  data.tar.gz: 165f134cfe2c427d6d96314f0bda0c73dfce38d93fd777cdd60740c65314438f
 SHA512:
-  metadata.gz: 3f7d3cbda48c13aa55f08da78e2d072c7c70322c2d53fd6048e68885acda47b969bf36634c4e41d8fcd98f809821fcd0ab6c3f8a0e8b5d2be35d1bbca4c3e141
-  data.tar.gz: 3e51c76e04d0dafed9c49ec6a548dbc6647727cde8fe930e74cff81eca818a67d8bf9b657717be1b55f9979eb29f814dfdd533c8b919492ffe188d9fcc9cd036
+  metadata.gz: e8337127e6a696efca4c24b673e3e1f5fea79886a9946ef37173683315701c7bb2c6644a1ae77d3cd55efc7717eb36efb80a1312c5db274fdfe8abe66aba289e
+  data.tar.gz: 538a81a2d58fe8bdfa85ec60409868526479cb6b6016b965f264a105b467ec9120d87c58efdf0260e1de9f6ae3ac3102c01eb432e0c098cc8ef7ee9bdf2982ff

data/Gemfile.lock

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

data/lib/mj/alternative_file/candidates.rb

@@ -41,6 +41,10 @@ module Mj
         next_file(@items.reverse, reference_file)
       end
 
+      def sorted_by_path
+        new(@items.sort_by(&:path))
+      end
+
       private
 
       def new(*args)

data/lib/mj/alternative_file/commands/list_command.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Mj
+  module AlternativeFile
+    module Commands
+      class ListCommand
+        attr_reader :file
+
+        def initialize(file, options)
+          @file = CurrentFile.new(file.to_s)
+          @options = options
+        end
+
+        def exists?
+          @options[:exists]
+        end
+
+        def types
+          @options[:types].to_s.split(",")
+        end
+
+        def debug?
+          @options[:debug]
+        end
+      end
+    end
+  end
+end

data/lib/mj/alternative_file/commands/list_command_handler.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Mj
+  module AlternativeFile
+    module Commands
+      class ListCommandHandler
+        def initialize(resolvers:)
+          @resolvers = resolvers
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def handle(command)
+          candidates = @resolvers.resolve(command.file)
+
+          if command.types.any?
+            candidates = candidates.of_types(command.types)
+          end
+
+          if command.exists?
+            candidates = candidates.existing
+          end
+
+          unless command.debug?
+            candidates = candidates.unique
+          end
+
+          candidates.sorted_by_path
+        end
+        # rubocop:enable Metrics/MethodLength
+      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,19 +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, metadata: {
-                                           resolved_by: self.class.name
-                                         })
+        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,14 +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
-            alternatives.push(create_candidate("lib/#{ruby_file.class_path}.rb", "lib"))
+            add_candidate("lib/#{ruby_file.class_path}.rb", "lib", to: candidates)
           end
         end
       end

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,7 +8,10 @@ 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"
+require_relative "commands/list_command_handler"
+require_relative "commands/list_command"
 
 module Mj
   module AlternativeFile
@@ -18,8 +21,10 @@ module Mj
       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))
+        handler = Commands::ListCommandHandler.new(resolvers: self.class.resolvers)
+        command = Commands::ListCommand.new(reference_file, options)
+        candidates = handler.handle(command)
+        print_candidates(candidates)
       end
 
       desc "next <reference-file>", "Next alternative file"
@@ -27,8 +32,10 @@ module Mj
       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)
+        handler = Commands::ListCommandHandler.new(resolvers: self.class.resolvers)
+        command = Commands::ListCommand.new(reference_file, options)
+        candidates = handler.handle(command)
+        candidate = candidates.after(command.file)
         print_candidates([candidate].compact)
       end
 
@@ -37,8 +44,10 @@ module Mj
       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)
+        handler = Commands::ListCommandHandler.new(resolvers: self.class.resolvers)
+        command = Commands::ListCommand.new(reference_file, options)
+        candidates = handler.handle(command)
+        candidate = candidates.before(command.file)
         print_candidates([candidate].compact)
       end
 
@@ -46,6 +55,7 @@ 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
 
@@ -54,26 +64,6 @@ module Mj
       def print_candidates(candidates)
         $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)
-
-        if options[:types]
-          candidates = candidates.of_types(options[:types].to_s.split(","))
-        end
-
-        if options[:exists]
-          candidates = candidates.existing
-        end
-
-        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.3.0"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Marcelo Jacobus
@@ -47,12 +47,15 @@ files:
 - lib/mj.rb
 - lib/mj/alternative_file/candidate.rb
 - lib/mj/alternative_file/candidates.rb
+- lib/mj/alternative_file/commands/list_command.rb
+- lib/mj/alternative_file/commands/list_command_handler.rb
 - lib/mj/alternative_file/current_file.rb
 - lib/mj/alternative_file/resolver.rb
 - lib/mj/alternative_file/resolvers/base.rb
 - 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