From aa7ca71e5df3c25d98b03032cb68a8a8d0380716 Mon Sep 17 00:00:00 2001 From: Mackenzie Morgan Date: Wed, 30 Nov 2016 09:47:48 -0500 Subject: [PATCH] rubocop --- app/models/concerns/photo_capable.rb | 8 +++----- app/models/harvest.rb | 1 - app/models/photo.rb | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/models/concerns/photo_capable.rb b/app/models/concerns/photo_capable.rb index f2f53aa42..4ee0d2756 100644 --- a/app/models/concerns/photo_capable.rb +++ b/app/models/concerns/photo_capable.rb @@ -8,11 +8,9 @@ module PhotoCapable end def remove_from_list - photolist = self.photos.to_a # save a temp copy of the photo list - self.photos.clear # clear relationship b/w object and photo + photolist = photos.to_a # save a temp copy of the photo list + photos.clear # clear relationship b/w object and photo - photolist.each do |photo| - photo.destroy_if_unused - end + photolist.each(&:destroy_if_unused) end end diff --git a/app/models/harvest.rb b/app/models/harvest.rb index 1afdf473d..e7304802a 100644 --- a/app/models/harvest.rb +++ b/app/models/harvest.rb @@ -8,7 +8,6 @@ class Harvest < ActiveRecord::Base belongs_to :owner, class_name: 'Member' belongs_to :plant_part - default_scope { order('created_at DESC') } validates :crop, approved: true diff --git a/app/models/photo.rb b/app/models/photo.rb index bd41b5c39..eef1d4e94 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,5 +1,5 @@ class Photo < ActiveRecord::Base - ON_MODELS = %w(plantings harvests gardens) + ON_MODELS = %w(plantings harvests gardens).freeze belongs_to :owner, class_name: 'Member' ON_MODELS.each do |relation| @@ -13,7 +13,7 @@ class Photo < ActiveRecord::Base def relationships associations = [] ON_MODELS.each do |association_name, _reflection| - associations << self.send("#{association_name}").to_a + associations << self.send(association_name.to_s).to_a end associations.flatten! end