mj 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69dc7451d088acc2d1a698e89db77361de5cdf2bb07bb137b8e63ddc224f6fc2
-  data.tar.gz: 7f1ac63a2d0b9e44845242bbf77f1154a0f14da3ba2a2a361b9dc90015a67904
+  metadata.gz: a69d697244fdee8394820682a99fdc199ec5b1b912c2d573f4b181c541100dc3
+  data.tar.gz: 7ac9b8f07c95ce5af439ddbfb18cb8d0385a1e1a3815188a5016757cfac978d6
 SHA512:
-  metadata.gz: 34c4108ff9d1bb29b9efa6051c5bf7399ac93fa7bb543cb3fcddfbbeabbd7be27fc19c8b66e088a56be329fd1291893c5a768699e74aaaa4d0c16ccdf4a9ac66
-  data.tar.gz: cc60732174983f0616a47a7735ab34229234676fea0a6e472adc639bfad107823c95b0f3498e2246ec7dccb2a3e40d23a290fd430ec417db5e98f3e7e0c6482f
+  metadata.gz: 19af4785f9f6441ca64ac8b721ef45db5e4b4ddff476f077b1f8430711ecad83070e643a102dd867e0d66bd7c6b9d1eb6510d37f5b58e1dbb92531b33e4025f8
+  data.tar.gz: fade8044f50496e2e2cf1a6d804e39fe69ae94b518faf733d489a3e17e2a48ba4af99dba3011ec647d0c3ea4d86498810f787d9d07ab5d47082636ab9c858d56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mj (0.4.0)
+    mj (0.5.0)
       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/resolvers/ruby/view_component_resolver.rb

@@ -8,11 +8,16 @@ module Mj
           private
 
           def apply_to?(file)
-            file.end_with?("component.rb", "component.html.erb")
+            file.end_with?(
+              "component.rb",
+              "component.html.erb",
+              "component_test.rb",
+              "component_spec.rb"
+            )
           end
 
           def add_candidates(file, candidates)
-            if file.end_with?("component.rb")
+            if file.extension == "rb"
               return resolve_template(file, candidates)
             end
 
@@ -20,8 +25,9 @@ module Mj
           end
 
           def resolve_template(file, candidates)
-            file_name = file.sub(/_component.rb$/, "_component.html.erb")
-            add_candidate(file_name, "component_template", to: 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)

data/lib/mj/alternative_file/thor_command.rb

@@ -10,6 +10,8 @@ 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
@@ -19,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"
@@ -28,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
 
@@ -38,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
 
@@ -54,28 +62,8 @@ module Mj
       private
 
       def print_candidates(candidates)
-        $stdout.puts candidates.map { |i| i.to_s(debug: options[:debug]) }.join(" ")
+        $stdout.puts candidates.map { |i| i.to_s(debug: options[:debug]) }.join("\n")
       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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Marcelo Jacobus
@@ -47,6 +47,8 @@ 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