Commit ee2e4e7
Changed files (6)
app
controllers
helpers
models
spec
controllers
helpers
app/controllers/training_sessions_controller.rb
@@ -1,13 +1,19 @@
-require 'temporary_storage'
+require "temporary_storage"
class TrainingSessionsController < ApplicationController
def index
- @training_sessions = current_user.training_sessions.order(occurred_at: :desc)
+ @training_sessions = current_user.training_sessions.
+ order(occurred_at: :desc)
end
def upload
- temporary_storage = TemporaryStorage.new
- ProcessBackupJob.perform_later(current_user, temporary_storage.store(params[:backup]))
- redirect_to dashboard_path, notice: t('.success')
+ ProcessBackupJob.perform_later(current_user, storage.store(params[:backup]))
+ redirect_to dashboard_path, notice: t(".success")
+ end
+
+ private
+
+ def storage
+ @storage ||= TemporaryStorage.new
end
end
app/helpers/application_helper.rb
@@ -1,5 +1,9 @@
module ApplicationHelper
def gravatar_for(user, size: 260)
- image_tag("https://secure.gravatar.com/avatar/#{user.gravatar_id}?s=#{size}&d=mm", alt: user.username, class: 'gravatar')
+ secure_host = "https://secure.gravatar.com/avatar"
+ options = "s=#{size}&d=mm"
+ image_tag "#{secure_host}/#{user.gravatar_id}?#{options}",
+ alt: user.username,
+ class: "gravatar"
end
end
app/jobs/process_backup_job.rb
@@ -1,5 +1,5 @@
class ProcessBackupJob < ActiveJob::Base
- WORKOUTS_SQL="select * from workouts"
+ WORKOUTS_SQL = "select * from workouts"
queue_as :default
def perform(user, backup_file)
app/models/training_session.rb
@@ -10,7 +10,11 @@ class TrainingSession < ActiveRecord::Base
if matching_workouts.any?
session = matching_workouts.first
else
- session = create!(workout: workout, occurred_at: workout_row.date, body_weight: workout_row.body_weight.to_f)
+ session = create!(
+ workout: workout,
+ occurred_at: workout_row.date,
+ body_weight: workout_row.body_weight.to_f
+ )
end
session.exercise_sessions.destroy_all
@@ -18,7 +22,7 @@ class TrainingSession < ActiveRecord::Base
exercise_row = workout_row.exercises[index]
sets = []
1.upto(exercise_workout.sets).each do |n|
- sets.push(exercise_row["set#{n}"].to_i > 0 ? exercise_row["set#{n}"] : 0)
+ sets << exercise_row["set#{n}"].to_i > 0 ? exercise_row["set#{n}"] : 0
end
session.exercise_sessions.create!(
spec/controllers/training_sessions_controller_spec.rb
@@ -35,7 +35,7 @@ describe TrainingSessionsController do
expect(response).to redirect_to(dashboard_path)
end
- it 'displays a friendly message' do
+ it "displays a friendly message" do
post :upload, backup: backup_file
translation = I18n.translate("training_sessions.upload.success")
expect(flash[:notice]).to eql(translation)
spec/helpers/application_helper_spec.rb
@@ -5,7 +5,10 @@ describe ApplicationHelper do
let(:user) { build(:user) }
it "returns the gravatar image tag" do
- expected = "<img alt=\"#{user.username}\" class=\"gravatar\" src=\"https://secure.gravatar.com/avatar/#{user.gravatar_id}?s=260&d=mm\" />"
+ expected = "<img alt=\"#{user.username}\" " +
+ "class=\"gravatar\" " +
+ "src=\"https://secure.gravatar.com/avatar/" +
+ "#{user.gravatar_id}?s=260&d=mm\" />"
expect(gravatar_for(user)).to eql(expected)
end
end