Merge pull request #3366 from alphagov/contents_list_refactor_2

Refactor contents list logic
alphagov · Oct 15, 2024 · a4a173a · a4a173a
2 parents ecfa1a3 + da0f7c1
commit a4a173a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 25 deletions.
diff --git a/app/presenters/content_item/contents_list.rb b/app/presenters/content_item/contents_list.rb
@@ -1,9 +1,9 @@
 module ContentItem
   module ContentsList
-    CHARACTER_LIMIT = 415
-    CHARACTER_LIMIT_WITH_IMAGE = 224
-    TABLE_ROW_LIMIT = 13
-    TABLE_ROW_LIMIT_WITH_IMAGE = 6
+    MINIMUM_CHARACTER_COUNT = 415
+    MINIMUM_CHARACTER_COUNT_IF_IMAGE_PRESENT = 224
+    MINIMUM_TABLE_ROW_COUNT = 13
+    MINIMUM_TABLE_ROW_COUNT_IF_IMAGE_PRESENT = 6
 
     def contents
       @contents ||=
@@ -23,14 +23,23 @@ def show_contents_list?
       return true if contents_items.count > 2
       return false if no_first_item?
 
-      first_item_has_long_content? ||
-        first_item_has_long_table? ||
-        first_item_has_image_and_long_content? ||
-        first_item_has_image_and_long_table?
+      first_item_size_requirements_met?(character_count, table_row_count)
     end
 
   private
 
+    def first_item_size_requirements_met?(char_count, table_row_count)
+      first_item_character_count > char_count || first_item_table_rows > table_row_count
+    end
+
+    def character_count
+      first_item_has_image? ? MINIMUM_CHARACTER_COUNT_IF_IMAGE_PRESENT : MINIMUM_CHARACTER_COUNT
+    end
+
+    def table_row_count
+      first_item_has_image? ? MINIMUM_TABLE_ROW_COUNT_IF_IMAGE_PRESENT : MINIMUM_TABLE_ROW_COUNT
+    end
+
     def extract_headings_with_ids
       headings = parsed_body.css("h2").map do |heading|
         id = heading.attribute("id")
@@ -39,10 +48,6 @@ def extract_headings_with_ids
       headings.compact
     end
 
-    def first_item_has_long_content?
-      first_item_character_count > CHARACTER_LIMIT
-    end
-
     def first_item_content
       element = first_item
       first_item_text = ""
@@ -60,10 +65,6 @@ def first_item_character_count
       @first_item_character_count ||= first_item_content.length
     end
 
-    def first_item_has_long_table?
-      first_item_table_rows > TABLE_ROW_LIMIT
-    end
-
     def find_first_table
       element = first_item
 
@@ -91,14 +92,6 @@ def first_item_has_image?
       end
     end
 
-    def first_item_has_image_and_long_content?
-      first_item_has_image? && first_item_character_count > CHARACTER_LIMIT_WITH_IMAGE
-    end
-
-    def first_item_has_image_and_long_table?
-      first_item_has_image? && first_item_table_rows > TABLE_ROW_LIMIT_WITH_IMAGE
-    end
-
     def parsed_body
       @parsed_body ||= Nokogiri::HTML(body)
     end

diff --git a/test/presenters/content_item/contents_list_test.rb b/test/presenters/content_item/contents_list_test.rb
@@ -17,7 +17,7 @@ def body
       end
     end
 
-    @contents_list.expects(:contents_items).returns([{ text: "A heading", id: "custom" }]).once
+    @contents_list.expects(:show_contents_list?).returns(true).once
     @contents_list.contents
     @contents_list.contents
   end