Tidy up implementation.

Author: samuel-williams-shopify

examples/basic.rb

@@ -42,7 +42,7 @@ def read
 puts "\n2. Async-safe class (no violation):"
 
 class SafeQueue
-	include Async::Safe::Concurrent
+	async_safe!
 
 	def initialize
 		@items = []

guides/getting-started/readme.md

@@ -69,7 +69,7 @@ Mark entire classes as safe for concurrent access:
 
 ~~~ ruby
 class MyQueue
-  include Async::Safe::Concurrent
+  async_safe!
 
   def initialize
     @queue = Thread::Queue.new

lib/async/safe.rb

@@ -5,7 +5,6 @@
 
 require_relative "safe/version"
 require_relative "safe/class"
-require_relative "safe/concurrent"
 require_relative "safe/monitor"
 require_relative "safe/builtins"
 
@@ -52,12 +51,7 @@ def async_safe?(method = nil)
 			end
 		end
 
-		# Global monitor instance
-		@monitor = Monitor.new
-		
 		class << self
-			ASYNC_SAFE = true
-			
 			# @attribute [Monitor] The global monitoring instance.
 			attr_reader :monitor
 
@@ -66,19 +60,14 @@ class << self
 			# This activates a TracePoint that tracks object access across fibers and threads.
 			# There is no performance overhead when monitoring is disabled.
 			def enable!
+				@monitor ||= Monitor.new
 				@monitor.enable!
 			end
 
 			# Disable thread safety monitoring.
 			def disable!
-				@monitor.disable!
-			end
-			
-			# Reset all tracked ownership.
-			#
-			# Useful for resetting state between test runs.
-			def reset!
-				@monitor.reset!
+				@monitor&.disable!
+				@monitor = nil
 			end
 
 			# Explicitly transfer ownership of objects to the current fiber.
@@ -97,7 +86,7 @@ def reset!
 			# end
 			# ~~~
 			def transfer(*objects)
-				@monitor.transfer(*objects)
+				@monitor&.transfer(*objects)
 			end
 		end
 	end

lib/async/safe/class.rb

@@ -17,5 +17,12 @@ def async_safe?(method = nil)
 
 		false
 	end
+	
+	# Mark the class as async-safe or not.
+	#
+	# @parameter value [Boolean] Whether the class is async-safe.
+	# @returns [Boolean] Whether the class is async-safe.
+	def async_safe!(value = true)
+		self.const_set(:ASYNC_SAFE, value)
+	end
 end
-

lib/async/safe/concurrent.rb

@@ -85,13 +85,6 @@ def disable!
 				end
 			end
 
-			# Reset all tracked ownership.
-			def reset!
-				@mutex.synchronize do
-					@owners = ObjectSpace::WeakMap.new
-				end
-			end
-			
 			# Explicitly transfer ownership of objects to the current fiber.
 			#
 			# @parameter objects [Array(Object)] The objects to transfer.

lib/async/safe/monitor.rb

@@ -24,7 +24,8 @@ def read
 	end
 
 	before do
-		subject.reset!
+		# Reset monitoring state:
+		subject.disable!
 		subject.enable!
 	end
 
@@ -54,7 +55,7 @@ def read
 
 	it "allows concurrent access to async-safe classes" do
 		queue_class = Class.new do
-			include Async::Safe::Concurrent
+			async_safe!
 
 			def push(item)
 				@items ||= []

test/async/safe.rb

@@ -23,7 +23,16 @@ def read
 		end
 	end
 
-	let(:monitor) {Async::Safe.monitor}
+	let(:monitor) do
+		# Ensure monitor exists (created lazily):
+		monitor = Async::Safe.instance_variable_get(:@monitor)
+		unless monitor
+			Async::Safe.enable!
+			Async::Safe.disable!
+			monitor = Async::Safe.instance_variable_get(:@monitor) || Async::Safe::Monitor.new
+		end
+		monitor
+	end
 
 	with "#check_access" do
 		it "records ownership on first access" do
@@ -87,7 +96,7 @@ def read
 
 		it "allows access to objects with ASYNC_SAFE constant" do
 			safe_class = Class.new do
-				include Async::Safe::Concurrent
+				async_safe!
 
 				def read
 					"data"