Merge branch 'dev' into refactor-hardcoded-emails

app/mailers/application_mailer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
+  default from: "Growstuff <#{Rails.configuration.x.email[:from]}>"
   layout 'mailer'
 end

app/mailers/notifier_mailer.rb

@@ -2,7 +2,7 @@
 
 class NotifierMailer < ApplicationMailer
   # include NotificationsHelper
-  default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  default from: "Growstuff <#{Rails.configuration.x.email[:from]}>"
 
   def verifier
     unless ENV['RAILS_SECRET_TOKEN']

app/models/member.rb

@@ -196,25 +196,4 @@ class Member < ApplicationRecord
   def get_block(member)
     blocks.find_by(blocked_id: member.id) if already_blocking?(member)
   end
-
-  def has_activity?
-    (gardens.exists? && gardens.count > 1) ||
-      plantings.exists? ||
-      harvests.exists? ||
-      seeds.exists? ||
-      photos.exists? ||
-      forums.exists? ||
-      activities.exists? ||
-      posts.exists? ||
-      comments.exists? ||
-      requested_crops.exists? ||
-      created_crops.exists? ||
-      likes.exists? ||
-      created_alternate_names.exists? ||
-      created_scientific_names.exists? ||
-      follows.exists? ||
-      inverse_follows.exists? ||
-      blocks.exists? ||
-      inverse_blocks.exists?
-  end
 end

app/views/alternate_names/_form.html.haml

@@ -22,8 +22,8 @@
       .form-group
         = f.label :crop_id, class: 'control-label col-md-2'
         .col-md-8
-          = select(:alternate_name, :crop_id,
+          = collection_select(:alternate_name, :crop_id,
-                              Crop.order(:name).pluck(:name, :id),
+                              Crop.all, :id, :name,
                               { selected: @alternate_name.crop_id || @crop.id },
                               class: 'form-control')
 

app/views/crops/_form.html.haml

@@ -85,7 +85,7 @@
 
       -# Only crop wranglers see the crop hierarchy (for now)
       - if can? :wrangle, @crop
-        = f.select(:parent_id, Crop.order(:name).pluck(:name, :id),
+        = f.collection_select(:parent_id, Crop.all.order(:name), :id, :name,
           { include_blank: true, label: 'Parent crop'})
         %span.help-block Optional. For setting up crop hierarchies for varieties etc.
 

app/views/crops/show.html.haml

@@ -73,11 +73,10 @@
               = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
 
     - if @crop.varieties.any?
-      - cache [@crop, 'varieties'] do
+      %section.varieties
-        %section.varieties
+        %h2 Varieties
-          %h2 Varieties
+        .index-cards
-          .index-cards
+          = render 'varieties', crop: @crop
-            = render 'varieties', crop: @crop
 
     %section.crop-map
       %h2
@@ -135,11 +134,9 @@
     = render 'harvests', crop: @crop
     = render 'find_seeds', crop: @crop
 
-    - cache [@crop, 'openfarm_data'] do
+    = render 'openfarm_data', crop: @crop
-      = render 'openfarm_data', crop: @crop
 
-    - cache [@crop, 'nutritional_data'] do
+    = render 'nutritional_data', crop: @crop
-      = render 'nutritional_data', crop: @crop
 
     = cute_icon
     .card

app/views/scientific_names/_form.html.haml

@@ -17,8 +17,8 @@
   .form-group
     = f.label :crop_id, class: 'control-label col-md-2'
     .col-md-8
-      = select(:scientific_name, :crop_id, Crop.order(:name).pluck(:name, :id),
+      = collection_select(:scientific_name, :crop_id, Crop.all.order(:name), :id,
-        { selected: @scientific_name.crop_id || @crop.id },
+        :name, { selected: @scientific_name.crop_id || @crop.id },
         class: 'form-control')
   .form-group
     = f.label :name, class: 'control-label col-md-2'

config/application.rb

@@ -62,9 +62,9 @@ module Growstuff
 
     # Growstuff-specific configuration variables
     config.currency = 'AUD'
-    config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
+    config.bot_email = Rails.configuration.x.email[:from]
     config.user_agent = 'Growstuff'
-    config.user_agent_email = "info@growstuff.org"
+    config.user_agent_email = Rails.configuration.x.email[:from]
 
     Gibbon::API.api_key = ENV['GROWSTUFF_MAILCHIMP_APIKEY'] || 'notarealkey'
     # API key can't be blank or tests fail

config/initializers/devise.rb

@@ -6,7 +6,7 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  config.mailer_sender = "Growstuff <#{Rails.configuration.x.email[:from]}>"
 
   config.secret_key = ENV.fetch('RAILS_SECRET_TOKEN', nil)
 

config/initializers/email.rb

@@ -0,0 +1,9 @@
+module Growstuff
+  class Application < Rails::Application
+    config.x.email = {
+      from: ENV.fetch('GROWSTUFF_EMAIL', 'info@growstuff.org'),
+      admin: ENV.fetch('GROWSTUFF_ADMIN_EMAIL', 'sysadmin@growstuff.org'),
+      support: ENV.fetch('GROWSTUFF_SUPPORT_EMAIL', 'info@growstuff.org')
+    }
+  end
+end

lib/tasks/members.rake

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-namespace :members do
-  desc "Remove inactive members with no activity and last login > 24 months ago"
-  # usage: rake members:cleanup_inactive
-  # usage: DRY_RUN=true rake members:cleanup_inactive
-  task cleanup_inactive: :environment do
-    limit_date = 3.years.ago
-    dry_run = ENV.fetch('DRY_RUN', 'false') == 'true'
-
-    inactive_members = Member.where("last_sign_in_at < ? OR (last_sign_in_at IS NULL AND created_at < ?)", limit_date, limit_date)
-
-    count = 0
-    inactive_members.find_each do |member|
-      # Check for activity using the model method
-      unless member.has_activity?
-        if dry_run
-          puts "[DRY RUN] Would delete inactive member: #{member.login_name} (ID: #{member.id}, Last login: #{member.last_sign_in_at || 'Never'}, Created: #{member.created_at})"
-        else
-          puts "Deleting inactive member: #{member.login_name} (ID: #{member.id}, Last login: #{member.last_sign_in_at || 'Never'}, Created: #{member.created_at})"
-          member.destroy
-        end
-        count += 1
-      end
-    end
-
-    if dry_run
-      puts "Total inactive members that would be deleted: #{count}"
-    else
-      puts "Total inactive members deleted: #{count}"
-    end
-  end
-end

spec/tasks/members_spec.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-require 'rake'
-
-describe 'members:cleanup_inactive' do
-  before :all do
-    Rails.application.load_tasks
-  end
-
-  let(:cleanup_task) { Rake::Task['members:cleanup_inactive'] }
-
-  before do
-    cleanup_task.reenable
-  end
-
-  it "deletes inactive members with no gardens and no other activity" do
-    inactive_no_activity = create(:member, last_sign_in_at: 25.months.ago)
-
-    # We must explicitly remove the default garden to test the "no gardens" condition
-    inactive_no_activity.gardens.destroy_all
-    expect(inactive_no_activity.gardens.count).to eq(0)
-
-    cleanup_task.invoke
-
-    expect(Member.exists?(inactive_no_activity.id)).to be_falsey
-  end
-
-  it "does not delete inactive members with a garden (even if empty)" do
-    inactive_with_garden = create(:member, last_sign_in_at: 25.months.ago)
-    # They have 1 default garden
-    expect(inactive_with_garden.gardens.count).to eq(1)
-
-    cleanup_task.invoke
-
-    expect(Member.exists?(inactive_with_garden.id)).to be_truthy
-  end
-
-  it "does not delete members with recent login" do
-    recent_member = create(:member, last_sign_in_at: 1.month.ago)
-    recent_member.gardens.destroy_all
-
-    cleanup_task.invoke
-
-    expect(Member.exists?(recent_member.id)).to be_truthy
-  end
-
-  it "does not delete inactive members with activity (posts)" do
-    inactive_with_post = create(:member, last_sign_in_at: 25.months.ago)
-    inactive_with_post.gardens.destroy_all
-    create(:post, author: inactive_with_post)
-
-    cleanup_task.invoke
-
-    expect(Member.exists?(inactive_with_post.id)).to be_truthy
-  end
-
-  it "honors DRY_RUN environment variable" do
-    inactive_no_activity = create(:member, last_sign_in_at: 25.months.ago)
-    inactive_no_activity.gardens.destroy_all
-
-    ENV['DRY_RUN'] = 'true'
-    cleanup_task.invoke
-    ENV['DRY_RUN'] = nil
-
-    expect(Member.exists?(inactive_no_activity.id)).to be_truthy
-  end
-end