mocktail 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 426f5dbb08f6db2542f0a323d186df7126aaae652e848b0a0c378a602231d777
-  data.tar.gz: 898501920257accc975d441a12d9e54a034c40aef8c950be2f0fa80aeb0288c6
+  metadata.gz: 8e043c9a28687502f8933593acca4a4860a11088b51a7f31ea726e2b80b8eb92
+  data.tar.gz: d406fcd7610fb29f2a6c964b777f0e77c770d273c87216872d2feeb9bcda39eb
 SHA512:
-  metadata.gz: 6eea3625f3851c035e00c1593e91ae7d97c76b499510a71bd8b68fb0cfb27c4cac9116f9224f30853a97cfb6826385338506e33bf2ea6d43160f12093e8a591c
-  data.tar.gz: 1e6041f4ea59a42c40b6ef42bf99f106f43eb18d3ec452580784072046f099af26753e61e79704679fba7973bc19b59b3b9cdf0b537fd95e20caceeb18a719ef
+  metadata.gz: '09b7f3e7931069bfd62993b8e91d08a92f6e11b51c5b6d21698a0f1773a72786d55d78db1c649aa9a1e935dc72e81042dd2127f15a09e0296c00dbdcb1937423'
+  data.tar.gz: d0ffd4f421f76afab828a426c9246a31794341fc7c5a8af862ab8f726eafad1324b3e2caa9ad2dae6ed79a34066fcd5e27be53e6dd7c70544bb3d75c900d725f

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# unreleased
+# 0.0.5
+
+* Fix concurrency [#6](https://github.com/testdouble/mocktail/pull/6)
+
+# 0.0.4
 
 * Introduce Mocktail.explain(), which will return a message & reference object
   for any of:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mocktail (0.0.4)
+    mocktail (0.0.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -731,3 +731,4 @@ including (but not limited to) one-on-one communications, public posts/comments,
 code reviews, pull requests, and GitHub issues. If violations occur, Test Double
 will take any action they deem appropriate for the infraction, up to and
 including blocking a user from the organization's repositories.
+

data/lib/mocktail/explains_thing.rb

@@ -59,9 +59,9 @@ module Mocktail
         This is a fake `#{double.original_type.name}' instance.
 
         It has these mocked methods:
-        #{double.dry_methods.map { |method| "  - #{method}" }.join("\n")}
+        #{double.dry_methods.sort.map { |method| "  - #{method}" }.join("\n")}
 
-        #{double.dry_methods.map { |method| describe_dry_method(double_data, method) }.join("\n")}
+        #{double.dry_methods.sort.map { |method| describe_dry_method(double_data, method) }.join("\n")}
       MSG
     end
 

data/lib/mocktail/value/top_shelf.rb

@@ -1,65 +1,60 @@
-# The top shelf stores all cross-thread & thread-aware state, so anything that
-# goes here is on its own when it comes to ensuring thread safety.
 module Mocktail
   class TopShelf
     def self.instance
-      @self ||= new
+      Thread.current[:mocktail_top_shelf] ||= new
     end
 
+    @@type_replacements = {}
+    @@type_replacements_mutex = Mutex.new
+
     def initialize
-      @type_replacements = {}
-      @new_registrations = {}
-      @of_next_registrations = {}
-      @singleton_method_registrations = {}
+      @new_registrations = []
+      @of_next_registrations = []
+      @singleton_method_registrations = []
     end
 
     def type_replacement_for(type)
-      @type_replacements[type] ||= TypeReplacement.new(type: type)
+      @@type_replacements_mutex.synchronize {
+        @@type_replacements[type] ||= TypeReplacement.new(type: type)
+      }
     end
 
     def type_replacement_if_exists_for(type)
-      @type_replacements[type]
+      @@type_replacements_mutex.synchronize {
+        @@type_replacements[type]
+      }
     end
 
     def reset_current_thread!
-      @new_registrations[Thread.current] = []
-      @of_next_registrations[Thread.current] = []
-      @singleton_method_registrations[Thread.current] = []
+      Thread.current[:mocktail_top_shelf] = self.class.new
     end
 
     def register_new_replacement!(type)
-      @new_registrations[Thread.current] ||= []
-      @new_registrations[Thread.current] |= [type]
+      @new_registrations |= [type]
     end
 
     def new_replaced?(type)
-      @new_registrations[Thread.current] ||= []
-      @new_registrations[Thread.current].include?(type)
+      @new_registrations.include?(type)
     end
 
     def register_of_next_replacement!(type)
-      @of_next_registrations[Thread.current] ||= []
-      @of_next_registrations[Thread.current] |= [type]
+      @of_next_registrations |= [type]
     end
 
     def of_next_registered?(type)
-      @of_next_registrations[Thread.current] ||= []
-      @of_next_registrations[Thread.current].include?(type)
+      @of_next_registrations.include?(type)
     end
 
     def unregister_of_next_replacement!(type)
-      @of_next_registrations[Thread.current] ||= []
-      @of_next_registrations[Thread.current] -= [type]
+      @of_next_registrations -= [type]
     end
 
     def register_singleton_method_replacement!(type)
-      @singleton_method_registrations[Thread.current] ||= []
-      @singleton_method_registrations[Thread.current] |= [type]
+      @singleton_method_registrations |= [type]
     end
 
     def singleton_methods_replaced?(type)
-      @singleton_method_registrations[Thread.current] ||= []
-      @singleton_method_registrations[Thread.current].include?(type)
+      @singleton_method_registrations.include?(type)
     end
   end
 end

data/lib/mocktail/version.rb

@@ -1,3 +1,3 @@
 module Mocktail
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/mocktail.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Justin Searls"]
   spec.email = ["searls@gmail.com"]
 
-  spec.summary = "your objects, less potency"
+  spec.summary = "Take your objects, and make them a double"
   spec.homepage = "https://github.com/testdouble/mocktail"
   spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocktail
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-10 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -119,5 +119,5 @@ requirements: []
 rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
-summary: your objects, less potency
+summary: Take your objects, and make them a double
 test_files: []