ruby-lsp-shoulda-context 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187f5ae0d0929abe9c9642e92de8859d06fbe03a3633c41402eb009e28023568
-  data.tar.gz: f8e209ea9af5c9d884a0536328a35a2ba0791c238306148b844cb6b81ca9caad
+  metadata.gz: 1e85ecf8ef4be164ef72b0817522b02075af4e60c67f5ea995fe4c8e2e822080
+  data.tar.gz: c3f914b5aa84fd369e433137c0efc6a996bdeef610dcd739bd8120fbdb746292
 SHA512:
-  metadata.gz: a41cfbdabc0ce001903accdaf9694463f74e81172531b65043378e1360ad9126a7b952d6c494309f63c89298038e858ebdbef11f25de3430306ad31f26cb0eb2
-  data.tar.gz: 5710da8600b182a6782449955100dc5262b046b0af9a1575854b3c1a19330a26bddfeded4cf1f5e6982b4a74ca4f701c5a7fe96a541f2a8c7a167b91ca3d754f
+  metadata.gz: 85b000eb5c0500c8dd375d912ee926d88d04d19cee72fd926013b78ea873c190570fa55c4fa483c6cb063db5700501d90b2e0feec6958f1591ec8b968ff53b78
+  data.tar.gz: 1b637d01c9aaf0f85abe772415389ffb7a0f46f9262a78470145716f240566d78a25dac593626e1d061f3235aa69b5902d7d46e72fba344ded83cf323d771d65

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 ## [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
 

data/Rakefile

@@ -9,10 +9,4 @@ require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-# Rake::TestTask.new(:test) do |t|
-#   t.libs << "test"
-#   t.libs << "lib"
-#   t.test_files = FileList["test/**/*_test.rb"]
-# end
-
 task default: [:test, :rubocop]

data/Readme.md

@@ -4,15 +4,15 @@ This gem provides support for [shoulda-context](https://github.com/thoughtbot/sh
 
 ## Installation
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+TODO: Replace `ruby-lsp-shoulda-context` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
 
 Install the gem and add to the application's Gemfile by executing:
 
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+    bundle add ruby-lsp-shoulda-context
 
 If bundler is not being used to manage dependencies, install the gem by executing:
 
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+    gem install ruby-lsp-shoulda-context
 
 ## Usage
 
@@ -36,13 +36,13 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 Everyone interacting in the RubyLsp::ShouldaContext project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[domingo2000]/ruby-lsp-shoulda-context/blob/main/CODE_OF_CONDUCT.md).
 
-## Roadmap:
+## Roadmap
 
 - [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.1.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/ruby_lsp/shoulda_context.rb

@@ -0,0 +1,11 @@
+# typed: strict
+# frozen_string_literal: true
+
+require_relative "shoulda_context/version"
+
+module RubyLsp
+  module ShouldaContext
+    class Error < StandardError; end
+    # Your code goes here...
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-shoulda-context
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 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
@@ -40,6 +40,7 @@ files:
 - Readme.md
 - lib/ruby_lsp/ruby-lsp-shoulda-context/addon.rb
 - lib/ruby_lsp/ruby-lsp-shoulda-context/code_lens.rb
+- lib/ruby_lsp/shoulda_context.rb
 - lib/ruby_lsp/shoulda_context/version.rb
 homepage: https://github.com/domingo2000/ruby-lsp-shoulda-context
 licenses: