Skip to content

Commit c914747

Browse files
committed
Refactor: Rename Calculators To Projectors
Why This Change Is Necessary ======================================================================== Now that the calculator is responsible for more than just a single `calculate` method, it is being renamed to something more appropriate for its task. What These Changes Do To Address the Issue ======================================================================== Rename and move the files for the `SmoothedAverage` class. Side Effects Caused By This Change ======================================================================== None expected.
1 parent e1e7f0c commit c914747

File tree

8 files changed

+62
-62
lines changed

8 files changed

+62
-62
lines changed

lib/ruby-progressbar/projector.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
require 'ruby-progressbar/calculators/smoothed_average'
1+
require 'ruby-progressbar/projectors/smoothed_average'
22

33
class ProgressBar
44
class Projector
5-
DEFAULT_PROJECTOR = ProgressBar::Calculators::SmoothedAverage
5+
DEFAULT_PROJECTOR = ProgressBar::Projectors::SmoothedAverage
66
NAME_TO_PROJECTOR_MAP = {
7-
'smoothed' => ProgressBar::Calculators::SmoothedAverage
7+
'smoothed' => ProgressBar::Projectors::SmoothedAverage
88
}.freeze
99

1010
def self.from_type(name)

lib/ruby-progressbar/calculators/smoothed_average.rb renamed to lib/ruby-progressbar/projectors/smoothed_average.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class ProgressBar
2-
module Calculators
2+
module Projectors
33
class SmoothedAverage
44
DEFAULT_STRENGTH = 0.1
55
DEFAULT_BEGINNING_POSITION = 0

spec/lib/ruby-progressbar/components/bar_spec.rb

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ module Components
3030

3131
describe '#bar' do
3232
it 'displays the bar with no indication of progress when just begun' do
33-
projector = Calculators::SmoothedAverage.new
33+
projector = Projectors::SmoothedAverage.new
3434
progress = Progress.new(:projector => projector, :total => 50)
3535
progressbar = Bar.new(:progress => progress,
3636
:length => 100)
@@ -41,7 +41,7 @@ module Components
4141

4242
it 'displays the bar with an indication of progress when nothing has been ' \
4343
'completed and the bar is incremented' do
44-
projector = Calculators::SmoothedAverage.new
44+
projector = Projectors::SmoothedAverage.new
4545
progress = Progress.new(:projector => projector, :total => 50)
4646
progressbar = Bar.new(:progress => progress,
4747
:length => 100)
@@ -53,7 +53,7 @@ module Components
5353

5454
it 'displays the bar with no indication of progress when a fraction of a percentage ' \
5555
'has been completed' do
56-
projector = Calculators::SmoothedAverage.new
56+
projector = Projectors::SmoothedAverage.new
5757
progress = Progress.new(:projector => projector, :total => 200)
5858
progressbar = Bar.new(:progress => progress,
5959
:length => 100)
@@ -64,7 +64,7 @@ module Components
6464
end
6565

6666
it 'displays the bar as 100% complete when completed' do
67-
projector = Calculators::SmoothedAverage.new
67+
projector = Projectors::SmoothedAverage.new
6868
progress = Progress.new(:projector => projector, :total => 50)
6969
progressbar = Bar.new(:progress => progress,
7070
:length => 100)
@@ -76,7 +76,7 @@ module Components
7676
end
7777

7878
it 'displays the bar as 98% complete when completed and the bar is decremented' do
79-
projector = Calculators::SmoothedAverage.new
79+
projector = Projectors::SmoothedAverage.new
8080
progress = Progress.new(:projector => projector, :total => 50)
8181
progressbar = Bar.new(:progress => progress,
8282
:length => 100)
@@ -90,7 +90,7 @@ module Components
9090

9191
describe '#bar_with_percentage' do
9292
it 'displays the bar with an integrated percentage properly when empty' do
93-
projector = Calculators::SmoothedAverage.new
93+
projector = Projectors::SmoothedAverage.new
9494
progress = Progress.new(:projector => projector, :total => 100)
9595
progressbar = Bar.new(:progress => progress,
9696
:length => 100)
@@ -101,7 +101,7 @@ module Components
101101

102102
it 'displays the bar with an integrated percentage properly just before' \
103103
'the percentage is displayed' do
104-
projector = Calculators::SmoothedAverage.new
104+
projector = Projectors::SmoothedAverage.new
105105
progress = Progress.new(:projector => projector, :total => 100)
106106
progressbar = Bar.new(:progress => progress,
107107
:length => 100)
@@ -114,7 +114,7 @@ module Components
114114

115115
it 'displays the bar with an integrated percentage properly immediately after' \
116116
'the percentage is displayed' do
117-
projector = Calculators::SmoothedAverage.new
117+
projector = Projectors::SmoothedAverage.new
118118
progress = Progress.new(:projector => projector, :total => 100)
119119
progressbar = Bar.new(:progress => progress,
120120
:length => 100)
@@ -127,7 +127,7 @@ module Components
127127

128128
it 'displays the bar with an integrated percentage properly on double digit' \
129129
'percentage' do
130-
projector = Calculators::SmoothedAverage.new
130+
projector = Projectors::SmoothedAverage.new
131131
progress = Progress.new(:projector => projector, :total => 100)
132132
progressbar = Bar.new(:progress => progress,
133133
:length => 100)
@@ -139,7 +139,7 @@ module Components
139139
end
140140

141141
it 'displays the bar with an integrated percentage properly when finished' do
142-
projector = Calculators::SmoothedAverage.new
142+
projector = Projectors::SmoothedAverage.new
143143
progress = Progress.new(:projector => projector, :total => 100)
144144
progressbar = Bar.new(:progress => progress,
145145
:length => 100)
@@ -151,7 +151,7 @@ module Components
151151

152152
it 'calculates the remaining negative space properly with an integrated percentage ' \
153153
'bar of 0 percent' do
154-
projector = Calculators::SmoothedAverage.new
154+
projector = Projectors::SmoothedAverage.new
155155
progress = Progress.new(:projector => projector, :total => 200)
156156
progressbar = Bar.new(:progress => progress,
157157
:length => 100)
@@ -173,7 +173,7 @@ module Components
173173

174174
describe '#incomplete_space' do
175175
it 'displays the bar with an integrated percentage properly when empty' do
176-
projector = Calculators::SmoothedAverage.new
176+
projector = Projectors::SmoothedAverage.new
177177
progress = Progress.new(:projector => projector, :total => 100)
178178
progressbar = Bar.new(:progress => progress,
179179
:length => 100)
@@ -184,7 +184,7 @@ module Components
184184

185185
it 'displays the bar with an integrated percentage properly just before' \
186186
'the percentage is displayed' do
187-
projector = Calculators::SmoothedAverage.new
187+
projector = Projectors::SmoothedAverage.new
188188
progress = Progress.new(:projector => projector, :total => 100)
189189
progressbar = Bar.new(:progress => progress,
190190
:length => 100)
@@ -197,7 +197,7 @@ module Components
197197

198198
it 'displays the bar with an integrated percentage properly immediately after' \
199199
'the percentage is displayed' do
200-
projector = Calculators::SmoothedAverage.new
200+
projector = Projectors::SmoothedAverage.new
201201
progress = Progress.new(:projector => projector, :total => 100)
202202
progressbar = Bar.new(:progress => progress,
203203
:length => 100)
@@ -210,7 +210,7 @@ module Components
210210

211211
it 'displays the bar with an integrated percentage properly on double digit' \
212212
'percentage' do
213-
projector = Calculators::SmoothedAverage.new
213+
projector = Projectors::SmoothedAverage.new
214214
progress = Progress.new(:projector => projector, :total => 100)
215215
progressbar = Bar.new(:progress => progress,
216216
:length => 100)
@@ -222,7 +222,7 @@ module Components
222222
end
223223

224224
it 'displays the bar with an integrated percentage properly when finished' do
225-
projector = Calculators::SmoothedAverage.new
225+
projector = Projectors::SmoothedAverage.new
226226
progress = Progress.new(:projector => projector, :total => 100)
227227
progressbar = Bar.new(:progress => progress,
228228
:length => 100)
@@ -234,7 +234,7 @@ module Components
234234

235235
it 'calculates the remaining negative space properly with an integrated percentage ' \
236236
'bar of 0 percent' do
237-
projector = Calculators::SmoothedAverage.new
237+
projector = Projectors::SmoothedAverage.new
238238
progress = Progress.new(:projector => projector, :total => 200)
239239
progressbar = Bar.new(:progress => progress,
240240
:length => 100)
@@ -254,7 +254,7 @@ module Components
254254
end
255255

256256
it 'is represented correctly when a bar has an unknown amount to completion' do
257-
projector = Calculators::SmoothedAverage.new
257+
projector = Projectors::SmoothedAverage.new
258258
progress = Progress.new(:projector => projector, :total => nil)
259259
progressbar = Bar.new(:progress => progress,
260260
:length => 80)
@@ -265,7 +265,7 @@ module Components
265265

266266
it 'is represented after being incremented once when a bar has an unknown amount ' \
267267
'to completion' do
268-
projector = Calculators::SmoothedAverage.new
268+
projector = Projectors::SmoothedAverage.new
269269
progress = Progress.new(:projector => projector, :total => nil)
270270
progressbar = Bar.new(:progress => progress,
271271
:length => 80)
@@ -278,7 +278,7 @@ module Components
278278

279279
it 'is represented after being incremented twice when a bar has an unknown amount ' \
280280
'to completion' do
281-
projector = Calculators::SmoothedAverage.new
281+
projector = Projectors::SmoothedAverage.new
282282
progress = Progress.new(:projector => projector, :total => nil)
283283
progressbar = Bar.new(:progress => progress,
284284
:length => 80)
@@ -290,7 +290,7 @@ module Components
290290
end
291291

292292
it 'is represented correctly when a bar has a customized unknown animation' do
293-
projector = Calculators::SmoothedAverage.new
293+
projector = Projectors::SmoothedAverage.new
294294
progress = Progress.new(:projector => projector, :total => nil)
295295
progressbar = Bar.new(:progress => progress,
296296
:unknown_progress_animation_steps => [
@@ -307,7 +307,7 @@ module Components
307307

308308
it 'raises an error when attempting to set the current value of the bar to be ' \
309309
'greater than the total' do
310-
projector = Calculators::SmoothedAverage.new
310+
projector = Projectors::SmoothedAverage.new
311311
progress = Progress.new(:projector => projector, :total => 10)
312312
_progressbar = Bar.new(:progress => progress)
313313

spec/lib/ruby-progressbar/components/percentage_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module Components
66
describe Percentage do
77
describe '#percentage' do
88
it 'returns the percentage' do
9-
projector = Calculators::SmoothedAverage.new
9+
projector = Projectors::SmoothedAverage.new
1010
progress = Progress.new(:projector => projector, :total => 10)
1111
percentage = Percentage.new(:progress => progress)
1212

@@ -18,7 +18,7 @@ module Components
1818

1919
describe '#percentage_with_precision' do
2020
it 'returns the percentage' do
21-
projector = Calculators::SmoothedAverage.new
21+
projector = Projectors::SmoothedAverage.new
2222
progress = Progress.new(:projector => projector, :total => 10)
2323
percentage = Percentage.new(:progress => progress)
2424

@@ -30,7 +30,7 @@ module Components
3030

3131
describe '#justified_percentage' do
3232
it 'returns the percentage' do
33-
projector = Calculators::SmoothedAverage.new
33+
projector = Projectors::SmoothedAverage.new
3434
progress = Progress.new(:projector => projector, :total => 10)
3535
percentage = Percentage.new(:progress => progress)
3636

@@ -42,7 +42,7 @@ module Components
4242

4343
describe '#justified_percentage_with_precision' do
4444
it 'returns the percentage' do
45-
projector = Calculators::SmoothedAverage.new
45+
projector = Projectors::SmoothedAverage.new
4646
progress = Progress.new(:projector => projector, :total => 10)
4747
percentage = Percentage.new(:progress => progress)
4848

spec/lib/ruby-progressbar/components/rate_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module Components
88
it 'returns the rate as a formatted integer' do
99
Timecop.freeze(::Time.utc(2020, 1, 1, 0, 0, 0))
1010

11-
projector = Calculators::SmoothedAverage.new
11+
projector = Projectors::SmoothedAverage.new
1212
progress = Progress.new(:projector => projector, :total => 100)
1313
timer = Timer.new
1414
rate = Rate.new(:progress => progress,
@@ -29,7 +29,7 @@ module Components
2929
it 'can scale the rate' do
3030
Timecop.freeze(::Time.utc(2020, 1, 1, 0, 0, 0))
3131

32-
projector = Calculators::SmoothedAverage.new
32+
projector = Projectors::SmoothedAverage.new
3333
progress = Progress.new(:projector => projector, :total => 100)
3434
timer = Timer.new
3535
rate = Rate.new(:progress => progress,
@@ -53,7 +53,7 @@ module Components
5353
it 'returns the rate as a formatted integer' do
5454
Timecop.freeze(::Time.utc(2020, 1, 1, 0, 0, 0))
5555

56-
projector = Calculators::SmoothedAverage.new
56+
projector = Projectors::SmoothedAverage.new
5757
progress = Progress.new(:projector => projector, :total => 100)
5858
timer = Timer.new
5959
rate = Rate.new(:progress => progress,

0 commit comments

Comments
 (0)