ruby-lsp-shoulda-context 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df77769d30187280cbfb7653ab7c30b097f1a257e96d6f8b516973c17e01e060
-  data.tar.gz: a4b86b7db5dbf742a8e23e209014b1f439fe09f6d183ee3b2cbdb3d2af09a884
+  metadata.gz: '09ae8206abcee5697a5b709fdb5527c3f764d0c31686d2b39a11c1d3ce346e3b'
+  data.tar.gz: 0c9a92f7d8411cab5d3967e069e457ef29c449312073f41c5dc69e41bce7d8fd
 SHA512:
-  metadata.gz: 10d9c031dfb1ebeb7710458e2bc57197ac9fd2d565351067d62d920558a40d8e0579bd82e37a8b869368b2e892b10a08a1e1de769bf37ce1108a70fe17cceea4
-  data.tar.gz: 75f3213c94dafce5ec96bbf6d3ab922b6806fa76b1c55a4dd96da7ff9765d5e771ffbb14cd5dcfe10700a530e1e88d75a747dbb4249301c7b9924e5850e12444
+  metadata.gz: db20a0d41b63d7000b54ada01a178d86391e72f5411cdea8e837a015cae79e87e50eba253785043ae7b24559a7adc4e0d159df973e1e442da8ad8e99aa7dccc9
+  data.tar.gz: 7d45ec20310b9f0f154d574756f16232957541fadbb846c9f848fb486fdf8a0d82d8e51a084e51e22036ed91a59914eed49d1b714b67f676e602a0f4bcbf878a

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
+## [0.3.0] - 2024-02-10
+- Removed collisions from different should/context methods that have the same name at different levels
 ## [0.2.0] - 2024-02-07
+
 - Add bump gem for semantic versioning and changelog
+
 ## [0.1.0] - 2024-02-07
 
 - Initial release

data/Rakefile

@@ -9,5 +9,4 @@ require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-
 task default: [:test, :rubocop]

data/Readme.md

@@ -40,9 +40,9 @@ Everyone interacting in the RubyLsp::ShouldaContext project's codebases, issue t
 
 - [x] Make context runnable
 - [x] Make should with string runnable
-- [ ] Make should with method runnable
+- [x] Make should with method runnable
 - [ ] Make exec method conditional to rails or Minitest setup
-- [ ] Make inner context or inner should with collissions with outer DSL not collide using full name of the test (Currently if 2 tests have the same name both are executed)
+- [x] Make inner context or inner should with collissions with outer DSL not collide using full name of the test (Currently if 2 tests have the same name both are executed)
 - [x] Provide grouping with classes that ends with "..Test" syntax (Note: The codelens is duplicated becuase lsp support minitest by default and LSP responses are merged)
 
 **Note**: This project is in very early stage and could have major bugs

data/lib/ruby_lsp/ruby-lsp-shoulda-context/code_lens.rb

@@ -9,7 +9,16 @@ module RubyLsp
 
       include ::RubyLsp::Requests::Support::Common
 
-      SUPPORTED_TEST_LIBRARIES = T.let(["minitest", "test-unit"], T::Array[String])
+      BASE_COMMAND = T.let(
+        begin
+          Bundler.with_original_env { Bundler.default_lockfile }
+          "bundle exec ruby"
+        rescue Bundler::GemfileNotFound
+          "ruby"
+        end + " -ITest",
+        String,
+      )
+
       REQUIRED_LIBRARY = T.let("shoulda-context", String)
 
       ResponseType = type_member { { fixed: T::Array[::RubyLsp::Interface::CodeLens] } }
@@ -22,29 +31,12 @@ module RubyLsp
         @_response = T.let([], ResponseType)
         # Listener is only initialized if uri.to_standardized_path is valid
         @path = T.let(T.must(uri.to_standardized_path), String)
+        @group_id = T.let(1, Integer)
         @group_id_stack = T.let([], T::Array[Integer])
-        @test_id_stack = T.let([], T::Array[Integer])
-        @id = T.let(1, Integer)
+        @pattern = T.let("test_: ", String)
         dispatcher.register(self, :on_call_node_enter, :on_call_node_leave, :on_class_node_enter, :on_class_node_leave)
 
-        @base_command = T.let(
-          begin
-            cmd = if File.exist?(File.join(Dir.pwd, "bin", "rspec"))
-              "bin/rspec"
-            else
-              "rspec"
-            end
-
-            if File.exist?("Gemfile.lock")
-              "bundle exec #{cmd}"
-            else
-              cmd
-            end
-          end,
-          String,
-        )
-
-        @base_command = "bundle exec ruby -ITest"
+        @base_command = BASE_COMMAND
 
         super(dispatcher)
       end
@@ -54,42 +46,49 @@ module RubyLsp
         case node.message
         when "should"
           name = generate_name(node)
+          @pattern += "should #{name} "
           add_test_code_lens(node, name: name, kind: :example)
-          @id += 1
-          @test_id_stack.push(@id)
         when "context"
           return unless valid_group?(node)
 
           name = generate_name(node)
+          @pattern += "#{name} "
           add_test_code_lens(node, name: name, kind: :group)
-          @group_id_stack.push(@id)
-          @id += 1
-          @test_id_stack.push(@id)
+
+          @group_id_stack.push(@group_id)
+          @group_id += 1
         end
       end
 
       sig { params(node: Prism::CallNode).void }
       def on_call_node_leave(node)
         case node.message
+        when "should"
+          name = generate_name(node)
+          @pattern = remove_last_pattern_in_string(@pattern, "should #{name} ")
         when "context"
           return unless valid_group?(node)
 
+          name = generate_name(node)
+          @pattern = remove_last_pattern_in_string(@pattern, "#{name} ")
           @group_id_stack.pop
-          @test_id_stack.pop
-        when "should"
-          @test_id_stack.pop
         end
       end
 
       sig { params(node: Prism::ClassNode).void }
       def on_class_node_enter(node)
         class_name = node.constant_path.slice
-        if class_name.end_with?("Test")
-          add_test_code_lens(node, name: class_name, kind: :group)
+
+        if @path && class_name.end_with?("Test")
+          add_test_code_lens(
+            node,
+            name: class_name,
+            kind: :group,
+          )
         end
 
-        @group_id_stack.push(@id)
-        @id += 1
+        @group_id_stack.push(@group_id)
+        @group_id += 1
       end
 
       sig { params(node: Prism::ClassNode).void }
@@ -99,9 +98,17 @@ module RubyLsp
 
       private
 
+      def remove_last_pattern_in_string(string, pattern)
+        string.sub(/#{pattern}$/, "")
+      end
+
+      def pattern_only_has_test?(pattern)
+        pattern == "test_: "
+      end
+
       sig { params(node: Prism::CallNode).returns(T::Boolean) }
       def valid_group?(node)
-        !(node.block.nil? || (node.receiver && node.receiver&.slice != "RSpec"))
+        !node.block.nil?
       end
 
       sig { params(node: Prism::CallNode).returns(String) }
@@ -129,11 +136,11 @@ module RubyLsp
       sig { params(node: Prism::Node, name: String, kind: Symbol).void }
       def add_test_code_lens(node, name:, kind:)
         return unless DependencyDetector.instance.dependencies.include?(REQUIRED_LIBRARY)
-        return unless SUPPORTED_TEST_LIBRARIES.include?(DependencyDetector.instance.detected_test_library) && @path
 
-        command = "#{@base_command} #{@path} -n \"/#{name}/\""
+        command = "#{@base_command} #{@path} -n \"/#{@pattern.strip}/\""
 
-        grouping_data = { group_id: @group_id_stack.last, kind: kind, id: @id }
+        grouping_data = { group_id: @group_id_stack.last, kind: kind }
+        grouping_data[:id] = @group_id if kind == :group
 
         arguments = [
           @path,

data/lib/ruby_lsp/shoulda_context/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module ShouldaContext
-    VERSION = "0.2.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-shoulda-context
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Domingo Edwards
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp