Xml file fixes (#427)

Author: dcollie2

app/services/language_content_processor.rb

@@ -25,16 +25,16 @@ def provider_files
   # this is needed to avoid loading all files into memory at once
   def language_files
     {
-      # all_providers: FileToUpload.new(
-      #   content: ->(language) { XmlGenerator::AllProviders.new(language).perform },
-      #   name: "#{language.file_storage_prefix}Server_XML.xml",
-      #   path: "#{language.file_storage_prefix}CMES-Pi/assets/XML",
-      # ),
-      # all_providers_recent: FileToUpload.new(
-      #   content: ->(language) { XmlGenerator::AllProviders.new(language, recent: true).perform },
-      #   name: "#{language.file_storage_prefix}New_Uploads_Server_XML.xml",
-      #   path: "#{language.file_storage_prefix}CMES-Pi/assets/XML",
-      # ),
+      all_providers: FileToUpload.new(
+        content: ->(language) { XmlGenerator::AllProviders.new(language).perform },
+        name: "#{language.file_storage_prefix}Server_XML.xml",
+        path: "#{language.file_storage_prefix}CMES-Pi/assets/XML",
+      ),
+      all_providers_recent: FileToUpload.new(
+        content: ->(language) { XmlGenerator::AllProviders.new(language, recent: true).perform },
+        name: "#{language.file_storage_prefix}New_Uploads_Server_XML.xml",
+        path: "#{language.file_storage_prefix}CMES-Pi/assets/XML",
+      ),
       tags: FileToUpload.new(
         content: ->(language) { TextGenerator::Tags.new(language).perform },
         name: "#{language.file_storage_prefix}tags.txt",
@@ -82,8 +82,8 @@ def process_language_content!
       FileUploadJob.perform_later(language.id, file_id.to_s, "file")
     end
 
-    # language.providers.distinct.find_each do |provider|
-    #   FileUploadJob.perform_later(language.id, provider.id, "provider")
-    # end
+    language.providers.distinct.find_each do |provider|
+      FileUploadJob.perform_later(language.id, provider.id, "provider")
+    end
   end
 end

app/services/xml_generator/base.rb

@@ -7,11 +7,15 @@ def perform
 
   def builder
     Ox::Document.new.tap do |doc|
+      # Use the XML declaration as in your working file
       instruct = Ox::Instruct.new(:xml)
       instruct[:version] = "1.0"
+      instruct[:encoding] = "UTF-8"
+      instruct[:standalone] = "no"
       doc << instruct
 
-      xml = Ox::Element.new("cmes")
+      # Use CMES as the root element (all caps)
+      xml = Ox::Element.new("CMES")
       xml_content(xml)
       doc << xml
     end

app/services/xml_generator/single_provider.rb

@@ -13,7 +13,7 @@ def xml_content(xml)
   end
 
   def provider_xml(provider)
-    Ox::Element.new("content_provider").tap do |xml|
+    Ox::Element.new("Content_Provider").tap do |xml|
       xml[:name] = provider.name
 
       grouped_topics(provider).sort_by { |year, _| -year.to_i }.each do |(year, months)|

spec/services/language_content_processor_spec.rb

@@ -15,20 +15,20 @@
   end
 
   it "processes content for every language" do
-    files_number = language.providers.size + 6 # 2 xml files for all providers, 1 xml file for single provider, 2 text files for tags, 5 csv files
+    files_number = language.providers.size + 9 # 2 xml files for all providers, 1 xml file for single provider, 2 text files for tags, 5 csv files
     subject.perform
 
     expect(FileUploadJob).to have_received(:perform_later).exactly(files_number).times
 
-    # expect(FileUploadJob).to have_received(:perform_later).with(language.id, "all_providers", "file")
-    # expect(FileUploadJob).to have_received(:perform_later).with(language.id, "all_providers_recent", "file")
+    expect(FileUploadJob).to have_received(:perform_later).with(language.id, "all_providers", "file")
+    expect(FileUploadJob).to have_received(:perform_later).with(language.id, "all_providers_recent", "file")
     expect(FileUploadJob).to have_received(:perform_later).with(language.id, "tags", "file")
     expect(FileUploadJob).to have_received(:perform_later).with(language.id, "tags_and_title", "file")
     expect(FileUploadJob).to have_received(:perform_later).with(language.id, "files", "file")
     expect(FileUploadJob).to have_received(:perform_later).with(language.id, "topics", "file")
     expect(FileUploadJob).to have_received(:perform_later).with(language.id, "tag_details", "file")
     expect(FileUploadJob).to have_received(:perform_later).with(language.id, "topic_tags", "file")
     expect(FileUploadJob).to have_received(:perform_later).with(language.id, "topic_authors", "file")
-    # expect(FileUploadJob).to have_received(:perform_later).with(language.id, provider.id, "provider")
+    expect(FileUploadJob).to have_received(:perform_later).with(language.id, provider.id, "provider")
   end
 end

spec/services/xml_generator/all_providers_spec.rb

@@ -23,12 +23,12 @@
     doc = Nokogiri::XML(xml)
 
     [ provider1, provider2 ].each do |prov|
-      pnode = doc.at_xpath("//cmes/content_provider[@name='#{prov.name}']")
+      pnode = doc.at_xpath("//CMES/Content_Provider[@name='#{prov.name}']")
       expect(pnode).to be_present
     end
 
     [ [ provider1, topic1 ], [ provider2, topic2 ] ].each do |prov, topic|
-      pnode = doc.at_xpath("//cmes/content_provider[@name='#{prov.name}']")
+      pnode = doc.at_xpath("//CMES/Content_Provider[@name='#{prov.name}']")
       year = topic.published_at.year
       ynode = pnode.at_xpath("./topic_year[@year='#{year}']")
       expect(ynode).to be_present
@@ -86,7 +86,7 @@
     xml = subject.perform
     doc = Nokogiri::XML(xml)
 
-    pnode = doc.at_xpath("//cmes/content_provider[@name='#{provider1.name}']")
+    pnode = doc.at_xpath("//CMES/Content_Provider[@name='#{provider1.name}']")
     expect(pnode).to be_present
 
     years = pnode.xpath("./topic_year/@year").map(&:value)
@@ -112,7 +112,7 @@
     xml = subject.perform
     doc = Nokogiri::XML(xml)
 
-    pnode = doc.at_xpath("//cmes/content_provider[@name='#{provider1.name}']")
+    pnode = doc.at_xpath("//CMES/Content_Provider[@name='#{provider1.name}']")
     expect(pnode).to be_present
 
     y2024 = pnode.at_xpath("./topic_year[@year='2024']")

spec/services/xml_generator/single_provider_spec.rb

@@ -8,7 +8,7 @@
   it "generates the xml" do
   xml = subject.perform
   doc = Nokogiri::XML(xml)
-  provider_nodes = doc.xpath("//cmes/content_provider[@name='#{provider.name}']")
+  provider_nodes = doc.xpath("//CMES/Content_Provider[@name='#{provider.name}']")
   expect(provider_nodes.size).to eq(1)
   # No topics → self-closing provider node (no children)
   expect(provider_nodes.first.element_children).to be_empty
@@ -36,34 +36,34 @@
       xml = subject.perform
       doc = Nokogiri::XML(xml)
 
-  provider_node = doc.at_xpath("//cmes/content_provider[@name='#{provider.name}']")
+      provider_node = doc.at_xpath("//CMES/Content_Provider[@name='#{provider.name}']")
       expect(provider_node).to be_present
 
-  year_node = provider_node.at_xpath("./topic_year[@year='#{topic.published_at.year}']")
+      year_node = provider_node.at_xpath("./topic_year[@year='#{topic.published_at.year}']")
       expect(year_node).to be_present
 
-  month_label = topic.published_at.strftime("%m_%B")
-  month_node = year_node.at_xpath("./topic_month[@month='#{month_label}']")
+      month_label = topic.published_at.strftime("%m_%B")
+      month_node = year_node.at_xpath("./topic_month[@month='#{month_label}']")
       expect(month_node).to be_present
 
-  title_node = month_node.at_xpath("./title[@name='#{topic.title}']")
+      title_node = month_node.at_xpath("./title[@name='#{topic.title}']")
       expect(title_node).to be_present
 
-  expect(title_node.at_xpath("./topic_id").text).to eq(topic.id.to_s)
-  expect(title_node.at_xpath("./counter").text).to eq("0")
-  expect(title_node.at_xpath("./topic_volume").text).to eq(topic.published_at.year.to_s)
-  expect(title_node.at_xpath("./topic_issue").text).to eq(topic.published_at.month.to_s)
+      expect(title_node.at_xpath("./topic_id").text).to eq(topic.id.to_s)
+      expect(title_node.at_xpath("./counter").text).to eq("0")
+      expect(title_node.at_xpath("./topic_volume").text).to eq(topic.published_at.year.to_s)
+      expect(title_node.at_xpath("./topic_issue").text).to eq(topic.published_at.month.to_s)
 
-  files_node = title_node.at_xpath("./topic_files[@files='Files']")
+      files_node = title_node.at_xpath("./topic_files[@files='Files']")
       expect(files_node).to be_present
-  file1 = files_node.at_xpath("./file_name_1")
-  expect(file1.text).to eq("test_image.png")
-  expect(file1["file_size"]).to be_present
+      file1 = files_node.at_xpath("./file_name_1")
+      expect(file1.text).to eq("test_image.png")
+      expect(file1["file_size"]).to be_present
 
-  author_node = title_node.at_xpath("./topic_author/topic_author_1")
-  expect(author_node.text).to eq(" ")
+      author_node = title_node.at_xpath("./topic_author/topic_author_1")
+      expect(author_node.text).to eq(" ")
 
-  expect(title_node.at_xpath("./topic_tags").text).to eq(topic.current_tags_list.join(", "))
+      expect(title_node.at_xpath("./topic_tags").text).to eq(topic.current_tags_list.join(", "))
     end
   end
 end