Skip to content

Commit 48d3dc9

Browse files
committed
Remove 'delegation' methods; reference config directly
1 parent bbe00ca commit 48d3dc9

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

lib/regexp-examples/constants.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,6 @@ def config
6161
self.max_results_limit = MAX_RESULTS_LIMIT_DEFAULT
6262
end
6363

64-
def self.max_repeater_variance
65-
Config.max_repeater_variance
66-
end
67-
68-
def self.max_group_results
69-
Config.max_group_results
70-
end
71-
72-
def self.max_results_limit
73-
Config.max_results_limit
74-
end
75-
7664
# Definitions of various special characters, used in regular expressions.
7765
# For example, `/\h/.examples` will return the value of `Hex` in this module
7866
module CharSets

lib/regexp-examples/max_results_limiter.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ def cumulate_total(new_results_count, cumulator_method)
2525

2626
def results_allowed_from(partial_results, limiter_method)
2727
partial_results.first(
28-
RegexpExamples.max_results_limit.public_send(limiter_method, @results_count)
28+
RegexpExamples::Config.max_results_limit
29+
.public_send(limiter_method, @results_count)
2930
)
3031
end
3132
end

lib/regexp-examples/repeaters.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def initialize(group)
1010
end
1111

1212
def result
13-
group_results = group.result.first(RegexpExamples.max_group_results)
13+
group_results = group.result.first(RegexpExamples::Config.max_group_results)
1414
results = []
1515
max_results_limiter = MaxResultsLimiterBySum.new
1616
min_repeats.upto(max_repeats) do |repeats|
@@ -51,7 +51,7 @@ class StarRepeater < BaseRepeater
5151
def initialize(group)
5252
super
5353
@min_repeats = 0
54-
@max_repeats = RegexpExamples.max_repeater_variance
54+
@max_repeats = RegexpExamples::Config.max_repeater_variance
5555
end
5656
end
5757

@@ -61,7 +61,7 @@ class PlusRepeater < BaseRepeater
6161
def initialize(group)
6262
super
6363
@min_repeats = 1
64-
@max_repeats = RegexpExamples.max_repeater_variance + 1
64+
@max_repeats = RegexpExamples::Config.max_repeater_variance + 1
6565
end
6666
end
6767

@@ -81,9 +81,11 @@ def initialize(group, min, has_comma, max)
8181
super(group)
8282
@min_repeats = min || 0
8383
if max # e.g. {1,100} --> Treat as {1,3} (by default max_repeater_variance)
84-
@max_repeats = smallest(max, @min_repeats + RegexpExamples.max_repeater_variance)
84+
@max_repeats = smallest(
85+
max, @min_repeats + RegexpExamples::Config.max_repeater_variance
86+
)
8587
elsif has_comma # e.g. {2,} --> Treat as {2,4} (by default max_repeater_variance)
86-
@max_repeats = @min_repeats + RegexpExamples.max_repeater_variance
88+
@max_repeats = @min_repeats + RegexpExamples::Config.max_repeater_variance
8789
else # e.g. {3} --> Treat as {3,3}
8890
@max_repeats = @min_repeats
8991
end

0 commit comments

Comments
 (0)