config changes

Author: ishaileshmishra

contentstack/config.py

@@ -22,39 +22,57 @@
  * SOFTWARE.
 
  """
+import logging
 
 
-class Config:
+logging.basicConfig(filename='contentstack.log', format='%(asctime)s - %(message)s', level=logging.INFO)
+logging.getLogger("Config")
+
+
+class Config():
 
     def __init__(self):
-        self.default_config = dict(protocol="https", host="cdn.contentstack.io", port=443, version="v3", urls={
-            "sync": "/stacks/sync",
-            "content_types": "/content_types/",
-            "entries": "/entries/",
-            "assets": "/assets/",
-            "environments": "/environments/"
+        self.defaultConfig = dict(protocol="https://", host="cdn.contentstack.io", port=443, version="v3", path={
+            "stacks": "stacks",
+            "sync": "stacks/sync",
+            "content_types": "content_types",
+            "entries": "entries",
+            "assets": "assets",
+            "environments": "environments"
         })
 
     def host(self, host_url=None):
         if host_url is not None:
-            self.default_config["host"] = host_url
-        return self.default_config["host"]
-
-    def version(self):
-        return self.default_config["host"]
+            self.defaultConfig["host"] = host_url
+        return self.defaultConfig["host"]
 
-    def protocol(self):
-        return self.default_config["protocol"]
+    def version(self, version: str = None):
+        if version is not None and isinstance(version, str):
+            self.defaultConfig['version'] = version
+            return self.defaultConfig['version']
+        else:
+            return self.defaultConfig['version']
 
-    def get_endpoint(self, url_path):
-        config_url = "{0}{1}/{2}/{3}".format(self.protocol(), self.host(), self.version(), url_path)
-        return config_url
+    def path(self, path):
+        url_section = self.defaultConfig['path']
+        if path in url_section:
+            return url_section[path]
+        else:
+            logging.error("{0} is invalid endpoint path".format(path))
+            raise ValueError('Invalid endpoint!!, {0} is invalid endpoint path, '
+                             'Path can be found among {1}'
+                             .format(path, url_section.keys()))
 
-    def hiShailesh(self):
-        print("Something")
+    def endpoint(self, path):
+        url = self.path(path)
+        if url is not None and isinstance(url, str):
+            url = "{0}{1}/{2}/{3}".format(self.defaultConfig["protocol"], self.host(), self.version(), url)
+            logging.info('{0} endpoint'.format(path))
+        return url
 
 
 config = Config()
-host = config.host("stag-cdn.contentstack.io")
-print(host)
+config.host("cdn.contentstack.io")
+result_url = config.endpoint('assets')
+print(result_url)
 

contentstack/http_request.py

@@ -1,3 +1,4 @@
+import platform
 import urllib.parse
 from urllib import parse
 
@@ -17,7 +18,7 @@ def __init__(self, url_path, query=dict, local_headers=dict):
         self._local_headers = local_headers
         self._local_headers['X-User-Agent'] = self._contentstack_user_agent()
         self._local_headers['Content-Type'] = 'application/json'
-        self.url_path = config.Config().get_endpoint(self.url_path)
+        self.url_path = config.Config().endpoint(self.url_path)
         if 'environment' in self._local_headers:
             self._query_prams['environment'] = self._local_headers['environment']
 
@@ -43,20 +44,17 @@ def _contentstack_user_agent() -> str:
             'name': 'contentstack.python',
             'version': "1.0.0"
         }}
-        # from contentstack import __version__
-        # from sys import platform as cs_plateforom
-        # os_name = cs_plateforom.system()
-        # if os_name == 'Darwin':
-        #    os_name = 'macOS'
-        # elif not os_name or os_name == 'Java':
-        #    os_name = None
-        # elif os_name and os_name not in ['macOS', 'Windows']:
-        #    os_name = 'Linux'
-        # header['os'] = {
-        #    'name': os_name,
-        #    'version': cs_plateforom.release()
-        # }
-
+        os_name = platform.system()
+        if os_name == 'Darwin':
+            os_name = 'macOS'
+        elif not os_name or os_name == 'Java':
+            os_name = None
+        elif os_name and os_name not in ['macOS', 'Windows']:
+            os_name = 'Linux'
+        header['os'] = {
+            'name': os_name,
+            'version': platform.release()
+        }
         return header.__str__()
 
     def set_entry_model(self):

contentstack/resource.py

@@ -0,0 +1,19 @@
+"""
+contentstack.resource
+~~~~~~~~~~~~~~~~~~~
+"""
+
+
+class Resource(object):
+
+    def __init__(self, default_locale='en-us', **item):
+        self.raw = item
+        self.default_locale = default_locale
+
+    def fields(self, locale=None):
+        if locale is None:
+            locale = self._locale()
+
+    @property
+    def locale(self):
+        pass

contentstack/utils.py

@@ -1,6 +1,5 @@
 """
  * MIT License
- *
  * Copyright (c) 2012 - 2019 Contentstack
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -13,17 +12,20 @@
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * [ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * SOFTWARE ]
  *
 """
 
 import logging
+import os
+
+import requests
 
 try:
     from logging import NullHandler
@@ -32,20 +34,40 @@ class NullHandler(logging.Handler):
         def emit(self, record):
             pass
 
-logging.getLogger(__name__).addHandler(NullHandler())
-log = logging.getLogger(__name__)
+logging.basicConfig(filename='contentstack.log', format='%(asctime)s - %(message)s', level=logging.INFO)
+logging.getLogger("Config")
 
 
-class utils:
+class Util:
 
     def __init__(self):
-        log.error('logging called in utils')
+        logging.error('logging called in utils')
         pass
 
-    '''def is_internet_on():
-        try: urllib.request.urlopen('http://216.58.192.142', timeout=1)
-        #return True
-    except urllib2.URLError as err: 
-        return False'''
+    @staticmethod
+    def log(message: str):
+        logging.debug(message)
+
+    @classmethod
+    def is_connected(cls):
+        import socket
+        try:
+            host = socket.gethostbyname('cdn.contentstack.io')
+            s = socket.create_connection((host, 80), 2)
+            s.close()
+            return True
+        except:
+            pass
+        return False
+
+    def findUserAgent(self):
+        url = 'https://www.contentful.com'
+        headers = {
+            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36'}
+        response = requests.get(url, headers=headers)
+        print(response.content)
 
 
+utils = Util()
+status = utils.findUserAgent()
+print(status)

setup.py

@@ -18,7 +18,6 @@ def get_version():
 
 
 def read(fname):
-    """Read description from local file."""
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 
@@ -47,7 +46,15 @@ def read(fname):
         "Operating System :: OS Independent",
         'Intended Audience :: Developers',
         'Natural Language :: English',
-        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.1',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
     ],
+    test_suite='tests',
+
 )