Merge branch 'dev' into fix-naming

.github/workflows/ci-features-admin.yml

@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (admin/)
         run: bundle exec rspec spec/features/admin/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-comments.yml

@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (comments/)
         run: bundle exec rspec spec/features/comments/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-conversations.yml

@@ -101,9 +101,3 @@ jobs:
       - name: Run rspec (conversations/)
         run: bundle exec rspec spec/features/conversations/ -fd -t ~@flaky
 
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-crops.yml

@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (crops/)
         run: bundle exec rspec spec/features/crops/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-gardens.yml

@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (gardens/)
         run: bundle exec rspec spec/features/gardens/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-harvests.yml

@@ -99,11 +99,4 @@ jobs:
         run: bundle exec rails search:reindex
 
       - name: Run rspec (harvests/)
-        run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky

.github/workflows/ci-features-home.yml

@@ -99,11 +99,4 @@ jobs:
         run: bundle exec rails search:reindex
 
       - name: Run rspec (home/)
-        run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/home/ -fd -t ~@flaky

.github/workflows/ci-features-members.yml

@@ -99,11 +99,4 @@ jobs:
         run: bundle exec rails search:reindex
 
       - name: Run rspec (members/)
-        run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/members/ -fd -t ~@flaky

.github/workflows/ci-features-places.yml

@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (places/)
         run: bundle exec rspec spec/features/places/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-plantings.yml

@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (plantings/)
         run: bundle exec rspec spec/features/plantings/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-posts.yml

@@ -1,4 +1,4 @@
-name: CI Features - Posts
+name: CI Features - Admin
 
 on: [pull_request]
 
@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (posts/)
         run: bundle exec rspec spec/features/posts/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-seeds.yml

@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (seeds/)
         run: bundle exec rspec spec/features/seeds/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

.github/workflows/ci-features-timeline.yml

@@ -99,11 +99,4 @@ jobs:
         run: bundle exec rails search:reindex
 
       - name: Run rspec (timeline/)
-        run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky

.github/workflows/ci-features.yml

@@ -108,11 +108,4 @@ jobs:
         run: bundle exec rspec spec/features/photos/ -fd
 
       - name: Run rspec (rss/)
-        run: bundle exec rspec spec/features/rss/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/rss/ -fd

Gemfile.lock

@@ -457,8 +457,8 @@ GEM
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.6.2)
-    pg (1.6.2-x86_64-linux)
+    pg (1.6.1)
+    pg (1.6.1-x86_64-linux)
     platform-api (3.8.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
@@ -475,7 +475,7 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (7.0.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     query_diet (0.7.2)
     racc (1.8.1)
@@ -601,7 +601,7 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.80.2)
+    rubocop (1.80.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -630,7 +630,7 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.7.0)
+    rubocop-rspec (3.6.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.31.0)

app/assets/stylesheets/overrides.scss

@@ -132,8 +132,6 @@ section {
     border-radius: 5%;
     margin: 0.5em 0.5em 0.5em 0;
     width: 200px;
-    align-items: stretch;
-    justify-content: space-between;
 
     .img-card {
       border-top-left-radius: 5%;

app/helpers/application_helper.rb

@@ -21,28 +21,6 @@ module ApplicationHelper
     classes
   end
 
-  # Similar to Rails' time_ago_in_words, but gives a more standard
-  # output like "in 3 days" or "5 months ago".
-  # Also handles the case where from_time is a Date and to_time is a Date
-  # (in which case it just says "today" if they're the same date).
-  #
-  # NOTE: This is similar to distance_of_time_in_words but different enough
-  # that I think it's worth having a separate helper for it.
-  #
-  # from_time - the starting time (Time or Date)
-  # to_time - the ending time (Time or Date). Default: now (Time.zone.now)
-  # include_seconds - whether to include seconds in the calculation
-  #
-  # Returns a string like "in 3 days" or "5 months ago"
-  def standard_time_distance(from_time, to_time = 0, include_seconds = false)
-    return 'today' if from_time.is_a?(Date) && (from_time == to_time)
-
-    return 'now' if from_time == to_time
-    return distance_of_time_in_words(from_time, to_time, include_seconds:) + ' ago' if from_time > to_time
-
-    'in ' + distance_of_time_in_words(from_time, to_time, include_seconds:)
-  end
-
   def count_github_contibutors
     File.open(Rails.root.join('CONTRIBUTORS.md')).readlines.grep(/^-/).size
   end

app/models/concerns/search_activities.rb

@@ -9,9 +9,7 @@ module SearchActivities
                mappings:       {
                  properties: {
                    active:     { type: :boolean },
-                   created_at: { type: :integer },
-                   updated_at: { type: :integer },
-                   due_date:   { type: :date }
+                   created_at: { type: :integer }
                  }
                }
 
@@ -25,10 +23,8 @@ module SearchActivities
         category:,
         garden_id:,
         garden_name:      garden&.name,
-        garden_slug:      garden&.garden_slug,
         planting_id:,
         planting_name:    planting&.crop&.name,
-        planting_slug:    planting&.slug,
         description:,
 
         # owner

app/models/harvest.rb

@@ -53,7 +53,6 @@ class Harvest < ApplicationRecord
 
   delegate :name, :slug, to: :crop, prefix: true
   delegate :login_name, :slug, to: :owner, prefix: true
-  delegate :name, to: :plant_part, prefix: true
 
   ##
   ## Validations
@@ -109,7 +108,7 @@ class Harvest < ApplicationRecord
   def to_s
     # 50 individual apples, weighing 3lb
     # 2 buckets of apricots, weighing 10kg
-    "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
+    "#{quantity_to_human} #{unit_to_human} #{plant_part_name_to_human} of #{crop_name} #{weight_to_human}".strip
   end
 
   def quantity_to_human
@@ -132,13 +131,13 @@ class Harvest < ApplicationRecord
     "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
   end
 
-  def crop_name_to_human
+  def plant_part_name_to_human
     if unit != 'individual' # buckets of apricot*s*
-      crop.name.pluralize
+       plant_part.name.pluralize
     elsif quantity == 1
-      crop.name
+      plant_part.name
     else
-      crop.name.pluralize
+      plant_part.name.pluralize
     end.to_s
   end
 

app/models/plant_part.rb

@@ -11,6 +11,10 @@ class PlantPart < ApplicationRecord
 
   scope :joins_members, -> { joins("INNER JOIN members ON members.id = harvests.owner_id") }
 
+  def whole_plant?
+    name == 'whole plant'
+  end
+
   def to_s
     name
   end

app/views/activities/_card.html.haml

@@ -20,23 +20,16 @@
               - if can? :destroy, activity
                 .dropdown-divider
                 = delete_button(activity, classes: 'dropdown-item text-danger')
-    .card-body
-      = link_to activity_path(slug: activity.slug) do
+    = link_to activity_path(slug: activity.slug) do
+      .card-body.text-center
         %h4= activity.name
-        %small.due-date{title: activity.due_date}
-          = standard_time_distance(activity.due_date.to_date, Time.zone.now.to_date)
-        %div
-          %small.text-justify{title: activity.description}= activity.description.truncate(150)
-      %p
-        %ul.list-unstyled
-        - if activity.garden_name && activity.garden_slug
-          %li
-            %small= link_to activity.garden_name, garden_path(slug: activity.garden_slug)
-        - if activity.planting_name && activity.planting_slug
-          %li
-            %small= link_to activity.planting_name, planting_path(slug: activity.planting_slug)
-
+        .text-center= activity.description
+        - if activity.garden
+          .text-center= activity.garden
+        - if activity.planting
+          .text-center= activity.planting
     .card-footer
-      %small.chip.member-chip
-        = link_to member_path(slug: activity.owner_slug) do
-          = activity.owner_login_name
+      .float-right
+        %span.chip.member-chip
+          = link_to member_path(slug: activity.owner_slug) do
+            = activity.owner_login_name

app/views/activities/_form.html.haml

@@ -27,13 +27,13 @@
 
       .row
         .col-md-4
-          = f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active.order_by_name,
+          = f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active,
             :id, :name,
             label: 'Is this for a specific garden?')
           = link_to "Add a garden.", new_garden_path
 
         .col-md-4
-          = f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active.recent,
+          = f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active,
             :id, :crop_name,
             label: 'Is this for a specific planting?')
           = link_to "Add a planting.", new_planting_path

app/views/crops/_harvests.html.haml

@@ -12,7 +12,7 @@
             #{harvest.owner} harvested #{display_quantity(harvest)}.
           .float-right= render 'members/location', member: harvest.owner
           .harvest-timeago
-            %small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
+            %small #{distance_of_time_in_words(harvest.harvested_at, Time.zone.now)} ago.
       %li.list-group-item= link_to "View all #{crop.name} harvests", crop_harvests_path(crop), class: 'card-link'
       - if crop.approved?
         - if current_member

app/views/harvests/show.html.haml

@@ -46,7 +46,7 @@
           %h3
             Harvested
             = editable :date, @harvest, :harvested_at, display_field: '.harvested_at'
-          %strong.harvested_at #{standard_time_distance @harvest.harvested_at, Time.zone.now.to_date}
+          %strong.harvested_at #{distance_of_time_in_words @harvest.harvested_at, Time.zone.now.to_date} ago
           %span.harvested_at= I18n.l @harvest.harvested_at
 
         .card{class: @harvest.quantity.present? ? '' : 'text-muted'}

spec/models/harvest_spec.rb

@@ -149,78 +149,94 @@ describe Harvest do
   end
 
   context "stringification" do
-    let(:crop) { FactoryBot.create(:crop, name: "apricot") }
+    let(:whole_plant) { FactoryBot.create(:plant_part, name: "whole plant") }
+    let(:leaf) { FactoryBot.create(:plant_part, name: "leaf") }
+    let(:fruit) { FactoryBot.create(:plant_part, name: "fruit") }
+    let(:other) { FactoryBot.create(:plant_part, name: "other") }
 
-    it "apricots" do
-      @h = FactoryBot.create(:harvest, crop:,
-                                       quantity:        nil,
-                                       unit:            nil,
-                                       weight_quantity: nil,
-                                       weight_unit:     nil)
-      expect(@h.to_s).to eq "apricots"
-    end
+    let(:apricot) { FactoryBot.create(:crop, name: "apricot") }
+    let(:lettuce) { FactoryBot.create(:crop, name: "lettuce") }
 
-    it "1 individual apricot" do
-      @h = FactoryBot.create(:harvest, crop:,
-                                       quantity:        1,
-                                       unit:            'individual',
-                                       weight_quantity: nil,
-                                       weight_unit:     nil)
-      expect(@h.to_s).to eq "1 individual apricot"
-    end
+    context "apricots" do
+      it "apricots" do
+        @h = FactoryBot.create(:harvest, crop:            apricot,
+                                         plant_part:      fruit,
+                                         quantity:        nil,
+                                         unit:            nil,
+                                         weight_quantity: nil,
+                                         weight_unit:     nil)
+        expect(@h.to_s).to eq "fruits of apricot"
+      end
 
-    it "10 individual apricots" do
-      @h = FactoryBot.create(:harvest, crop:,
-                                       quantity:        10,
-                                       unit:            'individual',
-                                       weight_quantity: nil,
-                                       weight_unit:     nil)
-      expect(@h.to_s).to eq "10 individual apricots"
-    end
+      it "1 individual apricot" do
+        @h = FactoryBot.create(:harvest, crop:            apricot,
+                                         plant_part:      fruit,
+                                         quantity:        1,
+                                         unit:            'individual',
+                                         weight_quantity: nil,
+                                         weight_unit:     nil)
+        expect(@h.to_s).to eq "1 individual fruit of apricot"
+      end
 
-    it "1 bushel of apricots" do
-      @h = FactoryBot.create(:harvest, crop:,
-                                       quantity:        1,
-                                       unit:            'bushel',
-                                       weight_quantity: nil,
-                                       weight_unit:     nil)
-      expect(@h.to_s).to eq "1 bushel of apricots"
-    end
+      it "10 individual apricots" do
+        @h = FactoryBot.create(:harvest, crop:            apricot,
+                                         plant_part:      fruit,
+                                         quantity:        10,
+                                         unit:            'individual',
+                                         weight_quantity: nil,
+                                         weight_unit:     nil)
+        expect(@h.to_s).to eq "10 individual fruits of apricot"
+      end
 
-    it "1.5 bushels of apricots" do
-      @h = FactoryBot.create(:harvest, crop:,
-                                       quantity:        1.5,
-                                       unit:            'bushel',
-                                       weight_quantity: nil,
-                                       weight_unit:     nil)
-      expect(@h.to_s).to eq "1.5 bushels of apricots"
-    end
+      it "1 bushel of apricots" do
+        @h = FactoryBot.create(:harvest, crop:            apricot,
+                                         plant_part:      fruit,
+                                         quantity:        1,
+                                         unit:            'bushel',
+                                         weight_quantity: nil,
+                                         weight_unit:     nil)
+        expect(@h.to_s).to eq "1 bushel of fruits of apricot"
+      end
 
-    it "10 bushels of apricots" do
-      @h = FactoryBot.create(:harvest, crop:,
-                                       quantity:        10,
-                                       unit:            'bushel',
-                                       weight_quantity: nil,
-                                       weight_unit:     nil)
-      expect(@h.to_s).to eq "10 bushels of apricots"
-    end
+      it "1.5 bushels of apricots" do
+        @h = FactoryBot.create(:harvest, crop:            apricot,
+                                         plant_part:      fruit,
+                                         quantity:        1.5,
+                                         unit:            'bushel',
+                                         weight_quantity: nil,
+                                         weight_unit:     nil)
+        expect(@h.to_s).to eq "1.5 bushels of fruits of apricot"
+      end
 
-    it "apricots weighing 1.2 kg" do
-      @h = FactoryBot.create(:harvest, crop:,
-                                       quantity:        nil,
-                                       unit:            nil,
-                                       weight_quantity: 1.2,
-                                       weight_unit:     'kg')
-      expect(@h.to_s).to eq "apricots weighing 1.2 kg"
-    end
+      it "10 bushels of apricots" do
+        @h = FactoryBot.create(:harvest, crop:            apricot,
+                                         plant_part:      fruit,
+                                         quantity:        10,
+                                         unit:            'bushel',
+                                         weight_quantity: nil,
+                                         weight_unit:     nil)
+        expect(@h.to_s).to eq "10 bushels of fruits of apricot"
+      end
 
-    it "10 bushels of apricots weighing 100 kg" do
-      @h = FactoryBot.create(:harvest, crop:,
-                                       quantity:        10,
-                                       unit:            'bushel',
-                                       weight_quantity: 100,
-                                       weight_unit:     'kg')
-      expect(@h.to_s).to eq "10 bushels of apricots weighing 100 kg"
+      it "apricots weighing 1.2 kg" do
+        @h = FactoryBot.create(:harvest, crop:            apricot,
+                                         plant_part:      fruit,
+                                         quantity:        nil,
+                                         unit:            nil,
+                                         weight_quantity: 1.2,
+                                         weight_unit:     'kg')
+        expect(@h.to_s).to eq "fruits of apricot weighing 1.2 kg"
+      end
+
+      it "10 bushels of apricots weighing 100 kg" do
+        @h = FactoryBot.create(:harvest, crop:            apricot,
+                                         plant_part:      fruit,
+                                         quantity:        10,
+                                         unit:            'bushel',
+                                         weight_quantity: 100,
+                                         weight_unit:     'kg')
+        expect(@h.to_s).to eq "10 bushels of fruits of apricot weighing 100 kg"
+      end
     end
   end