Merge pull request #5 from storebrand/release_v1_2_0

Update version number

README.md

@@ -14,7 +14,6 @@ Built with the [Meltano Tap SDK](https://sdk.meltano.com) for Singer Taps.
 * `about`
 * `stream-maps`
 * `schema-flattening`
-* `batch`
 
 ## Settings
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tap-sharepointsites"
-version = "0.0.1"
+version = "1.2.0"
 description = "`tap-sharepointsites` is a Singer tap for sharepointsites, built with the Meltano Singer SDK."
 authors = ["Henning Holgersen"]
 keywords = [

tap_sharepointsites/file_handlers/csv_handler.py

@@ -2,7 +2,6 @@
 
 import csv
 import logging
-import re
 
 LOGGER = logging.getLogger(__name__)
 
@@ -15,13 +14,6 @@ def __init__(self, textcontent, delimiter=","):
         self.textcontent = textcontent
         self.delimiter = delimiter
 
-    @staticmethod
-    def format_key(key):
-        """Format key."""
-        formatted_key = re.sub(r"[^\w\s]", "", key)
-        formatted_key = re.sub(r"\s+", "_", formatted_key)
-        return formatted_key.lower()
-
     def get_dictreader(self):
         """Read CSV file and return csv DictReader object for the file."""
         dr = csv.DictReader(
@@ -31,6 +23,4 @@ def get_dictreader(self):
             delimiter=self.delimiter,
         )
 
-        dr.fieldnames = [self.format_key(key) for key in dr.fieldnames.copy()]
-
         return dr

tap_sharepointsites/file_handlers/excel_handler.py

@@ -1,7 +1,6 @@
 """Handle Excel files."""
 
 import logging
-import re
 import tempfile
 
 import openpyxl
@@ -36,8 +35,7 @@ def fieldnames(self):
         """Return fieldnames."""
         return [c.value for c in self.xlsheet[1]]
 
-    @staticmethod
-    def generator_wrapper(reader):
+    def generator_wrapper(self, reader):
         """Wrap a reader in a generator."""
         header_row = None
         for row in reader:
@@ -50,16 +48,11 @@ def generator_wrapper(reader):
                 header_cell = header_row[index]
 
                 formatted_key = header_cell.value
+
                 if not formatted_key:
                     formatted_key = ""  # default to empty string for key
 
-                # remove non-word, non-whitespace characters
-                formatted_key = re.sub(r"[^\w\s]", "", formatted_key)
-
-                # replace whitespace with underscores
-                formatted_key = re.sub(r"\s+", "_", formatted_key)
-
-                to_return[formatted_key.lower()] = (
+                to_return[formatted_key] = (
                     str(cell.value) if cell.value is not None else ""
                 )