mj 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff905fc5978244944098033bf6ecfb671f1130c336e2f77c19beefab3c927dfe
-  data.tar.gz: 0560a8a156cb45bc2e8c459b021e721118e304abf55e92d25039cd9c9277ee24
+  metadata.gz: 79b064c1e86b2c881657f35989e852b5000e4677a1abf4636b2473974a5e115f
+  data.tar.gz: 165f134cfe2c427d6d96314f0bda0c73dfce38d93fd777cdd60740c65314438f
 SHA512:
-  metadata.gz: b20134878fb83b50a0d9dda518dfc81500af893f522616605835e1ee2f6d78bbe824a9302d07131926d799bf308ee463efbfa9a0b4d37dce793fd2ab614c91d8
-  data.tar.gz: 30f12048aa54fa5070895859a99f0ffdd66bf35962d82e98952fc889b8a23afd9f4b650a89bea6645f28434210b173d90460196ab20a72f93fe68368cc50d87d
+  metadata.gz: e8337127e6a696efca4c24b673e3e1f5fea79886a9946ef37173683315701c7bb2c6644a1ae77d3cd55efc7717eb36efb80a1312c5db274fdfe8abe66aba289e
+  data.tar.gz: 538a81a2d58fe8bdfa85ec60409868526479cb6b6016b965f264a105b467ec9120d87c58efdf0260e1de9f6ae3ac3102c01eb432e0c098cc8ef7ee9bdf2982ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mj (0.4.1)
+    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/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
 
@@ -56,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 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