mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-12 10:02:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into bundle-update-2018-03-22-131347

Browse Source
This commit is contained in:
Brenda Wallace
2018-03-31 18:15:25 +13:00
committed by GitHub
parent 61468b3587 25070f73d7
commit d5c8b9ae27
13 changed files with 112 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/helpers/photos_helper.rb
View File

@@ -3,7 +3,15 @@ module PhotosHelper
if crop.default_photo.present?
crop.default_photo.thumbnail_url
else
default_image
placeholder_image
end
end
def garden_image_path(garden)
if garden.default_photo.present?
garden.default_photo.thumbnail_url
else
placeholder_image
end
end
@@ -11,29 +19,33 @@ module PhotosHelper
if planting.photos.present?
planting.photos.first.thumbnail_url
else
default_image
placeholder_image
end
end
def harvest_image_path(harvest)
if harvest.photos.present?
harvest.photos.first.thumbnail_url
elsif harvest.planting.present? && harvest.planting.photos.present?
harvest.planting.photos.first.thumbnail_url
else
default_image
placeholder_image
end
end
def seed_image_path(seed)
if seed.default_photo
if seed.default_photo.present?
seed.default_photo.thumbnail_url
elsif seed.crop.default_photo.present?
seed.crop.default_photo.thumbnail_url
else
default_image
placeholder_image
end
end
private
def default_image
def placeholder_image
'placeholder_150.png'
end
end

11
app/models/crop.rb
View File

@@ -120,12 +120,7 @@ class Crop < ActiveRecord::Base
# later we can choose a default photo based on different criteria,
# eg. popularity
def default_photo
# most recent photo
return photos.order(created_at: :desc).first if photos.any?
# Crop has no photos? Look for the most recent harvest with a photo.
harvest_with_photo = Harvest.where(crop_id: id).joins(:photos).order('harvests.id DESC').limit(1).first
harvest_with_photo.photos.first if harvest_with_photo
first_photo(:plantings) || first_photo(:harvests) || first_photo(:seeds)
end
# returns hash indicating whether this crop is grown in
@@ -242,4 +237,8 @@ class Crop < ActiveRecord::Base
return unless reason_for_rejection == "other" && rejection_notes.blank?
errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
end
def first_photo(type)
Photo.joins(type).where("#{type}": { crop_id: id }).order("photos.created_at DESC").first
end
end

2
app/views/crops/_index_card.html.haml
View File

@@ -1,7 +1,7 @@
.well
.row
.col-md-4
= link_to image_tag((crop.default_photo ? crop.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(crop_image_path(crop),
alt: '',
class: 'img crop-image'),
crop

2
app/views/crops/_thumbnail.html.haml
View File

@@ -2,7 +2,7 @@
.thumbnail
.crop-thumbnail
- if crop
= link_to image_tag((crop.default_photo ? crop.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(crop_image_path(crop),
alt: crop.name, class: 'img'),
crop
.cropinfo

2
app/views/gardens/_photo.html.haml
View File

@@ -1,3 +1,3 @@
= link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(garden_image_path(garden),
alt: garden.name, class: 'img-responsive'),
garden_path(garden)

2
app/views/gardens/_thumbnail.html.haml
View File

@@ -8,7 +8,7 @@
.panel-body{ id: "gardens_panel_body" }
.row
.col-md-4
= link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(garden_image_path(garden),
alt: garden.name, class: 'img'),
garden_path(garden)
.col-md-8

2
app/views/harvests/_card.html.haml
View File

@@ -8,7 +8,7 @@
.panel-body
.row
.col-md-4
= link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(harvest_image_path(harvest),
alt: harvest.crop.name, class: 'img'),
harvest
.col-md-8

2
app/views/harvests/_thumbnail.html.haml
View File

@@ -1,7 +1,7 @@
.thumbnail
.harvest-thumbnail
- if harvest
= link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(harvest_image_path(harvest),
alt: harvest.crop.name, class: 'img'),
harvest
.harvestinfo

2
app/views/plantings/_card.html.haml
View File

@@ -8,7 +8,7 @@
.panel-body
.row
.col-xs-12.col-md-5
= link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(planting_image_path(planting),
alt: planting.crop_id, class: 'img img-responsive'),
planting
.col-xs-12.col-md-7

2
app/views/plantings/_thumbnail.html.haml
View File

@@ -1,7 +1,7 @@
.thumbnail
.planting-thumbnail
- if planting
= link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(planting_image_path(planting),
alt: planting.crop.name, class: 'img'),
planting
.plantinginfo

2
app/views/seeds/_card.html.haml
View File

@@ -8,7 +8,7 @@
.panel-body
.row
.col-md-4
= link_to image_tag((seed.crop.default_photo ? seed.crop.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(seed_image_path(seed),
alt: seed.crop.name, class: 'img'),
seed.crop
.col-md-8

2
app/views/seeds/_thumbnail.html.haml
View File

@@ -1,6 +1,6 @@
.thumbnail
.seed-thumbnail
= link_to image_tag((seed.default_photo ? seed.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(seed_image_path(seed),
alt: seed.crop.name, class: 'img'),
seed_path(seed)
.seedinfo

79
spec/helpers/photos_helper_spec.rb Normal file
View File

@@ -0,0 +1,79 @@
require 'rails_helper'
describe PhotosHelper do
let(:crop) { FactoryBot.create :crop }
let(:garden) { FactoryBot.create :garden }
let(:garden_photo) { FactoryBot.create(:photo, thumbnail_url: 'garden.jpg') }
let(:planting) { FactoryBot.create :planting, crop: crop }
let(:planting_photo) { FactoryBot.create(:photo, thumbnail_url: 'planting.jpg') }
let(:harvest) { FactoryBot.create :harvest, crop: crop }
let(:harvest_photo) { FactoryBot.create(:photo, thumbnail_url: 'harvest.jpg') }
let(:seed) { FactoryBot.create :seed, crop: crop }
let(:seed_photo) { FactoryBot.create(:photo, thumbnail_url: 'seed.jpg') }
describe "crops" do
subject { crop_image_path(crop) }
it { is_expected.to eq 'placeholder_150.png' }
describe "with a planting" do
before { planting.photos << planting_photo }
it "uses planting photos" do
is_expected.to eq planting_photo.thumbnail_url
end
end
describe "with a harvest photos" do
before { harvest.photos << harvest_photo }
it "uses harvest photos" do
is_expected.to eq harvest_photo.thumbnail_url
end
end
describe "uses seed photo" do
before { seed.photos << seed_photo }
it "uses seed photos" do
is_expected.to eq seed_photo.thumbnail_url
end
end
end
describe "gardens" do
subject { garden_image_path(garden) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses garden's own photo" do
before { garden.photos << garden_photo }
it { is_expected.to eq garden_photo.thumbnail_url }
end
end
describe 'plantings' do
subject { planting_image_path(planting) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses planting's own photo" do
before { planting.photos << planting_photo }
it { is_expected.to eq planting_photo.thumbnail_url }
end
end
describe 'harvests' do
subject { harvest_image_path(harvest) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses harvest's own photo" do
before { harvest.photos << harvest_photo }
it { is_expected.to eq harvest_photo.thumbnail_url }
end
end
describe 'seeds' do
subject { seed_image_path(seed) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses seed's own photo" do
before { seed.photos << seed_photo }
it { is_expected.to eq seed_photo.thumbnail_url }
end
end
end