rspec-sleeping_king_studios 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22fdef4cb18107dee334686704c841a0237b23859d8fd3888d76acb985a8e01d
-  data.tar.gz: 6a0968359af1d2ce3400448fd40a8647fda171534c47ec4e65c1fcb52651cd60
+  metadata.gz: dbc7883d66ce748d8174fe94ba3c6649ce4a6208be40b51f41697a087b09ab58
+  data.tar.gz: ec1d727204bc3bc7f3202a0880538d45966d2be8071781e5a6ab6e5e407cfd66
 SHA512:
-  metadata.gz: 71aeb0c2c91bedeaad195827e7346724a04516e42872305d75d89d996789697b770d6256c1008ce556fc7d497d7337ed991c34be837594a64738fb63b62f2b3a
-  data.tar.gz: 529427a25ff965bbb1950bb93776864245669beca3bd777fcca33a942bcb834d424cca7f54e61081e64718a77c9f1a9e22d20279216a06fa919a8b32a99125e0
+  metadata.gz: 3d9093dbb9207363e8c5d9637be9118c4dd06eb773943e8237ca81c6f6c6aa3687e9064a7a9d5b1cf91a15753fa4c06a81a938dd1930c4a5330df4226f837fae
+  data.tar.gz: 77f7d48b04cfb11d96fc6cce6c2d028bbb3f1f0b025016faccd573263affa13a2c39db4b78bbacd918572772ab766508af10095df0d766ee6ab3ab793c4fe2c2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.8.4
+
+Fixed deprecated direct reference to `SleepingKingStudios::Tools` methods.
+
 ## 2.8.3
 
 Added support for Ruby 4.0.

data/lib/rspec/sleeping_king_studios/examples/property_examples.rb

@@ -1,12 +1,12 @@
-# lib/rspec/sleeping_king_studios/examples/property_examples.rb
+# frozen_string_literal: true
 
-require 'sleeping_king_studios/tools/object_tools'
+require 'sleeping_king_studios/tools/toolbelt'
 
 require 'rspec/sleeping_king_studios/concerns/shared_example_group'
 require 'rspec/sleeping_king_studios/examples'
-require 'rspec/sleeping_king_studios/examples/property_examples/class_properties'
+require 'rspec/sleeping_king_studios/examples/property_examples/class_properties' # rubocop:disable Layout/LineLength
 require 'rspec/sleeping_king_studios/examples/property_examples/constants'
-require 'rspec/sleeping_king_studios/examples/property_examples/private_properties'
+require 'rspec/sleeping_king_studios/examples/property_examples/private_properties' # rubocop:disable Layout/LineLength
 require 'rspec/sleeping_king_studios/examples/property_examples/predicates'
 require 'rspec/sleeping_king_studios/examples/property_examples/properties'
 
@@ -14,6 +14,11 @@ require 'rspec/sleeping_king_studios/examples/property_examples/properties'
 # writer methods.
 module RSpec::SleepingKingStudios::Examples::PropertyExamples
   extend RSpec::SleepingKingStudios::Concerns::SharedExampleGroup
+  include RSpec::SleepingKingStudios::Examples::PropertyExamples::ClassProperties
+  include RSpec::SleepingKingStudios::Examples::PropertyExamples::Constants
+  include RSpec::SleepingKingStudios::Examples::PropertyExamples::PrivateProperties
+  include RSpec::SleepingKingStudios::Examples::PropertyExamples::Predicates
+  include RSpec::SleepingKingStudios::Examples::PropertyExamples::Properties
 
   # @api private
   #
@@ -21,27 +26,23 @@ module RSpec::SleepingKingStudios::Examples::PropertyExamples
   # value expectation.
   UNDEFINED_VALUE_EXPECTATION = Object.new.freeze
 
-  private def format_expected_value expected_value
+  private
+
+  def format_expected_value(expected_value) # rubocop:disable Metrics/MethodLength
     if expected_value.is_a?(Proc)
-      object_tools = SleepingKingStudios::Tools::ObjectTools
+      object_tools = SleepingKingStudios::Tools::Toolbelt.instance.object_tools
 
-      if 0 == expected_value.arity
-        comparable_value = object_tools.apply self, expected_value
+      if expected_value.arity.zero?
+        comparable_value = object_tools.apply(self, expected_value)
       else
         comparable_value = satisfy do |actual_value|
-          object_tools.apply self, expected_value, actual_value
-        end # satisfy
-      end # if-else
+          object_tools.apply(self, expected_value, actual_value)
+        end
+      end
     else
       comparable_value = expected_value
-    end # if
+    end
 
     comparable_value
-  end # method format_expected_value
-
-  include RSpec::SleepingKingStudios::Examples::PropertyExamples::ClassProperties
-  include RSpec::SleepingKingStudios::Examples::PropertyExamples::Constants
-  include RSpec::SleepingKingStudios::Examples::PropertyExamples::PrivateProperties
-  include RSpec::SleepingKingStudios::Examples::PropertyExamples::Predicates
-  include RSpec::SleepingKingStudios::Examples::PropertyExamples::Properties
-end # module
+  end
+end

data/lib/rspec/sleeping_king_studios/support/method_signature_expectation.rb

@@ -1,12 +1,12 @@
-# lib/rspec/sleeping_king_studios/support/method_signature_expectation.rb
+# frozen_string_literal: true
 
-require 'rspec/sleeping_king_studios/support/method_signature'
+require 'sleeping_king_studios/tools/toolbelt'
 
-require 'sleeping_king_studios/tools/array_tools'
+require 'rspec/sleeping_king_studios/support/method_signature'
 
 module RSpec::SleepingKingStudios::Support
   # @api private
-  class MethodSignatureExpectation
+  class MethodSignatureExpectation # rubocop:disable Metrics/ClassLength
     def initialize
       @min_arguments       = 0
       @max_arguments       = 0
@@ -15,7 +15,7 @@ module RSpec::SleepingKingStudios::Support
       @any_keywords        = false
       @block_argument      = false
       @errors              = {}
-    end # method initialize
+    end
 
     attr_accessor :min_arguments, :max_arguments, :keywords
 
@@ -23,30 +23,31 @@ module RSpec::SleepingKingStudios::Support
 
     attr_reader :errors
 
-    def description
+    def description # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       messages = []
 
-      if min_arguments == max_arguments
-        messages << "#{min_arguments} argument#{1 == min_arguments ? '' : 's'}"
-      else
-        messages << "#{min_arguments}..#{max_arguments} arguments"
-      end # if-else
+      messages <<
+        if min_arguments == max_arguments
+          "#{min_arguments} argument#{'s' unless min_arguments == 1}"
+        else
+          "#{min_arguments}..#{max_arguments} arguments"
+        end
 
       messages << 'unlimited arguments' if unlimited_arguments?
 
       unless keywords.empty?
         keywords_list = array_tools.humanize_list keywords.map(&:inspect)
-        messages << "keyword#{1 == keywords.count ? '' : 's'} #{keywords_list}"
-      end # if
+        messages << "keyword#{'s' unless keywords.one?} #{keywords_list}"
+      end
 
       messages << 'arbitrary keywords' if any_keywords?
 
       messages << 'a block' if block_argument?
 
       "with #{array_tools.humanize_list messages}"
-    end # method description
+    end
 
-    def matches? method
+    def matches?(method)
       @signature = MethodSignature.new(method)
       @errors    = {}
 
@@ -55,63 +56,59 @@ module RSpec::SleepingKingStudios::Support
       match = false unless matches_keywords?
       match = false unless matches_block?
       match
-    end # method matches?
+    end
 
     def any_keywords?
       !!@any_keywords
-    end # method any_keywords?
+    end
 
     def block_argument?
       !!@block_argument
-    end # method block_argument?
+    end
 
     def unlimited_arguments?
       !!@unlimited_arguments
-    end # method unlimited_arguments?
+    end
 
     private
 
     attr_reader :signature
 
     def array_tools
-      ::SleepingKingStudios::Tools::ArrayTools
-    end # method array_tools
+      ::SleepingKingStudios::Tools::Toolbelt.instance.array_tools
+    end
 
-    def matches_arity?
+    def matches_arity? # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       match = true
 
       if min_arguments < signature.min_arguments
         match = false
 
         @errors[:not_enough_args] = {
-          :expected => signature.min_arguments,
-          :received => min_arguments
-        } # end hash
-      end # if
+          expected: signature.min_arguments,
+          received: min_arguments
+        }
+      end
 
-      if signature.unlimited_arguments?
+      return match if signature.unlimited_arguments?
 
-      else
-        if max_arguments > signature.max_arguments
-          match = false
+      if max_arguments > signature.max_arguments
+        match = false
 
-          @errors[:too_many_args] = {
-            :expected => signature.max_arguments,
-            :received => max_arguments
-          } # end hash
-        end # if-else
+        @errors[:too_many_args] = {
+          expected: signature.max_arguments,
+          received: max_arguments
+        }
+      end
 
-        if unlimited_arguments?
-          match = false
+      if unlimited_arguments?
+        match = false
 
-          @errors[:no_variadic_args] = {
-            :expected => signature.max_arguments
-          } # end hash
-        end # if
-      end # if-else
+        @errors[:no_variadic_args] = { expected: signature.max_arguments }
+      end
 
       match
-    end # method matches_arity?
+    end
 
     def matches_block?
       match = true
@@ -120,12 +117,12 @@ module RSpec::SleepingKingStudios::Support
         match = false
 
         @errors[:no_block_argument] = true
-      end # if
+      end
 
       match
-    end # method matches_block?
+    end
 
-    def matches_keywords?
+    def matches_keywords? # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       match = true
 
       missing_keywords = signature.required_keywords - keywords
@@ -133,26 +130,24 @@ module RSpec::SleepingKingStudios::Support
         match = false
 
         @errors[:missing_keywords] = missing_keywords
-      end # unless
+      end
 
-      if signature.any_keywords?
+      return match if signature.any_keywords?
 
-      else
-        unexpected_keywords = keywords - signature.keywords
-        unless unexpected_keywords.empty?
-          match = false
+      unexpected_keywords = keywords - signature.keywords
+      unless unexpected_keywords.empty?
+        match = false
 
-          @errors[:unexpected_keywords] = unexpected_keywords
-        end # unless
+        @errors[:unexpected_keywords] = unexpected_keywords
+      end
 
-        if any_keywords?
-          match = false
+      if any_keywords?
+        match = false
 
-          @errors[:no_variadic_keywords] = true
-        end # if
-      end # if-else
+        @errors[:no_variadic_keywords] = true
+      end
 
       match
-    end # method matches_keywords?
-  end # class
-end # module
+    end
+  end
+end

data/lib/rspec/sleeping_king_studios/version.rb

@@ -13,7 +13,7 @@ module RSpec
       # Minor version.
       MINOR = 8
       # Patch version.
-      PATCH = 3
+      PATCH = 4
       # Prerelease version.
       PRERELEASE = nil
       # Build metadata.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sleeping_king_studios
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - Rob "Merlin" Smith
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A collection of RSpec patches and custom matchers.
 test_files: []