rubyforgood · maebeale · Mar 9, 2026 · Mar 8, 2026 · Mar 8, 2026 · Mar 8, 2026
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -11,10 +11,7 @@
 # PRs
 - After completing work, create a pull request using `gh pr create`
 - Once the PR is created, prepend the PR number to the branch name (e.g., rename `maebeale/fix-login` to `maebeale/1234-fix-login`) using `git branch -m` and `git push origin -u` with the new name, then delete the old remote branch
-
-# PRs
-- After completing work, create a pull request using `gh pr create`
-- Once the PR is created, prepend the PR number to the branch name (e.g., rename `maebeale/fix-login` to `maebeale/1234-fix-login`) using `git branch -m` and `git push origin -u` with the new name, then delete the old remote branch
+- On every push, update the PR title and description to reflect the current diff
 
 # Code style requirements:
 - Use modern Ruby syntax
@@ -67,8 +64,22 @@ This project uses rubocop-rails-omakase. All code MUST follow these rules:
 - No parentheses around conditions: `if foo` not `if (foo)`
 - No semicolons to separate statements
 
-# PRs
-- On every push, update the PR title and description to reflect the current diff
-
 # Git
 - When rebasing onto main, review incoming changes for their intent and flag any oversights — missing tests, incomplete migrations, broken assumptions, or conflicts between the two branches. Check both directions: schema/model changes on either branch that affect views, partials, or layouts on the other (e.g., main redesigned a table's CSS but your branch adds new columns to it, or vice versa)
+
+# HTML/ERB Formatting
+
+## Tag attributes
+- When a tag has long attributes, place the closing `>` on the same line as the last attribute
+- Do NOT put the closing `>` on its own line
+- Example (GOOD):
+  ```erb
+  <div class="relative z-10 w-full bg-white text-gray-800 py-2 px-4"
+       id="dropdown">
+  ```
+- Example (BAD):
+  ```erb
+  <div class="relative z-10 w-full bg-white text-gray-800 py-2 px-4"
+       id="dropdown"
+  >
+  ```
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -89,6 +89,14 @@ This project uses rubocop-rails-omakase. All code MUST follow these rules:
 - **No parentheses around conditions:** `if foo` not `if (foo)`
 - **No semicolons** to separate statements
 
+## HTML/ERB Formatting
+
+### Tag Attributes
+- **Closing `>` on same line as last attribute** — do not put `>` on its own line
+- When attributes span multiple lines, keep the closing `>` with the last attribute
+- Good: `<div class="..." id="...">` or `<div class="...\n     id="...">`
+- Bad: `<div class="...\n     id="..."\n  >`
+
 ## Related Files
 
 When changing a model or controller, check whether these related files need updates:

diff --git a/app/controllers/admin/analytics_controller.rb b/app/controllers/admin/analytics_controller.rb
@@ -15,7 +15,7 @@ def index
       @most_viewed_community_news = decorate_with_counts(most_viewed_for_model(CommunityNews, time_scope), :view_count)
       @most_viewed_stories = decorate_with_counts(most_viewed_for_model(Story, time_scope), :view_count)
       @most_viewed_quotes = decorate_with_counts(most_viewed_for_model(Quote, time_scope), :view_count)
-      @most_viewed_tutorials = decorate_with_counts(most_viewed_for_model(Tutorial, time_scope), :view_count)
+      @most_viewed_video_recordings = decorate_with_counts(most_viewed_for_model(VideoRecording, time_scope), :view_count)
       @most_viewed_organizations = decorate_with_counts(most_viewed_for_model(Organization, time_scope), :view_count)
       @most_viewed_events = decorate_with_counts(most_viewed_for_model(Event, time_scope), :view_count)
       @most_viewed_people = decorate_with_counts(most_viewed_for_model(Person, time_scope), :view_count)
@@ -26,7 +26,7 @@ def index
       @most_printed_stories = decorate_with_counts(most_printed_for_model(Story, time_scope), :print_count)
       # @most_printed_workshop_variations = decorate_with_counts(most_printed_for_model(WorkshopVariation, time_scope), :print_count)
       # @most_printed_quotes = decorate_with_counts(most_printed_for_model(Quote, time_scope), :print_count)
-      # @most_printed_tutorials = decorate_with_counts(most_printed_for_model(Tutorial, time_scope), :print_count)
+      # @most_printed_video_recordings = decorate_with_counts(most_printed_for_model(VideoRecording, time_scope), :print_count)
       # @most_printed_organizations = decorate_with_counts(most_printed_for_model(Organization, time_scope), :print_count)
       # @most_printed_events = decorate_with_counts(most_printed_for_model(Event, time_scope), :print_count)
 
@@ -68,9 +68,9 @@ def index
           views: all_counts["view.quote"] || 0,
           prints: all_counts["print.quote"] || 0
         },
-        tutorials: {
-          views: all_counts["view.tutorial"] || 0,
-          prints: all_counts["print.tutorial"] || 0
+        video_recordings: {
+          views: all_counts["view.video_recording"] || 0,
+          prints: all_counts["print.video_recording"] || 0
         },
         organizations: {
           views: all_counts["view.organization"] || 0,

diff --git a/app/controllers/home/video_gallery_controller.rb b/app/controllers/home/video_gallery_controller.rb
diff --git a/app/controllers/home/video_recordings_controller.rb b/app/controllers/home/video_recordings_controller.rb
@@ -0,0 +1,13 @@
+module Home
+  class VideoRecordingsController < ApplicationController
+    skip_before_action :authenticate_user!
+
+    def index
+      authorize! :home
+      base = VideoRecording.where.not(youtube_url: [ nil, "" ]).order(position: :asc, created_at: :desc)
+      @video_recordings = authorized_scope(base, with: HomePolicy).decorate
+
+      render "home/video_recordings/index"
+    end
+  end
+end
diff --git a/app/controllers/taggings_controller.rb b/app/controllers/taggings_controller.rb
@@ -16,7 +16,7 @@ def index
       people: params[:people_page],
       organizations: params[:organizations_page],
       quotes: params[:quotes_page],
-      tutorials: params[:tutorials_page]
+      video_recordings: params[:video_recordings_page]
     }
 
     @grouped_tagged_items = TaggingSearchService.call(

diff --git a/app/controllers/tutorials_controller.rb b/app/controllers/tutorials_controller.rb
diff --git a/app/controllers/video_recordings_controller.rb b/app/controllers/video_recordings_controller.rb
@@ -0,0 +1,143 @@
+class VideoRecordingsController < ApplicationController
+  include AhoyTracking, TagAssignable
+  skip_before_action :authenticate_user!, only: [ :index, :show ]
+  before_action :set_video_recording, only: [ :show, :edit, :update, :destroy ]
+
+  def index
+    authorize!
+    @video_type = params[:video_type].presence || "other"
+
+    if turbo_frame_request?
+      per_page = params[:number_of_items_per_page].presence || 6
+      base_scope = filter_by_video_type(authorized_scope(VideoRecording.all))
+      filtered = base_scope.search_by_params(params)
+
+      @count_display = filtered.size == base_scope.size ? base_scope.size : "#{filtered.count}/#{base_scope.count}"
+      @video_recordings = filtered.order(:position).paginate(page: params[:page], per_page: per_page).decorate
+
+      render :index_lazy
+    else
+      @sectors = Sector.published.order(:name)
+      @category_types = CategoryType.published.general.order(:name).decorate
+
+      render :index
+    end
+  end
+
+  def show
+    @video_recording = @video_recording.decorate
+    authorize! @video_recording
+    track_view(@video_recording)
+  end
+
+  def new
+    @video_recording = VideoRecording.new.decorate
+    authorize! @video_recording
+    set_form_variables
+  end
+
+  def edit
+    @video_recording = @video_recording.decorate
+    authorize! @video_recording
+    set_form_variables
+  end
+
+  def create
+    @video_recording = VideoRecording.new(video_recording_params)
+    authorize! @video_recording
+
+    success = false
+
+    VideoRecording.transaction do
+      if @video_recording.save
+        assign_associations(@video_recording)
+        success = true
+      end
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+      Rails.logger.error "VideoRecording create failed: #{e.class} - #{e.message}"
+      raise ActiveRecord::Rollback
+    end
+
+    if success
+      redirect_to @video_recording, notice: "#{VideoRecording.model_name.human} was successfully created."
+    else
+      @video_recording = @video_recording.decorate
+      set_form_variables
+      render :new, status: :unprocessable_content
+    end
+  end
+
+  def update
+    authorize! @video_recording
+
+    success = false
+
+    VideoRecording.transaction do
+      if @video_recording.update(video_recording_params)
+        assign_associations(@video_recording)
+        success = true
+      end
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+      Rails.logger.error "VideoRecording update failed: #{e.class} - #{e.message}"
+      raise ActiveRecord::Rollback
+    end
+
+    if success
+      redirect_to @video_recording, notice: "#{VideoRecording.model_name.human} was successfully updated.", status: :see_other
+    else
+      @video_recording = @video_recording.decorate
+      set_form_variables
+      render :edit, status: :unprocessable_content
+    end
+  end
+
+  def destroy
+    authorize! @video_recording
+    @video_recording.destroy!
+    redirect_to video_recordings_path, notice: "#{VideoRecording.model_name.human} was successfully destroyed."
+  end
+
+  # Optional hooks for setting variables for forms or index
+  def set_form_variables
+    @video_recording.build_primary_asset if @video_recording.primary_asset.blank?
+    @video_recording.gallery_assets.build
+    @categories_grouped =
+      Category
+        .includes(:category_type)
+        .published
+        .order(:position, :name)
+        .group_by(&:category_type)
+        .select { |type, _| type.nil? || type.published? }
+        .sort_by { |type, _| type&.name.to_s.downcase }
+    @sectors = Sector.published.order(:name)
+  end
+
+  private
+
+  def set_video_recording
+    @video_recording = VideoRecording.find(params[:id])
+  end
+
+  def filter_by_video_type(scope)
+    case @video_type
+    when "instructional"
+      scope.instructional
+    when "other"
+      scope.where(is_instructional: false)
+    else
+      scope
+    end
+  end
+
+  # Strong parameters
+  def video_recording_params
+    params.require(:video_recording).permit(
+      :title, :body, :rhino_body, :position, :youtube_url, :is_instructional, :is_podcast,
+      :featured, :published, :publicly_visible, :publicly_featured,
+      category_ids: [],
+      sector_ids: [],
+      primary_asset_attributes: [ :id, :file, :_destroy ],
+      gallery_assets_attributes: [ :id, :file, :_destroy ],
+    )
+  end
+end