rspec-instrumentation-matcher 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 539ee1e205d5e7e5ca496e11c38af0a38f7d436e
-  data.tar.gz: 962d456600fef1e8c4959a151c2eaf18e8e4f6a3
+SHA256:
+  metadata.gz: 8467c604dd5d08c30de5e04b5e729cc0487fb1302c2cd7a960f72060f67a9505
+  data.tar.gz: 10946f0c6b8c829765b8d0aac9e86a2974ccf8693c24af6ed8821a385015b260
 SHA512:
-  metadata.gz: de975bd43cf60ce0b7dee62f4e71c533f5a17001786e802d854a26691046bd9a6a630f265531c5d93da1588e66d93ec11d48f84b9290df6f4d1f9554c9d83351
-  data.tar.gz: ae2a6afdd15bc84ec4cd2489c8cdc9edc72cb442a9a20438a463a7c219514cb08bf74bbebbcdd51f601e25e9650db07e5c86f78828739b3e87175a2cb1af98f5
+  metadata.gz: 24023b18d3d8559dc3cc42f23fe3d82de50519ac6981857863422dc585cff2372db0ce605a5f33481a84203721d4cf3429965bba29f996c65eab685957d7e649
+  data.tar.gz: 5794a1bbd85c4ae6416e7744e8fb156bc4430af4639f9377a7787d59492f225459aba44d24706f9a57445ec0910f88e83e08fadfecdaf2cac9907951d27b9898

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    rspec-instrumentation-matcher (0.0.3)
+    rspec-instrumentation-matcher (0.0.6)
       activesupport
       rspec-expectations
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     coderay (1.1.0)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.2.5)
     ffi (1.9.3)
     formatador (0.2.5)
@@ -29,15 +29,15 @@ GEM
     guard-rspec (4.2.9)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    i18n (0.6.9)
-    json (1.8.1)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     listen (2.7.6)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.6)
     method_source (0.8.2)
-    minitest (5.3.4)
+    minitest (5.11.3)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -59,9 +59,9 @@ GEM
     rspec-support (3.0.0)
     slop (3.5.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.6)
     timers (1.1.0)
-    tzinfo (1.2.1)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -70,3 +70,6 @@ PLATFORMS
 DEPENDENCIES
   guard-rspec
   rspec-instrumentation-matcher!
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -20,6 +20,8 @@ Or install it yourself as:
 
     expect{ subject.do_something }.to instrument("key").with( foo: :bar )
     expect{ subject.do_something }.to instrument("key").once
+    expect{ subject.do_something }.to instrument("key").twice
+    expect{ subject.do_something }.to instrument("key").never
     expect{ subject.do_something }.to instrument("key").at_least(1)
     expect{ subject.do_something }.to instrument("key").at_most(10)
     expect{ subject.do_something }.to instrument("key").times(5)

data/lib/rspec-instrumentation-matcher.rb

@@ -1,4 +1,4 @@
-require "rspec-instrumentation-matcher/version"
+require 'rspec-instrumentation-matcher/version'
 require 'active_support/notifications'
 module RSpec
   module Instrumentation
@@ -7,7 +7,6 @@ module RSpec
         InstrumentMatcher.new(subject)
       end
       class InstrumentMatcher
-
         def initialize(subject)
           @subject = subject
           @payload = nil
@@ -26,41 +25,43 @@ module RSpec
         def matches?(event_proc)
           raise_block_syntax_error if block_given?
 
-          subscription = ActiveSupport::Notifications.subscribe @subject do |name, start, finish, id, _payload|
-            @payload = _payload
+          callback = lambda do |_name, _start, _finish, _id, payload|
+            @payload = payload
             @received += 1
           end
+          ActiveSupport::Notifications.subscribed(callback, @subject) do
+            event_proc.call
+          end
 
-          event_proc.call
-
-          ActiveSupport::Notifications.unsubscribe(subscription)
-
-          times? and at_least? and at_most? and with?
+          times? && at_least? && at_most? && with?
+        end
 
+        def negative_failure_message
+          failure_message(true)
         end
 
-        def failure_message
-          message = "Expected #{@subject} to be instrumented"
+        alias failure_message_when_negated negative_failure_message
+
+        def failure_message(negative = false)
+          message = "Expected #{@subject} #{'not ' if negative}to be instrumented"
           message << " at least #{count @at_least}" unless at_least?
           message << " at most #{count @at_most}" unless at_most?
           message << " exactly #{count @times}" unless times?
 
-          if !at_least? or !at_most? or !times?
+          if !at_least? || !at_most? || !times?
             message << " but was instrumented #{count @received}"
-            message << " and the payload should have been" unless with?
+            message << ' and the payload should have been' unless with?
           else
-            message << " with" unless with?
+            message << ' with' unless with?
           end
 
           message << " #{@payload_expectation.inspect} instead of #{@payload.inspect}" unless with?
 
-
           message
-
         end
 
         def at_least(value)
-          @at_least=value
+          @at_least = value
           self
         end
 
@@ -74,30 +75,31 @@ module RSpec
           times(1)
         end
 
+        def twice
+          times(2)
+        end
+
         def never
           times(0)
         end
 
-
-
         def times(value)
           @at_least = nil
           @times = value
           self
         end
 
-
         def with(expectation)
           @with = true
           @payload_expectation = expectation
           self
         end
 
-
         private
+
         def count(value)
           if value == 1
-            "1 time"
+            '1 time'
           else
             "#{value} times"
           end
@@ -119,17 +121,16 @@ module RSpec
         end
 
         def delta_payload
-          unmatched = @payload_expectation.reject do |key,value|
+          unmatched = @payload_expectation.reject do |key, value|
             matched_value?(value, @payload[key]) if @payload.key? key
           end
         end
 
         def with?
           return true unless @with
-          !@payload.nil? and delta_payload.size == 0
+          !@payload.nil? && delta_payload.empty?
         end
 
-
         def matched_value?(expected, actual)
           case expected
           when actual then true
@@ -140,16 +141,13 @@ module RSpec
         end
 
         def expectation_message
-          message = ""
+          message = ''
           message << "at least #{count @at_least}" unless @at_least.nil?
           message << "at most #{count @at_most}" unless @at_most.nil?
           message << "exactly #{count @times}" unless @times.nil?
-          if @with
-            message << " with payload #{@payload.inspect}"
-          end
+          message << " with payload #{@payload.inspect}" if @with
           message
         end
-
       end
     end
   end
@@ -158,5 +156,3 @@ end
 module RSpec::Matchers
   include RSpec::Instrumentation::Matcher
 end
-
-

data/lib/rspec-instrumentation-matcher/version.rb

@@ -1,7 +1,7 @@
 module Rspec
   module Instrumentation
     module Matcher
-      VERSION = "0.0.4"
+      VERSION = "0.0.6"
     end
   end
 end

data/spec/rspec-instrumentation-matcher_spec.rb

@@ -11,10 +11,25 @@ describe RSpec::Instrumentation::Matcher do
   let(:notification) { 'a notification' }
 
   specify { expect { event(notification) }.to instrument(notification).once }
+  specify { expect { 2.times { event(notification) } }.to instrument(notification).twice }
   specify { expect { 2.times { event(notification) } }.not_to instrument(notification).never }
   specify { expect { 2.times { event(notification) } }.to instrument(notification).at_least(1) }
   specify { expect { 2.times { event(notification) } }.to instrument(notification).at_most(2) }
   specify { expect { event(notification,{ test_payload: true }) }.to instrument(notification).with(test_payload: true) }
 
-
+  context 'when the instrumented block raises an exception' do
+    it 'still unsubscribes the spy subscription' do
+      notifier = ActiveSupport::Notifications.notifier
+      expect {
+        begin
+          expect {
+            ActiveSupport::Notifications.instrument(notification) do
+              raise ZeroDivisionError
+            end
+          }.to instrument(notification)
+        rescue ZeroDivisionError
+        end
+      }.not_to change { notifier.listeners_for(notification).length }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-instrumentation-matcher
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Vlad Verestiuc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2018-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -90,11 +90,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Support for spec-ing ActiveSupport::Notifications.instrument calls
 test_files:
 - spec/rspec-instrumentation-matcher_spec.rb
 - spec/spec_helper.rb
-has_rdoc: