rspec-sleeping_king_studios 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 001e7809e65b97646a63c8a663bcba7472df5327
-  data.tar.gz: a0309fd6b2ace7e0cceb015929d0b3449cb327df
+  metadata.gz: f3427b043889c866103ff0e5a58222621798f825
+  data.tar.gz: 3f7ea93de6bc4be9d9c6a5687be25eb57b406e78
 SHA512:
-  metadata.gz: 23957e513898499443a028ed1aadbed73aa31b19a7deec654988c418710c25cc7362791ea627344a1b2ed87ff25bf4580b4b819d2a9f553f5529da4874245296
-  data.tar.gz: 4ff7d63a7da8145d064e6c7902be789332ffd6613aa52c51db8540b2639a4c16e671ce5c7322f04fa51cdea4670b46749a80f1a31bb42c04910da961b110f6a7
+  metadata.gz: 5696860258e7bb62a86b97af732f8cab837bca81f6665cffb46dcf28ec407b54031e8c6d28029762b8039b5eab220db4515d39c35773593946ad6d42b8b2af9c
+  data.tar.gz: ec5dcd4a1a3ecd74e7dbf88e3761a27ed3e5e46fb295709a64b54a9f4b27cc9632311ef6883add79968104747c6d67a6eaa5654a135026c805f71c68e49326fd

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.0.3
+
+Internal update to add support for RSpec 3.3.
+
 ## 2.0.2
 
 #### `construct` and `respond_to` Matchers

data/DEVELOPMENT.md

@@ -4,12 +4,11 @@
 
 ### Release Candidate
 
-### 2.0.2
+### 2.0.3
 
-- Add additional syntax option for #respond_to keywords, e.g. 'expect().to respond_to(:method).with(1).arguments.and_keywords(:foo, :bar)' DONE
-  - `expect().to respond_to().with_keywords()'
-  - `expect().to respond_to().with_arbitrary_keywords'
-- Add additional syntax (see above) to #be_constructible. DONE
+- Add support for RSpec 3.3
+  - Transition from RSpec::Matchers::Pretty to RSpec::Matchers::EnglishPhrasing?
+  - Support new implementation of RSpec::Matchers::BuiltIn::Include
 
 ### 2.1.0+
 

data/README.md

@@ -4,7 +4,7 @@ A collection of matchers and extensions to ease TDD/BDD using RSpec. Extends bui
 
 ## Support
 
-RSpec::SleepingKingStudios is tested against RSpec 3.0, 3.1, and 3.2.
+RSpec::SleepingKingStudios is tested against RSpec 3.0, 3.1, 3.2, and 3.3.
 
 Currently, the following versions of Ruby are officially supported:
 
@@ -12,7 +12,7 @@ Currently, the following versions of Ruby are officially supported:
 * 2.1
 * 2.2
 
-If you require a previous version of Ruby or RSpec, the 1.0 branch supports Ruby 1.9.3 and RSpec 2: `gem "rspec-sleeping_king_studios", "~> 1.0.1"`.
+If you require a previous version of Ruby or RSpec, the 1.0 branch supports Ruby 1.9.3 and RSpec 2: `gem "rspec-sleeping_king_studios", "~> 1.0.1"`. However, changes from 2.0 and higher will not be backported.
 
 ## Contribute
 

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

@@ -7,8 +7,6 @@ module RSpec::SleepingKingStudios::Matchers
   #
   # @since 1.0.0
   class BaseMatcher
-    include RSpec::Matchers::Pretty
-
     attr_reader :actual
 
     # A short string that describes the purpose of the matcher.

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

@@ -21,7 +21,22 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
 
     # @api private
     #
-    # Converts the expected item to a human-readable string.
+    # @return [Boolean]
+    def matches?(actual)
+      perform_match(actual) { |v| v }
+    end # method matches?
+
+    # @api private
+    #
+    # @return [Boolean]
+    def does_not_match?(actual)
+      perform_match(actual) { |v| !v }
+    end # method does_not_match?
+
+    # @api private
+    #
+    # Converts the expected item to a human-readable string. Retained for
+    # pre-3.3 compatibility.
     def to_word expected_item
       case
       when is_matcher_with_description?(expected_item)
@@ -35,7 +50,7 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
 
     # (see BaseMatcher#failure_message)
     def failure_message
-      message = super
+      message = super.sub ':__block_comparison__', 'an item matching the block'
 
       message << ", but it does not respond to `include?`" unless actual.respond_to?(:include?) || message =~ /does not respond to/
 
@@ -44,7 +59,7 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
 
     # (see BaseMatcher#failure_message_when_negated)
     def failure_message_when_negated
-      message = super
+      message = super.sub ':__block_comparison__', 'an item matching the block'
 
       message << ", but it does not respond to `include?`" unless actual.respond_to?(:include?) || message =~ /does not respond to/
 
@@ -53,28 +68,40 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
 
     private
 
-    def perform_match(predicate, hash_subset_predicate)
-      return false unless actual.respond_to?(:include?)
+    # @api private
+    def perform_match(actual, &block)
+      @actual = actual
+      @divergent_items = excluded_from_actual(&block)
+      actual.respond_to?(:include?) && @divergent_items.empty?
+    end # method perform_match
+
+    # @api private
+    def excluded_from_actual
+      return [] unless @actual.respond_to?(:include?)
 
-      expected.__send__(predicate) do |expected_item|
+      expected.inject([]) do |memo, expected_item|
         if comparing_proc?(expected_item)
-          actual_matches_proc?(expected_item)
+          memo << :__block_comparison__ unless yield 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
+          expected_item.each do |(key, value)|
+            memo << { key => value } unless yield actual_hash_includes?(key, value)
+          end # each
         elsif comparing_hash_keys?(expected_item)
-          actual_hash_has_key?(expected_item)
+          memo << expected_item unless yield actual_hash_has_key?(expected_item)
         else
-          actual_collection_includes?(expected_item)
-        end
-      end
-    end
+          memo << expected_item unless yield actual_collection_includes?(expected_item)
+        end # if-elsif-else
 
+        memo
+      end # inject
+    end # method excluded_from_actual
+
+    # @api private
     def actual_matches_proc? expected_item
       !!actual.detect(&expected_item)
     end # method actual_matches_proc?
 
+    # @api private
     def comparing_proc? expected_item
       expected_item.is_a?(Proc)
     end # method comparing_proc?

data/lib/rspec/sleeping_king_studios/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sleeping_king_studios
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Rob "Merlin" Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec