Skip to content

Commit d7b4579

Browse files
committed
Minor cleanup
1 parent 347ca10 commit d7b4579

File tree

8 files changed

+32
-19
lines changed

8 files changed

+32
-19
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.DS_Store
33
.env
44
.yarn-integrity
5+
/.vscode
56
/.yarn
67
/coverage
78
/log

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ group :development do
4747
gem "rubocop-capybara"
4848
gem "rubocop-factory_bot"
4949
gem "rubocop-performance"
50+
gem "rubocop-rails-omakase"
5051
gem "rubocop-rake"
5152
gem "rubocop-rspec_rails"
5253
gem "rubocop-rspec"

Gemfile.lock

+11
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,16 @@ GEM
409409
lint_roller (~> 1.1)
410410
rubocop (>= 1.72.1, < 2.0)
411411
rubocop-ast (>= 1.38.0, < 2.0)
412+
rubocop-rails (2.30.2)
413+
activesupport (>= 4.2.0)
414+
lint_roller (~> 1.1)
415+
rack (>= 1.1)
416+
rubocop (>= 1.72.1, < 2.0)
417+
rubocop-ast (>= 1.38.0, < 2.0)
418+
rubocop-rails-omakase (1.1.0)
419+
rubocop (>= 1.72)
420+
rubocop-performance (>= 1.24)
421+
rubocop-rails (>= 2.30)
412422
rubocop-rake (0.7.1)
413423
lint_roller (~> 1.1)
414424
rubocop (>= 1.72.1)
@@ -553,6 +563,7 @@ DEPENDENCIES
553563
rubocop-capybara
554564
rubocop-factory_bot
555565
rubocop-performance
566+
rubocop-rails-omakase
556567
rubocop-rake
557568
rubocop-rspec
558569
rubocop-rspec_rails

app/models/playlist.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class Playlist < ApplicationRecord
2525

2626
scope :published, -> { where(published: true) }
2727

28-
after_save :update_duration
28+
after_save :save_duration
2929

30-
def update_duration
30+
def save_duration
3131
update_column(:duration, playlist_tracks.sum(:duration)) if self.persisted?
3232
end
3333

app/models/playlist_track.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ class PlaylistTrack < ApplicationRecord
77
uniqueness: { scope: :playlist_id }
88

99
before_save :assign_duration
10-
after_create :update_playlist_duration
11-
after_update :update_playlist_duration
12-
after_destroy :update_playlist_duration
10+
after_create :save_playlist_duration
11+
after_update :save_playlist_duration
12+
after_destroy :save_playlist_duration
1313

1414
private
1515

@@ -32,7 +32,7 @@ def excerpt_duration
3232
dur.negative? ? track.duration : dur
3333
end
3434

35-
def update_playlist_duration
36-
playlist.update_duration
35+
def save_playlist_duration
36+
playlist.save_duration
3737
end
3838
end

config/routes.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require "sidekiq/web"
22

33
Rails.application.routes.draw do
4-
get "/health", to: proc { [200, {}, ["OK"]] }
4+
get "/health", to: proc { [ 200, {}, [ "OK" ] ] }
55

66
Sidekiq::Web.use Rack::Auth::Basic do |username, password|
77
ActiveSupport::SecurityUtils.secure_compare(

spec/models/playlist_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
end
6363
end
6464

65-
describe '#update_duration' do
65+
describe '#save_duration' do
6666
let!(:playlist) { create(:playlist, tracks_count: 3) }
6767

6868
it 'updates the playlist duration after adding tracks' do

spec/models/playlist_track_spec.rb

+10-10
Original file line numberDiff line numberDiff line change
@@ -80,36 +80,36 @@
8080
end
8181
end
8282

83-
describe '#update_playlist_duration' do
83+
describe '#save_playlist_duration' do
8484
let(:playlist) { create(:playlist) }
8585

86-
before { allow(playlist).to receive(:update_duration) }
86+
before { allow(playlist).to receive(:save_duration) }
8787

8888
describe 'after create' do
89-
it 'calls update_duration on the parent playlist' do
89+
it 'calls save_duration on the parent playlist' do
9090
playlist_track = build(:playlist_track, playlist:)
9191
playlist_track.save
92-
expect(playlist).to have_received(:update_duration)
92+
expect(playlist).to have_received(:save_duration)
9393
end
9494
end
9595

9696
describe 'after update' do
97-
before { allow(playlist).to receive(:update_duration) }
97+
before { allow(playlist).to receive(:save_duration) }
9898

99-
it 'calls update_duration on the parent playlist' do
99+
it 'calls save_duration on the parent playlist' do
100100
playlist_track = create(:playlist_track, playlist:)
101101
playlist_track.update(starts_at_second: 3, ends_at_second: 5)
102-
expect(playlist).to have_received(:update_duration).twice
102+
expect(playlist).to have_received(:save_duration).twice
103103
end
104104
end
105105

106106
describe 'after destroy' do
107-
before { allow(playlist).to receive(:update_duration) }
107+
before { allow(playlist).to receive(:save_duration) }
108108

109-
it 'calls update_duration on the parent playlist' do
109+
it 'calls save_duration on the parent playlist' do
110110
playlist_track = create(:playlist_track, playlist:)
111111
playlist_track.destroy
112-
expect(playlist).to have_received(:update_duration).twice
112+
expect(playlist).to have_received(:save_duration).twice
113113
end
114114
end
115115
end

0 commit comments

Comments
 (0)