Allow cover and card images to defer to category cover/card image for categorizable records if category has cover image but categorizable record does not

Author: rsmithlal

app/controllers/better_together/categories_controller.rb

@@ -2,75 +2,17 @@
 
 module BetterTogether
   class CategoriesController < FriendlyResourceController # rubocop:todo Style/Documentation
-    before_action :set_model_instance, only: %i[show edit update destroy]
-    before_action :authorize_category, only: %i[show edit update destroy]
-    after_action :verify_authorized, except: :index
-
-    # GET /categories
-    def index
-      authorize resource_class
-      @categories = resource_class.all
-    end
-
-    # GET /categories/1
-    def show; end
-
-    # GET /categories/new
-    def new
-      @category = resource_class.new
-      authorize_category
-    end
-
-    # GET /categories/1/edit
-    def edit; end
-
-    # POST /categories
-    def create
-      @category = resource_class.new(category_params)
-      authorize_category
-
-      if @category.save
-        redirect_to @category, notice: 'Category was successfully created.'
-      else
-        render :new, status: :unprocessable_entity
-      end
-    end
-
-    # PATCH/PUT /categories/1
-    def update
-      if @category.update(category_params)
-        redirect_to @category, notice: 'Category was successfully updated.', status: :see_other
-      else
-        render :edit, status: :unprocessable_entity
-      end
+    before_action only: %i[new edit index], if: -> { Rails.env.development? } do
+      # Make sure that all subclasses are loaded in dev to generate type selector
+      Rails.application.eager_load!
     end
 
-    # DELETE /categories/1
-    def destroy
-      @category.destroy!
-      redirect_to categories_url, notice: 'Category was successfully destroyed.', status: :see_other
-    end
+    # def index
+    #   raise 'test'
+    # end
 
     protected
 
-    # Adds a policy check for the category
-    def authorize_category
-      authorize @category
-    end
-
-    def set_model_instance
-      @category = set_resource_instance
-    end
-
-    # Only allow a list of trusted parameters through.
-    def category_params
-      permitted = [
-        *resource_class.extra_permitted_attributes
-      ]
-
-      params.require(resource_class.name.demodulize.underscore.to_sym).permit(permitted)
-    end
-
     def resource_class
       ::BetterTogether::Category
     end

app/controllers/better_together/events_controller.rb

@@ -3,6 +3,11 @@
 module BetterTogether
   # CRUD for BetterTogether::Event
   class EventsController < FriendlyResourceController
+    before_action if: -> { Rails.env.development? } do
+      # Make sure that all subclasses are loaded in dev to generate type selector
+      Rails.application.eager_load!
+    end
+
     def index
       @draft_events = @events.draft
       @upcoming_events = @events.upcoming

app/helpers/better_together/badges_helper.rb

@@ -3,14 +3,27 @@
 module BetterTogether
   # Helpers for Badges
   module BadgesHelper
+    def categories_badge(entity, rounded: true, style: 'info')
+      return unless entity.respond_to?(:categories) && entity.categories.any?
+
+      entity.categories.map do |category|
+        create_badge(category.name, rounded: rounded, style: style)
+      end.join(' ').html_safe
+    end
+
     def privacy_badge(entity, rounded: true, style: 'primary')
       return unless entity.respond_to? :privacy
 
-      badge_label = entity.privacy.humanize.capitalize
+      create_badge(entity.privacy.humanize.capitalize, rounded: rounded, style: style)
+    end
+
+    private
+
+    def create_badge(label, rounded: true, style: 'primary')
       rounded_class = rounded ? 'rounded-pill' : ''
       style_class = "text-bg-#{style}"
 
-      content_tag :span, badge_label, class: "badge #{rounded_class} #{style_class}"
+      content_tag :span, label, class: "badge #{rounded_class} #{style_class}"
     end
   end
 end

app/helpers/better_together/content/blocks_helper.rb

@@ -6,7 +6,7 @@ module Content
     module BlocksHelper
       # Returns an array of acceptable image file types
       def acceptable_image_file_types
-        BetterTogether::Content::Image::CONTENT_TYPES
+        BetterTogether::Attachments::Images::VALID_IMAGE_CONTENT_TYPES
       end
 
       # Helper to generate a unique temp_id for a model

app/helpers/better_together/image_helper.rb

@@ -29,7 +29,16 @@ def cover_image_tag(entity, options = {}) # rubocop:todo Metrics/MethodLength, M
                        entity.cover_image_variant(image_width, image_height)
                      end
 
-        image_tag(attachment.url, **image_tag_attributes)
+        image_tag(rails_storage_proxy_url(attachment), **image_tag_attributes)
+      elsif entity.respond_to?(:categories) && entity.categories.with_cover_images.any?
+        category = entity.categories.with_cover_images.first
+
+        attachment = if category.respond_to?(:optimized_cover_image)
+                       category.optimized_cover_image
+                     else
+                       category.cover_image_variant(image_width, image_height)
+                     end
+        image_tag(rails_storage_proxy_url(attachment), **image_tag_attributes)
       else
         # Use a default image based on the entity type
         default_image = default_cover_image(entity, image_format)
@@ -61,6 +70,15 @@ def card_image_tag(entity, options = {}) # rubocop:todo Metrics/MethodLength, Me
                      end
 
         image_tag(rails_storage_proxy_url(attachment), **image_tag_attributes)
+      elsif entity.respond_to?(:categories) && entity.categories.with_cover_images.any?
+        category = entity.categories.with_cover_images.first
+
+        attachment = if category.respond_to?(:optimized_cover_image)
+                       category.optimized_cover_image
+                     else
+                       category.cover_image_variant(image_width, image_height)
+                     end
+        image_tag(rails_storage_proxy_url(attachment), **image_tag_attributes)
       else
         # Use a default image based on the entity type
         default_image = default_card_image(entity, image_format)

app/models/better_together/category.rb

@@ -2,22 +2,35 @@
 
 module BetterTogether
   class Category < ApplicationRecord # rubocop:todo Style/Documentation
+    include Attachments::Images
     include Identifier
     include Positioned
     include Protected
     include Translatable
 
+    attachable_cover_image
+
     has_many :categorizations, dependent: :destroy
     has_many :pages, through: :categorizations, source: :categorizable, source_type: 'BetterTogether::Page'
 
     translates :name, type: :string
     translates :description, backend: :action_text
 
+    slugged :name
+
     validates :name, presence: true
     validates :type, presence: true
 
-    def to_s
-      name
+    def self.permitted_attributes(id: false, destroy: false)
+      super + [
+        :type, :icon
+      ]
     end
+
+    def as_category
+      becomes(self.class.base_class)
+    end
+
+    configure_attachment_cleanup
   end
 end

app/models/better_together/event.rb

@@ -3,6 +3,8 @@
 module BetterTogether
   # A Schedulable Event
   class Event < ApplicationRecord
+    include Attachments::Images
+    include Categorizable
     include Creatable
     include FriendlySlug
     include Geography::Geospatial::One
@@ -11,6 +13,10 @@ class Event < ApplicationRecord
     include Privacy
     include Viewable
 
+    attachable_cover_image
+
+    categorizable(class_name: 'BetterTogether::EventCategory')
+
     # belongs_to :address, -> { where(physical: true, primary_flag: true) }
     # accepts_nested_attributes_for :address, allow_destroy: true, reject_if: :blank?
     # delegate :geocoding_string, to: :address, allow_nil: true
@@ -21,33 +27,7 @@ class Event < ApplicationRecord
     translates :name
     translates :description, backend: :action_text
 
-    has_one_attached :cover_image do |attachable|
-      attachable.variant :optimized_jpeg, resize_to_limit: [2400, 1200],
-                                          # rubocop:todo Layout/LineLength
-                                          saver: { strip: true, quality: 85, interlace: true, optimize_coding: true, trellis_quant: true, quant_table: 3 }, format: 'jpg'
-      # rubocop:enable Layout/LineLength
-      attachable.variant :optimized_png, resize_to_limit: [2400, 1200],
-                                         saver: { strip: true, quality: 85, optimize_coding: true }, format: 'png'
-
-      attachable.variant :optimized_card_jpeg, resize_to_limit: [1200, 300],
-                                               # rubocop:todo Layout/LineLength
-                                               saver: { strip: true, quality: 90, interlace: true, optimize_coding: true, trellis_quant: true, quant_table: 3 }, format: 'jpg'
-      # rubocop:enable Layout/LineLength
-      attachable.variant :optimized_card_png, resize_to_limit: [1200, 300],
-                                              saver: { strip: true, quality: 90, optimize_coding: true }, format: 'png'
-    end
-
-    CONTENT_TYPES = %w[image/jpeg image/png image/gif image/webp image/svg+xml].freeze
-
-    validates :cover_image,
-              content_type: CONTENT_TYPES,
-              size: { less_than: 100.megabytes, message: 'is too large' }
-
-    alias card_image cover_image
-
-    attr_accessor :remove_cover_image
-
-    before_save :purge_cover_image, if: -> { remove_cover_image == '1' }
+    validates :name, presence: true
 
     scope :draft, lambda {
       start_query = arel_table[:starts_at].eq(nil)
@@ -74,36 +54,6 @@ def self.permitted_attributes(id: false, destroy: false)
       ]
     end
 
-    def optimized_card_image
-      if card_image.content_type == 'image/svg+xml'
-        # If SVG, return the original without transformation
-        card_image
-
-      # For other formats, analyze to determine transparency
-      elsif card_image.content_type == 'image/png'
-        # If PNG with transparency, return the optimized PNG variant
-        card_image.variant(:optimized_card_png).processed
-      else
-        # Otherwise, use the optimized JPG variant
-        card_image.variant(:optimized_card_jpeg).processed
-      end
-    end
-
-    def optimized_cover_image
-      if cover_image.content_type == 'image/svg+xml'
-        # If SVG, return the original without transformation
-        cover_image
-
-      # For other formats, analyze to determine transparency
-      elsif cover_image.content_type == 'image/png'
-        # If PNG with transparency, return the optimized PNG variant
-        cover_image.variant(:optimized_png).processed
-      else
-        # Otherwise, use the optimized JPG variant
-        cover_image.variant(:optimized_jpeg).processed
-      end
-    end
-
     def schedule_address_geocoding
       return unless should_geocode?
 
@@ -122,6 +72,6 @@ def to_s
       name
     end
 
-    include ::BetterTogether::RemoveableAttachment
+    configure_attachment_cleanup
   end
 end

app/models/better_together/event_category.rb

@@ -0,0 +1,5 @@
+module BetterTogether
+  class EventCategory < Category
+    has_many :events, through: :categorizations, source: :categorizable, source_type: 'BetterTogether::Event'
+  end
+end

app/models/better_together/page.rb

@@ -10,6 +10,8 @@ class Page < ApplicationRecord
     include Privacy
     include Searchable
 
+    categorizable
+
     PAGE_LAYOUTS = [
       'layouts/better_together/page',
       'layouts/better_together/page_with_nav',

app/models/better_together/post.rb

@@ -10,6 +10,8 @@ class Post < ApplicationRecord
     include Privacy
     include Publishable
 
+    categorizable
+
     translates :title
     translates :content, type: :text
     # translates :content_html, type: :action_text