From 94db28b3a9cb7f65a94bb5f261b0ba0d03b7266b Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Sun, 28 Jan 2018 23:47:38 +0000 Subject: [PATCH 1/2] Auto corrected by following Style/AndOr --- lib/tasks/growstuff.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake index 03b2e3d0e..befff39a0 100644 --- a/lib/tasks/growstuff.rake +++ b/lib/tasks/growstuff.rake @@ -51,7 +51,7 @@ namespace :growstuff do send_on_day = 3 # wednesday every_n_weeks = 2 # send fortnightly - if Time.zone.today.cwday == send_on_day and Time.zone.today.cweek % every_n_weeks == 0 + if (Time.zone.today.cwday == send_on_day) && (Time.zone.today.cweek % every_n_weeks == 0) Member.confirmed.find_each do |m| Notifier.planting_reminder(m).deliver_now! end @@ -62,7 +62,7 @@ namespace :growstuff do # this fixes up anyone who has erroneously wound up with a 0,0 lat/long task depopulate_null_island: :environment do Member.find_each do |m| - if m.location and (m.latitude.nil? and m.longitude.nil?) + if m.location && (m.latitude.nil? && m.longitude.nil?) m.geocode m.save end @@ -88,7 +88,7 @@ namespace :growstuff do # site is small and there aren't many of them, so it shouldn't matter # for this one-off script. Garden.all.each do |g| - if g.name.nil? or g.name =~ /^\s*$/ + if g.name.nil? || g.name =~(/^\s*$/) g.name = "Garden" g.save end From 3d4598e4e1bc1f0ffd44771ca1c35c66ac72a397 Mon Sep 17 00:00:00 2001 From: Shiny Date: Mon, 29 Jan 2018 12:56:41 +1300 Subject: [PATCH 2/2] style clean up --- lib/tasks/growstuff.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake index befff39a0..908b71337 100644 --- a/lib/tasks/growstuff.rake +++ b/lib/tasks/growstuff.rake @@ -88,7 +88,7 @@ namespace :growstuff do # site is small and there aren't many of them, so it shouldn't matter # for this one-off script. Garden.all.each do |g| - if g.name.nil? || g.name =~(/^\s*$/) + if g.name.nil? || g.name =~ /^\s*$/ g.name = "Garden" g.save end