Added datadrig improvemnts

Author: nithinmurali

pygsheets/datarange.py

@@ -118,6 +118,10 @@ def range(self):
         """Range in format A1:C5"""
         return format_addr(self._start_addr) + ':' + format_addr(self._end_addr)
 
+    @property
+    def worksheet(self):
+        return self._worksheet
+
     def link(self, update=True):
         """link the dstarange so that all propertis are synced right after setting them
 
@@ -211,8 +215,12 @@ def __eq__(self, other):
         return self.start_addr == other.start_addr and self.end_addr == other.end_addr and self.name == other.name
 
     def __repr__(self):
-        return '<%s %s %s protected:%s>' % (self.__class__.__name__,
-                                            str(self._name), str(self.range), self._protected)
+        range_str = self.range
+        if self.worksheet:
+            range_str = str(self.range)
+        protected_str = " protected" if self._protected else ""
+
+        return '<%s %s %s%s>' % (self.__class__.__name__, str(self._name), range_str, protected_str)
 
 
 class ProtectedRange(object):

pygsheets/spreadsheet.py

@@ -11,6 +11,7 @@
 import warnings
 
 from .worksheet import Worksheet
+from .datarange import DataRange
 from .exceptions import (WorksheetNotFound, RequestError,
                          InvalidArgumentValue, InvalidUser)
 from .custom_types import *
@@ -34,7 +35,7 @@ def __init__(self, client, jsonsheet=None, id=None):
         self._jsonsheet = jsonsheet
         self._id = id
         self._title = ''
-        self.named_ranges = []
+        self._named_ranges = []
         self.update_properties(jsonsheet)
         self._permissions = dict()
         self.batch_mode = False
@@ -54,6 +55,12 @@ def sheet1(self):
         """Shortcut property for getting the first worksheet."""
         return self.worksheet()
 
+    @property
+    def named_ranges(self):
+        """All named ranges in thi spreadsheet"""
+        return [DataRange(namedjson=x, name=x['name'], worksheet=self.worksheet('id', x['range'].get('sheetId', 0)))
+                for x in self._named_ranges]
+
     @property
     def defaultformat(self):
         """ deafault cell format"""
@@ -86,7 +93,7 @@ def update_properties(self, jsonsheet=None, fetch_sheets=True):
         self._title = self._jsonsheet['properties']['title']
         self._defaultFormat = self._jsonsheet['properties']['defaultFormat']
         self.client.spreadsheetId = self._id
-        self.named_ranges = self._jsonsheet.get('namedRanges', [])
+        self._named_ranges = self._jsonsheet.get('namedRanges', [])
 
     def _fetch_sheets(self, jsonsheet=None):
         """update sheets list"""

pygsheets/worksheet.py

@@ -456,7 +456,6 @@ def update_row(self, index, values, col_offset=0):
         """
         if type(values[0]) is not list:
             values = [values]
-        # colrange = format_addr((row_offset, index), 'label') + ":" + format_addr((row_offset+len(values[0])-1,
         colrange = format_addr((index, col_offset+1), 'label') + ':' + format_addr((index+len(values)-1,
                                                                                     col_offset+len(values[0])), 'label')
         self.update_cells(crange=colrange, values=values, majordim='ROWS')
@@ -558,8 +557,7 @@ def insert_rows(self, row, number=1, values=None, inherit=False):
             self.update_row(row+1, values)
 
     def clear(self, start='A1', end=None):
-        """
-        clears the worksheet by default, if range given then clears range
+        """clears the worksheet by default, if range given then clears range
 
         :param start: topright cell address
         :param end: bottom left cell of range
@@ -571,11 +569,12 @@ def clear(self, start='A1', end=None):
         self.client.sh_batch_clear(self.spreadsheet.id, body)
 
     def adjust_column_width(self, start, end=None, pixel_size=100):
-        """
-        Adjust the width of one or more columns
+        """Adjust the width of one or more columns
+
         :param start: index of the column to be resized
         :param end: index of the end column that will be resized
         :param pixel_size: width in pixels
+
         """
         if end is None or end <= start:
             end = start + 1
@@ -598,11 +597,12 @@ def adjust_column_width(self, start, end=None, pixel_size=100):
         self.client.sh_batch_update(self.spreadsheet.id, request, batch=self.spreadsheet.batch_mode)
 
     def adjust_row_height(self, start, end=None, pixel_size=100):
-        """
-        Adjust the height of one or more rows
+        """Adjust the height of one or more rows
+
         :param start: index of the row to be resized
         :param end: index of the end row that will be resized
         :param pixel_size: height in pixels
+
         """
         if end is None or end <= start:
             end = start + 1
@@ -673,6 +673,8 @@ def create_named_range(self, name, start, end):
         :param end: bottom right cell adress
 
         """
+        start = format_addr(start, 'tuple')
+        end = format_addr(end, 'tuple')
         request = {"addNamedRange": {
             "namedRange": {
                 "name": name,
@@ -685,42 +687,43 @@ def create_named_range(self, name, start, end):
                 }
             }}}
         self.client.sh_batch_update(self.spreadsheet.id, request, batch=self.spreadsheet.batch_mode)
-        self.spreadsheet.named_ranges.append(request['addNamedRange']['namedRange'])
         return DataRange(start, end, self, name)
 
     def get_named_ranges(self, name=''):
         """
         get a named range given name
-        :param name: Name of the named range to be retrived
-        :return: :class: DataRange
+
+        :param name: Name of the named range to be retrived, if omitted all ranges are retrived
+        :return: :class:`DataRange`
+
         """
         if name == '':
             self.spreadsheet.update_properties()
-            nrange = [DataRange(namedjson=x, name=x['name'], worksheet=self) for x in self.spreadsheet.named_ranges if
-                      x['range'].get('sheetId', 0) == self.id]
+            nrange = [x for x in self.spreadsheet.named_ranges if x.worksheet.id == self.id]
             return nrange
         else:
-            nrange = [x for x in self.spreadsheet.named_ranges if x['name'] == name and x['range'].get('sheetId', 0) == self.id]
+            nrange = [x for x in self.spreadsheet.named_ranges if x.name == name and x.worksheet.id == self.id]
             if len(nrange) == 0:
                 self.spreadsheet.update_properties()
-                nrange = [x for x in self.spreadsheet.named_ranges if
-                          x['name'] == name and x['range'].get('sheetId', 0) == self.id]
+                nrange = [x for x in self.spreadsheet.named_ranges if x.name == name and x.worksheet.id == self.id]
                 if len(nrange) == 0:
                     raise RangeNotFound(name)
-            return DataRange(namedjson=nrange[0], name=nrange[0]['name'], worksheet=self)
+            return nrange[0]
 
     def delete_named_range(self, name, range_id=''):
-        """
-        delete a named range
+        """delete a named range
+
         :param name: name of named range to be deleted
         :param range_id: id of the named range
+
         """
         if not range_id:
             range_id = self.get_named_ranges(name=name).name_id
         request = {'deleteNamedRange': {
             "namedRangeId": range_id,
         }}
         self.client.sh_batch_update(self.spreadsheet.id, request, batch=self.spreadsheet.batch_mode)
+        self.spreadsheet._named_ranges = [x for x in self.spreadsheet._named_ranges if x["namedRangeId"] != range_id]
 
     def set_dataframe(self, df, start, copy_index=False, copy_head=True, fit=False, escape_formulae=False, nan='NaN'):
         """
@@ -733,7 +736,6 @@ def set_dataframe(self, df, start, copy_index=False, copy_head=True, fit=False,
         :param fit: should the worksheet should be resized to fit the dataframe
         :param escape_formulae: If any value starts with an equals sign =, it will be
                prefixed with a apostrophe ', to avoid being interpreted as a formula.
-
         :param nan: value to replace NaN with
         """
         start = format_addr(start, 'tuple')
@@ -835,10 +837,9 @@ def export(self, fformat=ExportType.CSV, filename=None):
             raise InvalidArgumentValue("fformat should be of ExportType Enum")
 
     def copy_to(self, spreadsheet_id):
-        """
-        copy the worksheet to specified spreadsheet
-        :param spreadsheet_id: id to the spreadsheet to copy
+        """copy the worksheet to specified spreadsheet
 
+        :param spreadsheet_id: id of the spreadsheet to copy
         """
         self.client.sh_copy_worksheet(self.spreadsheet.id, self.id, spreadsheet_id)