8000 Make with_overrides thread-safe by kylekthompson · Pull Request #60 · kylekthompson/strict · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Make with_overrides thread-safe #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Make with_overrides thread-safe #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions lib/strict.rb
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,42 @@ module Strict

class << self
def configuration
@configuration ||= Strict::Configuration.new
thread_configuration || global_configuration
end

def configure
raise Strict::Error, "cannot reconfigure overridden configuration" if overridden?

yield(configuration)
end

def with_overrides(**overrides)
original_configuration = configuration
original_thread_configuration = thread_configuration

begin
self.configuration = Strict::Configuration.new(**original_configuration.to_h.merge(overrides))
self.thread_configuration = Strict::Configuration.new(**configuration.to_h.merge(overrides))
yield
ensure
self.configuration = original_configuration
self.thread_configuration = original_thread_configuration
end
end

private

attr_writer :configuration
def overridden?
!!thread_configuration
end

def thread_configuration
Thread.current[:configuration]
end

def thread_configuration=(configuration)
Thread.current[:configuration] = configuration
end

def global_configuration
@global_configuration ||= Strict::Configuration.new
end
end
end
16 changes: 15 additions & 1 deletion test/strict_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,24 @@

refute_equal original_random, Strict.configuration.random

assert_equal 1, Strict.configuration.sample_ratio
Strict.with_overrides(sample_ratio: 0) do
current_random = Strict.configuration.random
error = assert_raises(Strict::Error) do
Strict.configure do |c|
c.random = Random.new
end
end

assert_equal current_random, Strict.configuration.random
assert_match(/cannot reconfigure overridden configuration/, error.message)

assert_equal 0, Strict.configuration.sample_ratio
Strict.with_overrides(sample_ratio: 0.5) do
assert_in_delta 0.5, Strict.configuration.sample_ratio
end
assert_equal 0, Strict.configuration.sample_ratio
end

assert_equal 1, Strict.configuration.sample_ratio
end
end
0