rspec-message-within 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 86005d7513d01eef6bd43ece104ea78d80ca2ff3
-  data.tar.gz: f243479b5a09274e53490ee6accf9097affdc423
-SHA512:
-  metadata.gz: f965dc638f52d4278c54dda068eda0088642576d0a4469ff98f0e4e14f48a29e707462de45cf75afb8173d279aa50d9051da4563598dfc4c8326ffbb75fe5423
-  data.tar.gz: f3054e941b22734f20ba54abcf8b57967bf7077b0f2fb0d2da9035ec1f50cd1dff81d12a9c45841165f8f6a45b2e2f490bbae888420704335eb1b147c3fcd48c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGY0MzBiODNkZWFmOTU0OWZkZWM3MDY4NWMzZTdhNWViMjNkZDBjYg==
+  data.tar.gz: !binary |-
+    YmRiN2Q5Y2U1ZGI4MzQ3MGY3Y2QxOWUyMTNhMzgzYWYwNjk1NmQxMA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZmUwMmY2MzJkZThkMjdlMDVmZGM5NzIxMGRiNTllNGRlMGViMWQwODJjYzg3
+    OGRhZGRmZDY4MDE1MGI1OWY2NTJmMGI3ODIwZTJmNmI0MmMyNWVkMTkzNzEz
+    ODZlYjVlZmFlNDM5ZGRjMDBiNjkyYjM3NWRiZjEyYzg0NzIwOTE=
+  data.tar.gz: !binary |-
+    ODZmNTQ5ZDk3NjE3MDc5NDNjZGQ3NTBiNTJkY2M0MmExNzAwNmRlNDJhMTYy
+    NzFhYTI3YzEyYzEzM2M1MWVkYjJhZmE4YWI4ZTUyY2U4NWRlMWMwYzdiMmM0
+    OGI1MTBkMTU4YmM4N2YzZjlkNzg2YmMzN2IzZjU0NmVjNTZmZjU=

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby
+  - rbx-19mode
+
+script:
+  - bundle exec rake spec

data/lib/rspec/message/within.rb

@@ -2,90 +2,67 @@ require 'rspec/message/within/version'
 require 'rspec/mocks'
 
 module RSpec
-  module Message
-    module Within
-
-      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
+  module MessageWithin
+    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
+  end
+end
 
-      module MessageExpectationPatch
-        def self.included(base)
-          # Seems to not work. Why?
-          base.send :include, InstanceMethods
-
-          base.send :alias_method, :orig_verify_messages_received, :verify_messages_received
-          base.send :undef_method, :verify_messages_received
-          base.send :define_method, :verify_messages_received, InstanceMethods.instance_method(:verify_messages_received)
+module RSpec
+  module Mocks
+    class MessageExpectation
+      alias_method :orig_verify_messages_received, :verify_messages_received
+      def verify_messages_received
+        MessageWithin.until(@within_time || 0) do
+          expected_messages_received? and !negative?
         end
 
-        module InstanceMethods
-          def verify_messages_received
-            Within.until(@within_time || 0) do
-              expected_messages_received? and !negative?
-            end
-
-            orig_verify_messages_received
-          end
+        orig_verify_messages_received
+      end
 
-          def within(time)
-            @within_time = time
-            self
-          end
-        end
+      def within(time)
+        @within_time = time
+        self
       end
+    end
 
-      module ReceivePatch
-        def self.included(base)
-          base.send :include, InstanceMethods
+    module Matchers
+      class Receive
+        def within(*args, &block)
+          @recorded_customizations << ::RSpec::Mocks::Matchers::Receive::Customization.new(:within, args, block)
+          self
         end
 
-        module InstanceMethods
-          def within(*args, &block)
-            @recorded_customizations << ::RSpec::Mocks::Matchers::Receive::Customization.new(:within, args, block)
-            self
-          end
-          def seconds
-            self
-          end
+        def seconds
+          self
         end
       end
+    end
 
-      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
+    module AnyInstance
+      class ExpectationChain
+        alias_method :orig_expectation_fulfilled?, :expectation_fulfilled?
 
+        def expectation_fulfilled?
+          RSpec::MessageWithin.until(@within_time || 0) do
             orig_expectation_fulfilled?
           end
+
+          orig_expectation_fulfilled?
         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.1.0'
+      VERSION = '1.1.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-message-within
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jan Graichen
@@ -42,14 +42,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: expect(object).to receive(:message).within(:some).seconds