Merge branch 'develop'

jaapz · jaapz · commit 06ed29567b73 · 2014-03-02T15:52:53.000+01:00
diff --git a/Cryptsy.py b/Cryptsy.py
@@ -21,7 +21,7 @@ def _public_api_query(self, method, marketid=None):
         rv = urllib2.urlopen(urllib2.Request(request_url))
         return json.loads(rv.read())
 
-    def _api_query(self, method, request_data=None):
+    def _api_query(self, method, request_data={}):
         """ Call to the "private" api and return the loaded json. """
         request_data['method'] = method
         request_data['nonce'] = int(round(time.time() * 1000))
@@ -180,7 +180,7 @@ def my_orders(self, marketid=None):
         :param marketid: If provided, orders will be filtered by this marketid.
         """
         if marketid is None:
-            return self.api_query('allmyorders')
+            return self._api_query('allmyorders')
         return self._api_query('myorders', request_data={'marketid': marketid})
 
     def depth(self, marketid):
diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@ API for Cryptsy.com Exchange utilizing completely built-in functions and utiliti
 Note: the next version of this API wrapper will introduce A LOT of API changes
 so be warned, here be dragons.
 
+[![Dependency Status](https://gemnasium.com/jaapz/CryptsyPythonAPI.png)](https://gemnasium.com/jaapz/CryptsyPythonAPI)
 [![Build Status](https://api.travis-ci.org/jaapz/CryptsyPythonAPI.png)](https://travis-ci.org/jaapz/CryptsyPythonAPI)
+[![PyPI Version](https://pypip.in/v/Cryptsy/badge.png)](https://pypi.python.org/pypi/Cryptsy)
 
 Author's Note
 -------------
@@ -39,6 +41,8 @@ Some things that I intend to add in future versions:
  * MOAR TESTS
  * sphinx reference generation
  * error handling
+ * add some unofficial api endpoints because the official ones may suck
+ * add travis ci builds
 
 Running the tests
 -----------------
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='Cryptsy',
-    version='0.2',
+    version='0.2.1',
     license='GNU GPL2',
     url='https://github.com/jaapz/CryptsyPythonAPI',
     author='Jaap Broekhuizen <jaapz.b@gmail.com>, '
diff --git a/test_cryptsy.py b/test_cryptsy.py
@@ -112,3 +112,146 @@ def test_market_data_v2(api, public_api_query_mock):
     """ Should use the old marketdata method if v2 is not set to True. """
     api.market_data(v2=True)
     public_api_query_mock.assert_called_with('marketdatav2')
+
+
+def test_order_book_data_no_marketid(api, public_api_query_mock):
+    """ Should call orderdata if no marketid is provided. """
+    api.order_book_data()
+    public_api_query_mock.assert_called_with('orderdata')
+
+
+def test_order_book_data_with_marketid(api, public_api_query_mock):
+    """ Should call singleorderdata if marketid is provided. """
+    api.order_book_data(marketid=10)
+    public_api_query_mock.assert_called_with('singleorderdata', marketid=10)
+
+
+def test_info(api, api_query_mock):
+    """ Should call getinfo. """
+    api.info()
+    api_query_mock.assert_called_with('getinfo')
+
+
+def test_markets(api, api_query_mock):
+    """ Should call getmarkets. """
+    api.markets()
+    api_query_mock.assert_called_with('getmarkets')
+
+
+def test_my_transactions(api, api_query_mock):
+    """ Should call mytransactions. """
+    api.my_transactions()
+    api_query_mock.assert_called_with('mytransactions')
+
+
+def test_market_trades(api, api_query_mock):
+    """ Should call markettrades with the provided marketid. """
+    api.market_trades(marketid=10)
+    api_query_mock.assert_called_with('markettrades',
+                                      request_data={'marketid': 10})
+
+
+def test_market_orders(api, api_query_mock):
+    """ Should call mytransactions. """
+    api.market_orders(marketid=10)
+    api_query_mock.assert_called_with('marketorders',
+                                      request_data={'marketid': 10})
+
+
+def test_my_trades_no_marketid(api, api_query_mock):
+    """ If no marketid is provided, it should call allmytrades. """
+    api.my_trades()
+    api_query_mock.assert_called_with('allmytrades')
+
+
+def test_my_trades_with_marketid(api, api_query_mock):
+    """ If a marketid is provided, it should call mytrades. """
+    api.my_trades(marketid=10)
+    api_query_mock.assert_called_with('mytrades',
+                                      request_data={
+                                            'marketid': 10,
+                                            'limit': 200
+                                      })
+
+
+def test_my_trades_with_marketid_and_limit(api, api_query_mock):
+    """ If limit is provided, use it.. """
+    api.my_trades(marketid=10, limit=10)
+    api_query_mock.assert_called_with('mytrades',
+                                      request_data={
+                                            'marketid': 10,
+                                            'limit': 10
+                                      })
+
+
+def test_my_orders_no_marketid(api, api_query_mock):
+    """ If no marketid is provided, it should call allmyorders. """
+    api.my_orders()
+    api_query_mock.assert_called_with('allmyorders')
+
+
+def test_my_orders_with_marketid(api, api_query_mock):
+    """ If a marketid is provided, it should call myorders. """
+    api.my_orders(marketid=10)
+    api_query_mock.assert_called_with('myorders',
+                                      request_data={
+                                        'marketid': 10,
+                                      })
+
+
+def test_depth(api, api_query_mock):
+    """ Should call depth with given marketid. """
+    api.depth(marketid=10)
+    api_query_mock.assert_called_with('depth', request_data={'marketid': 10})
+
+
+def test_cancel_order(api, api_query_mock):
+    """ Should call cancelorders with given orderid. """
+    api.cancel_order(orderid=10)
+    api_query_mock.assert_called_with('cancelorder',
+                                      request_data={'orderid': 10})
+
+
+def test_cancel_all_market_orders(api, api_query_mock):
+    """ Should call cancelmarketorders with given marketid. """
+    api.cancel_all_market_orders(marketid=10)
+    api_query_mock.assert_called_with('cancelmarketorders',
+                                      request_data={'marketid': 10})
+
+
+def test_cancel_all_orders(api, api_query_mock):
+    """ Should call cancelallorders. """
+    api.cancel_all_orders()
+    api_query_mock.assert_called_with('cancelallorders')
+
+
+def test_calculate_fees(api, api_query_mock):
+    """ Should call calculatefees with the correct parameters. """
+    api.calculate_fees('Buy', 200, 10)
+    api_query_mock.assert_called_with('calculatefees',
+                                      request_data={
+                                          'ordertype': 'Buy',
+                                          'quantity': 200,
+                                          'price': 10
+                                      })
+
+def test_my_transfers(api, api_query_mock):
+    """ Should call mytransfers. """
+    api.my_transfers()
+    api_query_mock.assert_called_with('mytransfers')
+
+
+def test_wallet_status(api, api_query_mock):
+    """ Should call getwalletstatus. """
+    api.wallet_status()
+    api_query_mock.assert_called_with('getwalletstatus')
+
+
+def test_make_withdrawal(api, api_query_mock):
+    """ Should call makewithdrawal with the given parameters. """
+    api.make_withdrawal('address', 100)
+    api_query_mock.assert_called_with('makewithdrawal',
+                                      request_data={
+                                          'address': 'address',
+                                          'amount': 100
+                                      })
