mj 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efbd2ad2b7959ec1add88daadd57eaf56787c7f1e3a0297b676500f644ce2bf5
-  data.tar.gz: 9d3b3cfc72c599c70f76019093526870bafefc2063a08535cc58702b2e199828
+  metadata.gz: 2c06a541585bad692ef35a285e3c64a38a336b90a4360cbd415a2da773cc3372
+  data.tar.gz: 58514059df9ea6588bc11f2927a54b66833d82342858da33059e4fde88481d94
 SHA512:
-  metadata.gz: afb390219762a7f89a6e67936b0b6dfdb447bc970bae132e02989c25491075ce2c0beb6bb6196c03c9fe3b2ac625d7c4c5d7ba744eb0556a851eba4117c7e50f
-  data.tar.gz: af2332590c6cf8f828244e720e16f550c7ced67c7394087f3f9c85fe77fd06ec93c09a5163bcf978c8044d42e6996fbcad325b62f60cc68122c9b6e11a838098
+  metadata.gz: 027f603fc2bb78de14d6d40516db6db07d644db6cbd1bf4a2f207818c3e913199b10c7a8936e4446122c0efb767b8cac84d26a621cc6398ef77455dfe981bfcf
+  data.tar.gz: f3a4def6dee2cddbf1e0b7eb657c9f6103517e80da6cda4ca2a54f5476488b2ff8263ec86036fe95f5427927d5ffd6d445966ef59a0e14465e2fd2b07df73554

data/Gemfile.lock

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

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

@@ -5,23 +5,34 @@ module Mj
     module Resolvers
       module Ruby
         class RailsResolver < Resolvers::Base
+          attr_reader :root
+
+          def initialize(root: nil)
+            if root
+              root = "#{root.chomp("/")}/"
+            end
+
+            @root = root
+          end
+
           private
 
           def apply_to?(file)
             file.extension == "rb"
           end
 
-          def add_candidates(file, candidates)
-            ruby_file = Ruby::RubyFile.new(file)
-            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)
+          def add_candidates(file, candidates) # rubocop:disable Metrics/AbcSize
+            ruby_file = Ruby::RubyFile.new(file).without_prefix(root)
+
+            add_candidate("#{root}app/#{ruby_file.class_path}.rb", :model, to: candidates)
+            add_candidate("#{root}spec/#{ruby_file.class_path}_spec.rb", :spec, to: candidates)
+            add_candidate("#{root}test/#{ruby_file.class_path}_test.rb", :minitest, to: candidates)
 
             # lib files
-            add_candidate("lib/#{ruby_file.class_path}.rb", "lib", to: candidates)
-            add_candidate("#{ruby_file.class_path}.rb", "lib", to: candidates)
-            add_candidate("spec/lib/#{ruby_file.class_path}_spec.rb", :spec, to: candidates)
-            add_candidate("test/lib/#{ruby_file.class_path}_test.rb", :minitest, to: candidates)
+            add_candidate("#{root}lib/#{ruby_file.class_path}.rb", "lib", to: candidates)
+            add_candidate("#{root}#{ruby_file.class_path}.rb", "lib", to: candidates)
+            add_candidate("#{root}spec/lib/#{ruby_file.class_path}_spec.rb", :spec, to: candidates)
+            add_candidate("#{root}test/lib/#{ruby_file.class_path}_test.rb", :minitest, to: candidates)
           end
         end
       end

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

@@ -5,33 +5,17 @@ module Mj
     module Resolvers
       module Ruby
         class VendoredGemsResolver < Resolvers::Base
-          def initialize
-            @rails = RailsResolver.new
-          end
-
           private
 
           def apply_to?(file)
             file.extension == "rb" && find_root(file)
           end
 
-          def add_candidates(file, candidates) # rubocop:disable Metrics/MethodLength
-            root = find_root(file)
+          def add_candidates(file, candidates)
+            @rails = RailsResolver.new(root: find_root(file))
 
             @rails.resolve(file).each do |resolved|
-              found = resolved.to_s.sub("#{root}/app/", "")
-              found = found.sub("#{root}/", "")
-
-              unless found.match?("_spec.rb")
-                found = found.sub("spec/", "")
-              end
-
-              unless found.match?("_test.rb")
-                found = found.sub("test/", "")
-              end
-
-              file = [root, found].flatten.join("/")
-              add_candidate(file, resolved.type, to: candidates)
+              add_candidate(resolved, resolved.type, to: candidates)
             end
           end
 

data/lib/mj/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Marcelo Jacobus