rspec-sleeping_king_studios 1.0.1 → 2.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2914760ac00f260530d026c9aa1fb0215f1942cb
-  data.tar.gz: 185f9dc20a98f638ce428af5f53c353408734913
+  metadata.gz: cbf466af0152a14ef3bc8c347801fde6920ed6e9
+  data.tar.gz: 376e2f08164ead08c9c45b40dbb905059b3604c3
 SHA512:
-  metadata.gz: 331f73ab249d34ecb3a46f327136774a8755c74de5cd543fc8a0b709ccfd354f1d1e5f73b6286ebf28f758d604574f952ed13432591a9817877225a904f9b5ca
-  data.tar.gz: 7550a28dd849c96e717df1d1e38a4eba927116aaa0caeccefdf8a97bd2ba6d8f32f8387c841ef2f6c39464e32dfc674747a7c77e9e6852a66399e7dab68b63f7
+  metadata.gz: fb509c9eadc232566f2e7cd186ae526f3985c22afc507a3f4773236155ed9e173e0858b1125186831897fa75571d7c477d87e91a07052e6c30390cf9f30faa60
+  data.tar.gz: bf36d933af302a1f19266b148631c7c023ae855433bfa3e888e88f11287048bac924e221cb2e30c0d0ea7ce2e340098611e4b3b80e1365747cf67ea00e86c052

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 2.0.0.alpha
+
+Update the entire library to support RSpec 3. Most of the updates are purely
+internal, but there are a few changes that are not backward compatible to be
+aware of.
+
+### Matchers
+
+All matchers have been updated to support the RSpec 3 matcher API.
+
+#### fail_with_actual Matcher
+
+Now correctly handles the #does_not_match? case for the new matcher API.
+
+#### respond\_to Matcher
+
+The #and fluent method has been removed, and the #a_block method for verifying
+the presence of a block argument has been renamed to #with_a_block.
+
+### Mocks
+
+The #custom_double mock method has been completely removed. The recommended
+solution for that use case is `double('My Double').extend(MyModule)`, for some
+`MyModule` that implements the desired actual (non-stubbed) functionality.
+
 ## 1.0.1
 
 ### New Features
@@ -8,7 +33,8 @@
   arguments, of the form def foo(bar:, baz:). If the class constructor or
   method requires one or more keyword arguments, and one or more of those 
   keywords are not provided when checking arguments using the #with
-  method, the matcher will fail with the message "missing keywords" and a list of the keywords that were not provided as arguments to #with.
+  method, the matcher will fail with the message "missing keywords" and a list
+  of the keywords that were not provided as arguments to #with.
 
 ## 1.0.0
 

data/README.md

@@ -10,32 +10,27 @@ Currently, the following versions of Ruby are officially supported:
 * 2.0.0
 * 2.1.0
 
-## The Extensions
+## Contribute
 
-To enable an extension, simply require the associated file.
+- https://github.com/sleepingkingstudios/rspec-sleeping_king_studios
 
-### Mocks
+### A Note From The Developer
 
-These extensions support the creation and use of mock objects.
-
-#### custom\_double
-
-    require 'rspec/sleeping_king_studios/mocks/custom_double'
-
-As the built-in 'double' method, but accepts a block that is passed to
-Class.new when the double is created, allowing you to create functional class
-and instance methods on the double. Useful when you need to test a function or
-sequence that repeatedly updates or checks the state of the injected object.
-
-**How To Use:**
-
-    custom_double('My Double', :foo => "Foo") { attr_accessor :bar }
+Hi, I'm Rob Smith, the maintainer of this library. As a professional Ruby
+developer, I use these tools every day. If you find this project helpful in
+your own work, or if you have any questions, suggestions or critiques, please
+feel free to get in touch! I can be reached on GitHub (see above, and feel
+encouraged to submit bug reports or merge requests there) or via email at
+merlin@sleepingkingstudios.com. I look forward to hearing from you!
 
 ## The Matchers
 
 To enable a custom matcher, simply require the associated file. Matchers can be
 required individually or by category:
 
+    require 'rspec/sleeping_king_studios'
+    #=> requires all features, including matchers
+
     require 'rspec/sleeping_king_studios/matchers/core'
     #=> requires all of the core matchers
     
@@ -111,19 +106,19 @@ accepted by the method, and whether the method accepts a block argument.
 
 **How To Use:**
 
-    expect(instance).to respond_to(:foo).with(2..3).arguments.and.a_block
+    expect(instance).to respond_to(:foo).with(2..3).arguments.with_a_block
 
 **Chaining:**
 
-* **a\_block:** No parameters. Verifies that the method requires a block
-  argument of the form &my_argument. _Important note:_ A negative result does
-  _not* mean the method cannot accept a block, merely that it does not require
-  one. Also, does _not_ check whether the block is called or yielded.
 * **with:** Expects one Integer or Range argument. If an Integer, verifies that
   the method accepts that number of arguments; if a Range, verifies that the
   method accepts both the minimum and maximum number of arguments.
+* **with\_a\_block:** No parameters. Verifies that the method requires a block
+  argument of the form &my_argument. _Important note:_ A negative result does
+  _not* mean the method cannot accept a block, merely that it does not require
+  one. Also, does _not_ check whether the block is called or yielded.
 
-##### Ruby 2.0
+##### Ruby 2.0+
 
 Has additional functionality to support Ruby 2.0 keyword arguments.
 
@@ -177,7 +172,7 @@ optional number of arguments.
   verifies that the constructor accepts both the minimum and maximum number of
   arguments.
 
-##### Ruby 2.0
+##### Ruby 2.0+
 
 Has additional functionality to support Ruby 2.0 keyword arguments.
 
@@ -289,12 +284,12 @@ pass\_with\_actual matcher, below.
     expect(matcher).to fail_with_actual(actual).with_message(/expected to/)
     
 **Parameters:** Matcher. Expects an object that, at minimum, responds to
-:matches? and :failure\_message\_for\_should.
+:matches? and :failure\_message.
 
 **Chaining:**
 
 * **with\_message:** Expects one String or Regexp argument, which is matched
-  against the given matcher's failure\_message\_for\_should.
+  against the given matcher's failure\_message.
 
 #### pass\_with\_actual Matcher
 
@@ -309,15 +304,15 @@ fail\_with\_actual matcher, above.
 
 **How To Use:**
 
-    expect(matcher).to pass_with_actual(actual)
+    expect(matcher).to pass_with_actual(actual).with_message(/expected not to/)
   
 **Parameters:** Matcher. Expects an object that, at minimum, responds to
-:matches? and :failure\_message\_for\_should\_not.
+:matches? and :failure\_message\_when\_negated.
 
 **Chaining:**
 
 * **with\_message:** Expects one String or Regexp argument, which is matched
-  against the given matcher's failure\_message\_for\_should\_not.
+  against the given matcher's failure\_message\_when\_negated.
 
 ## License
 

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

@@ -89,8 +89,8 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       self
     end # method with_message
 
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message
+    def failure_message
       # Failure cases:
       # * object is not a model ("to respond to valid")
       # * expected one or more errors, but received none ("to have errors")
@@ -104,10 +104,10 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       else
         "expected #{@actual.inspect} to have errors#{expected_errors_message}#{received_errors_message}"
       end # if-elsif-else
-    end # method failure_message_for_should
+    end # method failure_message
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       # Failure cases:
       # * expected one or more errors, received one or more ("not to have
       #   errors")
@@ -121,7 +121,7 @@ module RSpec::SleepingKingStudios::Matchers::ActiveModel
       else
         return "expected #{@actual.inspect} not to have errors#{expected_errors_message}#{received_errors_message}"
       end # if-else
-    end # method failure_message_for_should_not
+    end # method failure_message_when_negated
 
     private
     

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

@@ -7,14 +7,17 @@ module RSpec::SleepingKingStudios::Matchers
   # 
   # @since 1.0.0
   class BaseMatcher
-    def initialize *args
-    end # constructor
+    include RSpec::Matchers::Pretty
 
-    # A short string that describes the purpose of the matcher.
+    attr_reader :actual
+
+    # A short string that describes the purpose of the matcher. Borrowed from
+    # RSpec::Matchers::BuiltIn::BaseMatcher.
     # 
     # @return [String] the matcher description
     def description
-      "match"
+      return name_to_sentence unless defined?(@expected)
+      "#{name_to_sentence}#{to_sentence @expected}"
     end # method description
 
     # Tests the actual object to see if it matches the defined condition(s).
@@ -30,14 +33,14 @@ module RSpec::SleepingKingStudios::Matchers
 
     # Message for when the object does not match, but was expected to. Make
     # sure to always call #matches? first to set up the matcher state.
-    def failure_message_for_should
+    def failure_message
       "expected #{@actual.inspect} to #{description}"
-    end # method failure_message_for_should
+    end # method failure_message
 
     # Message for when the object matches, but was expected not to. Make sure
     # to always call #matches? first to set up the matcher state.
-    def failure_message_for_should_not
+    def failure_message_when_negated
       "expected #{@actual.inspect} not to #{description}"
-    end # method failure_message_for_should_not
+    end # method failure_message_when_negated
   end # class
 end # module

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

@@ -18,15 +18,15 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
       match_type? expected
     end # method match
 
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message
+    def failure_message
       "expected #{@actual.inspect} to be #{type_string}"
-    end # method failure_message_for_should
+    end # method failure_message
     
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       "expected #{@actual.inspect} not to be #{type_string}"
-    end # method failure_message_for_should_not
+    end # method failure_message_when_negated
 
     private
     

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

@@ -17,69 +17,58 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
       super *expected
     end # constructor
 
-    # Checks if the object includes the specified objects. Proc expectations
-    # are evaluated by passing each item to proc#call.
-    # 
-    # @param [Object] actual the object to check
-    # 
-    # @return [Boolean] true if for each item expectation, the object contains
-    #   an item matching that expectation; otherwise false
-    def matches? actual
-      super
-    end # method matches?
-
     # @private
-    def name
-      "include"
-    end # method name
-
-    # @private
-    def to_word item
+    def to_word expected_item
       case
-      when is_matcher_with_description?(item)
-        item.description
-      when Proc === item
-        "matching block"
+      when is_matcher_with_description?(expected_item)
+        expected_item.description
+      when Proc === expected_item
+        "an item matching the block"
       else
-        item.inspect
+        expected_item.inspect
       end # case
     end # method to_word
 
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message
+    def failure_message
       return "expected #{@actual.inspect} to respond to :include?" if false === @includes
 
       super
     end # method failure_message_for_should
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       super
     end # method
 
     private
 
-    def perform_match predicate, hash_predicate, actuals, expecteds
-      expecteds.__send__(predicate) do |expected|
-        if comparing_proc? actuals, expected
-          !!actuals.detect { |actual| expected.call(actual) }
-        elsif comparing_hash_values?(actuals, expected)
-          expected.__send__(hash_predicate) { |k,v|
-            actuals.has_key?(k) && actuals[k] == v
-          }
-        elsif comparing_hash_keys?(actuals, expected)
-          actuals.has_key?(expected)
-        elsif comparing_with_matcher?(actual, expected)
-          actual.any? { |value| expected.matches?(value) }
+    def perform_match(predicate, hash_subset_predicate)
+      expected.__send__(predicate) do |expected_item|
+        if comparing_proc?(expected_item)
+          actual_matches_proc?(expected_item)
+        elsif comparing_hash_to_a_subset?(expected_item)
+          expected_item.__send__(hash_subset_predicate) do |(key, value)|
+            actual_hash_includes?(key, value)
+          end
+        elsif comparing_hash_keys?(expected_item)
+          actual_hash_has_key?(expected_item)
         else
-          @includes = actuals.respond_to?(:include?)
-          @includes && actuals.include?(expected)
-        end # if-elsif-end
-      end # send
-    end # method perform_match
+          actual_collection_includes?(expected_item)
+        end
+      end
+    end
+
+    def actual_collection_includes? expected_item
+      (@includes = actual.respond_to?(:include?)) && super
+    end # method actual_collection_includes?
+
+    def actual_matches_proc? expected_item
+      !!actual.detect(&expected_item)
+    end # method actual_matches_proc?
 
-    def comparing_proc? actual, expected
-      expected.is_a?(Proc)
+    def comparing_proc? expected_item
+      expected_item.is_a?(Proc)
     end # method comparing_proc?
   end # class
 end # module

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

@@ -8,17 +8,6 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
   class RespondToMatcher < RSpec::Matchers::BuiltIn::RespondTo
     include RSpec::SleepingKingStudios::Matchers::Shared::MatchParameters
 
-    # Checks if the object responds to the specified message. If so, checks the
-    # parameters against the expected parameters, if any.
-    # 
-    # @param [Object] actual the object to check
-    # 
-    # @return [Boolean] true if the object responds to the message and accepts
-    #   the specified parameters; otherwise false
-    def matches? actual
-      super
-    end # method matches?
-
     # @overload with count
     #   Adds a parameter count expectation.
     # 
@@ -53,30 +42,17 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
     # expectation if it expects a parameter of the form &block.
     # 
     # @return [RespondToMatcher] self
-    def a_block
+    def with_a_block
       @expected_block = true
       self
-    end # method a_block
-
-    # Convenience method for more fluent specs. Does nothing and returns self.
-    # 
-    # @return [RespondToMatcher] self
-    def arguments
-      self
-    end # method arguments
+    end # method with_a_block
 
-    # Convenience method for more fluent specs. Does nothing and returns self.
-    # 
-    # @return [RespondToMatcher] self
-    def and
-      self
-    end # method arguments
-
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
-      messages = []
+    # @see BaseMatcher#failure_message
+    def failure_message
       @failing_method_names ||= []
-      @failing_method_names.map do |method|
+      methods, messages = @names - @failing_method_names, []
+
+      methods.map do |method|
         message = "expected #{@actual.inspect} to respond to #{method.inspect}"
         if @actual.respond_to?(method)
           message << " with arguments:\n#{format_errors_for_method method}"
@@ -84,14 +60,14 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
         messages << message
       end # method
       messages.join "\n"
-    end # method failure_message_for_should
+    end # method failure_message
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       @failing_method_names ||= []
       methods, messages = @names - @failing_method_names, []
 
-      @names.map do |method|
+      methods.map do |method|
         message   = "expected #{@actual.inspect} not to respond to #{method.inspect}"
         unless (formatted = format_expected_arguments).empty?
           message << " with #{formatted}"
@@ -99,7 +75,7 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
         messages << message
       end # method
       messages.join "\n"
-    end # method failure_message_for_should_not
+    end # method failure_message_when_negated
 
     private
 

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

@@ -19,15 +19,15 @@ module RSpec::SleepingKingStudios::Matchers::Core
       true === actual || false === actual
     end # method matches?
 
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message
+    def failure_message
       "expected #{@actual.inspect} to be true or false"
-    end # method failure_message_for_should
+    end # method failure_message
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       "expected #{@actual.inspect} not to be true or false"
-    end # method failure_message_for_should_not
+    end # method failure_message_when_negated
   end # class
 end # module
 

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

@@ -51,21 +51,21 @@ module RSpec::SleepingKingStudios::Matchers::Core
       self
     end # method arguments
 
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message
+    def failure_message
       message = "expected #{@actual.inspect} to construct"
       message << " with arguments:\n#{format_errors}" if @actual.respond_to?(:new)
       message
-    end # method failure_message_for_should
+    end # method failure_message
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       message = "expected #{@actual.inspect} not to construct"
       unless (formatted = format_expected_arguments).empty?
         message << " with #{formatted}" 
       end # unless
       message
-    end # method failure_message_for_should_not
+    end # method failure_message_when_negated
 
     private
 

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

@@ -13,7 +13,6 @@ module RSpec::SleepingKingStudios::Matchers::Core
     # @param [String, Symbol] expected the property to check for on the actual
     #   object
     def initialize expected
-      super
       @expected = expected.intern
     end # method initialize
 
@@ -54,8 +53,8 @@ module RSpec::SleepingKingStudios::Matchers::Core
       self
     end # method with
 
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message
+    def failure_message
       methods = []
       methods << ":#{@expected}"  unless @match_reader
       methods << ":#{@expected}=" unless @match_writer
@@ -65,14 +64,14 @@ module RSpec::SleepingKingStudios::Matchers::Core
       "unexpected value for #{@actual.inspect}\##{@expected}" +
         "\n  expected: #{@value.inspect}" +
         "\n       got: #{@actual.send(@expected).inspect}"
-    end # failure_message_for_should
+    end # failure_message
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       message = "expected #{@actual.inspect} not to respond to :#{@expected} or :#{@expected}="
       message << " with value #{@value.inspect}" if @value_set
       message
-    end # failure_message_for_should_not
+    end # failure_message_when_negated
   end # class
 end # module
 

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

@@ -12,7 +12,6 @@ module RSpec::SleepingKingStudios::Matchers::Core
     # @param [String, Symbol] expected the property to check for on the actual
     #   object
     def initialize expected
-      super
       @expected = expected.intern
     end # method initialize
 
@@ -48,8 +47,8 @@ module RSpec::SleepingKingStudios::Matchers::Core
       self
     end # method with
 
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message
+    def failure_message
       unless @match_reader
         return "expected #{@actual} to respond to #{@expected.inspect}"
       end # unless
@@ -57,14 +56,14 @@ module RSpec::SleepingKingStudios::Matchers::Core
       "unexpected value for #{@actual}\##{@expected}\n" +
           "  expected: #{@value.inspect}\n" +
           "       got: #{@actual.send(@expected).inspect}"
-    end # method failure_message_for_should
+    end # method failure_message
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       message = "expected #{@actual} not to respond to #{@expected.inspect}"
       message << " with value #{@value.inspect}" if @value_set
       message
-    end # method failure_message_for_should
+    end # method failure_message
   end # class
 end # module
 

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

@@ -12,7 +12,6 @@ module RSpec::SleepingKingStudios::Matchers::Core
     # @param [String, Symbol] expected the property to check for on the actual
     #   object
     def initialize expected
-      super
       @expected = expected.to_s.gsub(/=$/,'').intern
     end # method initialize
 
@@ -70,8 +69,8 @@ module RSpec::SleepingKingStudios::Matchers::Core
       self
     end # method with
 
-    # @see BaseMatcher#failure_message_for_should
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message
+    def failure_message
       return "expected #{@actual.inspect} to respond to #{@expected.inspect}=" unless @match_writer
 
       unless @actual.respond_to?(@expected) || @value_block.respond_to?(:call)
@@ -82,14 +81,14 @@ module RSpec::SleepingKingStudios::Matchers::Core
       return "unexpected value for #{@actual.inspect}#foo=\n" +
         "  expected: #{@value.inspect}\n" +
         "       got: #{@actual_value.inspect}"
-    end # method failure_message_for_should
+    end # method failure_message
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       message = "expected #{@actual} not to respond to #{@expected.inspect}="
       message << " with value #{@value.inspect}" if @value_set && @match_writer
       message
-    end # method failure_message_for_should
+    end # method failure_message
   end # class
 end # module
 

data/lib/rspec/sleeping_king_studios/matchers/meta/fail_with_actual.rb

@@ -18,34 +18,34 @@ module RSpec::SleepingKingStudios::Matchers::Meta
   class FailWithActualMatcher < RSpec::SleepingKingStudios::Matchers::BaseMatcher
     # @param [Object] expected the actual object to check the matcher against
     def initialize expected
-      super
       @expected = expected
     end # method initialize
 
     # Checks if the matcher evaluates to false with the expected object. If a
     # message expectation is set, checks the value of
-    # #failure_message_for_should against the expected message.
+    # #failure_message against the expected message.
     # 
     # @param [Object] actual the RSpec matcher to check; should respond to
-    #   :matches? and :failure_message_for_should, as a minimum
+    #   :matches? and :failure_message, as a minimum
     # 
     # @return [Boolean] true if the matcher evaluates to false and the
-    #   matcher's #failure_message_for_should matches the expected message
+    #   matcher's #failure_message matches the expected message
     #   (if any); otherwise false
     def matches? actual
       super
-      return false if @matches = @actual.matches?(@expected)
+
+      return false if matches_actual?
 
       if @message.is_a? Regexp
-        !!(@actual.failure_message_for_should =~ @message)
+        !!(@actual.failure_message =~ @message)
       elsif @message
-        @actual.failure_message_for_should == @message.to_s
+        @actual.failure_message == @message.to_s
       else
         true
       end # if-elsif-else
     end # method matches?
 
-    def failure_message_for_should
+    def failure_message
       if @matches
         "expected #{@actual} not to match #{@expected}"
       else
@@ -54,15 +54,15 @@ module RSpec::SleepingKingStudios::Matchers::Meta
         "expected message#{@message.is_a?(Regexp) ? " matching" : ""}:\n#{
           message_text.lines.map { |line| "#{" " * 2}#{line}" }.join
         }\nreceived message:\n#{
-          @actual.failure_message_for_should.lines.map { |line| "#{" " * 2}#{line}" }.join
+          @actual.failure_message.lines.map { |line| "#{" " * 2}#{line}" }.join
         }"
       end # if-else
-    end # method failure_message_for_should
+    end # method failure_message
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       "failure: testing positive condition with negative matcher\n~>  use the :pass_with_actual matcher instead"
-    end # method failure_message_for_should_not
+    end # method failure_message_when_negated
 
     # The expected failure message for should when the matcher is called via
     # expect#to.
@@ -72,7 +72,7 @@ module RSpec::SleepingKingStudios::Matchers::Meta
     attr_reader :message
 
     # Sets up a message expectation. When the matcher is called with the
-    # provided actual object, the matcher's failure_message_for_should
+    # provided actual object, the matcher's failure_message
     # message is compared to the provided message.
     # 
     # @param [String, Regexp] message the message to compare
@@ -82,6 +82,20 @@ module RSpec::SleepingKingStudios::Matchers::Meta
       @message = message
       self
     end # method with_message
+
+    private
+
+    # Handles the actual matching through #does_not_match? if the matcher
+    # supports that method, otherwise falls back to @matches?.
+    # 
+    # @return [Boolean]
+    def matches_actual?
+      if @actual.respond_to?(:does_not_match?)
+        @matches = !@actual.does_not_match?(@expected)
+      else
+        @matches = @actual.matches?(@expected)
+      end # if-else
+    end # method matches_actual?
   end # class
 end # module
 
@@ -91,52 +105,3 @@ module RSpec::SleepingKingStudios::Matchers
     Meta::FailWithActualMatcher.new expected
   end # method fail_with_actual
 end # module
-
-=begin
-RSpec::Matchers.define :fail_with_actual do |actual|
-  match do |matcher|
-    @matcher = matcher
-    @actual  = actual
-    
-    next false if @matches = @matcher.matches?(@actual)
-    
-    text = @matcher.failure_message_for_should
-    if @message.is_a? Regexp
-      !!(text =~ @message)
-    elsif @message
-      text == @message.to_s
-    else
-      true
-    end # if-elsif-else
-  end # match
-  
-  failure_message_for_should do
-    if @matches = @matcher.matches?(@actual)
-      "expected #{@matcher} not to match #{@actual}"
-    else
-      message_text = @message.is_a?(Regexp) ? @message.inspect : @message.to_s
-
-      "expected message#{@message.is_a?(Regexp) ? " matching" : ""}:\n#{
-        message_text.lines.map { |line| "#{" " * 2}#{line}" }.join
-      }\nreceived message:\n#{
-        @matcher.failure_message_for_should.lines.map { |line| "#{" " * 2}#{line}" }.join
-      }"
-    end # if-else
-  end # method failure_message_for_should
-  
-  failure_message_for_should_not do
-    "failure: testing positive condition with negative matcher\n~>  use the :pass_with_actual matcher instead"
-  end # method failure_message_for_should_not
-
-  def message
-    @message
-  end # reader message
-
-  # The text of the tested matcher's :failure_message_for_should, when the
-  # tested matcher correctly fails to match the actual object.
-  def with_message message
-    @message = message
-    self
-  end # method with_message
-end # matcher pass
-=end

data/lib/rspec/sleeping_king_studios/matchers/meta/pass_with_actual.rb

@@ -18,54 +18,53 @@ module RSpec::SleepingKingStudios::Matchers::Meta
   class PassWithActualMatcher < RSpec::SleepingKingStudios::Matchers::BaseMatcher
     # @param [Object] expected the actual object to check the matcher against
     def initialize expected
-      super
       @expected = expected
     end # method initialize
 
     # Checks if the matcher evaluates to true with the expected object. If a
     # message expectation is set, checks the value of
-    # #failure_message_for_should_not against the expected message.
+    # #failure_message_when_negated against the expected message.
     # 
     # @param [Object] actual the RSpec matcher to check; should respond to
-    #   :matches? and :failure_message_for_should_not, as a minimum
+    #   :matches? and :failure_message_when_negated, as a minimum
     # 
     # @return [Boolean] true if the matcher evaluates to true and the matcher's
-    #   #failure_message_for_should_not matches the expected message (if any);
+    #   #failure_message_when_negated matches the expected message (if any);
     #   otherwise false
     def matches? actual
       super
       return false unless @matches = @actual.matches?(@expected)
 
       if @message.is_a? Regexp
-        !!(@actual.failure_message_for_should_not =~ @message)
+        !!(@actual.failure_message_when_negated =~ @message)
       elsif @message
-        @actual.failure_message_for_should_not == @message.to_s
+        @actual.failure_message_when_negated == @message.to_s
       else
         true
       end # if-elsif-else
     end # method matches?
 
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message
       if @matches
         message_text = @message.is_a?(Regexp) ? @message.inspect : @message.to_s
 
         "expected message#{@message.is_a?(Regexp) ? " matching" : ""}:\n#{
           message_text.lines.map { |line| "#{" " * 2}#{line}" }.join
         }\nreceived message:\n#{
-          @actual.failure_message_for_should_not.lines.map { |line| "#{" " * 2}#{line}" }.join
+          @actual.failure_message_when_negated.lines.map { |line| "#{" " * 2}#{line}" }.join
         }"
       else
-        failure_message = @actual.failure_message_for_should
+        failure_message = @actual.failure_message
         failure_message = failure_message.lines.map { |line| "#{" " * 4}#{line}" }.join("\n")
         "expected #{@actual} to match #{@expected}\n  message:\n#{failure_message}"
       end # if-else
-    end # method failure_message_for_should
+    end # method failure_message
     
-    # @see BaseMatcher#failure_message_for_should_not
-    def failure_message_for_should_not
+    # @see BaseMatcher#failure_message_when_negated
+    def failure_message_when_negated
       "failure: testing negative condition with positive matcher\n~>  use the :fail_with_actual matcher instead"
-    end # method failure_message_for_should_not
+    end # method failure_message_when_negated
 
     # The expected failure message for should_not when the matcher is called
     # via expect#not_to.
@@ -75,7 +74,7 @@ module RSpec::SleepingKingStudios::Matchers::Meta
     attr_reader :message
 
     # Sets up a message expectation. When the matcher is called with the
-    # provided actual object, the matcher's failure_message_for_should_not
+    # provided actual object, the matcher's failure_message_when_negated
     # message is compared to the provided message.
     # 
     # @param [String, Regexp] message the message to compare

data/lib/rspec/sleeping_king_studios/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module SleepingKingStudios
-    VERSION = '1.0.1'
+    VERSION = '2.0.0.alpha'
   end # module
 end # module

data/lib/rspec/sleeping_king_studios.rb

@@ -1,5 +1,3 @@
 # lib/rspec/sleeping_king_studios.rb
 
 require 'rspec/sleeping_king_studios/matchers'
-
-require 'rspec/sleeping_king_studios/mocks/custom_double'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sleeping_king_studios
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0.alpha
 platform: ruby
 authors:
 - Rob "Merlin" Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +107,6 @@ files:
 - lib/rspec/sleeping_king_studios/matchers/require.rb
 - lib/rspec/sleeping_king_studios/matchers/shared/match_parameters.rb
 - lib/rspec/sleeping_king_studios/matchers/shared/require.rb
-- lib/rspec/sleeping_king_studios/mocks/custom_double.rb
 - lib/rspec/sleeping_king_studios/require.rb
 - lib/rspec/sleeping_king_studios/version.rb
 homepage: http://sleepingkingstudios.com
@@ -139,9 +124,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1
@@ -149,3 +134,4 @@ signing_key:
 specification_version: 4
 summary: A collection of RSpec patches and custom matchers.
 test_files: []
+has_rdoc: 

data/lib/rspec/sleeping_king_studios/mocks/custom_double.rb

@@ -1,13 +0,0 @@
-# lib/rspec/sleeping_king_studios/mocks/custom_double.rb
-
-module RSpec
-  module Mocks
-    module ExampleMethods
-      def custom_double(*args, &block)
-        args << {} unless Hash === args.last
-        args.last[:__declared_as] = "Custom Double"
-        Class.new(&block).new.tap { |obj| RSpec::Mocks::TestDouble.extend_onto obj, *args }
-      end # method
-    end # module
-  end # module
-end # module