rspec-matcher 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 949268732dd1527ea7670b3351218482dad1a2d1
-  data.tar.gz: 9e2cecc4308ccbe2b8244283e1a6fbb079f0a7aa
+  metadata.gz: 7532489552ab193eb37e60fa4ce1842d8c0f4930
+  data.tar.gz: 6272b0ed34cfbfae5e47027beba52ed09a842ef1
 SHA512:
-  metadata.gz: 293ba5441ee375f2cedf2744ac5c74b6bff5bb8e1a084c7c1023eacdedae8ef05540a74811d78f3780f53477f1fa1b99e9626db5ae1c12a4b2595ac1daadc46f
-  data.tar.gz: b4288aedb72ed2487626fa9adb15f7764104f0e9a8c4f787d9502310a096a6c7a2af23f7e940554c625fb0cd14df9d1015fc719ce1d19d41a7856fc8e55b450d
+  metadata.gz: 8051875b6eccdfee13f989e4ac44f96ef241bed02b7c82adc72f7331653ea149c9d706915f11493c66afd22679c5ec3df173fe46317db40ca15f6311660784a8
+  data.tar.gz: 635c5c03852de53e9ee053ac664b1905f8ceda58f8c3a0150d4eb66c016f81967601160a0af992c3dd901274a38bb2f0f9ca990d1bf49493ba6b94ff4135cc3d

data/lib/rspec/matcher.rb

@@ -42,6 +42,45 @@ module RSpec
       attr_accessor :expected, :actual
     end
 
+    # @api private
+    # Ensures hook is always called and takes care of control jumps.
+    class RescueAndCatch
+      attr_accessor :context, :catchable, :to_catch, :rescuable, :to_rescue
+
+      def initialize context, &block
+        self.context = context
+        instance_eval(&block)
+      end
+
+      def result
+        r = catch catchable do
+          cdo(&to_catch)
+        end
+        cdo(&to_rescue)
+
+        r
+      rescue rescuable => e
+        cdo(&to_rescue)
+        raise e
+      end
+
+      private
+
+      def catching catchable, &block
+        self.to_catch = block
+        self.catchable = catchable
+      end
+
+      def ensuring rescuable, &block
+        self.to_rescue = block
+        self.rescuable = rescuable
+      end
+
+      def cdo &block
+        context.instance_eval(&block)
+      end
+    end
+
     # @api private
     # Used to let user define initialize
     module PrependedMethods #:nodoc:
@@ -97,14 +136,13 @@ module RSpec
     # Hides RSpec internal api
     def matches? actual
       self.actual = actual
-
-      catch(:resolution) do
-        if method(:match).arity == 0
-          match
-        else
-          match actual
+      RescueAndCatch.new self do
+        catching(:resolution) do
+          method(:match).arity == 0 ? match : match(actual)
         end
-      end
+
+        ensuring(Exception) { clean_up }
+      end.result
     end
 
     # @method actual
@@ -171,6 +209,11 @@ module RSpec
       false
     end
 
+    # Always gets called after decision is made.
+    # @return [void]
+    def clean_up
+    end
+
     private
 
     # @api public

data/lib/rspec/matcher/identity.rb

@@ -12,7 +12,7 @@ module RSpec
       end
 
       def self.version
-        "0.1.3"
+        "0.1.4"
       end
 
       def self.version_label

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-matcher
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Pooyan Khosravi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport