diff options
| author | mo khan <mo@mokhan.ca> | 2015-01-20 22:04:02 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2015-01-20 22:04:02 -0700 |
| commit | ba2b6e9fc1d0dd07e8a5f66384b6de2ef1dffbf2 (patch) | |
| tree | 3c9ca6ff4190bee76103ca3efe3589fbc4d0dddb | |
| parent | b8220fc12cc3baae6c3e8f3c5dc5686cf1ef4df3 (diff) | |
happy hound.
| -rw-r--r-- | app/controllers/my/avatars_controller.rb | 8 | ||||
| -rw-r--r-- | app/models/photo.rb | 2 | ||||
| -rw-r--r-- | app/models/tutorial.rb | 4 | ||||
| -rw-r--r-- | app/models/version.rb | 2 | ||||
| -rw-r--r-- | spec/jobs/re_process_photo_job_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/password_reset_spec.rb | 3 |
6 files changed, 16 insertions, 7 deletions
diff --git a/app/controllers/my/avatars_controller.rb b/app/controllers/my/avatars_controller.rb index eea96a61..a06bbbd0 100644 --- a/app/controllers/my/avatars_controller.rb +++ b/app/controllers/my/avatars_controller.rb @@ -6,8 +6,14 @@ module My def create image = params[:photo][:image] - ProcessAvatarJob.perform_later(current_user, TemporaryStorage.new.store(image)) + ProcessAvatarJob.perform_later(current_user, storage.store(image)) redirect_to new_my_avatar_path, notice: t(:avatar_uploaded) end + + private + + def storage + TemporaryStorage.new + end end end diff --git a/app/models/photo.rb b/app/models/photo.rb index dd2e3d97..ef8b96c8 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -25,7 +25,7 @@ class Photo < ActiveRecord::Base end def version(key) - versions.find { |version| version.for?(key) } + versions.detect { |version| version.for?(key) } end private diff --git a/app/models/tutorial.rb b/app/models/tutorial.rb index a46390c0..e6fe95c3 100644 --- a/app/models/tutorial.rb +++ b/app/models/tutorial.rb @@ -3,8 +3,8 @@ class Tutorial < ActiveRecord::Base belongs_to :user acts_as_taggable default_scope -> { order('tutorials.created_at desc') } - scope :search, ->(query) do - query.blank? ? all : where(["UPPER(heading) LIKE :query OR UPPER(description) LIKE :query", { query: "%#{query.upcase}%" }]) + scope :search, ->(query) do + query.blank? ? all : where(["UPPER(heading) LIKE :query OR UPPER(description) LIKE :query", { query: "%#{query.upcase}%" }]) end def to_param diff --git a/app/models/version.rb b/app/models/version.rb index 648915c6..43ab3ef0 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -7,7 +7,7 @@ class Version @photo = photo end - def adjust(image) + def adjust(_image) fail "Please override with version specific behaviours" end diff --git a/spec/jobs/re_process_photo_job_spec.rb b/spec/jobs/re_process_photo_job_spec.rb index 35198b9e..00b6f9ff 100644 --- a/spec/jobs/re_process_photo_job_spec.rb +++ b/spec/jobs/re_process_photo_job_spec.rb @@ -23,7 +23,9 @@ describe ReProcessPhotoJob, type: :job do subject.perform(photo) - expect(ProcessPhotoJob).to have_received(:perform_later).with(photo, temp_file) + expect(ProcessPhotoJob). + to have_received(:perform_later). + with(photo, temp_file) end end end diff --git a/spec/models/password_reset_spec.rb b/spec/models/password_reset_spec.rb index f9cc3c4a..6a2cd65d 100644 --- a/spec/models/password_reset_spec.rb +++ b/spec/models/password_reset_spec.rb @@ -6,7 +6,8 @@ describe PasswordReset do let(:mailer) { double(deliver_later: true) } before :each do - allow(PasswordResetMailer).to receive(:send_password_reset_instructions_to). + allow(PasswordResetMailer). + to receive(:send_password_reset_instructions_to). with(user). and_return(mailer) end |
