Merge pull request #134 from codeforboston/mastodon-fix-trailing

Mastodon fix trailing

Author: jonnyjohannes

adoption_sources/rescue_groups.py

@@ -245,11 +245,6 @@ def _clean_description(self, description: str) -> str:
             r"\*\*Home for the Holidays.*?\*\*", "", text, flags=re.IGNORECASE
         )
 
-        # Trim to reasonable length for social posts
-        text = text.strip()
-        if len(text) > 500:
-            text = text[:497] + "..."
-
         return text
 
     def _get_image_url(self, attrs: dict) -> str | None:

manual_testing/mastodon_manual_test.py

@@ -66,6 +66,21 @@ def post_within_500_chars_limit_without_adoption_link():
                     )
     return pet
 
+def post_about_800_chars_with_adoption_link():
+    pet = AdoptablePet("Kool-Aid Man", 
+                        "Unknown", 
+                        "Unknown", 
+                        "Quahog", 
+                        "OH YEAH!"*100, 
+                        None, 
+                        "https://static.wikia.nocookie.net/familyguy/images/8/8b/Koolaid.jpg/revision/latest?cb=20090128174245",
+                        None, 
+                        "Unknown", 
+                        None, 
+                        None
+                    )
+    return pet
+
 def post_unicode():
     pet = AdoptablePet("Vinny", 
                         "Unknown", 
@@ -82,7 +97,8 @@ def post_unicode():
     return pet
 
 testing_cases = [
-    post_exceed_500_chars_limit_with_adoption_link,
+    #post_exceed_500_chars_limit_with_adoption_link,
+    post_about_800_chars_with_adoption_link,
     #post_exceed_500_chars_limit_without_adoption_link,
     #post_within_500_chars_limit_with_adoption_link,
     #post_within_500_chars_limit_without_adoption_link,

tests/test_mastodon.py

@@ -1,5 +1,5 @@
 from abstractions import AdoptablePet, Post
-from hypothesis import given, strategies as st
+from hypothesis import given, strategies as st, assume
 import pytest
 from social_posters.mastodon import (
     PosterMastodon,
@@ -23,6 +23,14 @@
     max_size=3,
 )
 
+caption_text = st.text(
+    alphabet=st.characters(
+        blacklist_categories=("Cs", "Cc"),
+    ),
+    min_size=0,
+    max_size=5000,
+)
+
 text_strategy = st.text(
     alphabet=st.characters(blacklist_categories=("Cs",)),
     min_size=0,
@@ -156,6 +164,35 @@ def test_format_post_output_stays_under_mastodon_limit_after_splitting(self, pet
         assert len(main_caption) <= MASTODON_CHARACTER_LIMIT
         assert all(len(reply) <= MASTODON_CHARACTER_LIMIT for reply in replies)
         assert len(replies) <= MAX_REPLIES
+    
+    @given(
+            text=caption_text,
+            limit=st.integers(min_value=1, max_value=10),
+           )
+    def test_safe_truncate_correctly(self, text, limit):
+        fst, snd = self.poster._safe_truncate(text, limit)
+
+        assert len(fst) <= limit 
+
+        if len(text) <= limit:
+            assert fst == text
+            assert snd == ""
+        else:
+            assert fst == fst.rstrip()
+            assert snd == snd.strip()
+
+    @given(
+            text=st.text(),
+            limit=st.integers(min_value=1, max_value=10),
+            )
+    def test_safe_truncate_nothing(self, text, limit):
+        assume(len(text) <= limit)
+        fst, snd = self.poster._safe_truncate(text, limit)
+
+
+        assert fst == text
+        assert snd == ""
+
 
 
 class TestMastodonCaption: