Fixed object naming conventions to match python

Author: nuwang

genomespaceclient/client.py

@@ -25,10 +25,10 @@ class GSDataFormat(object):
     See: http://www.genomespace.org/support/api/restful-access-to-dm#appendix_c
     """
 
-    def __init__(self, name, url, fileExtension, description):
+    def __init__(self, name, url, file_extension, description):
         self.name = name
         self.url = url
-        self.fileExtension = fileExtension
+        self.file_extension = file_extension
         self.description = description
 
     @staticmethod
@@ -93,9 +93,9 @@ class GSAclObject(object):
     See: http://www.genomespace.org/support/api/restful-access-to-dm#acl
     """
 
-    def __init__(self, objectId, objectType):
-        self.objectId = objectId
-        self.objectType = objectType
+    def __init__(self, object_id, object_type):
+        self.object_id = object_id
+        self.object_type = object_type
 
     @staticmethod
     def from_json(json_data):
@@ -113,9 +113,9 @@ class GSEffectiveAcl(object):
     See: http://www.genomespace.org/support/api/restful-access-to-dm#appendix_f
     """
 
-    def __init__(self, accessControlEntries, effective_acl_object,
+    def __init__(self, access_control_entries, effective_acl_object,
                  effective_acl_id=None):
-        self.accessControlEntries = accessControlEntries
+        self.access_control_entries = access_control_entries
         self.object = effective_acl_object
         self.id = effective_acl_id
 
@@ -137,22 +137,22 @@ class GSFileMetadata(object):
     See: http://www.genomespace.org/support/api/restful-access-to-dm#appendix_a
     """
 
-    def __init__(self, name, path, url, parentUrl, size, owner, isDirectory,
-                 isLink, targetPath, lastModified, dataFormat,
-                 availableDataFormats, effectiveAcl):
+    def __init__(self, name, path, url, parentUrl, size, owner, is_directory,
+                 is_link, target_path, last_modified, data_format,
+                 available_data_formats, effective_acl):
         self.name = name
         self.path = path
         self.url = url
-        self.parentUrl = parentUrl
+        self.parent_url = parentUrl
         self.size = size
         self.owner = owner
-        self.isDirectory = isDirectory
-        self.isLink = isLink
-        self.targetPath = targetPath
-        self.lastModified = lastModified
-        self.dataFormat = dataFormat
-        self.availableDataFormats = availableDataFormats
-        self.effectiveAcl = effectiveAcl
+        self.is_directory = is_directory
+        self.is_link = is_link
+        self.target_path = target_path
+        self.last_modified = last_modified
+        self.data_format = data_format
+        self.available_data_formats = available_data_formats
+        self.effective_acl = effective_acl
 
     @staticmethod
     def from_json(json_data):
@@ -578,7 +578,7 @@ def isdir(self, genomespace_url):
         """
         try:
             md = self.get_metadata(genomespace_url)
-            return md.isDirectory
+            return md.is_directory
         except GSClientException:
             return False
         except HTTPError as e:

genomespaceclient/shell.py

@@ -41,10 +41,10 @@ def genomespace_list_files(args):
     for folder in folder_contents.contents:
         print("{isdir:<3s} {owner:<10s} {size:>10s} {last_modified:>26s}"
               " {name:s}".format(
-                  isdir="d" if folder.isDirectory else "_",
+                  isdir="d" if folder.is_directory else "_",
                   owner=folder.owner["name"] or "",
                   size=util.format_file_size(folder.size),
-                  last_modified=folder.lastModified or "",
+                  last_modified=folder.last_modified or "",
                   name=folder.name))
 
 

test/test_genomespace_client.py

@@ -70,7 +70,7 @@ def test_mkdir_rmdir(self):
         filelist = client.list(helpers.get_remote_test_folder())
         found_file = [f for f in filelist.contents
                       if self._adjust_gs_swift_bug(f.name) == remote_name1 and
-                      f.isDirectory]
+                      f.is_directory]
         self.assertTrue(len(found_file) == 1,
                         "Expected to find one created folder")
         # The recurse is needed to compensate for a bug in GenomeSpace swift
@@ -245,25 +245,25 @@ def test_get_metadata(self):
             metadata, GSFileMetadata,
             "Expected metadata to be of type GSFileMetadata")
         self.assertIsInstance(
-            metadata.dataFormat, GSDataFormat,
+            metadata.data_format, GSDataFormat,
             "Expected metadata's dataFormat to be of type GSDataFormat")
         self.assertIsInstance(
-            metadata.availableDataFormats, list,
+            metadata.available_data_formats, list,
             "Expected metadata's available formats to be of type list")
 
         owner = get_test_username()
         self.assertTrue(
             metadata.owner['name'] == owner,
             "Expected file to owned by uploader")
-        acl_object = metadata.effectiveAcl.object
+        acl_object = metadata.effective_acl.object
         self.assertTrue(
-            acl_object.objectId.endswith(remote_name),
+            acl_object.object_id.endswith(remote_name),
             "Expected acl object path of %s to end with %s" % (
-                acl_object.objectId, remote_name))
+                acl_object.object_id, remote_name))
         self.assertTrue(
-            acl_object.objectType == 'DataManagerFileObject',
+            acl_object.object_type == 'DataManagerFileObject',
             "Expected acl object type has changed?")
-        access_control_entries = metadata.effectiveAcl.accessControlEntries
+        access_control_entries = metadata.effective_acl.access_control_entries
         self.assertTrue(
             len(access_control_entries) == 2,
             "Expected only two entries in ACL")