XML: group by published_at with year->month nesting; dedupe providers in AllProviders; use rails_blob_path in TopicsHelper

Author: dcollie2

app/helpers/topics_helper.rb

@@ -12,28 +12,28 @@ def card_preview_media(file)
   private
 
   def render_image(file)
-    image_tag(url_for(file), class: "img-fluid w-100")
+    image_tag(rails_blob_path(file, disposition: "inline"), class: "img-fluid w-100")
   end
 
   def render_pdf(file)
     content_tag(:div, class: "embed-responsive embed-responsive-item embed-responsive-16by9 w-100") do
-      content_tag(:object, data: url_for(file), type: "application/pdf", width: "100%", height: "400px") do
-        content_tag(:iframe, "", src: url_for(file), width: "100%", height: "100%", style: "border: none;") do
-          content_tag(:p, "Your browser does not support PDF viewing. #{link_to('Download the PDF', url_for(file))}")
+      content_tag(:object, data: rails_blob_path(file, disposition: "inline"), type: "application/pdf", width: "100%", height: "400px") do
+        content_tag(:iframe, "", src: rails_blob_path(file, disposition: "inline"), width: "100%", height: "100%", style: "border: none;") do
+          content_tag(:p, "Your browser does not support PDF viewing. #{link_to('Download the PDF', rails_blob_path(file))}")
         end
       end
     end
   end
 
   def render_video(file)
-    video_tag(url_for(file), style: "width: 100%")
+    video_tag(rails_blob_path(file, disposition: "inline"), style: "width: 100%")
   end
 
   def render_audio(file)
-    audio_tag(url_for(file), controls: true, style: "width: 100%")
+    audio_tag(rails_blob_path(file, disposition: "inline"), controls: true, style: "width: 100%")
   end
 
   def render_download_link(file)
-    link_to file.filename, url_for(file)
+    link_to file.filename, rails_blob_path(file)
   end
 end

app/services/xml_generator/single_provider.rb

@@ -16,28 +16,30 @@ def provider_xml(provider)
     Ox::Element.new("content_provider").tap do |xml|
       xml[:name] = provider.name
 
-      grouped_topics(provider).each do |(year, month), topics|
+      grouped_topics(provider).sort_by { |year, _| -year.to_i }.each do |(year, months)|
         xml << Ox::Element.new("topic_year").tap do |year_element|
           year_element[:year] = year.to_s
-          year_element << Ox::Element.new("topic_month").tap do |month_element|
-            month_element[:month] = month
-            topics.each do |topic|
-              month_element << Ox::Element.new("title").tap do |title_element|
-                title_element[:name] = topic.title
-                title_element << Ox::Element.new("topic_id").tap { |id| id << topic.id.to_s }
-                title_element << Ox::Element.new("topic_files").tap do |files|
-                  files[:files] = "Files"
-                  topic.documents.each_with_index do |document, index|
-                    next if document.content_type == "video/mp4"
-                    files << Ox::Element.new("file_name_#{index + 1}").tap do |file_name|
-                      file_name << document.filename.to_s
-                      file_name[:file_size] = document.byte_size
+          months.sort_by { |month_label, _| month_label }.each do |(month, topics)|
+            year_element << Ox::Element.new("topic_month").tap do |month_element|
+              month_element[:month] = month
+              topics.each do |topic|
+                month_element << Ox::Element.new("title").tap do |title_element|
+                  title_element[:name] = topic.title
+                  title_element << Ox::Element.new("topic_id").tap { |id| id << topic.id.to_s }
+                  title_element << Ox::Element.new("topic_files").tap do |files|
+                    files[:files] = "Files"
+                    topic.documents.each_with_index do |document, index|
+                      next if document.content_type == "video/mp4"
+                      files << Ox::Element.new("file_name_#{index + 1}").tap do |file_name|
+                        file_name << document.filename.to_s
+                        file_name[:file_size] = document.byte_size
+                      end
                     end
                   end
-                end
-                title_element << Ox::Element.new("topic_tags").tap do |tags|
-                  names = topic.taggings.map { |tg| tg.tag&.name }.compact.uniq
-                  tags << names.join(", ")
+                  title_element << Ox::Element.new("topic_tags").tap do |tags|
+                    names = topic.taggings.map { |tg| tg.tag&.name }.compact.uniq
+                    tags << names.join(", ")
+                  end
                 end
               end
             end
@@ -48,16 +50,19 @@ def provider_xml(provider)
   end
 
   def grouped_topics(prov)
-    topic_scope(prov).group_by { |topic| [ topic.published_at.year, topic.published_at.strftime("%m_%B") ] }
+    # { year => { "MM_Month" => [topics] } }
+    topic_scope(prov)
+      .group_by { |topic| topic.published_at.year }
+      .transform_values { |topics_in_year| topics_in_year.group_by { |t| t.published_at.strftime("%m_%B") } }
   end
 
   def topic_scope(prov)
     scope = prov.topics
     scope = scope.where("published_at > ?", 1.month.ago) if args.fetch(:recent, false)
     scope
       .select(:id, :title, :published_at, :language_id, :provider_id)
-      .includes(:language, taggings: :tag)  # eager-load language and taggings->tag
-      .with_attached_documents              # eager-load Active Storage attachments + blobs
+      .includes(:language, taggings: :tag)
+      .with_attached_documents
       .order(published_at: :desc)
   end
 end