strict 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae43c882eaf20478716e5770eff835c3c9611b714f20ba98b23418969a40cb8f
-  data.tar.gz: b003e41e3b5efb4628e40c14dc84e4fdb64e8ab8c457a6299347d921ff4907bd
+  metadata.gz: b15e13a3f628809ea9410898b170658979f5e4c5a69b03a1ef4dcccad35e947f
+  data.tar.gz: b37173fddebaa55c744c20230548a80832a38c86e6bb4879f39d54a105fb5ddb
 SHA512:
-  metadata.gz: c09fa26af6510b02c08c2cb7965f3ccb83703f0d5ca4c8a741516f09810e0069ed46bb69a6b5af0fec8effd105c6c0be49619a42c7ca5debacd5462391ebe9b4
-  data.tar.gz: 17d077e3ea3ed656a71ff3fed66c057c9f49468bcdbd66b3ea16c1d519a7a2ab2ff28973b4b98507035dce8367ebf5e7665772ced2eaec67e4cf300c6e69d320
+  metadata.gz: 25bb591ed6df44c60f6e2c01f977f4fcb881b022e62af11adbcd32e4d15dd83bfbfd34a1f20139aa64b0de0e8447e8cdc9e73d6ff5ac5331ea1ef9cab81f1f7e
+  data.tar.gz: 46ddcaa771d227162e762d6bb424382c0efc3451d540340ad70a888842669ad8fb5969af11302d49ff5c5f5334852d44201be20253c399156373d9fd5d4c7ae8

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    strict (1.3.0)
+    strict (1.4.0)
       zeitwerk (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    debug (1.6.2)
+    debug (1.6.3)
       irb (>= 1.3.6)
       reline (>= 0.3.1)
     gem-release (2.2.2)
@@ -27,25 +27,25 @@ GEM
     reline (0.3.1)
       io-console (~> 0.5)
     rexml (3.2.5)
-    rubocop (1.36.0)
+    rubocop (1.38.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-minitest (0.22.2)
+    rubocop-minitest (0.23.0)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.3.0)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.4)
 
 PLATFORMS
   arm64-darwin-21

data/lib/strict/interface.rb

@@ -13,13 +13,19 @@ module Strict
 
     def expose(method_name, &block)
       sig = sig(&block)
-      parameter_list = sig.parameters.map { |parameter| "#{parameter.name}:" }.join(", ")
-      argument_list = sig.parameters.map { |parameter| "#{parameter.name}: #{parameter.name}" }.join(", ")
+      parameter_list = [
+        *sig.parameters.map { |parameter| "#{parameter.name}:" },
+        "&block"
+      ].join(", ")
+      argument_list = [
+        *sig.parameters.map { |parameter| "#{parameter.name}: #{parameter.name}" },
+        "&block"
+      ].join(", ")
 
       module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-        def #{method_name}(#{parameter_list}, &block)              # def method_name(one:, two:, three:, &block)
-          implementation.#{method_name}(#{argument_list}, &block)  #   implementation.method_name(one: one, two: two, three: three, &block)
-        end                                                        # end
+        def #{method_name}(#{parameter_list})              # def method_name(one:, two:, three:, &block)
+          implementation.#{method_name}(#{argument_list})  #   implementation.method_name(one: one, two: two, three: three, &block)
+        end                                                # end
       RUBY
     end
   end

data/lib/strict/interfaces/instance.rb

@@ -12,7 +12,7 @@ module Strict
           h[k] = { additional_parameters: [], missing_parameters: [], non_keyword_parameters: [] }
         end
 
-        self.class.strict_instance_methods.each do |method_name, strict_method|
+        self.class.strict_instance_methods.each do |method_name, strict_method| # rubocop:disable Metrics/BlockLength
           unless implementation.respond_to?(method_name)
             missing_methods ||= []
             missing_methods << method_name
@@ -21,9 +21,16 @@ module Strict
 
           expected_parameters = Set.new(strict_method.parameters.map(&:name))
           defined_parameters = Set.new
+          has_keyword_splat = false
 
           implementation.method(method_name).parameters.each do |kind, parameter_name|
-            next if kind == :block
+            case kind
+            when :block, :rest
+              next
+            when :keyrest
+              has_keyword_splat = true
+              next
+            end
 
             if expected_parameters.include?(parameter_name)
               defined_parameters.add(parameter_name)
@@ -33,6 +40,8 @@ module Strict
             end
           end
 
+          next if has_keyword_splat
+
           missing_parameters = expected_parameters - defined_parameters
           invalid_method_definitions[method_name][:missing_parameters] = missing_parameters if missing_parameters.any?
         end

data/lib/strict/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Strict
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strict
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Kyle Thompson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk