rspec-sorbet 1.8.3 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d40a0e2d4b22ec8c7a7809fea36e467492bd7c649ac7de5ac3e09130ac7e180
-  data.tar.gz: a39fe8993182ca260861e2d583e68ce9fb332e9557d376210583f33be7042208
+  metadata.gz: c919fffe36f51d10375e595ccb204bc198e25cf8315e266b58ac003e5a3044e3
+  data.tar.gz: e9f7fd2ebc16cbfb02a35386e6e18167e4c2d7135d892818cfef0828bbac3d29
 SHA512:
-  metadata.gz: daa20d80ec931a565cdec2dbcd25a72c781a319b0760d5896e0470ad35cd789eb90a8d543aebb01e282fa11f512882c1ccff03832ec7865d18d1627974857a45
-  data.tar.gz: bb6bc7ea8e5f088f73eea5c72498ba4839c3aecc6dc83fb727135d15abdf24cb9ce3454de689fd7f31662e8fc65d0868ad2157c671ff55f23c7aeb5b434583b6
+  metadata.gz: 036dc3f8f4fe03014d3fd841c3db206cb3f4d044238f995f204ea66379763e1dd4f66882fd87571eaf1fa5a473af3b4dd28cdd943d7ff1dfb902b03ef1849b86
+  data.tar.gz: bfaa969a76685774eedbceb4842b977a3bdb39dc48055035a93c85b53cf9a7029b9f6592722307a96d0b03ac2ff51ed0d5b406012469334eaf92c11f3bfd855c

data/.github/workflows/ci.yml

@@ -1,5 +1,7 @@
 ---
 name: Continuous Integration
+env:
+  SLACK_CHANNEL_ID: C0317P7C9C2
 on:
   push:
     branches-ignore:
@@ -38,9 +40,9 @@ jobs:
         || github.ref == 'refs/heads/stable')
       uses: pullreminders/slack-action@a5a262c896a1cc80dcbae59ba95513e2dfb21439
       env:
-        SLACK_BOT_TOKEN: "${{ secrets.SLACK_BOT_TOKEN }}"
+        SLACK_BOT_TOKEN: "${{ secrets.BELLROY_SLACK_TOKEN }}"
       with:
-        args: '{\"channel\":\"C33574SJJ\",\"text\":\"* ${{ github.repository }} BUILD
+        args: '{\"channel\":\"${{ env.SLACK_CHANNEL_ID }}\",\"text\":\"* ${{ github.repository }} BUILD
           FAILURE*\", \"attachments\": [{ \"fallback\": \"Failure summary\", \"color\":
           \"#ff0000\", \"fields\": [{\"title\": \"Branch\", \"value\":\"${{ steps.extract_branch.outputs.branch
           }}\"}, {\"title\": \"Who broke it\", \"value\":\"${{ github.actor }}\"},

data/CHANGELOG.md

@@ -1,53 +1,63 @@
-1.8.3
+# Changelog
 
-* Make sorbet a development dependency
+## 1.9.1
 
-1.8.2
+- Support `T.nilable(T.class_of(...))` among others (thanks [@deecewan](https://github.com/deecewan))
 
-* Reduce gem size by excluding RBIs from gem build
+## 1.9.0
 
-1.8.1
+- Allow specification of a custom validation handler (thanks [@bmalinconico](https://github.com/bmalinconico))
 
-* [BUGFIX] Fix processing T.let type mismatch messages when there are digits in module name
+## 1.8.3
 
-1.8.0
+- Make sorbet a development dependency
 
-* Fixed issues around union types referencing typed enumerables.
+## 1.8.2
 
-1.7.0
+- Reduce gem size by excluding RBIs from gem build
 
-* Added support `T.class_of`.
+## 1.8.1
 
-1.6.0
+- [BUGFIX] Fix processing T.let type mismatch messages when there are digits in module name
 
-* Non-verifying double support improved.
+## 1.8.0
 
-1.5.0
+- Fixed issues around union types referencing typed enumerables.
 
-* Added support for `T.cast`.
+## 1.7.0
 
-1.4.0
+- Added support `T.class_of`.
 
-* Added support for `T.let` referencing `T.nilable` types.
+## 1.6.0
 
-1.3.0
+- Non-verifying double support improved.
 
-* Added ability to allow any kind of double (Class, Instance, Object).
-* `RSpec::Sorbet.allow_instance_doubles!` has been renamed to `RSpec::Sorbet.allow_doubles!`, an alias remains for backwards compatibility for the time being.
+## 1.5.0
 
-1.2.1
+- Added support for `T.cast`.
 
-* Fix call check when opts contains :message instead of :pretty_message.
+## 1.4.0
 
-1.2.0
+- Added support for `T.let` referencing `T.nilable` types.
 
-* Added support for verifying `T::Enumerable` types.
+## 1.3.0
 
-1.1.0
+- Added ability to allow any kind of double (Class, Instance, Object).
+- `RSpec::Sorbet.allow_instance_doubles!` has been renamed to `RSpec::Sorbet.allow_doubles!`, an alias remains for backwards compatibility for the time being.
 
-* Add basic `instance_double` verification to help check the type of an instance double.
+## 1.2.1
 
-1.0.0
+- Fix call check when opts contains :message instead of :pretty_message.
 
-* Initial release
-* Supports just allowing instance doubles for now
+## 1.2.0
+
+- Added support for verifying `T::Enumerable` types.
+
+## 1.1.0
+
+- Add basic `instance_double` verification to help check the type of an instance double.
+
+## 1.0.0
+
+- Initial release
+- Supports just allowing instance doubles for now

data/README.md

@@ -34,3 +34,16 @@ RSpec::Sorbet.allow_doubles!
 ### `eq` matcher usage with `T::Struct`'s
 
 Using the [`eq` matcher](https://www.rubydoc.info/github/rspec/rspec-expectations/RSpec%2FMatchers:eq) to compare [`T::Struct`'s](https://sorbet.org/docs/tstruct) might not behave as you'd expect whereby two separate instances of the same struct class with identical attributes are not `==` out of the box. The standalone [sorbet-struct-comparable](https://github.com/tricycle/sorbet-struct-comparable) gem may be of interest if you are looking for a simple attribute based comparison that will help make the `eq` matcher behave as you expect.
+
+### Specifying a custom validation handler
+
+You can customise the handler of Sorbet validation errors if you so desire.
+
+
+```ruby
+def handler(signature, opts)
+  raise MyCustomException, "The options were #{opts}"
+end
+
+T::Configuration.call_validation_error_handler = handler
+```

data/lib/rspec/sorbet/doubles.rb

@@ -11,6 +11,8 @@ module RSpec
           inline_type_error_handler(error)
         end
 
+        @existing_handler = T::Configuration.instance_variable_get(:@call_validation_error_handler)
+
         T::Configuration.call_validation_error_handler = proc do |signature, opts|
           call_validation_error_handler(signature, opts)
         end
@@ -21,7 +23,14 @@ module RSpec
       private
 
       INLINE_DOUBLE_REGEX =
-        /T.(?:let|cast): Expected type (?:T.(?<t_method>any|nilable|class_of)\()?(?<expected_types>[a-zA-Z0-9:: ,]*)(\))?, got (?:type .* with value )?#<(?<double_type>Instance|Class|Object)?Double([\(]|[ ])(?<doubled_type>[a-zA-Z0-9:: ,]*)(\))?/.freeze
+        /T.(?:let|cast): Expected type (?:T.(?<t_method>any|nilable|class_of)\()*(?<expected_types>[a-zA-Z0-9:: ,]*)(\))*, got (?:type .* with value )?#<(?<double_type>Instance|Class|Object)?Double([\(]|[ ])(?<doubled_type>[a-zA-Z0-9:: ,]*)(\))?/.freeze
+
+
+      def handle_call_validation_error(signature, opts)
+        raise TypeError, opts[:pretty_message] unless @existing_handler 
+
+        @existing_handler.call(signature, opts)
+      end
 
       def inline_type_error_handler(error)
         case error
@@ -75,7 +84,7 @@ module RSpec
         message.match?(TYPED_ARRAY_MESSAGE)
       end
 
-      def call_validation_error_handler(_signature, opts)
+      def call_validation_error_handler(signature, opts)
         should_raise = true
 
         message = opts.fetch(:pretty_message, opts.fetch(:message, ''))
@@ -108,7 +117,7 @@ module RSpec
           end
         end
 
-        raise TypeError, opts[:pretty_message] if should_raise
+        handle_call_validation_error(signature, opts) if should_raise
       end
     end
   end

data/lib/rspec/sorbet/version.rb

@@ -3,6 +3,6 @@
 
 module RSpec
   module Sorbet
-    VERSION = '1.8.3'
+    VERSION = '1.9.1'
   end
 end

data/nix/sources.json

@@ -1,14 +1,14 @@
 {
     "nixpkgs": {
-        "branch": "nixos-21.05",
+        "branch": "nixos-22.05",
         "description": "Nix packages collection",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e85f0175e3effe9ba191d66c09e8f1b7d6362d5e",
-        "sha256": "1qr2hmymbzwj8jrz6smcgc04scgwp2v5070x22k4fvh261g1n4zw",
+        "rev": "1935dd8fdab8e022a9d958419663162fd840014c",
+        "sha256": "1z0nkqpwahlaz362lcdx5qcdvwdzr5a3bdfirjgbf9jg37rsbwl2",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e85f0175e3effe9ba191d66c09e8f1b7d6362d5e.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/1935dd8fdab8e022a9d958419663162fd840014c.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

data/nix/sources.nix

@@ -31,8 +31,28 @@ let
           if spec ? branch then "refs/heads/${spec.branch}" else
             if spec ? tag then "refs/tags/${spec.tag}" else
               abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+      submodules = if spec ? submodules then spec.submodules else false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules == true
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                {}
+            else {};
+        in
+          if nixSupportsSubmodules
+          then { inherit submodules; }
+          else emptyArgWithWarning;
     in
-      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
+      builtins.fetchGit
+        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
 
   fetch_local = spec: spec.path;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sorbet
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.1
 platform: ruby
 authors:
 - Samuel Giles
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: A small gem consisting of helpers for using Sorbet & RSpec together.