From 6167af700d7e2117e21a67b9a2cccd4f691da8de Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 5 Feb 2019 12:37:09 +1300 Subject: [PATCH] Rubocop lint tidy --- app/controllers/crops_controller.rb | 2 +- app/helpers/plantings_helper.rb | 2 +- app/models/photo.rb | 6 +++--- app/resources/api/v1/crop_resource.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb index 0c3425b7d..837225d80 100644 --- a/app/controllers/crops_controller.rb +++ b/app/controllers/crops_controller.rb @@ -53,7 +53,7 @@ class CropsController < ApplicationController @posts = @crop.posts.order(created_at: :desc).paginate(page: params[:page]) @photos = Photo.by_crop(@crop) - + respond_to do |format| format.html format.json { render json: @crop.to_json(crop_json_fields) } diff --git a/app/helpers/plantings_helper.rb b/app/helpers/plantings_helper.rb index 6f6cc2df4..34b76d2e2 100644 --- a/app/helpers/plantings_helper.rb +++ b/app/helpers/plantings_helper.rb @@ -60,7 +60,7 @@ module PlantingsHelper t 'planting.status.perennial' elsif planting.finished? t 'planting.status.finished' - elsif ! planting.finish_is_predicatable? + elsif !planting.finish_is_predicatable? t 'planting.status.not_enough_data' elsif planting.harvest_time? t 'planting.status.harvesting' diff --git a/app/models/photo.rb b/app/models/photo.rb index 56d2c840c..cd51d15b1 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -15,9 +15,9 @@ class Photo < ApplicationRecord end default_scope { joins(:owner) } # Ensures the owner still exists - scope :by_crop, ->(crop) { joins(:photographings).where(photographings: {crop: crop}) } - scope :by_model, ->(model_name) { joins(:photographings).where(photographings: {photographable_type: model_name.to_s}) } - + scope :by_crop, ->(crop) { joins(:photographings).where(photographings: { crop: crop }) } + scope :by_model, ->(model_name) { joins(:photographings).where(photographings: { photographable_type: model_name.to_s }) } + # This is split into a side-effect free method and a side-effecting method # for easier stubbing and testing. def flickr_metadata diff --git a/app/resources/api/v1/crop_resource.rb b/app/resources/api/v1/crop_resource.rb index 1449202e5..8eac32091 100644 --- a/app/resources/api/v1/crop_resource.rb +++ b/app/resources/api/v1/crop_resource.rb @@ -10,7 +10,7 @@ module Api has_many :harvests has_many :photos - + has_one :parent attribute :name