async-rspec 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b16775a1318cfc18c1d2f08ce937291e5b5a76f233a83cad775cc65e4a85444
-  data.tar.gz: fbc4009e8b7df715903c33e0e57a863182f3000c9f7e39b44177f759da4b4713
+  metadata.gz: f790c28cf9e2685e31a1ee197071be8cf64a0ef31f88ee6f627536733b7a2b1f
+  data.tar.gz: 290e3da14a70db132cfe92d493832ea2f0eec4a7a2543666ec33781912e88fb7
 SHA512:
-  metadata.gz: 4079b21429b84d174e922ace80aad05a126e2ea68ee47248a46f13585a3ac24e898eb767ba0bb039d80b9aacdedeb28b64bd0ea6a265de3ae457c6e45c2fa877
-  data.tar.gz: 3b231e51b87424651f97e619a30f61726da951f5a22984eb77770b200d626a862f9ca08f6dc0161f17a32daee13ab051ebf52b3bf1adbc6dee3a76d420523d89
+  metadata.gz: f469938b965ea3aa5e99bab4cd903f0311a0a7975df1bffbfa8dcd757326cda2f7c75f5353e7221672d5c1a2ed6e3811de5466aa65e447521f14230c9053bb31
+  data.tar.gz: 3fe986d225ed92222f91d3766b1904c9989ba05b99ccf83640084e90abb6810a94fd4c7459daae8915fa60caba0a769741c316a13c62ba76d17facda5c99b54f

data/lib/async/rspec/memory/limit_allocations.rb

@@ -60,16 +60,19 @@ module Async
 							yield "expected within #{limit}"
 						end
 					when Integer
-						unless value <= limit
-							yield "expected at most #{limit}"
+						unless value == limit
+							yield "expected exactly #{limit}"
 						end
 					end
 				end
 				
 				def matches?(given_proc)
-					return true unless trace = Trace.capture(&given_proc)
+					return true unless trace = Trace.capture(@allocations.keys, &given_proc)
 					
-					if total = trace.total
+					if @count or @size
+						# If the spec specifies a total limit, we have a limit which we can enforce which takes all allocations into account:
+						total = trace.total
+						
 						check(total.count, @count) do |expected|
 							@errors << "allocated #{total.count} instances, #{total.size} bytes, #{expected} instances"
 						end if @count
@@ -77,10 +80,15 @@ module Async
 						check(total.size, @size) do |expected|
 							@errors << "allocated #{total.count} instances, #{total.size} bytes, #{expected} bytes"
 						end if @size
+					else
+						# Otherwise unspecified allocations are considered an error:
+						trace.ignored.each do |klass, allocation|
+							@errors << "allocated #{allocation.count} #{klass} instances, #{allocation.size} bytes, but it was not specified"
+						end
 					end
 					
-					@allocations.each do |klass, acceptable|
-						next unless allocation = trace.allocated[klass]
+					trace.allocated.each do |klass, allocation|
+						next unless acceptable = @allocations[klass]
 						
 						check(allocation.count, acceptable[:count]) do |expected|
 							@errors << "allocated #{allocation.count} #{klass} instances, #{allocation.size} bytes, #{expected} instances"
@@ -99,8 +107,8 @@ module Async
 				end
 			end
 			
-			def limit_allocations(allocations)
-				LimitAllocations.new(allocations)
+			def limit_allocations(*args)
+				LimitAllocations.new(*args)
 			end
 		end
 	end

data/lib/async/rspec/memory/trace.rb

@@ -24,9 +24,17 @@ module Async
 	module RSpec
 		module Memory
 			Allocation = Struct.new(:count, :size) do
+				SLOT_SIZE = 40
+				
 				def << object
 					self.count += 1
-					self.size += ObjectSpace.memsize_of(object)
+					
+					# We don't want to force specs to take the slot size into account.
+					self.size += ObjectSpace.memsize_of(object) - SLOT_SIZE
+				end
+				
+				def self.default_hash
+					Hash.new{|h,k| h[k] = Allocation.new(0, 0)}
 				end
 			end
 			
@@ -36,8 +44,8 @@ module Async
 				end
 				
 				if supported?
-					def self.capture(&block)
-						self.new.tap do |trace|
+					def self.capture(*args, &block)
+						self.new(*args).tap do |trace|
 							trace.capture(&block)
 						end
 					end
@@ -49,9 +57,13 @@ module Async
 					end
 				end
 				
-				def initialize
-					@allocated = Hash.new{|h,k| h[k] = Allocation.new(0, 0)}
-					@retained = Hash.new{|h,k| h[k] = Allocation.new(0, 0)}
+				def initialize(klasses)
+					@klasses = klasses
+					
+					@allocated = Allocation.default_hash
+					@retained = Allocation.default_hash
+					
+					@ignored = Allocation.default_hash
 					
 					@total = Allocation.new(0, 0)
 				end
@@ -59,6 +71,8 @@ module Async
 				attr :allocated
 				attr :retained
 				
+				attr :ignored
+				
 				attr :total
 				
 				def current_objects(generation)
@@ -73,6 +87,10 @@ module Async
 					return allocations
 				end
 				
+				def find_base(object)
+					@klasses.find{|klass| object.is_a? klass}
+				end
+				
 				def capture(&block)
 					GC.start
 					
@@ -92,13 +110,25 @@ module Async
 					
 					# All allocated objects, including those freed in the last GC:
 					allocated.each do |object|
-						@allocated[object.class] << object
+						if klass = find_base(object)
+							@allocated[klass] << object
+						else
+							# If the user specified classes, but we can't pin this allocation to a specific class, we issue a warning.
+							if @klasses.any?
+								warn "Ignoring allocation of #{object.class} at #{ObjectSpace.allocation_sourcefile(object)}:#{ObjectSpace.allocation_sourceline(object)}"
+							end
+							
+							@ignored[object.class] << object
+						end
+						
 						@total << object
 					end
 					
 					# Retained objects are still alive after a final GC:
 					retained.each do |object|
-						@retained[object.class] << object
+						if klass = find_base(object)
+							@retained[klass] << object
+						end
 					end
 				end
 			end

data/lib/async/rspec/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module RSpec
-		VERSION = "1.8.0"
+		VERSION = "1.9.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-rspec
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec