mj 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd23331c306744d915b029c8eab565d7efb7aff9dcd1dc32e610c255f7467c41
-  data.tar.gz: 68eb844f251cc40384aab1f6593ae14bdcd4d8c208900a01b076082b7a98e744
+  metadata.gz: 62cae7d92a611cb2802cc0356c7bb49e90ddbaf7563feb7e5cd1994a62353b38
+  data.tar.gz: 2506a13d2aa781f2afdfdccaf8da67c9601f6a292a2c6050475f140877b19fc1
 SHA512:
-  metadata.gz: 9d98dc23ebb94db59c62e1a7a3d2d6edd01447e32fe11bcd199afbc24aa4849ccadbf3d237bbf13c4d483b418cb02d4624a34d14fd7b4f65c742074b4ef91c39
-  data.tar.gz: 8ce6225ed80da0b6c797774345a9ad079306963f080ac3952337b7f27fde4c7d246bc4bcb83c53eca637e10920427db4a7b7e4dba0740ff895f78f01a8bc5d73
+  metadata.gz: d50de7decd8581114c52c8fc66c9d3b33440f43e09492183a4aed5299798a03d8841765d2622605a3c4aafc95e5c5d66b25cd52b953c4b19cad33396f1982fd5
+  data.tar.gz: 6cc367813e79ae7355654ba5bff4ba859d53b054064862e924b44d0462dbee601854d3781904f74f37020ec0a440ed50706931109bad74b407bfa63659b09a86

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mj (1.2.1)
+    mj (1.3.0)
       colorize
       koine-rest_client
       mj-hash_utils

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

@@ -42,6 +42,9 @@ module Mj
           def add_integration_test(file, candidates, type)
             path = file.without_prefix("app/controllers").without_suffix(".rb").trim_slashes
             add_candidate("#{type}/integration/#{path}_#{type}.rb", "integration_#{type}", to: candidates)
+
+            path = file.without_prefix("app/controllers").without_suffix(".rb").trim_slashes
+            add_candidate("#{type}/integration/controllers/#{path}_#{type}.rb", "integration_#{type}", to: candidates)
           end
 
           def add_request_test(file, candidates, type)
@@ -68,6 +71,7 @@ module Mj
             end
 
             controller_path = file.sub("test/integration", "app/controllers")
+              .sub("spec/integration/controllers", "app/controllers")
               .sub("spec/integration", "app/controllers")
               .sub("spec/controllers", "app/controllers")
               .sub("test/controllers", "app/controllers")

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mj
+  module AlternativeFile
+    module Resolvers
+      module Ruby
+        class RailsSubfolderResolver < Resolvers::Base
+          private
+
+          def apply_to?(file)
+            file.extension == "rb" && file.to_s.match?(%r{^apps/\w+})
+          end
+
+          def add_candidates(file, candidates)
+            subfolder = file.to_s.match(%r{^apps/\w+}).to_s
+            resolver = RailsResolver.new(root: subfolder)
+            resolver.resolve(file).each do |candidate|
+              add_candidate(candidate.path, candidate.type, to: candidates)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mj/alternative_file/thor_command.rb

@@ -7,6 +7,7 @@ require_relative "current_file"
 require_relative "resolver"
 require_relative "resolvers/base"
 require_relative "resolvers/ruby/rails_resolver"
+require_relative "resolvers/ruby/rails_subfolder_resolver"
 require_relative "resolvers/ruby/rails_controller_resolver"
 require_relative "resolvers/ruby/view_component_resolver"
 require_relative "resolvers/ruby/packwerk_resolver"
@@ -55,6 +56,7 @@ module Mj
 
       def self.resolvers
         @resolvers ||= AlternativeFile::Resolver.new.tap do |resolvers|
+          resolvers.add(Resolvers::Ruby::RailsSubfolderResolver.new)
           resolvers.add(Resolvers::Ruby::RailsResolver.new)
           resolvers.add(Resolvers::Ruby::RailsControllerResolver.new)
           resolvers.add(Resolvers::Ruby::ViewComponentResolver.new)

data/lib/mj/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Marcelo Jacobus
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -124,6 +123,7 @@ files:
 - lib/mj/alternative_file/resolvers/ruby/packwerk_resolver.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/rails_subfolder_resolver.rb
 - lib/mj/alternative_file/resolvers/ruby/ruby_file.rb
 - lib/mj/alternative_file/resolvers/ruby/vendored_gems_resolver.rb
 - lib/mj/alternative_file/resolvers/ruby/view_component_resolver.rb
@@ -163,7 +163,6 @@ metadata:
   source_code_uri: https://github.com/mjacobus/mj
   changelog_uri: https://github.com/mjacobus/mj/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,8 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: My personal CLI
 test_files: []