rspec-sleeping_king_studios 2.8.4 → 2.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbc7883d66ce748d8174fe94ba3c6649ce4a6208be40b51f41697a087b09ab58
-  data.tar.gz: ec1d727204bc3bc7f3202a0880538d45966d2be8071781e5a6ab6e5e407cfd66
+  metadata.gz: '002180c2b61102ae17dfa6814f04d8bbc8ffbaabcdf9eb2ee3659663881da1c1'
+  data.tar.gz: '0481509d19957f9be6ed46f70ef42c6c905bac506bcbf9af7e6f0e6573913e47'
 SHA512:
-  metadata.gz: 3d9093dbb9207363e8c5d9637be9118c4dd06eb773943e8237ca81c6f6c6aa3687e9064a7a9d5b1cf91a15753fa4c06a81a938dd1930c4a5330df4226f837fae
-  data.tar.gz: 77f7d48b04cfb11d96fc6cce6c2d028bbb3f1f0b025016faccd573263affa13a2c39db4b78bbacd918572772ab766508af10095df0d766ee6ab3ab793c4fe2c2
+  metadata.gz: aa434f2ae76a8c062d601af815cd000e00880c74d87710be827b9e62983e82d72b57db2ffac52f9c20993e64efbd30c406bbffa9645eb1ec2e1585cdedae630f
+  data.tar.gz: 58ad6ba8b887d4032394884e0974d1ebad253463af1c4dc40aede8b504f2b24ae2b2149c264ed2dff96581c19bf46a66e7808ceda4ab3a5dffa9f4f86bcab4b7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.8.5
+
+Fixed remaining direct references to `SleepingKingStudios::Tools` methods.
+
 ## 2.8.4
 
 Fixed deprecated direct reference to `SleepingKingStudios::Tools` methods.

data/lib/rspec/sleeping_king_studios/matchers/active_model/have_errors_matcher.rb

@@ -19,7 +19,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       # The error and message expectations are set up through #on and
       # #with_message.
       @error_expectations = []
-    end # constructor
+    end
 
     # (see BaseMatcher#description)
     def description
@@ -30,22 +30,22 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
 
         error_messages = expectation.messages.select(&:expected).map do |message_expectation|
           %{"#{message_expectation.message}"}
-        end # map
+        end
 
         unless error_messages.empty?
-          tools = ::SleepingKingStudios::Tools::ArrayTools
+          tools = SleepingKingStudios::Tools::Toolbelt.instance
 
           attribute_message <<
             " with message#{error_messages.count == 1 ? '' : 's'} "\
-            "#{tools.humanize_list error_messages}"
-        end # unless
+            "#{tools.array_tools.humanize_list error_messages}"
+        end
 
         attribute_message
-      end # each
+      end
       message << " on #{attribute_messages.join(", and on ")}" unless attribute_messages.empty?
 
       message
-    end # method description
+    end
 
     # Checks if the object can be validated, whether the object is valid, and
     # checks the errors on the object against the expected errors and messages
@@ -66,7 +66,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       return false unless @validates = actual.respond_to?(:valid?)
 
       !matches?(actual)
-    end # method does_not_match?
+    end
 
     # Checks if the object can be validated, whether the object is valid, and
     # checks the errors on the object against the expected errors and messages
@@ -85,7 +85,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       return false unless @validates = actual.respond_to?(:valid?)
 
       !@actual.valid? && attributes_have_errors?
-    end # method matches?
+    end
 
     # Adds an error expectation. If the actual object does not have an error on
     # the specified attribute, #matches? will return false.
@@ -100,7 +100,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       @error_expectations << ErrorExpectation.new(attribute)
 
       self
-    end # method on
+    end
 
     # Adds a message expectation for the most recently added error attribute.
     # If the actual object does not have an error on the that attribute with
@@ -125,7 +125,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       @error_expectations.last.messages << MessageExpectation.new(message)
 
       self
-    end # method with_message
+    end
 
     # Adds a set of message expectations for the most recently added error
     # attribute.
@@ -137,7 +137,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       messages.each do |message| self.with_message(message); end
 
       self
-    end # method with_message
+    end
     alias_method :with, :with_messages
 
     # (see BaseMatcher#failure_message)
@@ -154,8 +154,8 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
         "expected #{@actual.inspect} to have errors"
       else
         "expected #{@actual.inspect} to have errors#{expected_errors_message}#{received_errors_message}"
-      end # if-elsif-else
-    end # method failure_message
+      end
+    end
 
     # (see BaseMatcher#failure_message_when_negated)
     def failure_message_when_negated
@@ -174,8 +174,8 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
         return "expected #{@actual.inspect} not to have errors#{received_errors_message}"
       else
         return "expected #{@actual.inspect} not to have errors#{expected_errors_message}#{received_errors_message}"
-      end # if-else
-    end # method failure_message_when_negated
+      end
+    end
 
     private
 
@@ -186,7 +186,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
         # Find the matching error expectation, if any.
         error_expectation = @error_expectations.detect do |error_expectation|
           error_expectation.attribute == attribute
-        end # detect
+        end
 
         if error_expectation
           error_expectation.received = true
@@ -201,52 +201,52 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
                   message =~ message_expectation.message
                 else
                   message == message_expectation.message
-                end # if-else
-              end # detect
+                end
+              end
 
               if message_expectation
                 message_expectation.received = true
               else
                 error_expectation.messages << MessageExpectation.new(message, false, true)
-              end # if-else
-            end # each
-          end # unless
+              end
+            end
+          end
         else
           error_expectation = ErrorExpectation.new attribute, false, true
           messages.each do |message|
             error_expectation.messages << MessageExpectation.new(message, false, true)
-          end # each
+          end
 
           @error_expectations << error_expectation
-        end # if-else
-      end # each
+        end
+      end
 
       missing_errors.empty? && missing_messages.empty?
-    end # method attributes_have_errors
+    end
 
     def expected_errors
       @error_expectations.select do |error_expectation|
         error_expectation.expected
-      end # select
-    end # method expected_errors
+      end
+    end
 
     def missing_errors
       @error_expectations.select do |error_expectation|
         error_expectation.expected && !error_expectation.received
-      end # select
-    end # method missing_errors
+      end
+    end
 
     def missing_messages
       @error_expectations.select do |error_expectation|
         !error_expectation.messages.missing.empty?
-      end # select
-    end # method missing_messages
+      end
+    end
 
     def unexpected_errors
       @error_expectations.select do |error_expectation|
         !error_expectation.expected && error_expectation.received
-      end # select
-    end # method unexpected_errors
+      end
+    end
 
     def expected_errors_message
       "\n  expected errors:" + expected_errors.map do |error_expectation|
@@ -254,7 +254,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
           "(#{@negative_expectation ? 'none' : 'any'})" :
           error_expectation.messages.expected.map(&:message).map(&:inspect).join(", "))
       end.join # map
-    end # method expected_errors_message
+    end
 
     def received_errors_message
       return "" unless @validates
@@ -264,6 +264,6 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       "\n  received errors:" + @actual.errors.messages.map do |attr, ary|
         "\n    #{attr}: " + ary.map(&:inspect).join(", ")
       end.join # map
-    end # method received_errors_message
-  end # class
-end # module
+    end
+  end
+end

data/lib/rspec/sleeping_king_studios/matchers/built_in/be_kind_of_matcher.rb

@@ -9,7 +9,7 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
     # (see BaseMatcher#description)
     def description
       message = "be #{type_string}"
-    end # method description
+    end
 
     # Checks if the object matches one of the specified types. Allows an
     # expected value of nil as a shortcut for expecting an instance of
@@ -23,17 +23,17 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
     #   otherwise false.
     def match expected, actual
       match_type? expected
-    end # method match
+    end
 
     # (see BaseMatcher#failure_message)
     def failure_message
       "expected #{@actual.inspect} to be #{type_string}"
-    end # method failure_message
+    end
 
     # (see BaseMatcher#failure_message_when_negated)
     def failure_message_when_negated
       "expected #{@actual.inspect} not to be #{type_string}"
-    end # method failure_message_when_negated
+    end
 
     private
 
@@ -45,21 +45,21 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
         expected.reduce(false) { |memo, obj| memo || match_type?(obj) }
       else
         @actual.kind_of? expected
-      end # case
-    end # method match_type?
+      end
+    end
 
     def type_string
       case
       when @expected.nil?
         @expected.inspect
       when @expected.is_a?(Enumerable) && 1 < @expected.count
-        tools = ::SleepingKingStudios::Tools::ArrayTools
+        tools = SleepingKingStudios::Tools::Toolbelt.instance
         items = @expected.map { |value| value.nil? ? 'nil' : value }
 
-        "a #{tools.humanize_list items, :last_separator => ' or '}"
+        "a #{tools.array_tools.humanize_list items, :last_separator => ' or '}"
       else
         "a #{expected}"
-      end # case
-    end # method type_string
-  end # class
-end # module
+      end
+    end
+  end
+end

data/lib/rspec/sleeping_king_studios/matchers/core/have_constant_matcher.rb

@@ -17,7 +17,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
     #   the actual object.
     def initialize expected
       @expected = expected.intern
-    end # method initialize
+    end
 
     # (see BaseMatcher#description)
     def description
@@ -27,7 +27,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
       message << ' with value ' << value_to_string if @value_set
 
       message
-    end # method description
+    end
 
     # (see BaseMatcher#does_not_match?)
     def does_not_match? actual
@@ -36,7 +36,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
       @errors = {}
 
       !has_constant?
-    end # method does_not_match?
+    end
 
     # (see BaseMatcher#failure_message)
     def failure_message
@@ -49,33 +49,33 @@ module RSpec::SleepingKingStudios::Matchers::Core
           ", but #{@actual.inspect} does not respond to ::const_defined?"
 
         return message
-      end # if
+      end
 
       if @errors[:constant_is_not_defined]
         message <<
           ", but #{@actual.inspect} does not define constant #{@expected.inspect}"
 
         return message
-      end # if
+      end
 
       if hsh = @errors[:value_does_not_match]
         messages <<
           "constant #{@expected.inspect} has value #{hsh[:received].inspect}"
-      end # if
+      end
 
       if hsh = @errors[:value_is_mutable]
         messages <<
           "the value of #{@expected.inspect} was mutable"
-      end # if
+      end
 
       unless messages.empty?
-        tools = ::SleepingKingStudios::Tools::ArrayTools
+        tools = SleepingKingStudios::Tools::Toolbelt.instance
 
-        message << ', but ' << tools.humanize_list(messages)
-      end # unless
+        message << ', but ' << tools.array_tools.humanize_list(messages)
+      end
 
       message
-    end # method failure_message
+    end
 
     # (see BaseMatcher#failure_message_when_negated)
     def failure_message_when_negated
@@ -86,7 +86,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
         "value #{actual.const_get(@expected).inspect}"
 
       message
-    end # method failure_message
+    end
 
     # Sets a mutability expectation. The matcher will determine whether the
     # value of the constant is mutable. Values of `nil`, `false`, `true` are
@@ -99,14 +99,14 @@ module RSpec::SleepingKingStudios::Matchers::Core
       @immutable = true
 
       self
-    end # method immutable
+    end
     alias_method :frozen, :immutable
 
     # @return [Boolean] True if a mutability expectation is set, otherwise
     #   false.
     def immutable?
       !!@immutable
-    end # method immutable
+    end
     alias_method :frozen?, :immutable?
 
     # Checks if the object has a constant :expected. Additionally, if a
@@ -125,7 +125,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
       return false unless has_constant?
 
       matches_constant? :all?
-    end # method matches?
+    end
 
     # Sets a value expectation. The matcher will compare the value of the
     # constant with the specified value.
@@ -137,7 +137,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
       @value     = value
       @value_set = true
       self
-    end # method with
+    end
     alias_method :with_value, :with
 
     private
@@ -147,16 +147,16 @@ module RSpec::SleepingKingStudios::Matchers::Core
         @errors[:does_not_define_constants] = true
 
         return false
-      end # unless
+      end
 
       unless actual.const_defined?(@expected)
         @errors[:constant_is_not_defined] = true
 
         return false
-      end # unless
+      end
 
       true
-    end # method has_constant?
+    end
 
     def immutable_value?
       return true unless @immutable
@@ -167,16 +167,16 @@ module RSpec::SleepingKingStudios::Matchers::Core
         @errors[:value_is_mutable] = true
 
         return false
-      end # if
+      end
 
       true
-    end # method immutable_value
+    end
 
     def matches_constant? filter
       [ matches_constant_value?,
         immutable_value?
       ].send(filter) { |bool| bool }
-    end # method matches_constant?
+    end
 
     def matches_constant_value?
       return true unless @value_set
@@ -193,10 +193,10 @@ module RSpec::SleepingKingStudios::Matchers::Core
         } # end hash
 
         return false
-      end # unless
+      end
 
       true
-    end # method matches_constant_value?
+    end
 
     def mutable? value
       case value
@@ -212,8 +212,8 @@ module RSpec::SleepingKingStudios::Matchers::Core
         (value.keys + value.values).reduce(false) { |memo, item| memo || mutable?(item) }
       else
         !value.frozen?
-      end # case
-    end # method mutable?
+      end
+    end
 
     # Formats the expected value as a human-readable string. If the value looks
     # like an RSpec matcher (it responds to :matches? and :description), calls
@@ -224,6 +224,6 @@ module RSpec::SleepingKingStudios::Matchers::Core
       return @value.description if @value.respond_to?(:matches?) && @value.respond_to?(:description)
 
       @value.inspect
-    end # method value_to_string
-  end # class
-end # module
+    end
+  end
+end

data/lib/rspec/sleeping_king_studios/matchers/description.rb

@@ -23,13 +23,13 @@ module RSpec::SleepingKingStudios::Matchers
       desc << format_expected_items
 
       desc
-    end # method description
+    end
 
     private
 
     def expected_items_for_description
       defined?(@expected) ? @expected : DEFAULT_EXPECTED_ITEMS
-    end # method expected_items_for_description
+    end
 
     def format_expected_items
       expected_items = expected_items_for_description
@@ -43,20 +43,25 @@ module RSpec::SleepingKingStudios::Matchers
         # RSpec 3.0-3.3
         to_sentence(expected_items)
       else
-        array_tools = ::SleepingKingStudios::Tools::ArrayTools
-        processed   = [expected_items].flatten.map(&:inspect)
+        processed =
+          tools
+          .array_tools
+          .humanize_list([expected_items].flatten.map(&:inspect))
 
         ' ' << array_tools.humanize_list(processed)
-      end # if-elsif-else
-    end # method format_expected_items
+      end
+    end
 
     def matcher_name
       return @matcher_name if @matcher_name
 
-      string_tools = ::SleepingKingStudios::Tools::StringTools
-      name         = string_tools.underscore(self.class.name.split('::').last)
+      name = tools.string_tools.underscore(self.class.name.split('::').last)
 
       @matcher_name = name.tr('_', ' ').sub(/ matcher\z/, '')
-    end # method matcher_name
-  end # module
-end # module
+    end
+
+    def tools
+      SleepingKingStudios::Tools::Toolbelt.instance
+    end
+  end
+end

data/lib/rspec/sleeping_king_studios/matchers/shared/match_parameters.rb

@@ -1,19 +1,18 @@
-# lib/rspec/sleeping_king_studios/matchers/shared/parameters_matcher.rb
+# frozen_string_literal: true
 
 require 'rspec/sleeping_king_studios/matchers'
 require 'sleeping_king_studios/tools/array_tools'
 require 'rspec/sleeping_king_studios/support/method_signature_expectation'
 
 module RSpec::SleepingKingStudios::Matchers::Shared
-  # Helper methods for checking the parameters and keywords (Ruby 2.0 only) of
-  # a method.
+  # Helper methods for checking the arguments and keywords of a method.
   module MatchParameters
     # Convenience method for more fluent specs. Does nothing and returns self.
     #
     # @return self
     def argument
       self
-    end # method argument
+    end
     alias_method :arguments, :argument
 
     # Adds a parameter count expectation and/or one or more keyword
@@ -55,12 +54,12 @@ module RSpec::SleepingKingStudios::Matchers::Shared
 
         method_signature_expectation.min_arguments = arity
         method_signature_expectation.max_arguments = arity
-      end # case
+      end
 
       method_signature_expectation.keywords = keywords
 
       self
-    end # method with
+    end
 
     # Adds a block expectation. The actual object will only match a block
     # expectation if it expects a parameter of the form &block.
@@ -70,7 +69,7 @@ module RSpec::SleepingKingStudios::Matchers::Shared
       method_signature_expectation.block_argument = true
 
       self
-    end # method with_a_block
+    end
     alias_method :and_a_block, :with_a_block
 
     # Adds an arbitrary keyword expectation, e.g. that the method supports
@@ -79,7 +78,7 @@ module RSpec::SleepingKingStudios::Matchers::Shared
       method_signature_expectation.any_keywords = true
 
       self
-    end # method with_arbitrary_keywords
+    end
     alias_method :and_arbitrary_keywords, :with_arbitrary_keywords
     alias_method :with_any_keywords,      :with_arbitrary_keywords
     alias_method :and_any_keywords,       :with_any_keywords
@@ -94,7 +93,7 @@ module RSpec::SleepingKingStudios::Matchers::Shared
       method_signature_expectation.keywords = keywords
 
       self
-    end # method with_keywords
+    end
     alias_method :and_keywords, :with_keywords
 
     # Adds an unlimited parameter count expectation, e.g. that the method
@@ -105,17 +104,15 @@ module RSpec::SleepingKingStudios::Matchers::Shared
       method_signature_expectation.unlimited_arguments = true
 
       self
-    end # method with_unlimited_arguments
+    end
     alias_method :and_unlimited_arguments, :with_unlimited_arguments
 
     private
 
-    # @api private
     def check_method_signature method
       method_signature_expectation.matches?(method)
-    end # method check_method_signature
+    end
 
-    # @api private
     def format_errors errors
       messages = []
 
@@ -127,17 +124,17 @@ module RSpec::SleepingKingStudios::Matchers::Shared
       # - at least :min (for methods with variadic params)
       if hsh = errors.fetch(:not_enough_args, false)
         messages << "  expected at least #{hsh[:expected]} arguments, but received #{hsh[:received]}"
-      end # if
+      end
 
       if hsh = errors.fetch(:too_many_args, false)
         messages << "  expected at most #{hsh[:expected]} arguments, but received #{hsh[:received]}"
-      end # if
+      end
 
       # TODO: Replace this with "  expected method to receive unlimited "\
       # "arguments, but method can receive at most :max arguments"
       if hsh = errors.fetch(:no_variadic_args, false)
         messages << "  expected at most #{hsh[:expected]} arguments, but received unlimited arguments"
-      end # if
+      end
 
       # TODO: Replace this with "  expected method to receive arbitrary "\
       # "keywords, but the method can receive :keyword_list", with
@@ -146,46 +143,44 @@ module RSpec::SleepingKingStudios::Matchers::Shared
       # " receive keywords"
       if errors.fetch(:no_variadic_keywords, false)
         messages << "  expected arbitrary keywords"
-      end # if
+      end
 
       # TODO: Replace this with "  expected method to receive keywords "\
       # ":received_list, but the method requires keywords :required_list"
       if ary = errors.fetch(:missing_keywords, false)
-        tools = ::SleepingKingStudios::Tools::ArrayTools
-
         messages <<
           "  missing keyword#{ary.count == 1 ? '' : 's'} "\
-          "#{tools.humanize_list ary.map(&:inspect)}"
-      end # if
+          "#{tools.array_tools.humanize_list ary.map(&:inspect)}"
+      end
 
       # TODO: Replace this with "  expected method to receive keywords "\
       # ":received_list, but the method can receive :keyword_list"
       if ary = errors.fetch(:unexpected_keywords, false)
-        tools = ::SleepingKingStudios::Tools::ArrayTools
-
         messages <<
           "  unexpected keyword#{ary.count == 1 ? '' : 's'} "\
-          "#{tools.humanize_list ary.map(&:inspect)}"
-      end # if
+          "#{tools.array_tools.humanize_list ary.map(&:inspect)}"
+      end
 
       # TODO: Replace this with "  expected method to receive a block "\
       # "argument, but the method signature does not specify a block argument"
       if errors.fetch(:no_block_argument, false)
         messages << "  unexpected block"
-      end # if
+      end
 
       messages.join "\n"
-    end # method format_errors
+    end
 
-    # @api private
     def method_signature_expectation
       @method_signature_expectation ||=
         ::RSpec::SleepingKingStudios::Support::MethodSignatureExpectation.new
-    end # method_signature_expectation
+    end
 
-    # @api private
     def method_signature_expectation?
       !!@method_signature_expectation
-    end # method_signature_expectation
-  end # module
-end # module
+    end
+
+    def tools
+      SleepingKingStudios::Tools::Toolbelt.instance
+    end
+  end
+end

data/lib/rspec/sleeping_king_studios/version.rb

@@ -13,7 +13,7 @@ module RSpec
       # Minor version.
       MINOR = 8
       # Patch version.
-      PATCH = 4
+      PATCH = 5
       # 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.4
+  version: 2.8.5
 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.3
+rubygems_version: 4.0.15
 specification_version: 4
 summary: A collection of RSpec patches and custom matchers.
 test_files: []