Description attribute added to Pokemon class

Author: Paul Hallett

HISTORY.rst

@@ -3,6 +3,12 @@
 History
 -------
 
+0.1.1 (2013-12-24)
+++++++++++++++++++
+
+* Description attribute added to Pokemon class
+
+
 0.1.0 (2013-12-23)
 ++++++++++++++++++
 

pykemon/__init__.py

@@ -3,7 +3,7 @@
 
 __author__ = 'Paul Hallett'
 __email__ = 'hello@phalt.co'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __copyright__ = 'Copyright Paul Hallett 2013'
 __license__ = 'BSD'
 

pykemon/models.py

@@ -33,6 +33,7 @@ def __init__(self, bundle):
         self.egg_groups = buildr(bundle, 'egg_groups')
         self.evolutions = {
             f['to']: f['resource_uri'] for f in bundle['evolutions']}
+        self.descriptions = buildr(bundle, 'descriptions')
         self.moves = buildr(bundle, 'moves')
         self.types = buildr(bundle, 'types')
         self.catch_rate = bundle['catch_rate']

setup.py

@@ -19,8 +19,8 @@
 
 setup(
     name='pykemon',
-    version='0.1.0',
-    description='A python wrapper for PokeAPI',
+    version='0.1.1',
+    description='A Python wrapper for PokeAPI',
     long_description=readme + '\n\n' + history,
     author='Paul Hallett',
     author_email='hello@phalt.co',
@@ -37,7 +37,7 @@
     zip_safe=False,
     keywords='pykemon',
     classifiers=[
-        'Development Status :: 3 - Beta',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',

tests/test_pykemon.py

@@ -22,7 +22,7 @@ def setUp(self):
         self.type_one = pykemon.get(type_id=10)  # Fire
         self.ability_one = pykemon.get(ability_id=1)  # Stench
         self.egg_one = pykemon.get(egg_id=1)  # Monster
-        self.description_one = pykemon.get(description_id=1)
+        self.description_one = pykemon.get(description_id=2)
         self.sprite_one = pykemon.get(sprite_id=152)  # Mew_auto
         self.game_one = pykemon.get(game_id=4)  # Red
 
@@ -32,7 +32,7 @@ def test_name_attribute(self):
         self.assertEquals(self.type_one.name, 'Fire')
         self.assertEquals(self.ability_one.name, 'Stench')
         self.assertEquals(self.egg_one.name, 'Monster')
-        self.assertEquals(self.description_one.name, 'Bulbasaur_red_blue')
+        self.assertEquals(self.description_one.name, 'Bulbasaur_gen_1')
         self.assertEquals(self.sprite_one.name, 'Mew_auto')
         self.assertEquals(self.game_one.name, 'Red')
 
@@ -43,7 +43,7 @@ def test_repr(self):
         self.assertEquals(str(self.ability_one), '<Ability - Stench>')
         self.assertEquals(str(self.egg_one), '<Egg - Monster>')
         self.assertEquals(
-            str(self.description_one), '<Description - Bulbasaur_red_blue>')
+            str(self.description_one), '<Description - Bulbasaur_gen_1>')
         self.assertEquals(str(self.sprite_one), '<Sprite - Mew_auto>')
         self.assertEquals(str(self.game_one), '<Game - Red>')
 
@@ -54,7 +54,7 @@ def test_resource_uri_attribute(self):
         self.assertEquals(self.ability_one.resource_uri, '/api/v1/ability/1/')
         self.assertEquals(self.egg_one.resource_uri, '/api/v1/egg/1/')
         self.assertEquals(
-            self.description_one.resource_uri, '/api/v1/description/1/')
+            self.description_one.resource_uri, '/api/v1/description/2/')
         self.assertEquals(self.sprite_one.resource_uri, '/api/v1/sprite/152/')
         self.assertEquals(self.game_one.resource_uri, '/api/v1/game/4/')
 
@@ -64,6 +64,7 @@ def test_pokemon_complex_attribs(self):
         self.assertIn('grass', self.poke_one.types)
         self.assertIn('overgrow', self.poke_one.abilities)
         self.assertIn('Monster', self.poke_one.egg_groups)
+        self.assertIn('bulbasaur_gen_1', self.poke_one.descriptions)
 
     def test_type_complex_attribs(self):
         self.assertIn('grass', self.type_one.super_effective)
@@ -75,7 +76,7 @@ def test_egg_complex_attribs(self):
         self.assertIn('Blastoise', self.egg_one.pokemon)
 
     def test_description_complex_attribs(self):
-        self.assertIn('blue', self.description_one.games)
+        self.assertIn('red(JPN)', self.description_one.games)
 
 
 class Testexceptions(unittest.TestCase):