Merge branch 'release/2.0'

Author: tarunbhardwaj

LICENSE

@@ -2,9 +2,7 @@
 '''
     magento API
 
-    :copyright: (c) 2010 by Sharoon Thomas.
-    :copyright: (c) 2010-2013 by Openlabs Technologies & Consulting (P) LTD
-    :license: AGPLv3, see LICENSE for more details
+    :license: BSD, see LICENSE for more details
 '''
 __all__ = [
             'API', 'Store', 'Magento',

magento/__init__.py

@@ -1,12 +1,10 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 '''
     magento.api
 
     Generic API for magento
 
-    :copyright: (c) 2010 by Sharoon Thomas.
-    :copyright: (c) 2010 by Openlabs Technologies & Consulting (P) LTD
-    :license: AGPLv3, see LICENSE for more details
+    :license: BSD, see LICENSE for more details
 '''
 
 PROTOCOLS = []
@@ -24,6 +22,15 @@
 else:
     PROTOCOLS.append('soap')
 
+from . import rest
+try:
+    import requests
+    import json
+except ImportError:
+    pass
+else:
+    PROTOCOLS.append('rest')
+
 from magento.utils import expand_url
 
 
@@ -33,7 +40,8 @@ class API(object):
     """
 
     def __init__(self, url, username, password,
-                 version='1.3.2.4', full_url=False, protocol='xmlrpc', transport=None):
+                 version='1.3.2.4', full_url=False, protocol='xmlrpc', transport=None,
+                 verify_ssl=True):
         """
         This is the Base API class which other APIs have to subclass. By
         default the inherited classes also get the properties of this
@@ -98,6 +106,7 @@ def store_views(self):
         :param protocol: 'xmlrpc' and 'soap' are valid values
         :param transport: optional xmlrpclib.Transport subclass for
                     use in xmlrpc requests
+        :param verify_ssl: for REST API, skip SSL validation if False
         """
         assert protocol \
             in PROTOCOLS, "protocol must be %s" % ' OR '.join(PROTOCOLS)
@@ -109,6 +118,7 @@ def store_views(self):
         self.transport = transport
         self.session = None
         self.client = None
+        self.verify_ssl = verify_ssl
 
     def connect(self):
         """
@@ -121,6 +131,10 @@ def connect(self):
                     self.url, allow_none=True, transport=self.transport)
             else:
                 self.client = ServerProxy(self.url, allow_none=True)
+        elif self.protocol == 'rest':
+            # Use an authentication token as the password
+            self.client = rest.Client(self.url, self.password,
+                                      verify_ssl=self.verify_ssl)
         else:
             self.client = Client(self.url)
 
@@ -134,6 +148,8 @@ def __enter__(self):
         if self.protocol == 'xmlrpc':
             self.session = self.client.login(
                 self.username, self.password)
+        elif self.protocol == 'rest':
+            self.session = True
         else:
             self.session = self.client.service.login(
                 self.username, self.password)
@@ -147,7 +163,7 @@ def __exit__(self, type, value, traceback):
         """
         if self.protocol == 'xmlrpc':
             self.client.endSession(self.session)
-        else:
+        elif self.protocol == 'soap':
             self.client.service.endSession(self.session)
         self.session = None
 
@@ -157,6 +173,8 @@ def call(self, resource_path, arguments):
         """
         if self.protocol == 'xmlrpc':
             return self.client.call(self.session, resource_path, arguments)
+        elif self.protocol == 'rest':
+            return self.client.call(resource_path, arguments)
         else:
             return self.client.service.call(
                 self.session, resource_path, arguments)

magento/api.py

@@ -4,9 +4,7 @@
 
     Product Catalog API for magento
 
-    :copyright: (c) 2010 by Sharoon Thomas.
-    :copyright: (c) 2010 by Openlabs Technologies & Consulting (P) LTD
-    :license: AGPLv3, see LICENSE for more details
+    :license: BSD, see LICENSE for more details
 '''
 
 import warnings

magento/catalog.py

@@ -5,10 +5,8 @@
     Checkout API for magento
     Allows you to manage shopping carts and the checkout process.
 
-    :copyright: (c) 2010 by Sharoon Thomas.
-    :copyright: (c) 2010 by Openlabs Technologies & Consulting (P) LTD.
 
-    :license: AGPLv3, see LICENSE for more details
+    :license: BSD, see LICENSE for more details
 '''
 
 from .api import API

magento/checkout.py

@@ -4,8 +4,6 @@
 
     Client API for magento
 
-    :copyright: (c) 2014 by Openlabs Technologies & Consulting (P) LTD
-    :license: BSD, see LICENSE for more details
 '''
 from threading import RLock
 

magento/client.py

@@ -4,10 +4,8 @@
 
     Customer API for magento
 
-    :copyright: (c) 2010 by Sharoon Thomas.
-    :copyright: (c) 2010 by Openlabs Technologies & Consulting (P) LTD.
 
-    :license: AGPLv3, see LICENSE for more details
+    :license: BSD, see LICENSE for more details
 '''
 from magento.api import API
 

magento/customer.py

@@ -4,9 +4,7 @@
 
     Directory Country API for magento
 
-    :copyright: (c) 2010 by Sharoon Thomas.
-    :copyright: (c) 2010 by Openlabs Technologies & Consulting (P) LTD
-    :license: AGPLv3, see LICENSE for more details
+    :license: BSD, see LICENSE for more details
 '''
 from magento.api import API
 

magento/directory.py

@@ -4,8 +4,6 @@
 
     This API allows to access additional magento information
 
-    :copyright: (c) 2013 by Openlabs Technologies & Consulting (P) Limited
-    :license: AGPLv3, see LICENSE for more details.
 """
 from magento.api import API
 

magento/miscellaneous.py

@@ -0,0 +1,22 @@
+# coding: utf-8
+try:
+    import requests
+    import json
+except ImportError:
+    pass
+
+
+class Client(object):
+
+    def __init__(self, url, token, verify_ssl=True):
+        self._url = url
+        self._token = token
+        self._verify_ssl = verify_ssl
+
+    def call(self, resource_path, arguments):
+        url = '%s/%s' % (self._url, resource_path)
+        res = requests.get(
+            url, params=arguments, verify=self._verify_ssl,
+            headers={'Authorization': 'Bearer %s' % self._token})
+        res.raise_for_status()
+        return res.json()