Removed TibiaData features

Author: Galarzaa90

CHANGELOG.rst

@@ -33,7 +33,7 @@ Changelog
 - Removed support for Python 3.5.
 - Changed the hierarchy of base classes. Base classes no longer implement ``Serializable``, ``Serializable`` is now
   directly implemented by most classes.
-
+- Removed TibiaData functionality.
 
 .. _v2.5.1:
 

docs/index.rst

@@ -9,7 +9,6 @@ Tibia.py
 
 
 Tibia.py is a library for parsing HTML content from Tibia.com_. into Python objects.
-It can also parse json content from TibiaData_.
 
 **Features:**
 
@@ -22,7 +21,6 @@ It can also parse json content from TibiaData_.
 
 
 .. _Tibia.com: https://www.tibia.com/news/?subtopic=latestnews
-.. _TibiaData: https://www.tibiadata.com/
 .. _aiohttp: https://aiohttp.readthedocs.io/en/stable/
 
 

docs/intro.rst

@@ -39,8 +39,8 @@ The asynchronous client (:class:`tibiapy.Client`) contains methods to obtain inf
 
 The parsing methods allow you to get Python objects given the html content of a page.
 
-The main models have a ``get_url``/``get_url_tibiadata`` method that can be used to get their Tibia.com/TibiaData.com page.
-With the url, the html/json content can be fetched and then passed to their ``from_content``/``from_tibiadata`` methods.
+The main models have a ``get_url`` method that can be used to get their Tibia.com page.
+With the url, the html/json content can be fetched and then passed to their ``from_content`` methods.
 
 This allows you to use any networking module to obtain the data, and use the library to parse it.
 

tests/tests_character.py

@@ -18,13 +18,6 @@
 FILE_CHARACTER_MULTIPLE_HOUSES = "character/tibiacom_multiple_houses.txt"
 FILE_CHARACTER_TRUNCATED_DEATHS = "character/tibiacom_truncated_deaths.txt"
 
-FILE_CHARACTER_TIBIADATA = "character/tibiadata.json"
-FILE_CHARACTER_TIBIADATA_UNHIDDEN = "character/tibiadata_unhidden.json"
-FILE_CHARACTER_TIBIADATA_DELETED = "character/tibiadata_deleted.json"
-FILE_CHARACTER_TIBIADATA_SPECIAL_POSITION = "character/tibiadata_special_position.json"
-FILE_CHARACTER_TIBIADATA_NOT_FOUND = "character/tibiadata_not_found.json"
-FILE_CHARACTER_TIBIADATA_DEATHS_SUMMON = "character/tibiadata_deaths_summon.json"
-
 
 class TestCharacter(TestCommons, unittest.TestCase):
     def _compare_character(self, mock_character, character):
@@ -175,84 +168,3 @@ def test_death_types(self):
         self.assertEqual(spawn_invasion.killer, spawn_invasion.killers[0])
         self.assertIsNone(spawn_invasion.killer.url)
         self.assertTrue(spawn_invasion.by_player)
-
-    # region TibiaData Character tests
-
-    def test_character_from_tibiadata(self):
-        """Testing parsing TibiaData content"""
-        content = self.load_resource(FILE_CHARACTER_TIBIADATA)
-        char = Character.from_tibiadata(content)
-
-        self.assertEqual(char.url_tibiadata, Character.get_url_tibiadata(char.name))
-        self.assertIsInstance(char, Character)
-        self.assertIsNotNone(char.guild_name)
-        self.assertIsInstance(char.last_login, datetime.datetime)
-
-        self.assertIsInstance(char.houses[0], CharacterHouse)
-        self.assertEqual(char.houses[0].owner, char.name)
-        self.assertEqual(char.houses[0].town, "Ankrahmun")
-        self.assertEqual(char.houses[0].world, char.world)
-        self.assertIsInstance(char.houses[0].paid_until_date, datetime.date)
-
-        self.assertTrue(char.deaths[3].by_player)
-
-    def test_character_from_tibiadata_unhidden(self):
-        """Testing parsing an unhidden character"""
-        content = self.load_resource(FILE_CHARACTER_TIBIADATA_UNHIDDEN)
-        char = Character.from_tibiadata(content)
-
-        self.assertIsNotNone(char.account_information)
-        self.assertTrue(char.other_characters)
-        self.assertFalse(char.hidden)
-
-        self.assertIsInstance(char.houses[0], CharacterHouse)
-        self.assertEqual(char.houses[0].owner, char.name)
-        self.assertEqual(char.houses[0].town, "Kazordoon")
-        self.assertEqual(char.houses[0].world, char.world)
-        self.assertIsInstance(char.houses[0].paid_until_date, datetime.date)
-
-    def test_character_from_tibiadata_deleted(self):
-        """Testing parsing a deleted character"""
-        content = self.load_resource(FILE_CHARACTER_TIBIADATA_DELETED)
-        char = Character.from_tibiadata(content)
-
-        self.assertEqual(char.url_tibiadata, Character.get_url_tibiadata(char.name))
-        self.assertIsInstance(char, Character)
-        self.assertTrue(char.deleted)
-        self.assertIsInstance(char.deletion_date, datetime.datetime)
-        self.assertIsNone(char.guild_name)
-        self.assertIsNone(char.last_login)
-
-    def test_character_from_tibiadata_position(self):
-        """Testing parsing a character with position"""
-        content = self.load_resource(FILE_CHARACTER_TIBIADATA_SPECIAL_POSITION)
-        char = Character.from_tibiadata(content)
-        self.assertEqual(char.name, "Steve")
-        self.assertEqual(char.position, "CipSoft Member")
-        self.assertEqual(char.account_information.position, "CipSoft Member")
-
-    def test_character_from_tibiadata_summon_deaths(self):
-        """Testing parsing a character with summon deaths"""
-        content = self.load_resource(FILE_CHARACTER_TIBIADATA_DEATHS_SUMMON)
-        char = Character.from_tibiadata(content)
-        self.assertTrue(char.deaths)
-
-        summon_death = char.deaths[2]
-        self.assertTrue(summon_death.killers[2].summon, "a fire elemental")
-        self.assertTrue(summon_death.killers[2].name, "Hasi Pupsi")
-
-    def test_character_from_tibiadata_not_found(self):
-        """Testing parsing a not found character"""
-        content = self.load_resource(FILE_CHARACTER_TIBIADATA_NOT_FOUND)
-        char = Character.from_tibiadata(content)
-        self.assertIsNone(char)
-
-    def test_character_from_tibiadata_invalid_json(self):
-        """Testing parsing an invalid JSON string"""
-        with self.assertRaises(InvalidContent):
-            Character.from_tibiadata("<html><b>Not a json string</b></html>")
-
-    def test_character_from_tibiadata_unrelated_json(self):
-        """Testing parsing an unrelated TibiaData section"""
-        with self.assertRaises(InvalidContent):
-            Character.from_tibiadata(self.load_resource(tests.tests_guild.FILE_GUILD_TIBIADATA))

tests/tests_guild.py

@@ -15,13 +15,6 @@
 FILE_GUILD_LIST_NOT_FOUND = "guild/tibiacom_list_not_found.txt"
 FILE_GUILD_IN_WAR = "guild/tibiacom_war.txt"
 
-FILE_GUILD_TIBIADATA = "guild/tibiadata.json"
-FILE_GUILD_TIBIADATA_NOT_FOUND = "guild/tibiadata_not_found.json"
-FILE_GUILD_TIBIADATA_DISBANDING = "guild/tibiadata_disbanding.json"
-FILE_GUILD_TIBIADATA_INVITED = "guild/tibiadata_invited.json"
-FILE_GUILD_TIBIADATA_LIST = "guild/tibiadata_list.json"
-FILE_GUILD_TIBIADATA_LIST_NOT_FOUND = "guild/tibiadata_list_not_found.json"
-
 FILE_GUILD_WAR_ACTIVE_HISTORY = "guild/wars/tibiacom_active_history.txt"
 FILE_GUILD_WAR_EMPTY = "guild/wars/tibiacom_empty.txt"
 FILE_GUILD_WAR_UNACTIVE_HISTORY = "guild/wars/tibiacom_unactive_history.txt"
@@ -38,7 +31,6 @@ def test_guild_from_content(self):
         self.assertIsInstance(guild, Guild, "Guild should be a Guild object.")
         self.assertEqual(guild.url, Guild.get_url(guild.name))
         self.assertEqual(guild.url_wars, Guild.get_url_wars(guild.name))
-        self.assertEqual(guild.url_tibiadata, Guild.get_url_tibiadata(guild.name))
         self.assertTrue(guild.active, "Guild should be active")
         self.assertIsInstance(guild.founded, datetime.date, "Guild founded date should be an instance of datetime.date")
         self.assertTrue(guild.open_applications, "Guild applications should be open")
@@ -211,78 +203,6 @@ def test_guild_init_founded(self):
         self.assertIsNone(Guild(founded=None).founded)
         self.assertIsNone(Guild(founded="Jul 20").founded)
 
-    def test_guild_from_tibiadata(self):
-        """Testing parsing a guild from TibiaData"""
-        content = self.load_resource(FILE_GUILD_TIBIADATA)
-        guild = Guild.from_tibiadata(content)
-
-        self.assertIsInstance(guild, Guild)
-        self.assertTrue(guild.open_applications)
-        self.assertIsNotNone(guild.guildhall)
-        self.assertEqual(guild.founded, datetime.date(2002, 2, 18))
-        self.assertIsInstance(guild.guildhall, GuildHouse)
-        self.assertEqual(guild.guildhall.world, guild.world)
-        self.assertIsNotNone(guild.logo_url)
-
-    def test_guild_from_tibiadata_not_found(self):
-        """Testing parsing a non existent guild"""
-        content = self.load_resource(FILE_GUILD_TIBIADATA_NOT_FOUND)
-        guild = Guild.from_tibiadata(content)
-        self.assertIsNone(guild)
-
-    def test_guild_from_tibiadata_disbanding(self):
-        """Testing parsing a disbanding guild from TibiaData"""
-        content = self.load_resource(FILE_GUILD_TIBIADATA_DISBANDING)
-        guild = Guild.from_tibiadata(content)
-        self.assertIsNotNone(guild.disband_condition)
-        self.assertEqual(guild.disband_date, datetime.date(2018, 12, 26))
-
-    def test_guild_from_tibiadata_with_invites(self):
-        """Testing parsing a guild with invites"""
-        content = self.load_resource(FILE_GUILD_TIBIADATA_INVITED)
-        guild = Guild.from_tibiadata(content)
-        self.assertTrue(len(guild.invites) > 0)
-        self.assertIsInstance(guild.invites[0], GuildInvite)
-
-    def test_guild_from_tibiadata_invalid_json(self):
-        """Testing parsing an invalid json"""
-        with self.assertRaises(InvalidContent):
-            Guild.from_tibiadata("<html><p>definitely not a json string</p></html>")
-
-    def test_guild_from_tibiadata_unrelated_section(self):
-        """Testing parsing a different TibiaData json"""
-        content = self.load_resource(tests.tests_character.FILE_CHARACTER_TIBIADATA)
-        with self.assertRaises(InvalidContent):
-            Guild.from_tibiadata(content)
-
-    def test_listed_guild_from_tibiadata(self):
-        """Testing parsing a guild list from TibiaData"""
-        content = self.load_resource(FILE_GUILD_TIBIADATA_LIST)
-        guilds = ListedGuild.list_from_tibiadata(content)
-        self.assertTrue(guilds)
-        self.assertIsNotNone(ListedGuild.get_world_list_url_tibiadata(guilds[0].world))
-        self.assertEqual("Zunera", guilds[0].world)
-        self.assertIsInstance(guilds[0], ListedGuild)
-        self.assertTrue(guilds[0].active)
-        self.assertFalse(guilds[-1].active)
-
-    def test_listed_guild_from_tibiadata_not_found(self):
-        """Testing parsing a non existent guild"""
-        content = self.load_resource(FILE_GUILD_TIBIADATA_LIST_NOT_FOUND)
-        guilds = ListedGuild.list_from_tibiadata(content)
-        # There's no way to tell if the searched world doesn't exist or has no guilds
-        self.assertEqual(guilds, [])
-
-    def test_listed_guild_from_tibiadata_unrelated_section(self):
-        """Testing parsing an unrelated section"""
-        content = self.load_resource(tests.tests_character.FILE_CHARACTER_TIBIADATA)
-        with self.assertRaises(InvalidContent):
-            ListedGuild.list_from_tibiadata(content)
-
-    def test_listed_guild_from_tibiadata_invalid_json(self):
-        """Testing parsing an invalid json"""
-        with self.assertRaises(InvalidContent):
-            ListedGuild.list_from_tibiadata("<b>Not JSON</b>")
 
     # region Guild War Tests
     def test_guild_wars_from_content_active_history(self):

tests/tests_highscores.py

@@ -12,11 +12,6 @@
 FILE_HIGHSCORES_EMPTY = "highscores/tibiacom_empty.txt"
 FILE_HIGHSCORES_NO_RESULTS = "highscores/tibiacom_no_results.txt"
 
-FILE_HIGHSCORES_TIBIADATA_FULL = "highscores/tibiadata_full.json"
-FILE_HIGHSCORES_TIBIADATA_EXPERIENCE = "highscores/tibiadata_experience.json"
-FILE_HIGHSCORES_TIBIADATA_LOYALTY = "highscores/tibiadata_loyalty.json"
-FILE_HIGHSCORES_TIBIADATA_EMPTY = "highscores/tibiadata_empty.json"
-
 
 class TestHighscores(unittest.TestCase, TestCommons):
     # region Tibia.com Tests
@@ -110,74 +105,3 @@ def test_highscores_from_content_unrelated_section(self):
             Highscores.from_content(content)
 
     # endregion
-
-    # region TibiaData.com Tests
-    def _test_highscores_from_tibiadata(self):
-        """Testing parsing highscores from TibiaData"""
-        content = self.load_resource(FILE_HIGHSCORES_TIBIADATA_FULL)
-        highscores = Highscores.from_tibiadata(content)
-
-        self.assertEqual(highscores.world, "Antica")
-        self.assertEqual(highscores.vocation, VocationFilter.ALL)
-        self.assertEqual(highscores.category, Category.AXE_FIGHTING)
-        self.assertEqual(highscores.results_count, 300)
-
-        self.assertEqual(highscores.url_tibiadata,
-                         Highscores.get_url_tibiadata(highscores.world, highscores.category, highscores.vocation))
-
-        for entry in highscores.entries:
-            self.assertIsInstance(entry, HighscoresEntry)
-            self.assertIsInstance(entry.name, str)
-            self.assertIsInstance(entry.vocation, Vocation)
-            self.assertIsInstance(entry.rank, int)
-            self.assertIsInstance(entry.value, int)
-
-    def test_highscores_from_tibiadata_experience(self):
-        """Testing parsing experience highscores"""
-        content = self.load_resource(FILE_HIGHSCORES_TIBIADATA_EXPERIENCE)
-        highscores = Highscores.from_tibiadata(content)
-
-        self.assertEqual(highscores.world, "Luminera")
-        self.assertEqual(highscores.vocation, VocationFilter.ALL)
-        self.assertEqual(highscores.category, Category.EXPERIENCE)
-        self.assertEqual(highscores.results_count, 300)
-
-        for entry in highscores.entries:
-            self.assertIsInstance(entry, ExpHighscoresEntry)
-            self.assertIsInstance(entry.name, str)
-            self.assertIsInstance(entry.vocation, Vocation)
-            self.assertIsInstance(entry.rank, int)
-            self.assertIsInstance(entry.value, int)
-            self.assertIsInstance(entry.level, int)
-
-    def _test_highscores_from_tibiadata_loyalty(self):
-        """Testing parsing loyalty highscores"""
-        content = self.load_resource(FILE_HIGHSCORES_TIBIADATA_LOYALTY)
-        highscores = Highscores.from_tibiadata(content)
-
-        self.assertEqual(highscores.world, "Zunera")
-        self.assertEqual(highscores.vocation, VocationFilter.ALL)
-        self.assertEqual(highscores.category, Category.LOYALTY_POINTS)
-        self.assertEqual(highscores.results_count, 57)
-
-        for entry in highscores.entries:
-            self.assertIsInstance(entry, LoyaltyHighscoresEntry)
-            self.assertIsInstance(entry.name, str)
-            self.assertIsInstance(entry.vocation, Vocation)
-            self.assertIsInstance(entry.rank, int)
-            self.assertIsInstance(entry.value, int)
-            self.assertIsInstance(entry.title, str)
-
-    def test_highscores_from_tibiadata_empty(self):
-        """Testing parsing empty highscores"""
-        content = self.load_resource(FILE_HIGHSCORES_TIBIADATA_EMPTY)
-        highscores = Highscores.from_tibiadata(content)
-
-        self.assertIsNone(highscores)
-
-    def test_highscores_from_tibiadata_unrelated_section(self):
-        """Testing parsing an unrelated section"""
-        with self.assertRaises(InvalidContent):
-            Highscores.from_tibiadata(self.load_resource(tests.tests_character.FILE_CHARACTER_TIBIADATA))
-
-    # endregion