Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-22 03:13:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change URL from PokéAPI to gh for sprites (#257)

Browse source
This commit is contained in:
Paul Hallett 2016-08-13 18:35:42 +01:00 committed by GitHub
parent 01c36b9a72
commit 404f23abd1
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pokemon_v2/serializers.py
View file

@ -1402,11 +1402,11 @@ class ItemDetailSerializer(serializers.ModelSerializer):
sprites_object = ItemSprites.objects.get(item_id=obj) sprites_object = ItemSprites.objects.get(item_id=obj)
sprites_data = ItemSpritesSerializer(sprites_object, context=self.context).data sprites_data = ItemSpritesSerializer(sprites_object, context=self.context).data
sprites_data = json.loads(sprites_data['sprites']) sprites_data = json.loads(sprites_data['sprites'])
host = self.context['request'].META['HTTP_HOST'] host = 'raw.githubusercontent.com/PokeAPI/sprites/master/'
for key, val in sprites_data.iteritems(): for key, val in sprites_data.iteritems():
if sprites_data[key]: if sprites_data[key]:
sprites_data[key] = 'http://' + host + sprites_data[key] sprites_data[key] = 'https://' + host + sprites_data[key].replace('/media/', '')
return sprites_data return sprites_data
@ -2303,11 +2303,11 @@ class PokemonFormDetailSerializer(serializers.ModelSerializer):
sprites_data = PokemonFormSpritesSerializer(sprites_object, context=self.context).data sprites_data = PokemonFormSpritesSerializer(sprites_object, context=self.context).data
sprites_data = json.loads(sprites_data['sprites']) sprites_data = json.loads(sprites_data['sprites'])
host = self.context['request'].META['HTTP_HOST'] host = 'raw.githubusercontent.com/PokeAPI/sprites/master/'
for key, val in sprites_data.iteritems(): for key, val in sprites_data.iteritems():
if sprites_data[key]: if sprites_data[key]:
sprites_data[key] = 'http://' + host + sprites_data[key] sprites_data[key] = 'https://' + host + sprites_data[key].replace('/media/', '')
return sprites_data return sprites_data
@ -2519,11 +2519,11 @@ class PokemonDetailSerializer(serializers.ModelSerializer):
sprites_object = PokemonSprites.objects.get(pokemon_id=obj) sprites_object = PokemonSprites.objects.get(pokemon_id=obj)
sprites_data = PokemonSpritesSerializer(sprites_object, context=self.context).data sprites_data = PokemonSpritesSerializer(sprites_object, context=self.context).data
sprites_data = json.loads(sprites_data['sprites']) sprites_data = json.loads(sprites_data['sprites'])
host = self.context['request'].META['HTTP_HOST'] host = 'raw.githubusercontent.com/PokeAPI/sprites/master/'
for key, val in sprites_data.iteritems(): for key, val in sprites_data.iteritems():
if sprites_data[key]: if sprites_data[key]:
sprites_data[key] = 'http://' + host + sprites_data[key] sprites_data[key] = 'https://' + host + sprites_data[key].replace('/media/', '')
return sprites_data return sprites_data

8
pokemon_v2/tests.py
View file

@ -5,7 +5,7 @@ from pokemon_v2.models import * # NOQA
import json import json
test_host = 'http://testserver' test_host = 'http://testserver'
media_sprites = '/media/sprites/{}' media_host = 'https://raw.githubusercontent.com/PokeAPI/sprites/master/'
api_v2 = '/api/v2' api_v2 = '/api/v2'
@ -2716,7 +2716,7 @@ class APITests(APIData, APITestCase):
# sprites # sprites
self.assertEqual( self.assertEqual(
response.data['sprites']['default'], response.data['sprites']['default'],
'{}{}'.format(test_host, sprites_data['default'])) '{}{}'.format(media_host, sprites_data['default'].replace('/media/', '')))
# Berry Tests # Berry Tests
def test_berry_firmness_api(self): def test_berry_firmness_api(self):
@ -4253,7 +4253,7 @@ class APITests(APIData, APITestCase):
# sprite params # sprite params
self.assertEqual( self.assertEqual(
response.data['sprites']['front_default'], response.data['sprites']['front_default'],
'{}{}'.format(test_host, sprites_data['front_default'])) '{}{}'.format(media_host, sprites_data['front_default'].replace('/media/', '')))
self.assertEqual(response.data['sprites']['back_default'], None) self.assertEqual(response.data['sprites']['back_default'], None)
def test_pokemon_form_api(self): def test_pokemon_form_api(self):
@ -4292,7 +4292,7 @@ class APITests(APIData, APITestCase):
# sprite params # sprite params
self.assertEqual( self.assertEqual(
response.data['sprites']['front_default'], response.data['sprites']['front_default'],
'{}{}'.format(test_host, sprites_data['front_default'])) '{}{}'.format(media_host, sprites_data['front_default'].replace('/media/', '')))
self.assertEqual(response.data['sprites']['back_default'], None) self.assertEqual(response.data['sprites']['back_default'], None)
# Evolution test # Evolution test

1
templates/pages/docsv2.html
View file

@ -18,6 +18,7 @@
<ul> <ul>
<li><a href="#info">Information</a></li> <li><a href="#info">Information</a></li>
<li><a href="#fairuse">Fair Use</a></li>
<li><a href="#slack">Slack</a></li> <li><a href="#slack">Slack</a></li>
<li><a href="#wrap">Wrappers</a></li> <li><a href="#wrap">Wrappers</a></li>