Rename ResultCountLimiters to Config, simplify code and make it THREAD SAFE

Author: tom-lord

lib/core_extensions/regexp/examples.rb

@@ -5,19 +5,13 @@ module Regexp
     # No core classes are extended in any way, other than the above two methods.
     module Examples
       def examples(**config_options)
-        RegexpExamples::ResultCountLimiters.with_configuration(
-          max_repeater_variance: config_options[:max_repeater_variance],
-          max_group_results: config_options[:max_group_results],
-          max_results_limit: config_options[:max_results_limit]
-        ) do
+        RegexpExamples::Config.with_configuration(config_options) do
           examples_by_method(:result)
         end
       end
 
       def random_example(**config_options)
-        RegexpExamples::ResultCountLimiters.with_configuration(
-          max_repeater_variance: config_options[:max_repeater_variance]
-        ) do
+        RegexpExamples::Config.with_configuration(config_options) do
           examples_by_method(:random_result).sample
         end
       end

lib/regexp-examples/constants.rb

@@ -1,64 +1,76 @@
 # :nodoc:
 module RegexpExamples
   # Configuration settings to limit the number/length of Regexp examples generated
-  class ResultCountLimiters
+  class Config
     class << self
-      attr_accessor :max_repeater_variance, :max_group_results, :max_results_limit
-      def with_configuration(max_repeater_variance: nil,
-                            max_group_results: nil,
-                            max_results_limit: nil)
-        original_vals = [
-          @max_repeater_variance,
-          @max_group_results,
-          @max_results_limit
-        ]
+      def with_configuration(**new_config)
+        original_config = config.dup
 
-        @max_repeater_variance = max_repeater_variance if max_repeater_variance
-        @max_group_results = max_group_results if max_group_results
-        @max_results_limit = max_results_limit if max_results_limit
+        begin
+          self.config = new_config
+          result = yield
+        ensure
+          self.config = original_config
+        end
 
-        result = yield
+        result
+      end
 
-        @max_repeater_variance, @max_group_results, @max_results_limit = *original_vals
+      # Thread-safe getters and setters
+      %i[max_repeater_variance max_group_results max_results_limit].each do |m|
+        define_method(m) do
+          config[m]
+        end
+        define_method("#{m}=") do |value|
+          config[m] = value
+        end
+      end
 
-        result
+      private
+
+      def config=(**args)
+        Thread.current[:regexp_examples_config].merge!(args)
+      end
+
+      def config
+        Thread.current[:regexp_examples_config] ||= {}
       end
     end
     # The maximum variance for any given repeater, to prevent a huge/infinite number of
-    # examples from being listed. For example, if @@max_repeater_variance = 2 then:
+    # examples from being listed. For example, if self.max_repeater_variance = 2 then:
     # .* is equivalent to .{0,2}
     # .+ is equivalent to .{1,3}
     # .{2,} is equivalent to .{2,4}
     # .{,3} is equivalent to .{0,2}
     # .{3,8} is equivalent to .{3,5}
     MAX_REPEATER_VARIANCE_DEFAULT = 2
-    @max_repeater_variance = MAX_REPEATER_VARIANCE_DEFAULT
+    self.max_repeater_variance = MAX_REPEATER_VARIANCE_DEFAULT
 
     # Maximum number of characters returned from a char set, to reduce output spam
-    # For example, if @@max_group_results = 5 then:
+    # For example, if self.max_group_results = 5 then:
     # \d is equivalent to [01234]
     # \w is equivalent to [abcde]
     MAX_GROUP_RESULTS_DEFAULT = 5
-    @max_group_results = MAX_GROUP_RESULTS_DEFAULT
+    self.max_group_results = MAX_GROUP_RESULTS_DEFAULT
 
     # Maximum number of results to be generated, for Regexp#examples
     # This is to prevent the system "freezing" when given instructions like:
     # /[ab]{30}/.examples
     # (Which would attempt to generate 2**30 == 1073741824 examples!!!)
     MAX_RESULTS_LIMIT_DEFAULT = 10_000
-    @max_results_limit = MAX_RESULTS_LIMIT_DEFAULT
+    self.max_results_limit = MAX_RESULTS_LIMIT_DEFAULT
   end
 
   def self.max_repeater_variance
-    ResultCountLimiters.max_repeater_variance
+    Config.max_repeater_variance
   end
 
   def self.max_group_results
-    ResultCountLimiters.max_group_results
+    Config.max_group_results
   end
 
   def self.max_results_limit
-    ResultCountLimiters.max_results_limit
+    Config.max_results_limit
   end
 
   # Definitions of various special characters, used in regular expressions.

spec/result_count_limiters_spec.rb spec/config_spec.rbspec/result_count_limiters_spec.rb renamed to spec/config_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe RegexpExamples::ResultCountLimiters do
+RSpec.describe RegexpExamples::Config do
 
   describe 'max_repeater_variance' do
     context 'as a passed parameter' do
@@ -38,11 +38,11 @@
 
     context 'as a global setting' do
       before do
-        @original = RegexpExamples::ResultCountLimiters.max_results_limit
-        RegexpExamples::ResultCountLimiters.max_results_limit = 5
+        @original = RegexpExamples::Config.max_results_limit
+        RegexpExamples::Config.max_results_limit = 5
       end
       after do
-        RegexpExamples::ResultCountLimiters.max_results_limit = @original
+        RegexpExamples::Config.max_results_limit = @original
       end
 
       it 'sets limit without passing explicitly' do
@@ -66,11 +66,11 @@
 
     context 'as a global setting' do
       before do
-        @original = RegexpExamples::ResultCountLimiters.max_repeater_variance
-        RegexpExamples::ResultCountLimiters.max_repeater_variance = 5
+        @original = RegexpExamples::Config.max_repeater_variance
+        RegexpExamples::Config.max_repeater_variance = 5
       end
       after do
-        RegexpExamples::ResultCountLimiters.max_repeater_variance = @original
+        RegexpExamples::Config.max_repeater_variance = @original
       end
 
       it 'sets limit without passing explicitly' do
@@ -94,11 +94,11 @@
 
     context 'as a global setting' do
       before do
-        @original = RegexpExamples::ResultCountLimiters.max_group_results
-        RegexpExamples::ResultCountLimiters.max_group_results = 10
+        @original = RegexpExamples::Config.max_group_results
+        RegexpExamples::Config.max_group_results = 10
       end
       after do
-        RegexpExamples::ResultCountLimiters.max_group_results = @original
+        RegexpExamples::Config.max_group_results = @original
       end
 
       it 'sets limit without passing explicitly' do
@@ -108,5 +108,4 @@
     end
   end # describe 'max_group_results'
 
-
 end