Simplified fluent interface - v2

README.md

@@ -56,6 +56,7 @@ Import (Card and Set will be most used)
     set
     set_code
     retreat_cost
+    converted_retreat_cost
     text
     types
     attacks
@@ -73,6 +74,7 @@ Import (Card and Set will be most used)
     standard_legal
     expanded_legal
     release_date
+    updated_at
     symbol_url
     logo_url
 
@@ -84,23 +86,23 @@ Import (Card and Set will be most used)
 
 #### Filter Cards via query parameters
 
-    cards = Card.where(set='generations').where(supertype='pokemon').all()
+    cards = Card.where(set='generations', supertype='pokemon')
 
 #### Find all cards (will take awhile)
 
     cards = Card.all()
 
 #### Get all cards, but only a specific page of data
 
-    cards = Card.where(page=5).where(pageSize=100).all()
+    cards = Card.where(page=5, pageSize=100)
 
 #### Find a set by code
 
     set = Set.find('base1')
 
 #### Filter sets via query parameters
 
-    sets = Set.where(standardLegal=true).all()
+    sets = Set.where(standardLegal=true)
 
 #### Get all Sets
 
@@ -125,3 +127,9 @@ Import (Card and Set will be most used)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+## Developing
+
+### Running Tests
+
+    python -m unittest discover -s tests/

pokemontcgsdk/card.py

@@ -31,6 +31,7 @@ def __init__(self, response_dict={}):
         self.set = response_dict.get('set')
         self.set_code = response_dict.get('setCode')
         self.retreat_cost = response_dict.get('retreatCost')
+        self.converted_retreat_cost = response_dict.get('convertedRetreatCost')
         self.text = response_dict.get('text')
         self.attacks = response_dict.get('attacks')
         self.weaknesses = response_dict.get('weaknesses')

pokemontcgsdk/config.py

@@ -8,7 +8,7 @@
 # http://www.opensource.org/licenses/MIT-license
 # Copyright (c) 2016, Andrew Backes <[email protected]>
 
-__version__ = "1.4.1"
+__version__ = "2.0.0"
 __pypi_packagename__ = "pokemontcgsdk"
 __github_username__ = "PokemonTCG"
 __github_reponame__ = "pokemon-tcg-sdk-python"

pokemontcgsdk/querybuilder.py

@@ -35,12 +35,12 @@ def where(self, **kwargs):
         Args:
             **kwargs: Arbitrary keyword arguments.
         Returns:
-            QueryBuilder: Instance of the QueryBuilder
+            list of object: List of resource objects
         """
         for key, value in kwargs.items():
             self.params[key] = value
 
-        return self
+        return self.all()
 
     def all(self):
         """Get all resources, automatically paging through data

pokemontcgsdk/set.py

@@ -25,6 +25,7 @@ def __init__(self, response_dict={}):
         self.release_date = response_dict.get('releaseDate')
         self.symbol_url = response_dict.get('symbolUrl')
         self.logo_url = response_dict.get('logoUrl')
+        self.updated_at = response_dict.get('updatedAt')
 
     @staticmethod
     def find(id):

tests/test_card.py

@@ -31,6 +31,7 @@ def test_find_returns_card(self):
             self.assertEqual('Once during your turn (before your attack), you may heal 20 damage from each of your Pokémon.',card.ability['text'])
             self.assertEqual('130', card.hp)
             self.assertEqual(['Colorless', 'Colorless'], card.retreat_cost)
+            self.assertEqual(2, card.converted_retreat_cost)
             self.assertEqual('54', card.number)
             self.assertEqual('TOKIYA', card.artist)
             self.assertEqual('Rare Holo', card.rarity)
@@ -44,18 +45,16 @@ def test_find_returns_card(self):
 
     def test_all_with_params_return_cards(self):
         with vcr.use_cassette('fixtures/mega_pokemon.yaml'):
-            cards = Card.where(supertype='pokemon') \
-                        .where(subtype='mega') \
-                        .all()
+            cards = Card.where(supertype='pokemon', subtype='mega')
             self.assertTrue(len(cards) >= 70)
 
     def test_all_with_page_returns_cards(self):
         with vcr.use_cassette('fixtures/all_first_page.yaml'):
-            cards = Card.where(page=1).all()
+            cards = Card.where(page=1)
             self.assertEqual(100, len(cards))
 
     def test_all_with_page_and_page_size_returns_card(self):
         with vcr.use_cassette('fixtures/all_first_page_one_card.yaml'):
-            cards = Card.where(page=1).where(pageSize=1).all()
+            cards = Card.where(page=1, pageSize=1)
             self.assertEqual(1, len(cards))
 

tests/test_set.py

@@ -27,7 +27,7 @@ def test_find_returns_set(self):
 
     def test_where_filters_on_name(self):
         with vcr.use_cassette('fixtures/filtered_sets.yaml'):
-            sets = Set.where(name='steam').all()
+            sets = Set.where(name='steam')
 
             self.assertEqual(1, len(sets))
             self.assertEqual('xy11', sets[0].code)