Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-09-20 22:21:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #73 from zaneadix/docs

Browse source 
Docs
This commit is contained in:
Zane Adickes 2015-12-08 13:07:41 -05:00
commit 2c33493741
4 changed files with 3285 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/urls.py
View file

@ -82,11 +82,11 @@ router.register(r"nature", NatureResource)
router.register(r"pal-park-area", PalParkAreaResource)
router.register(r"pokedex", PokedexResource)
router.register(r"pokemon", PokemonResource)
router.register(r"pokemon-color", PokemonColorResource)
router.register(r"pokemon-form", PokemonFormResource)
router.register(r"pokemon-habitat", PokemonHabitatResource)
router.register(r"pokemon-shape", PokemonShapeResource)
router.register(r"pokemon-species", PokemonSpeciesResource)
router.register(r"pokemon-color", PokemonColorResource)
router.register(r"pokemon-form", PokemonFormResource)
router.register(r"pokeathlon-stat", PokeathlonStatResource)
router.register(r"region", RegionResource)
router.register(r"stat", StatResource)

3270
pokemon_v2/README.md Normal file
View file

File diff suppressed because it is too large Load diff

13
pokemon_v2/serializers.py
View file

@ -964,13 +964,13 @@ class AbilityEffectTextSerializer(serializers.ModelSerializer):
class AbilityFlavorTextSerializer(serializers.ModelSerializer):
text = serializers.CharField(source="flavor_text")
flavor_text = serializers.CharField()
language = LanguageSummarySerializer()
version_group = VersionGroupSummarySerializer()
class Meta:
model = AbilityFlavorText
fields = ('text', 'version_group', 'language')
fields = ('flavor_text', 'language', 'version_group')
class AbilityChangeEffectTextSerializer(serializers.ModelSerializer):
@ -1007,7 +1007,7 @@ class AbilityDetailSerializer(serializers.ModelSerializer):
flavor_text_entries = AbilityFlavorTextSerializer(many=True, read_only=True, source="abilityflavortext")
names = AbilityNameSerializer(many=True, read_only=True, source="abilityname")
generation = GenerationSummarySerializer()
changes = AbilityChangeSerializer(many=True, read_only=True, source="abilitychange")
effect_changes = AbilityChangeSerializer(many=True, read_only=True, source="abilitychange")
pokemon = serializers.SerializerMethodField('get_ability_pokemon')
class Meta:
@ -1018,10 +1018,10 @@ class AbilityDetailSerializer(serializers.ModelSerializer):
'is_main_series',
'generation',
'names',
'effect_entries',
'effect_entries',
'effect_changes',
'flavor_text_entries',
'pokemon',
'changes'
)
def get_ability_pokemon(self, obj):
@ -1038,6 +1038,7 @@ class AbilityDetailSerializer(serializers.ModelSerializer):
######################
# STAT SERIALIZERS #
######################
@ -2677,7 +2678,7 @@ class EvolutionChainDetailSerializer(serializers.ModelSerializer):
entry['is_baby'] = species['is_baby']
entry['species'] = summary_data[index]
if evolution_data: entry['evolution_details'] = evolution_data
entry['evolution_details'] = evolution_data or None
entry['evolves_to'] = []
# Keep track of previous entries for complex chaining

12
pokemon_v2/tests.py
View file

@ -2364,7 +2364,7 @@ class APITests(APIData, APITestCase):
self.assertEqual(response.data['effect_entries'][0]['language']['name'], ability_effect_text.language.name)
self.assertEqual(response.data['effect_entries'][0]['language']['url'], '{}{}/language/{}/'.format(test_host, api_v2, ability_effect_text.language.pk))
# flavor text params
self.assertEqual(response.data['flavor_text_entries'][0]['text'], ability_flavor_text.flavor_text)
self.assertEqual(response.data['flavor_text_entries'][0]['flavor_text'], ability_flavor_text.flavor_text)
self.assertEqual(response.data['flavor_text_entries'][0]['version_group']['name'], ability_flavor_text.version_group.name)
self.assertEqual(response.data['flavor_text_entries'][0]['language']['name'], ability_flavor_text.language.name)
self.assertEqual(response.data['flavor_text_entries'][0]['language']['url'], '{}{}/language/{}/'.format(test_host, api_v2, ability_flavor_text.language.pk))
@ -2372,11 +2372,11 @@ class APITests(APIData, APITestCase):
self.assertEqual(response.data['generation']['name'], ability.generation.name)
self.assertEqual(response.data['generation']['url'], '{}{}/generation/{}/'.format(test_host, api_v2, ability.generation.pk))
# change params
self.assertEqual(response.data['changes'][0]['version_group']['name'], ability_change.version_group.name)
self.assertEqual(response.data['changes'][0]['version_group']['url'], '{}{}/version-group/{}/'.format(test_host, api_v2, ability_change.version_group.pk))
self.assertEqual(response.data['changes'][0]['effect_entries'][0]['effect'], ability_change_effect_text.effect)
self.assertEqual(response.data['changes'][0]['effect_entries'][0]['language']['name'], ability_change_effect_text.language.name)
self.assertEqual(response.data['changes'][0]['effect_entries'][0]['language']['url'], '{}{}/language/{}/'.format(test_host, api_v2, ability_change_effect_text.language.pk))
self.assertEqual(response.data['effect_changes'][0]['version_group']['name'], ability_change.version_group.name)
self.assertEqual(response.data['effect_changes'][0]['version_group']['url'], '{}{}/version-group/{}/'.format(test_host, api_v2, ability_change.version_group.pk))
self.assertEqual(response.data['effect_changes'][0]['effect_entries'][0]['effect'], ability_change_effect_text.effect)
self.assertEqual(response.data['effect_changes'][0]['effect_entries'][0]['language']['name'], ability_change_effect_text.language.name)
self.assertEqual(response.data['effect_changes'][0]['effect_entries'][0]['language']['url'], '{}{}/language/{}/'.format(test_host, api_v2, ability_change_effect_text.language.pk))
# pokemon params
self.assertEqual(response.data['pokemon'][0]['is_hidden'], pokemon_ability.is_hidden)
self.assertEqual(response.data['pokemon'][0]['slot'], pokemon_ability.slot)