From 80b3ecd88dcf1c5bbd3197f85b8903f95f506731 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 15:37:32 -0400
Subject: [PATCH 01/22] pep8-ify

---
 wordsmith/wordsmith.py | 87 ++++++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 38 deletions(-)

diff --git a/wordsmith/wordsmith.py b/wordsmith/wordsmith.py
index 3f417bb..32365cd 100644
--- a/wordsmith/wordsmith.py
+++ b/wordsmith/wordsmith.py
@@ -12,47 +12,58 @@
 from .project import Project
 from .exceptions import ProjectSlugError
 
+
 class Wordsmith(object):
-  """
-  Constructs a :class:`Wordsmith <Wordsmith>` object.
-
-  :param api_key: API key from Wordsmith.
-  :param base_url: (optional) String representing the base URL for the Wordsmith API per documentation at http://wordsmith.readme.io/v1/docs
-  :param user_agent: (optional) String representing the user agent that should be sent with each API request
-  """
-
-  def __init__(self, api_key, **kwargs):
-    self.projects = []
-    self.config = Configuration(api_key)
-    if 'base_url' in kwargs:
-      self.config.base_url = kwargs['base_url']
-    if 'user_agent' in kwargs:
-      self.config.user_agent = kwargs['user_agent']
-    response = requests.get(self.config.base_url + '/projects', headers=self.config.get_headers())
-    if response.status_code == 200:
-      for project_data in json.loads(response.text)['data']:
-        self.projects.append(Project(project_data['name'], project_data['slug'], project_data['schema'], project_data['templates'], self.config))
-
-  def project(self, slug):
     """
-    Get a Wordsmith project by slug
+    Constructs a :class:`Wordsmith <Wordsmith>` object.
 
-    :param slug: String representing the slug of the Wordmsith project
-    :return: :class:`Wordsmith <Project>`
-    :rtype: wordsmith.Project
+    :param api_key: API key from Wordsmith.
+    :param base_url: (optional) String representing the base URL for the
+                     Wordsmith API per documentation at
+                     http://wordsmith.readme.io/v1/docs
+    :param user_agent: (optional) String representing the user agent that
+                       should be sent with each API request
     """
-    matches = [project for project in self.projects if project.slug == slug]
-    if len(matches) == 1:
-      return matches[0]
-    else:
-      raise ProjectSlugError('{} is not a valid project slug.'.format(slug))
 
-  def find_project(self, name):
-    """
-    Find Wordsmith projects by project name
+    def __init__(self, api_key, **kwargs):
+        self.projects = []
+        self.config = Configuration(api_key)
+        if 'base_url' in kwargs:
+            self.config.base_url = kwargs['base_url']
+        if 'user_agent' in kwargs:
+            self.config.user_agent = kwargs['user_agent']
+        response = requests.get(self.config.base_url + '/projects',
+                                headers=self.config.get_headers())
+        if response.status_code == 200:
+            for project_data in json.loads(response.text)['data']:
+                self.projects.append(Project(project_data['name'],
+                                             project_data['slug'],
+                                             project_data['schema'],
+                                             project_data['templates'],
+                                             self.config))
 
-    :param name: String representing the name of the Wordsmith project
-    :return: :class:`list`
-    :rtype: list
-    """
-    return [project for project in self.projects if project.name == name]
+    def project(self, slug):
+        """
+        Get a Wordsmith project by slug
+
+        :param slug: String representing the slug of the Wordmsith project
+        :return: :class:`Wordsmith <Project>`
+        :rtype: wordsmith.Project
+        """
+        matches = [project for project in self.projects
+                   if project.slug == slug]
+        if len(matches) == 1:
+            return matches[0]
+        else:
+            raise ProjectSlugError(
+                                '{} is not a valid project slug.'.format(slug))
+
+    def find_project(self, name):
+        """
+        Find Wordsmith projects by project name
+
+        :param name: String representing the name of the Wordsmith project
+        :return: :class:`list`
+        :rtype: list
+        """
+        return [project for project in self.projects if project.name == name]

From f5388008d1b6533788b5abcdf5be4b238b3f5a64 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 15:49:50 -0400
Subject: [PATCH 02/22] pep8-ify the rest

---
 wordsmith/__init__.py      |  14 ++--
 wordsmith/configuration.py |  47 +++++++------
 wordsmith/exceptions.py    |  55 ++++++++-------
 wordsmith/narrative.py     | 141 +++++++++++++++++++++----------------
 wordsmith/project.py       |  71 ++++++++++---------
 wordsmith/template.py      |  71 +++++++++++--------
 6 files changed, 225 insertions(+), 174 deletions(-)

diff --git a/wordsmith/__init__.py b/wordsmith/__init__.py
index 5499376..ce8469d 100644
--- a/wordsmith/__init__.py
+++ b/wordsmith/__init__.py
@@ -1,11 +1,13 @@
-__title__ = 'wordsmith'
-__version__ = '0.5'
-__author__ = 'John Hegele'
-__copyright__ = 'Copyright 2016 Automated Insights'
-
 from .wordsmith import Wordsmith
 from .configuration import Configuration
 from .project import Project
 from .template import Template
 from .narrative import Narrative, Batch
-from .exceptions import (ProjectSlugError, TemplateSlugError, NarrativeGenerateError)
+from .exceptions import (ProjectSlugError,
+                         TemplateSlugError,
+                         NarrativeGenerateError)
+
+__title__ = 'wordsmith'
+__version__ = '0.5'
+__author__ = 'John Hegele'
+__copyright__ = 'Copyright 2016 Automated Insights'
diff --git a/wordsmith/configuration.py b/wordsmith/configuration.py
index 91414e1..a4274f5 100644
--- a/wordsmith/configuration.py
+++ b/wordsmith/configuration.py
@@ -6,28 +6,35 @@
 """
 from . import __version__
 
-class Configuration(object):
-  """
-    Constructs a :class:`Wordsmith <Configuration>` object.
 
-    :param api_key: API key from Wordsmith.
-    :param base_url: (optional) String representing the base URL for the Wordsmith API per documentation at http://wordsmith.readme.io/v1/docs
-    :param user_agent: (optional) String representing the user agent that should be sent with each API request
+class Configuration(object):
     """
+        Constructs a :class:`Wordsmith <Configuration>` object.
 
-  DEFAULT_URL = 'https://api.automatedinsights.com/v1'
-  DEFAULT_USER_AGENT = 'PythonSDK/' + __version__
+        :param api_key: API key from Wordsmith.
+        :param base_url: (optional) String representing the base URL for the
+                         Wordsmith API per documentation at
+                         http://wordsmith.readme.io/v1/docs
+        :param user_agent: (optional) String representing the user agent that
+                           should be sent with each API request
+        """
 
-  def __init__(self, api_key, **kwargs):
-    self.api_key = api_key
-    self.base_url = kwargs['base_url'] if 'base_url' in kwargs else self.DEFAULT_URL
-    self.user_agent = kwargs['user_agent'] if 'user_agent' in kwargs else self.DEFAULT_USER_AGENT
+    DEFAULT_URL = 'https://api.automatedinsights.com/v1'
+    DEFAULT_USER_AGENT = 'PythonSDK/' + __version__
 
-  def get_headers(self):
-    """
-    Format user agent and auth values as a dictionary for use in GET/POST requests to the API
-    """
-    return {
-      'User-Agent' : self.user_agent,
-      'Authorization' : 'Bearer ' + self.api_key
-    }
+    def __init__(self, api_key, **kwargs):
+        self.api_key = api_key
+        self.base_url = kwargs['base_url'] if 'base_url' in kwargs\
+            else self.DEFAULT_URL
+        self.user_agent = kwargs['user_agent'] if 'user_agent' in kwargs\
+            else self.DEFAULT_USER_AGENT
+
+    def get_headers(self):
+        """
+        Format user agent and auth values as a dictionary for use in GET/POST
+        requests to the API
+        """
+        return {
+            'User-Agent': self.user_agent,
+            'Authorization': 'Bearer ' + self.api_key
+        }
diff --git a/wordsmith/exceptions.py b/wordsmith/exceptions.py
index 40937f2..30ae05b 100644
--- a/wordsmith/exceptions.py
+++ b/wordsmith/exceptions.py
@@ -5,34 +5,41 @@
 This module contains Wordsmith's custom exceptions.
 """
 
+
 class ProjectSlugError(ValueError):
-  """An invalid project slug was passed."""
+    """An invalid project slug was passed."""
+
+    def __init__(self, msg):
+        self.msg = msg
 
-  def __init__(self, msg):
-    self.msg = msg
 
 class TemplateSlugError(ValueError):
-  """An invalid template slug was passed."""
+    """An invalid template slug was passed."""
+
+    def __init__(self, msg):
+        self.msg = msg
 
-  def __init__(self, msg):
-    self.msg = msg
 
 class NarrativeGenerateError(Exception):
-  """The Wordsmith platform responded with an error code when attempting to generate narrative."""
-
-  def __init__(self, response, data):
-    """Initialize with the HTTP response object"""
-    self.http_status_code = response.status_code
-    self.http_reason = response.reason
-    self.data = data
-    try:
-      self.details = [str(e['detail']) for e in response.json()['errors']]
-      self._details_reported = True
-    except KeyError:
-      self.details = ['Wordsmith reported an error but no details were provided.']
-      self._details_reported = False
-    self.msg = '\nError generating narrative.' + \
-               '\nHTTP Status Code: {}'.format(self.http_status_code) + \
-               '\nHTTP Reason: {}'.format(self.http_reason) + \
-               '\nNumber of errors reported by Wordsmith: {}'.format(len(self.details) if self._details_reported else 0)
-    super(NarrativeGenerateError, self).__init__(self.msg)
+    """The Wordsmith platform responded with an error code when attempting to
+    generate narrative."""
+
+    def __init__(self, response, data):
+        """Initialize with the HTTP response object"""
+        self.http_status_code = response.status_code
+        self.http_reason = response.reason
+        self.data = data
+        try:
+            self.details = [str(e['detail'])
+                            for e in response.json()['errors']]
+            self._details_reported = True
+        except KeyError:
+            self.details =\
+                  ['Wordsmith reported an error but no details were provided.']
+            self._details_reported = False
+        self.msg = '\nError generating narrative.' + \
+                   '\nHTTP Status Code: {}'.format(self.http_status_code) + \
+                   '\nHTTP Reason: {}'.format(self.http_reason) + \
+                   '\nNumber of errors reported by Wordsmith: {}'.\
+                   format(len(self.details) if self._details_reported else 0)
+        super(NarrativeGenerateError, self).__init__(self.msg)
diff --git a/wordsmith/narrative.py b/wordsmith/narrative.py
index 9a954fb..671c8d7 100644
--- a/wordsmith/narrative.py
+++ b/wordsmith/narrative.py
@@ -11,74 +11,93 @@
 from multiprocessing.dummy import Pool
 from .exceptions import NarrativeGenerateError
 
+
 class Narrative(object):
-  """
-  Constructs a :class:`Wordsmith <Narrative>` object.
+    """
+    Constructs a :class:`Wordsmith <Narrative>` object.
+
+    :param project_slug: String representing the slug of the parent project of
+                         this narrative
+    :param template_slug: String representing the slug of the parent template
+                          of this narrative
+    :param data: Dictionary representation of the row data to be passed to the
+                 Wordsmith platform
+    :param config: wordsmith.Configuration object containing configuration
+                   details
+    """
 
-  :param project_slug: String representing the slug of the parent project of this narrative
-  :param template_slug: String representing the slug of the parent template of this narrative
-  :param data: Dictionary representation of the row data to be passed to the Wordsmith platform
-  :param config: wordsmith.Configuration object containing configuration details
-  """
+    def __init__(self, project_slug, template_slug, data, config):
+        self.project_slug = project_slug
+        self.template_slug = template_slug
+        self.data = data
+        self._config = config
+        self.post_url = '{}/projects/{}/templates/{}/outputs'\
+                        .format(self._config.base_url,
+                                self.project_slug,
+                                self.template_slug)
+        headers = self._config.get_headers()
+        headers['Content-Type'] = 'application/json'
+        for header, value in six.iteritems(data):
+            if value is None:
+                data[header] = ''
+        ws_data = {
+            'data': data
+        }
+        response = requests.post(self.post_url,
+                                 data=json.dumps(ws_data),
+                                 headers=headers)
+        if response.status_code == 200:
+            self.text = json.loads(response.text)['data']['content']
+        else:
+            self.text = None
+            raise NarrativeGenerateError(response, data)
 
-  def __init__(self, project_slug, template_slug, data, config):
-    self.project_slug = project_slug
-    self.template_slug = template_slug
-    self.data = data
-    self._config = config
-    self.post_url = '{}/projects/{}/templates/{}/outputs'.format(self._config.base_url, self.project_slug, self.template_slug)
-    headers = self._config.get_headers()
-    headers['Content-Type'] = 'application/json'
-    for header, value in six.iteritems(data):
-      if value is None:
-        data[header] = ''
-    ws_data = {
-      'data' : data
-    }
-    response = requests.post(self.post_url, data=json.dumps(ws_data), headers=headers)
-    if response.status_code == 200:
-      self.text = json.loads(response.text)['data']['content']
-    else:
-      self.text = None
-      raise NarrativeGenerateError(response, data)
+        def __str__(self):
+            return self.text
 
-    def __str__(self):
-      return self.text
 
 class Batch(object):
-  """
-  Constructs a :class:`Wordsmith <NarrativeBatch>` object.
+    """
+    Constructs a :class:`Wordsmith <NarrativeBatch>` object.
 
-  :param project_slug: String representing the slug of the parent project of this narrative
-  :param template_slug: String representing the slug of the parent template of this narrative
-  :param data_list: List of dictionary representations of the row data to be passed to the Wordsmith platform
-  :param config: wordsmith.Configuration object containing configuration details
-  """
+    :param project_slug: String representing the slug of the parent project of
+                         this narrative
+    :param template_slug: String representing the slug of the parent template
+                          of this narrative
+    :param data_list: List of dictionary representations of the row data to be
+                      passed to the Wordsmith platform
+    :param config: wordsmith.Configuration object containing configuration
+                   details
+    """
 
-  def __init__(self, project_slug, template_slug, data_list, config):
-    self.project_slug = project_slug
-    self.template_slug = template_slug
-    self.data_list = data_list
-    self._config = config
-    self.break_on_error = False
-    self.pool_size = 8
-    self.narratives = []
-    self.errors = []
+    def __init__(self, project_slug, template_slug, data_list, config):
+        self.project_slug = project_slug
+        self.template_slug = template_slug
+        self.data_list = data_list
+        self._config = config
+        self.break_on_error = False
+        self.pool_size = 8
+        self.narratives = []
+        self.errors = []
 
-  def _generate_narrative(self, data):
-    narrative = None
-    try:
-      narrative = Narrative(self.project_slug, self.template_slug, data, self._config)
-    except NarrativeGenerateError as e:
-      if self.break_on_error:
-        raise e
-      else:
-        self.errors.append(e)
-    return narrative
+    def _generate_narrative(self, data):
+        narrative = None
+        try:
+            narrative = Narrative(self.project_slug,
+                                  self.template_slug,
+                                  data,
+                                  self._config)
+        except NarrativeGenerateError as e:
+            if self.break_on_error:
+                raise e
+            else:
+                self.errors.append(e)
+        return narrative
 
-  def generate(self):
-    self._index = 0
-    thread_pool = Pool(self.pool_size)
-    self.narratives = thread_pool.map(self._generate_narrative, self.data_list)
-    thread_pool.close()
-    thread_pool.join()
+    def generate(self):
+        self._index = 0
+        thread_pool = Pool(self.pool_size)
+        self.narratives = thread_pool.map(self._generate_narrative,
+                                          self.data_list)
+        thread_pool.close()
+        thread_pool.join()
diff --git a/wordsmith/project.py b/wordsmith/project.py
index 937396c..85ae271 100644
--- a/wordsmith/project.py
+++ b/wordsmith/project.py
@@ -7,37 +7,44 @@
 from .template import Template
 from .exceptions import TemplateSlugError
 
+
 class Project(object):
 
-  def __init__(self, name, slug, schema, templates, config):
-    self._config = config
-    self.templates = []
-    self.name = name
-    self.slug = slug
-    self.schema = schema
-    for template_data in templates:
-      self.templates.append(Template(self.slug, template_data['name'], template_data['slug'], self._config))
-
-  def template(self, slug):
-    """
-    Get a Wordsmith template by slug
-
-    :param slug: String representing the slug of the Wordmsith template
-    :return: :class:`Wordsmith <Template>`
-    :rtype: wordsmith.Template
-    """
-    matches = [template for template in self.templates if template.slug == slug]
-    if len(matches) == 1:
-      return matches[0]
-    else:
-      raise TemplateSlugError('{} is not a valid template slug.'.format(slug))
-
-  def find_template(self, name):
-    """
-    Find Wordsmith templates by template name
-
-    :param name: String representing the name of the Wordsmith template
-    :return: :class:`list`
-    :rtype: list
-    """
-    return [template for template in self.templates if template.name == name]
+    def __init__(self, name, slug, schema, templates, config):
+        self._config = config
+        self.templates = []
+        self.name = name
+        self.slug = slug
+        self.schema = schema
+        for template_data in templates:
+            self.templates.append(Template(self.slug,
+                                           template_data['name'],
+                                           template_data['slug'],
+                                           self._config))
+
+    def template(self, slug):
+        """
+        Get a Wordsmith template by slug
+
+        :param slug: String representing the slug of the Wordmsith template
+        :return: :class:`Wordsmith <Template>`
+        :rtype: wordsmith.Template
+        """
+        matches = [template for template in self.templates
+                   if template.slug == slug]
+        if len(matches) == 1:
+            return matches[0]
+        else:
+            raise TemplateSlugError('{} is not a valid template slug.'
+                                    .format(slug))
+
+    def find_template(self, name):
+        """
+        Find Wordsmith templates by template name
+
+        :param name: String representing the name of the Wordsmith template
+        :return: :class:`list`
+        :rtype: list
+        """
+        return [template for template in self.templates
+                if template.name == name]
diff --git a/wordsmith/template.py b/wordsmith/template.py
index 6d64e44..7a54e09 100644
--- a/wordsmith/template.py
+++ b/wordsmith/template.py
@@ -8,40 +8,49 @@
 import requests
 import json
 from multiprocessing.dummy import Pool
-
 from .narrative import Narrative, Batch
 
-class Template(object):
-  """
-  Constructs a :class:`Wordsmith <Template>` object.
-
-  :param project_slug: String representing the slug of the parent project of this template
-  :param template_data: Dictionary representation of the template data for a single project in the project list JSON response from Wordsmith.
-  :param config: wordsmith.Configuration object containing configuration details
-  """
 
-  def __init__(self, project_slug, name, slug, config):
-    self.project_slug = project_slug
-    self.name = name
-    self.slug = slug
-    self._config = config
-
-  def generate_narrative(self, data):
-    """
-    Generate a single narrative from this template
-
-    :param data: Dictionary of key, value pairs where the value represents the Wordsmith column name and the value represents the value of that column
-    :rtype: wordsmith.narrative.Narrative
+class Template(object):
     """
-    return Narrative(self.project_slug, self.slug, data, self._config)
-
-  def batch_narrative(self, data_list):
+    Constructs a :class:`Wordsmith <Template>` object.
+
+    :param project_slug: String representing the slug of the parent project of
+                         this template
+    :param template_data: Dictionary representation of the template data for a
+                          single project in the project list JSON response from
+                          Wordsmith.
+    :param config: wordsmith.Configuration object containing configuration
+                   details
     """
-    Bulk generate multiple rows of data using multithreaded processing
 
-    :param data_list: List of dictionaries where key, value pairs represent the Wordsmith column name and column value respectively
-    :param pool_size: (optional) Int representing the number of workers to allocate to this job
-    :return: :class:`list`
-    :rtype: wordsmith.narrative.NarrativeBatch
-    """
-    return Batch(self.project_slug, self.slug, data_list, self._config)
+    def __init__(self, project_slug, name, slug, config):
+        self.project_slug = project_slug
+        self.name = name
+        self.slug = slug
+        self._config = config
+
+    def generate_narrative(self, data):
+        """
+        Generate a single narrative from this template
+
+        :param data: Dictionary of key, value pairs where the value represents
+                     the Wordsmith column name and the value represents the
+                     value of that column
+        :rtype: wordsmith.narrative.Narrative
+        """
+        return Narrative(self.project_slug, self.slug, data, self._config)
+
+    def batch_narrative(self, data_list):
+        """
+        Bulk generate multiple rows of data using multithreaded processing
+
+        :param data_list: List of dictionaries where key, value pairs represent
+                          the Wordsmith column name and column value
+                          respectively
+        :param pool_size: (optional) Int representing the number of workers to
+                          allocate to this job
+        :return: :class:`list`
+        :rtype: wordsmith.narrative.NarrativeBatch
+        """
+        return Batch(self.project_slug, self.slug, data_list, self._config)

From c8b27288e10fb647df64ee51556c51866d5a1837 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 16:33:08 -0400
Subject: [PATCH 03/22] add pr template

---
 PULL_REQUEST_TEMPLATE.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 PULL_REQUEST_TEMPLATE.md

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..386b244
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,21 @@
+#### Background context for this PR
+
+#### What does this PR do?
+- [x] Something that's complete
+- [ ] Something that's still in progress
+
+#### Impacted areas in application
+- A page affected
+- A library affected
+
+#### How should PR reviewers test this?
+- Unit tests:
+  - `rake` (...OR replace with specific test files to run)
+- Manual tests:
+  - What features need to be on or off?
+  - Detailed description of how to reproduce
+  - ...what page
+  - ...test data
+  - ...etc
+
+#### Would you like specific feedback on anything?

From a2f0e01ac1838c5f1ff9f213944b4780c9553689 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 16:48:01 -0400
Subject: [PATCH 04/22] remove reference to rake

---
 PULL_REQUEST_TEMPLATE.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 386b244..7d054a1 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,6 @@
 
 #### How should PR reviewers test this?
 - Unit tests:
-  - `rake` (...OR replace with specific test files to run)
 - Manual tests:
   - What features need to be on or off?
   - Detailed description of how to reproduce

From bde5fe6df66b228a9252a437801ff0be83125165 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 16:51:35 -0400
Subject: [PATCH 05/22] switch order of imports

---
 wordsmith/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wordsmith/__init__.py b/wordsmith/__init__.py
index ce8469d..3935c9b 100644
--- a/wordsmith/__init__.py
+++ b/wordsmith/__init__.py
@@ -1,3 +1,8 @@
+__title__ = 'wordsmith'
+__version__ = '0.5'
+__author__ = 'John Hegele'
+__copyright__ = 'Copyright 2016 Automated Insights'
+
 from .wordsmith import Wordsmith
 from .configuration import Configuration
 from .project import Project
@@ -6,8 +11,3 @@
 from .exceptions import (ProjectSlugError,
                          TemplateSlugError,
                          NarrativeGenerateError)
-
-__title__ = 'wordsmith'
-__version__ = '0.5'
-__author__ = 'John Hegele'
-__copyright__ = 'Copyright 2016 Automated Insights'

From 3c610ea6e739327c9bbf4e1be4ad68e6d122b5cf Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 16:52:01 -0400
Subject: [PATCH 06/22] removed extra projects from expected project list

---
 tests/test_wordsmith.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tests/test_wordsmith.py b/tests/test_wordsmith.py
index cb7685f..fec5f33 100644
--- a/tests/test_wordsmith.py
+++ b/tests/test_wordsmith.py
@@ -17,22 +17,14 @@ def test_config_specifying_base_url(self):
     def test_list_all_projects(self):
         #ws = Wordsmith(API_KEY)
         projects = [project.name for project in self.ws.projects]
-        assert projects == ['Real Estate',
-                            'Ecommerce',
-                            'Business Intelligence',
-                            'Tutorial',
-                            'Test']
+        assert projects == ['Test']
 
     def test_list_all_projects_with_custom_base_url(self):
         ws = Wordsmith(API_KEY,
                        user_agent='python sdk test suite',
                        base_url='https://api.automatedinsights.com/v1')
         projects = [project.name for project in ws.projects]
-        assert projects == ['Real Estate',
-                            'Ecommerce',
-                            'Business Intelligence',
-                            'Tutorial',
-                            'Test']
+        assert projects == ['Test']
 
     def test_find_project_by_slug(self):
         project = self.ws.project('test')
@@ -47,8 +39,8 @@ def test_bad_template_raises_error(self):
             template = self.ws.project('test').template('fake template')
 
     def test_find_project_by_name(self):
-        matches = self.ws.find_project('Real Estate')
-        assert matches[0].name == 'Real Estate'
+        matches = self.ws.find_project('Test')
+        assert matches[0].name == 'Test'
 
     def test_find_template_that_exists(self):
         matches = self.ws.project('test').find_template('Test')

From 388409d76c4622de975d51d1745d9bc8c395d1f2 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 16:54:30 -0400
Subject: [PATCH 07/22] pep8-ify tests

---
 tests/test_wordsmith.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/tests/test_wordsmith.py b/tests/test_wordsmith.py
index fec5f33..a8567ce 100644
--- a/tests/test_wordsmith.py
+++ b/tests/test_wordsmith.py
@@ -1,8 +1,12 @@
 import pytest
-from wordsmith import Wordsmith, ProjectSlugError, TemplateSlugError, NarrativeGenerateError
+from wordsmith import (Wordsmith,
+                       ProjectSlugError,
+                       TemplateSlugError,
+                       NarrativeGenerateError)
 
 API_KEY = '923b278a6088675262af64ceb437bab31d7ebc6b07aaf89f88b0b88dd4fe2a97'
 
+
 class TestWordsmith(object):
 
     def setup(self):
@@ -13,9 +17,7 @@ def test_config_specifying_base_url(self):
                        user_agent='python sdk test suite',
                        base_url='https://api.automatedinsights.com/v1')
 
-
     def test_list_all_projects(self):
-        #ws = Wordsmith(API_KEY)
         projects = [project.name for project in self.ws.projects]
         assert projects == ['Test']
 
@@ -52,12 +54,14 @@ def test_find_template_that_doesnt_exist(self):
 
     def test_generate_narrative(self):
         data = {'a': 1, 'b': 1, 'c': 1}
-        narr = self.ws.project('test').template('test').generate_narrative(data).text
+        narr = self.ws.project('test')\
+            .template('test').generate_narrative(data).text
         assert narr == 'The value of A is 1.'
 
     def test_batch_generate_narrative(self):
         data = [{'a': i, 'b': i, 'c': i} for i in range(10)]
-        expected_outputs = ['The value of A is {}.'.format(i) for i in range(10)]
+        expected_outputs = ['The value of A is {}.'.format(i)
+                            for i in range(10)]
         narrs = self.ws.project('test').template('test').batch_narrative(data)
         narrs.generate()
         for expected, actual in zip(expected_outputs, narrs.narratives):
@@ -72,11 +76,14 @@ def test_bad_batch_generate_no_break(self):
         narrs = self.ws.project('test').template('test').batch_narrative(data)
         narrs.break_on_error = False
         narrs.generate()
-        expected_narratives = ['The value of A is 1.', None, 'The value of A is 1.']
+        expected_narratives = ['The value of A is 1.',
+                               None,
+                               'The value of A is 1.']
         actual_narratives = []
         for n in narrs.narratives:
             actual_narratives.append(n.text if n is not None else None)
-        assert (expected_narratives == actual_narratives) and (len(narrs.errors) == 1)
+        assert (expected_narratives == actual_narratives)\
+            and (len(narrs.errors) == 1)
 
     def test_bad_batch_generate_break(self):
         with pytest.raises(NarrativeGenerateError):
@@ -85,11 +92,13 @@ def test_bad_batch_generate_break(self):
                 {'d': 1, 'e': 1},
                 {'a': 1, 'b': 1, 'c': 1}
             ]
-            narrs = self.ws.project('test').template('test').batch_narrative(data)
+            narrs = self.ws.project('test')\
+                .template('test').batch_narrative(data)
             narrs.break_on_error = True
             narrs.generate()
 
     def test_wordsmith_400_error(self):
         with pytest.raises(NarrativeGenerateError):
             data = {'not_a_valid_column': 0}
-            narr = self.ws.project('test').template('test').generate_narrative(data)
+            narr = self.ws.project('test')\
+                .template('test').generate_narrative(data)

From f4e3b3b17d1b7d8b4cbc10312bd01e78f38534c0 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 17:23:59 -0400
Subject: [PATCH 08/22] DRY out test classes by inheriting a configured
 Wordsmith object

---
 tests/fixtures.py       | 13 +++++++++++++
 tests/test_wordsmith.py |  7 +++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 tests/fixtures.py

diff --git a/tests/fixtures.py b/tests/fixtures.py
new file mode 100644
index 0000000..f5e09d6
--- /dev/null
+++ b/tests/fixtures.py
@@ -0,0 +1,13 @@
+import pytest
+from wordsmith import (Wordsmith,
+                       ProjectSlugError,
+                       TemplateSlugError,
+                       NarrativeGenerateError)
+
+API_KEY = '923b278a6088675262af64ceb437bab31d7ebc6b07aaf89f88b0b88dd4fe2a97'
+
+
+class TestWordsmith(object):
+
+    def initialize(self):
+        return Wordsmith(API_KEY, user_agent='python sdk test suite')
diff --git a/tests/test_wordsmith.py b/tests/test_wordsmith.py
index a8567ce..358369f 100644
--- a/tests/test_wordsmith.py
+++ b/tests/test_wordsmith.py
@@ -3,14 +3,13 @@
                        ProjectSlugError,
                        TemplateSlugError,
                        NarrativeGenerateError)
+from tests.fixtures import TestWordsmith
 
-API_KEY = '923b278a6088675262af64ceb437bab31d7ebc6b07aaf89f88b0b88dd4fe2a97'
 
-
-class TestWordsmith(object):
+class TestSomeStuff(TestWordsmith):
 
     def setup(self):
-        self.ws = Wordsmith(API_KEY, user_agent='python sdk test suite')
+        self.ws = super().initialize()
 
     def test_config_specifying_base_url(self):
         ws = Wordsmith(API_KEY,

From 3d8a63f266d1f71559246b062d628cf1e68d6d6b Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 17:43:58 -0400
Subject: [PATCH 09/22] started porting ruby tests

---
 tests/fixtures.py       |  4 ++--
 tests/test_config.py    | 21 +++++++++++++++++++++
 tests/test_wordsmith.py |  4 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 tests/test_config.py

diff --git a/tests/fixtures.py b/tests/fixtures.py
index f5e09d6..c66ce96 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -9,5 +9,5 @@
 
 class TestWordsmith(object):
 
-    def initialize(self):
-        return Wordsmith(API_KEY, user_agent='python sdk test suite')
+    def initialize(self, **kwargs):
+        return Wordsmith(API_KEY, user_agent='python sdk test suite', **kwargs)
diff --git a/tests/test_config.py b/tests/test_config.py
new file mode 100644
index 0000000..f29d014
--- /dev/null
+++ b/tests/test_config.py
@@ -0,0 +1,21 @@
+import pytest
+from wordsmith import (Wordsmith,
+                       ProjectSlugError,
+                       TemplateSlugError,
+                       NarrativeGenerateError)
+from tests.fixtures import TestWordsmith
+
+
+class TestConfig(TestWordsmith):
+
+    def setup(self):
+        self.ws = super().initialize()
+
+    def test_set_token_value(self):
+        token = 'my_token'
+        ws = Wordsmith(token)
+        assert ws.config.api_key == token
+
+    def test_default_url(self):
+        assert self.ws.config.base_url \
+            == 'https://api.automatedinsights.com/v1'
diff --git a/tests/test_wordsmith.py b/tests/test_wordsmith.py
index 358369f..3b6cdf3 100644
--- a/tests/test_wordsmith.py
+++ b/tests/test_wordsmith.py
@@ -12,7 +12,7 @@ def setup(self):
         self.ws = super().initialize()
 
     def test_config_specifying_base_url(self):
-        ws = Wordsmith(API_KEY,
+        ws = Wordsmith(self.ws.config.api_key,
                        user_agent='python sdk test suite',
                        base_url='https://api.automatedinsights.com/v1')
 
@@ -21,7 +21,7 @@ def test_list_all_projects(self):
         assert projects == ['Test']
 
     def test_list_all_projects_with_custom_base_url(self):
-        ws = Wordsmith(API_KEY,
+        ws = Wordsmith(self.ws.config.api_key,
                        user_agent='python sdk test suite',
                        base_url='https://api.automatedinsights.com/v1')
         projects = [project.name for project in ws.projects]

From 3b68a9f1c8737109ba8e413318ea6784147ad12e Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 18:05:14 -0400
Subject: [PATCH 10/22] add ability for custom version number

---
 wordsmith/configuration.py | 5 ++++-
 wordsmith/wordsmith.py     | 6 +-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wordsmith/configuration.py b/wordsmith/configuration.py
index a4274f5..cffd458 100644
--- a/wordsmith/configuration.py
+++ b/wordsmith/configuration.py
@@ -19,7 +19,8 @@ class Configuration(object):
                            should be sent with each API request
         """
 
-    DEFAULT_URL = 'https://api.automatedinsights.com/v1'
+    DEFAULT_VERSION = '1'
+    DEFAULT_URL = 'https://api.automatedinsights.com/v' + DEFAULT_VERSION
     DEFAULT_USER_AGENT = 'PythonSDK/' + __version__
 
     def __init__(self, api_key, **kwargs):
@@ -28,6 +29,8 @@ def __init__(self, api_key, **kwargs):
             else self.DEFAULT_URL
         self.user_agent = kwargs['user_agent'] if 'user_agent' in kwargs\
             else self.DEFAULT_USER_AGENT
+        self.version = kwargs['version'] if 'version' in kwargs\
+            else self.DEFAULT_VERSION
 
     def get_headers(self):
         """
diff --git a/wordsmith/wordsmith.py b/wordsmith/wordsmith.py
index 32365cd..5c2960c 100644
--- a/wordsmith/wordsmith.py
+++ b/wordsmith/wordsmith.py
@@ -27,11 +27,7 @@ class Wordsmith(object):
 
     def __init__(self, api_key, **kwargs):
         self.projects = []
-        self.config = Configuration(api_key)
-        if 'base_url' in kwargs:
-            self.config.base_url = kwargs['base_url']
-        if 'user_agent' in kwargs:
-            self.config.user_agent = kwargs['user_agent']
+        self.config = Configuration(api_key, **kwargs)
         response = requests.get(self.config.base_url + '/projects',
                                 headers=self.config.get_headers())
         if response.status_code == 200:

From c3746a44684483d92d2641d2b84b5d3e87f1b7ae Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Tue, 23 May 2017 18:05:30 -0400
Subject: [PATCH 11/22] more ruby tests ported

---
 tests/test_config.py  | 17 +++++++++++++----
 tests/test_project.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 tests/test_project.py

diff --git a/tests/test_config.py b/tests/test_config.py
index f29d014..66792d9 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,8 +1,5 @@
 import pytest
-from wordsmith import (Wordsmith,
-                       ProjectSlugError,
-                       TemplateSlugError,
-                       NarrativeGenerateError)
+from wordsmith import Wordsmith
 from tests.fixtures import TestWordsmith
 
 
@@ -19,3 +16,15 @@ def test_set_token_value(self):
     def test_default_url(self):
         assert self.ws.config.base_url \
             == 'https://api.automatedinsights.com/v1'
+
+    def test_config_specifying_base_url(self):
+        new_url = 'www.new_url.com'
+        ws = Wordsmith(self.ws.config.api_key,
+                       user_agent='python sdk test suite',
+                       base_url=new_url)
+        assert ws.config.base_url == new_url
+
+    def test_set_new_version(self):
+        new_version = 'a_new_version'
+        ws = Wordsmith('my_token', version=new_version)
+        assert ws.config.version == new_version
diff --git a/tests/test_project.py b/tests/test_project.py
new file mode 100644
index 0000000..080e357
--- /dev/null
+++ b/tests/test_project.py
@@ -0,0 +1,28 @@
+import pytest
+from wordsmith import Wordsmith
+from tests.fixtures import TestWordsmith
+
+
+class TestProject(TestWordsmith):
+
+    def setup(self):
+        self.ws = super().initialize()
+
+    def test_list_all_projects(self):
+        projects = [project.name for project in self.ws.projects]
+        assert projects == ['Test']
+
+    def test_list_all_projects_with_custom_base_url(self):
+        ws = Wordsmith(self.ws.config.api_key,
+                       user_agent='python sdk test suite',
+                       base_url='https://api.automatedinsights.com/v1')
+        projects = [project.name for project in ws.projects]
+        assert projects == ['Test']
+
+    def test_find_project_by_slug(self):
+        project = self.ws.project('test')
+        assert project.name == 'Test'
+
+    def test_bad_project_raises_error(self):
+        with pytest.raises(ProjectSlugError):
+            project = self.ws.project('fake project')

From 8f2c8edd13e5069b18dbc90c9b7568ea612cd040 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Wed, 24 May 2017 10:22:17 -0400
Subject: [PATCH 12/22] finished test refactor

---
 tests/test_batch_generate.py |  54 ++++++++++++++++++
 tests/test_config.py         |   7 ---
 tests/test_project.py        |  17 +++++-
 tests/test_template.py       |  32 +++++++++++
 tests/test_wordsmith.py      | 103 -----------------------------------
 5 files changed, 102 insertions(+), 111 deletions(-)
 create mode 100644 tests/test_batch_generate.py
 create mode 100644 tests/test_template.py
 delete mode 100644 tests/test_wordsmith.py

diff --git a/tests/test_batch_generate.py b/tests/test_batch_generate.py
new file mode 100644
index 0000000..3c81dc1
--- /dev/null
+++ b/tests/test_batch_generate.py
@@ -0,0 +1,54 @@
+import pytest
+from wordsmith import NarrativeGenerateError
+from tests.fixtures import TestWordsmith
+
+
+class TestProject(TestWordsmith):
+
+    def setup(self):
+        self.ws = super().initialize()
+
+    def test_batch_generate_narrative(self):
+        data = [{'a': i, 'b': i, 'c': i} for i in range(10)]
+        expected_outputs = ['The value of A is {}.'.format(i)
+                            for i in range(10)]
+        narrs = self.ws.project('test').template('test').batch_narrative(data)
+        narrs.generate()
+        for expected, actual in zip(expected_outputs, narrs.narratives):
+            assert expected == actual.text
+
+    def test_bad_batch_generate_no_break(self):
+        data = [
+            {'a': 1, 'b': 1, 'c': 1},
+            {'d': 1, 'e': 1},
+            {'a': 1, 'b': 1, 'c': 1}
+        ]
+        narrs = self.ws.project('test').template('test').batch_narrative(data)
+        narrs.break_on_error = False
+        narrs.generate()
+        expected_narratives = ['The value of A is 1.',
+                               None,
+                               'The value of A is 1.']
+        actual_narratives = []
+        for n in narrs.narratives:
+            actual_narratives.append(n.text if n is not None else None)
+        assert (expected_narratives == actual_narratives)\
+            and (len(narrs.errors) == 1)
+
+    def test_bad_batch_generate_break(self):
+        with pytest.raises(NarrativeGenerateError):
+            data = [
+                {'a': 1, 'b': 1, 'c': 1},
+                {'d': 1, 'e': 1},
+                {'a': 1, 'b': 1, 'c': 1}
+            ]
+            narrs = self.ws.project('test')\
+                .template('test').batch_narrative(data)
+            narrs.break_on_error = True
+            narrs.generate()
+
+    def test_wordsmith_400_error(self):
+        with pytest.raises(NarrativeGenerateError):
+            data = {'not_a_valid_column': 0}
+            narr = self.ws.project('test')\
+                .template('test').generate_narrative(data)
diff --git a/tests/test_config.py b/tests/test_config.py
index 66792d9..7f75f03 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -17,13 +17,6 @@ def test_default_url(self):
         assert self.ws.config.base_url \
             == 'https://api.automatedinsights.com/v1'
 
-    def test_config_specifying_base_url(self):
-        new_url = 'www.new_url.com'
-        ws = Wordsmith(self.ws.config.api_key,
-                       user_agent='python sdk test suite',
-                       base_url=new_url)
-        assert ws.config.base_url == new_url
-
     def test_set_new_version(self):
         new_version = 'a_new_version'
         ws = Wordsmith('my_token', version=new_version)
diff --git a/tests/test_project.py b/tests/test_project.py
index 080e357..aa2cb9d 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -1,5 +1,5 @@
 import pytest
-from wordsmith import Wordsmith
+from wordsmith import Wordsmith, ProjectSlugError
 from tests.fixtures import TestWordsmith
 
 
@@ -26,3 +26,18 @@ def test_find_project_by_slug(self):
     def test_bad_project_raises_error(self):
         with pytest.raises(ProjectSlugError):
             project = self.ws.project('fake project')
+
+    '''
+    TODO
+    def test_schema
+        project = Wordsmith::Project.find 'test'
+        expected = {a: 'Number', b: 'Number', c: 'Number'}
+        assert_equal expected, project.schema
+      end
+
+      def test_template_collection_exists
+        project = Wordsmith::Project.find('test')
+        assert_instance_of Wordsmith::TemplateCollection, project.templates
+      end
+    end
+    '''
diff --git a/tests/test_template.py b/tests/test_template.py
new file mode 100644
index 0000000..29edfdb
--- /dev/null
+++ b/tests/test_template.py
@@ -0,0 +1,32 @@
+import pytest
+from wordsmith import TemplateSlugError
+from tests.fixtures import TestWordsmith
+
+
+class TestProject(TestWordsmith):
+
+    def setup(self):
+        self.ws = super().initialize()
+
+    def test_bad_template_raises_error(self):
+        with pytest.raises(TemplateSlugError):
+            template = self.ws.project('test').template('fake template')
+
+    def test_find_project_by_name(self):
+        matches = self.ws.find_project('Test')
+        assert matches[0].name == 'Test'
+
+    def test_find_template_that_exists(self):
+        matches = self.ws.project('test').find_template('Test')
+        assert len(matches) > 0
+
+    def test_find_template_that_doesnt_exist(self):
+        matches = self.ws.project('test').find_template('Fake Template')
+        assert len(matches) == 0
+
+    def test_generate_narrative(self):
+        data = {'a': 1, 'b': 1, 'c': 1}
+        narr = self.ws.project('test')\
+            .template('test').generate_narrative(data).text
+        assert narr == 'The value of A is 1.'
+    
\ No newline at end of file
diff --git a/tests/test_wordsmith.py b/tests/test_wordsmith.py
deleted file mode 100644
index 3b6cdf3..0000000
--- a/tests/test_wordsmith.py
+++ /dev/null
@@ -1,103 +0,0 @@
-import pytest
-from wordsmith import (Wordsmith,
-                       ProjectSlugError,
-                       TemplateSlugError,
-                       NarrativeGenerateError)
-from tests.fixtures import TestWordsmith
-
-
-class TestSomeStuff(TestWordsmith):
-
-    def setup(self):
-        self.ws = super().initialize()
-
-    def test_config_specifying_base_url(self):
-        ws = Wordsmith(self.ws.config.api_key,
-                       user_agent='python sdk test suite',
-                       base_url='https://api.automatedinsights.com/v1')
-
-    def test_list_all_projects(self):
-        projects = [project.name for project in self.ws.projects]
-        assert projects == ['Test']
-
-    def test_list_all_projects_with_custom_base_url(self):
-        ws = Wordsmith(self.ws.config.api_key,
-                       user_agent='python sdk test suite',
-                       base_url='https://api.automatedinsights.com/v1')
-        projects = [project.name for project in ws.projects]
-        assert projects == ['Test']
-
-    def test_find_project_by_slug(self):
-        project = self.ws.project('test')
-        assert project.name == 'Test'
-
-    def test_bad_project_raises_error(self):
-        with pytest.raises(ProjectSlugError):
-            project = self.ws.project('fake project')
-
-    def test_bad_template_raises_error(self):
-        with pytest.raises(TemplateSlugError):
-            template = self.ws.project('test').template('fake template')
-
-    def test_find_project_by_name(self):
-        matches = self.ws.find_project('Test')
-        assert matches[0].name == 'Test'
-
-    def test_find_template_that_exists(self):
-        matches = self.ws.project('test').find_template('Test')
-        assert len(matches) > 0
-
-    def test_find_template_that_doesnt_exist(self):
-        matches = self.ws.project('test').find_template('Fake Template')
-        assert len(matches) == 0
-
-    def test_generate_narrative(self):
-        data = {'a': 1, 'b': 1, 'c': 1}
-        narr = self.ws.project('test')\
-            .template('test').generate_narrative(data).text
-        assert narr == 'The value of A is 1.'
-
-    def test_batch_generate_narrative(self):
-        data = [{'a': i, 'b': i, 'c': i} for i in range(10)]
-        expected_outputs = ['The value of A is {}.'.format(i)
-                            for i in range(10)]
-        narrs = self.ws.project('test').template('test').batch_narrative(data)
-        narrs.generate()
-        for expected, actual in zip(expected_outputs, narrs.narratives):
-            assert expected == actual.text
-
-    def test_bad_batch_generate_no_break(self):
-        data = [
-            {'a': 1, 'b': 1, 'c': 1},
-            {'d': 1, 'e': 1},
-            {'a': 1, 'b': 1, 'c': 1}
-        ]
-        narrs = self.ws.project('test').template('test').batch_narrative(data)
-        narrs.break_on_error = False
-        narrs.generate()
-        expected_narratives = ['The value of A is 1.',
-                               None,
-                               'The value of A is 1.']
-        actual_narratives = []
-        for n in narrs.narratives:
-            actual_narratives.append(n.text if n is not None else None)
-        assert (expected_narratives == actual_narratives)\
-            and (len(narrs.errors) == 1)
-
-    def test_bad_batch_generate_break(self):
-        with pytest.raises(NarrativeGenerateError):
-            data = [
-                {'a': 1, 'b': 1, 'c': 1},
-                {'d': 1, 'e': 1},
-                {'a': 1, 'b': 1, 'c': 1}
-            ]
-            narrs = self.ws.project('test')\
-                .template('test').batch_narrative(data)
-            narrs.break_on_error = True
-            narrs.generate()
-
-    def test_wordsmith_400_error(self):
-        with pytest.raises(NarrativeGenerateError):
-            data = {'not_a_valid_column': 0}
-            narr = self.ws.project('test')\
-                .template('test').generate_narrative(data)

From d4b5cfb3f09d803a32eabccbc6357c2bfcd18f91 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Wed, 24 May 2017 11:26:32 -0400
Subject: [PATCH 13/22] remove extraneous imports

---
 tests/fixtures.py     | 6 +-----
 tests/test_project.py | 2 +-
 wordsmith/template.py | 3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/fixtures.py b/tests/fixtures.py
index c66ce96..67c8c10 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -1,8 +1,4 @@
-import pytest
-from wordsmith import (Wordsmith,
-                       ProjectSlugError,
-                       TemplateSlugError,
-                       NarrativeGenerateError)
+from wordsmith import Wordsmith
 
 API_KEY = '923b278a6088675262af64ceb437bab31d7ebc6b07aaf89f88b0b88dd4fe2a97'
 
diff --git a/tests/test_project.py b/tests/test_project.py
index aa2cb9d..c18ed98 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -25,7 +25,7 @@ def test_find_project_by_slug(self):
 
     def test_bad_project_raises_error(self):
         with pytest.raises(ProjectSlugError):
-            project = self.ws.project('fake project')
+            self.ws.project('fake project')
 
     '''
     TODO
diff --git a/wordsmith/template.py b/wordsmith/template.py
index 7a54e09..ef0029b 100644
--- a/wordsmith/template.py
+++ b/wordsmith/template.py
@@ -5,9 +5,6 @@
 This module implements the Wordsmith template object.
 """
 
-import requests
-import json
-from multiprocessing.dummy import Pool
 from .narrative import Narrative, Batch
 
 

From 6271985171622e02d372cd32e71ae95730a44189 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 16:21:58 -0400
Subject: [PATCH 14/22] make setup.py pep8-compliant

---
 setup.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/setup.py b/setup.py
index 16db589..a3f5ebf 100644
--- a/setup.py
+++ b/setup.py
@@ -3,25 +3,27 @@
 from setuptools import setup
 
 with open('wordsmith/__init__.py', 'r') as fd:
-  version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
+    version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
+                        fd.read(),
+                        re.MULTILINE).group(1)
 
 if not version:
-  raise RuntimeError('Could not locate version information')
+    raise RuntimeError('Could not locate version information')
 
 setup(
-  name = 'wordsmith',
-  version = version,
-  description = 'A wrapper around the Wordsmith API written in python',
-  author = 'John Hegele - Automated Insights',
-  packages = ['wordsmith'],
-  package_dir = {'wordsmith' : 'wordsmith'},
-  install_requires = ['requests', 'six'],
-  classifiers = [
-    'Development Status :: 4 - Beta',
-    'Intended Audience :: Developers',
-    'Natural Language :: English',
-    'Programming Language :: Python',
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3.5'
-  ]
+    name='wordsmith',
+    version=version,
+    description='A wrapper around the Wordsmith API written in python',
+    author='John Hegele - Automated Insights',
+    packages=['wordsmith'],
+    package_dir={'wordsmith': 'wordsmith'},
+    install_requires=['requests', 'six'],
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.5'
+    ]
 )

From 1a6a6c2bb24665faa1a1ca0cd0991280432bf333 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 16:24:40 -0400
Subject: [PATCH 15/22] clean up linting problems in tests

---
 tests/test_batch_generate.py | 2 +-
 tests/test_config.py         | 1 -
 tests/test_template.py       | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/test_batch_generate.py b/tests/test_batch_generate.py
index 3c81dc1..da14b3b 100644
--- a/tests/test_batch_generate.py
+++ b/tests/test_batch_generate.py
@@ -50,5 +50,5 @@ def test_bad_batch_generate_break(self):
     def test_wordsmith_400_error(self):
         with pytest.raises(NarrativeGenerateError):
             data = {'not_a_valid_column': 0}
-            narr = self.ws.project('test')\
+            self.ws.project('test')\
                 .template('test').generate_narrative(data)
diff --git a/tests/test_config.py b/tests/test_config.py
index 7f75f03..df95a2c 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,4 +1,3 @@
-import pytest
 from wordsmith import Wordsmith
 from tests.fixtures import TestWordsmith
 
diff --git a/tests/test_template.py b/tests/test_template.py
index 29edfdb..b298584 100644
--- a/tests/test_template.py
+++ b/tests/test_template.py
@@ -10,7 +10,7 @@ def setup(self):
 
     def test_bad_template_raises_error(self):
         with pytest.raises(TemplateSlugError):
-            template = self.ws.project('test').template('fake template')
+            self.ws.project('test').template('fake template')
 
     def test_find_project_by_name(self):
         matches = self.ws.find_project('Test')
@@ -29,4 +29,3 @@ def test_generate_narrative(self):
         narr = self.ws.project('test')\
             .template('test').generate_narrative(data).text
         assert narr == 'The value of A is 1.'
-    
\ No newline at end of file

From 1fb1a03d687566c3e3d6138392558d709ef84339 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 16:54:36 -0400
Subject: [PATCH 16/22] eliminate circular version import

---
 wordsmith/configuration.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wordsmith/configuration.py b/wordsmith/configuration.py
index cffd458..57924df 100644
--- a/wordsmith/configuration.py
+++ b/wordsmith/configuration.py
@@ -4,7 +4,6 @@
 
 This module implements the Wordsmith configuration object.
 """
-from . import __version__
 
 
 class Configuration(object):
@@ -21,7 +20,7 @@ class Configuration(object):
 
     DEFAULT_VERSION = '1'
     DEFAULT_URL = 'https://api.automatedinsights.com/v' + DEFAULT_VERSION
-    DEFAULT_USER_AGENT = 'PythonSDK/' + __version__
+    DEFAULT_USER_AGENT = 'PythonSDK'
 
     def __init__(self, api_key, **kwargs):
         self.api_key = api_key

From 138b0d262f1761ecf098bb746c4e28d0d666ad3d Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 16:57:52 -0400
Subject: [PATCH 17/22] imports go at the top of __init__.py

---
 setup.py              |  2 +-
 wordsmith/__init__.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index a3f5ebf..e47ab38 100644
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,6 @@
         'Natural Language :: English',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.5'
+        'Programming Language :: Python :: 3.6'
     ]
 )
diff --git a/wordsmith/__init__.py b/wordsmith/__init__.py
index 3935c9b..ce8469d 100644
--- a/wordsmith/__init__.py
+++ b/wordsmith/__init__.py
@@ -1,8 +1,3 @@
-__title__ = 'wordsmith'
-__version__ = '0.5'
-__author__ = 'John Hegele'
-__copyright__ = 'Copyright 2016 Automated Insights'
-
 from .wordsmith import Wordsmith
 from .configuration import Configuration
 from .project import Project
@@ -11,3 +6,8 @@
 from .exceptions import (ProjectSlugError,
                          TemplateSlugError,
                          NarrativeGenerateError)
+
+__title__ = 'wordsmith'
+__version__ = '0.5'
+__author__ = 'John Hegele'
+__copyright__ = 'Copyright 2016 Automated Insights'

From 1427cc06b9f4e08fbb21e1d39fe413675f1af566 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 17:01:50 -0400
Subject: [PATCH 18/22] ignore unused linting error

---
 wordsmith/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wordsmith/__init__.py b/wordsmith/__init__.py
index ce8469d..a3797ee 100644
--- a/wordsmith/__init__.py
+++ b/wordsmith/__init__.py
@@ -1,3 +1,4 @@
+# flake8: noqa: F401
 from .wordsmith import Wordsmith
 from .configuration import Configuration
 from .project import Project

From 0de563649b3a7d3ea0c89665f7118a0d95cf541d Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 17:05:03 -0400
Subject: [PATCH 19/22] version bump

---
 wordsmith/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wordsmith/__init__.py b/wordsmith/__init__.py
index a3797ee..1fcbaea 100644
--- a/wordsmith/__init__.py
+++ b/wordsmith/__init__.py
@@ -9,6 +9,6 @@
                          NarrativeGenerateError)
 
 __title__ = 'wordsmith'
-__version__ = '0.5'
+__version__ = '0.5.1'
 __author__ = 'John Hegele'
 __copyright__ = 'Copyright 2016 Automated Insights'

From 5c12ad2d77f93ae5d3c6c7f00b2763c40b9880d6 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 17:09:22 -0400
Subject: [PATCH 20/22] slightly more info in comment

---
 tests/test_project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_project.py b/tests/test_project.py
index c18ed98..3ebb1f4 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -28,7 +28,7 @@ def test_bad_project_raises_error(self):
             self.ws.project('fake project')
 
     '''
-    TODO
+    TODO - these tests from ruby version
     def test_schema
         project = Wordsmith::Project.find 'test'
         expected = {a: 'Number', b: 'Number', c: 'Number'}

From 0bf2a3efa25325dd353f0cb5ddb6f448ae89da4c Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 17:10:46 -0400
Subject: [PATCH 21/22] move global constants to top of file

---
 wordsmith/configuration.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wordsmith/configuration.py b/wordsmith/configuration.py
index 57924df..f3370b9 100644
--- a/wordsmith/configuration.py
+++ b/wordsmith/configuration.py
@@ -6,6 +6,11 @@
 """
 
 
+DEFAULT_VERSION = '1'
+DEFAULT_URL = 'https://api.automatedinsights.com/v' + DEFAULT_VERSION
+DEFAULT_USER_AGENT = 'PythonSDK'
+
+
 class Configuration(object):
     """
         Constructs a :class:`Wordsmith <Configuration>` object.
@@ -18,10 +23,6 @@ class Configuration(object):
                            should be sent with each API request
         """
 
-    DEFAULT_VERSION = '1'
-    DEFAULT_URL = 'https://api.automatedinsights.com/v' + DEFAULT_VERSION
-    DEFAULT_USER_AGENT = 'PythonSDK'
-
     def __init__(self, api_key, **kwargs):
         self.api_key = api_key
         self.base_url = kwargs['base_url'] if 'base_url' in kwargs\

From 8d6ab4943e1046b30ac33d7f55f80e7f3d3e4037 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nickdavidhaynes@gmail.com>
Date: Fri, 26 May 2017 17:12:20 -0400
Subject: [PATCH 22/22] __str__() was in wrong context

---
 wordsmith/narrative.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wordsmith/narrative.py b/wordsmith/narrative.py
index 671c8d7..8797f51 100644
--- a/wordsmith/narrative.py
+++ b/wordsmith/narrative.py
@@ -52,8 +52,8 @@ def __init__(self, project_slug, template_slug, data, config):
             self.text = None
             raise NarrativeGenerateError(response, data)
 
-        def __str__(self):
-            return self.text
+    def __str__(self):
+        return self.text
 
 
 class Batch(object):