mj 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d956a04733940240dd116cbd23f2bce4f7489d98954b6eebf4bef7ad650265
-  data.tar.gz: bfd4982a65d4794f54c662fb62aed6952f35af192708984462aa286522a273df
+  metadata.gz: 69dc7451d088acc2d1a698e89db77361de5cdf2bb07bb137b8e63ddc224f6fc2
+  data.tar.gz: 7f1ac63a2d0b9e44845242bbf77f1154a0f14da3ba2a2a361b9dc90015a67904
 SHA512:
-  metadata.gz: 3f7d3cbda48c13aa55f08da78e2d072c7c70322c2d53fd6048e68885acda47b969bf36634c4e41d8fcd98f809821fcd0ab6c3f8a0e8b5d2be35d1bbca4c3e141
-  data.tar.gz: 3e51c76e04d0dafed9c49ec6a548dbc6647727cde8fe930e74cff81eca818a67d8bf9b657717be1b55f9979eb29f814dfdd533c8b919492ffe188d9fcc9cd036
+  metadata.gz: 34c4108ff9d1bb29b9efa6051c5bf7399ac93fa7bb543cb3fcddfbbeabbd7be27fc19c8b66e088a56be329fd1291893c5a768699e74aaaa4d0c16ccdf4a9ac66
+  data.tar.gz: cc60732174983f0616a47a7735ab34229234676fea0a6e472adc639bfad107823c95b0f3498e2246ec7dccb2a3e40d23a290fd430ec417db5e98f3e7e0c6482f

data/Gemfile.lock

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

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,35 @@
+# 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")
+          end
+
+          def add_candidates(file, candidates)
+            if file.end_with?("component.rb")
+              return resolve_template(file, candidates)
+            end
+
+            resolve_component_class(file, candidates)
+          end
+
+          def resolve_template(file, candidates)
+            file_name = file.sub(/_component.rb$/, "_component.html.erb")
+            add_candidate(file_name, "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,6 +8,7 @@ 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"
 
 module Mj
@@ -46,6 +47,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
 

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.0"
 end

metadata

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