rspec-message-within 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 901cfae8fb7a51dd3d33658d93215a79d758444e
-  data.tar.gz: 2567568e486a1a962153676efa391c62d7e849ae
+  metadata.gz: 86005d7513d01eef6bd43ece104ea78d80ca2ff3
+  data.tar.gz: f243479b5a09274e53490ee6accf9097affdc423
 SHA512:
-  metadata.gz: 88799333c84c71f54cf3f351ca40c340b7b3e39cb0d51c445a22836f72af7c48bdafe9b4582386d7c63a628c6a2d3d8282d2c048eef920c28755d382282532a2
-  data.tar.gz: 9bbd80768664bc5dcfebd8a9cb419b9bad6f7052ecc325a1324350a4b06487da9429ffeba3d989118f6add026a5d208222208caf3a9f6f53eba714008b4db915
+  metadata.gz: f965dc638f52d4278c54dda068eda0088642576d0a4469ff98f0e4e14f48a29e707462de45cf75afb8173d279aa50d9051da4563598dfc4c8326ffbb75fe5423
+  data.tar.gz: f3054e941b22734f20ba54abcf8b57967bf7077b0f2fb0d2da9035ec1f50cd1dff81d12a9c45841165f8f6a45b2e2f490bbae888420704335eb1b147c3fcd48c

data/lib/rspec/message/within.rb

@@ -5,7 +5,17 @@ module RSpec
   module Message
     module Within
 
-      module ExpectationPatch
+      def self.until(within_time)
+        if within_time && within_time > 0.0
+          time = Time.now + within_time
+          while time > Time.now
+            break if yield
+            sleep 0
+          end
+        end
+      end
+
+      module MessageExpectationPatch
         def self.included(base)
           # Seems to not work. Why?
           base.send :include, InstanceMethods
@@ -17,14 +27,8 @@ module RSpec
 
         module InstanceMethods
           def verify_messages_received
-            @within_time ||= nil
-
-            if @within_time
-              time = Time.now + @within_time
-              while time > Time.now
-                break if expected_messages_received? and !negative?
-                sleep 0
-              end
+            Within.until(@within_time || 0) do
+              expected_messages_received? and !negative?
             end
 
             orig_verify_messages_received
@@ -37,7 +41,7 @@ module RSpec
         end
       end
 
-      module MatcherPatch
+      module ReceivePatch
         def self.included(base)
           base.send :include, InstanceMethods
         end
@@ -52,9 +56,36 @@ module RSpec
           end
         end
       end
-    end
 
-    ::RSpec::Mocks::MessageExpectation.send :include, Within::ExpectationPatch
-    ::RSpec::Mocks::Matchers::Receive.send :include, Within::MatcherPatch
+      module ExpectationChainPatch
+        def self.included(base)
+          base.send :alias_method, :orig_expectation_fulfilled?, :expectation_fulfilled?
+          base.send :undef_method, :expectation_fulfilled?
+          base.send :define_method, :expectation_fulfilled?, InstanceMethods.instance_method(:expectation_fulfilled?)
+        end
+
+        module InstanceMethods
+          def expectation_fulfilled?
+            Within.until(@within_time || 0) do
+              orig_expectation_fulfilled?
+            end
+
+            orig_expectation_fulfilled?
+          end
+        end
+      end
+
+      module ChainPatch
+        def within(time)
+          @within_time = time
+          self
+        end
+      end
+
+      ::RSpec::Mocks::MessageExpectation.send :include, MessageExpectationPatch
+      ::RSpec::Mocks::AnyInstance::Chain.send :include, ChainPatch
+      ::RSpec::Mocks::AnyInstance::ExpectationChain.send :include, ExpectationChainPatch
+      ::RSpec::Mocks::Matchers::Receive.send :include, ReceivePatch
+    end
   end
 end

data/lib/rspec/message/within/version.rb

@@ -1,7 +1,7 @@
 module Rspec
   module Message
     module Within
-      VERSION = '1.0.0'
+      VERSION = '1.1.0'
     end
   end
 end

data/spec/rspec_message_within_spec.rb

@@ -1,17 +1,31 @@
 require 'spec_helper'
 
+class Reciv
+  def message; end
+end
+
 describe Rspec::Message::Within do
   let(:obj) { double }
 
   describe '#within' do
     it 'should allow to time-box an asynchronous method call' do
-      expect(obj).to receive(:message).within(2).seconds
+      expect(obj).to receive(:message).within(10).seconds
 
       Thread.new do
+        sleep 1
         obj.message
       end
     end
 
+    it 'any-instance' do
+      expect_any_instance_of(Reciv).to receive(:message).within(10).seconds
+
+      Thread.new do
+        sleep 1
+        Reciv.new.message
+      end
+    end
+
     it 'should fail message expectation after timeout' do
       expect(obj).to_not receive(:message).within(1).seconds
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-message-within
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks