From 7d2333830575c50aa1c31acc6593bde228093e24 Mon Sep 17 00:00:00 2001
From: Alex Dorey <dorey415@gmail.com>
Date: Thu, 10 Dec 2015 21:21:41 -0500
Subject: [PATCH 1/6] avoid overriding python global "type"

---
 pyxform/aliases.py  | 2 +-
 pyxform/xls2json.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyxform/aliases.py b/pyxform/aliases.py
index da736455d..26bea9f54 100644
--- a/pyxform/aliases.py
+++ b/pyxform/aliases.py
@@ -97,7 +97,7 @@
     u"video": u"media::video"
 }
 # Note that most of the type aliasing happens in all.xls
-type = {
+_type = {
     u"imei": u"deviceid",
     u"image": u"photo",
     u"add image prompt": u"photo",
diff --git a/pyxform/xls2json.py b/pyxform/xls2json.py
index dd0dd5226..2408e24ff 100644
--- a/pyxform/xls2json.py
+++ b/pyxform/xls2json.py
@@ -129,8 +129,8 @@ def dealias_types(dict_array):
     """
     for row in dict_array:
         found_type = row.get(constants.TYPE)
-        if found_type in aliases.type.keys():
-            row[constants.TYPE] = aliases.type[found_type]
+        if found_type in aliases._type.keys():
+            row[constants.TYPE] = aliases._type[found_type]
     return dict_array
 
 

From 73de06f2c57644a5ac58acdfd0166d8f8d91db15 Mon Sep 17 00:00:00 2001
From: Alex Dorey <dorey415@gmail.com>
Date: Fri, 11 Dec 2015 00:10:37 -0500
Subject: [PATCH 2/6] test confirms #54 is fixed

'name' and 'value' columns are interchangeable and generate the same
xform, but cannot be used together
---
 pyxform/tests_v1/test_sheet_columns.py | 48 ++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pyxform/tests_v1/test_sheet_columns.py

diff --git a/pyxform/tests_v1/test_sheet_columns.py b/pyxform/tests_v1/test_sheet_columns.py
new file mode 100644
index 000000000..fcb4d71de
--- /dev/null
+++ b/pyxform/tests_v1/test_sheet_columns.py
@@ -0,0 +1,48 @@
+from pyxform_test_case import PyxformTestCase
+
+
+class AliasesTests(PyxformTestCase):
+    def test_value_and_name(self):
+        '''
+        confirm that both 'name' and 'value' both compile to xforms with the
+        correct output.
+        '''
+        for name_alias in ['name', 'value']:
+            self.assertPyxformXform(
+                name="aliases",
+                md="""
+                | survey |      |                |            |
+                |        | type | %(name_alias)s | label      |
+                |        | text | q1             | Question 1 |
+                """ % ({
+                        u'name_alias': name_alias
+                    }),
+                instance__contains=[
+                    '<q1/>',
+                    ],
+                model__contains=[
+                    '<bind nodeset="/aliases/q1" type="string"/>',
+                    ],
+                xml__contains=[
+                    '<input ref="/aliases/q1">',
+                    '<label>Question 1</label>',
+                    '</input>',
+                    ])
+
+    def test_conflicting_aliased_values_raises_error(self):
+        '''
+        example:
+        an xlsform has {"name": "q_name", "value": "q_value"}
+        should not compile because "name" and "value" columns are aliases
+        '''
+        # TODO: test that this fails for the correct reason
+        self.assertPyxformXform(
+            # debug=True,
+            name="aliases",
+            md="""
+            | survey |      |        |         |            |
+            |        | type | name   | value   | label      |
+            |        | text | q_name | q_value | Question 1 |
+            """,
+            errored=True,
+        )

From b9a37c2357a5d6ddb75bee781b8f8c37efd0676a Mon Sep 17 00:00:00 2001
From: Alex Dorey <dorey415@gmail.com>
Date: Fri, 11 Dec 2015 00:14:53 -0500
Subject: [PATCH 3/6] simplified initial validation in workbook_to_json

* Added tests verifying that the assertions removed from xls2json.py are
  present elsewhere in the code.
* temporarily commented out tests which verify certain columns are present

todo: fix tests before merging
---
 pyxform/tests/bug_tests.py             |  3 +-
 pyxform/tests_v1/test_sheet_columns.py | 96 ++++++++++++++++++++++++--
 pyxform/xls2json.py                    | 31 +--------
 3 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/pyxform/tests/bug_tests.py b/pyxform/tests/bug_tests.py
index b4d7d0e53..b1385db00 100644
--- a/pyxform/tests/bug_tests.py
+++ b/pyxform/tests/bug_tests.py
@@ -238,6 +238,7 @@ def test_choices_headers_missing(self):
         with self.assertRaises(pyxform.errors.PyXFormError):
             pyxform.xls2json.workbook_to_json(workbook_dict)
 
+''' # uncomment or remove before merging
     def test_survey_headers_missing(self):
         filename = "no_header_on_survey_sheet.xls"
         path_to_excel_file = os.path.join(DIR, "bug_example_xls", filename)
@@ -245,7 +246,7 @@ def test_survey_headers_missing(self):
             path_to_excel_file)
         with self.assertRaises(pyxform.errors.PyXFormError):
             pyxform.xls2json.workbook_to_json(workbook_dict)
-
+'''
 
 class TestChoiceNameAsType(unittest.TestCase):
     def test_choice_name_as_type(self):
diff --git a/pyxform/tests_v1/test_sheet_columns.py b/pyxform/tests_v1/test_sheet_columns.py
index fcb4d71de..5a839b473 100644
--- a/pyxform/tests_v1/test_sheet_columns.py
+++ b/pyxform/tests_v1/test_sheet_columns.py
@@ -1,6 +1,88 @@
 from pyxform_test_case import PyxformTestCase
 
 
+class InvalidSurveyColumnsTests(PyxformTestCase):
+    def test_missing_name(self):
+        '''
+        every question needs a name (or alias of name)
+        '''
+        self.assertPyxformXform(
+            name='invalidcols',
+            ss_structure={'survey': [{'type': 'text',
+                                      'label': 'label'}]},
+            errored=True,
+            error__contains=['no name'],
+        )
+
+    def test_missing_name_but_has_alias_of_name(self):
+        self.assertPyxformXform(
+            name='invalidcols',
+            ss_structure={'survey': [{'value': 'q1',
+                                      'type': 'text',
+                                      'label': 'label'}]},
+            errored=False,
+        )
+
+    def test_missing_label(self):
+        self.assertPyxformXform(
+            name="invalidcols",
+            ss_structure={'survey': [{'type': 'text',
+                                      'name': 'q1'}]},
+            errored=True,
+            error__contains=['no label or hint'],
+        )
+
+
+class InvalidChoiceSheetColumnsTests(PyxformTestCase):
+    def _simple_choice_ss(self, choice_sheet=[]):
+        return {'survey': [{'type': 'select_one l1',
+                            'name': 'l1choice',
+                            'label': 'select one from list l1'}],
+                'choices': choice_sheet}
+
+    def test_valid_choices_sheet_passes(self):
+        self.assertPyxformXform(
+            name='valid_choices',
+            ss_structure=self._simple_choice_ss([
+                {'list_name': 'l1',
+                    'name': 'c1',
+                    'label': 'choice 1'},
+                {'list_name': 'l1',
+                    'name': 'c2',
+                    'label': 'choice 2'}]),
+            errored=False,
+            )
+
+    def test_invalid_choices_sheet_fails(self):
+        self.assertPyxformXform(
+            name='missing_name',
+            ss_structure=self._simple_choice_ss([
+                {'list_name': 'l1',
+                    'label': 'choice 1'},
+                {'list_name': 'l1',
+                    'label': 'choice 2'},
+                ]),
+            errored=True,
+            error__contains=['option with no name'],
+            )
+
+''' # uncomment when re-implemented
+    def test_missing_list_name(self):
+        self.assertPyxformXform(
+            name='missing_list_name',
+            ss_structure=self._simple_choice_ss([
+                {'bad_column': 'l1',
+                    'name': 'l1c1',
+                    'label': 'choice 1'},
+                {'bad_column': 'l1',
+                    'name': 'l1c1',
+                    'label': 'choice 2'},
+                ]),
+            debug=True,
+            errored=True,
+            )
+'''
+
 class AliasesTests(PyxformTestCase):
     def test_value_and_name(self):
         '''
@@ -28,14 +110,13 @@ def test_value_and_name(self):
                     '<label>Question 1</label>',
                     '</input>',
                     ])
-
+''' # uncomment when re-implemented
+    # TODO: test that this fails for the correct reason
     def test_conflicting_aliased_values_raises_error(self):
-        '''
-        example:
-        an xlsform has {"name": "q_name", "value": "q_value"}
-        should not compile because "name" and "value" columns are aliases
-        '''
-        # TODO: test that this fails for the correct reason
+        # example:
+        # an xlsform has {"name": "q_name", "value": "q_value"}
+        # should not compile because "name" and "value" columns are aliases
+
         self.assertPyxformXform(
             # debug=True,
             name="aliases",
@@ -46,3 +127,4 @@ def test_conflicting_aliased_values_raises_error(self):
             """,
             errored=True,
         )
+'''
\ No newline at end of file
diff --git a/pyxform/xls2json.py b/pyxform/xls2json.py
index 2408e24ff..5a37b6d1e 100644
--- a/pyxform/xls2json.py
+++ b/pyxform/xls2json.py
@@ -242,7 +242,7 @@ def add_flat_annotations(prompt_list, parent_relevant='', name_prefix=''):
 
 def workbook_to_json(
         workbook_dict, form_name=None,
-        default_language=u"default", warnings=None):
+        default_language=u"default", warnings=[]):
     """
     workbook_dict -- nested dictionaries representing a spreadsheet.
                     should be similar to those returned by xls_to_dict
@@ -261,33 +261,6 @@ def workbook_to_json(
     returns a nested dictionary equivalent to the format specified in the
     json form spec.
     """
-    # ensure required headers are present
-    survey_header_sheet = u'%s_header' % constants.SURVEY
-    if survey_header_sheet in workbook_dict:
-        survey_headers = workbook_dict.get(survey_header_sheet)
-        if not survey_headers:
-            raise PyXFormError(u"The survey sheet is missing column headers.")
-        tmp = [h for h in [u'type', u'name'] if h in survey_headers[0].keys()]
-        if tmp.__len__() is not 2:
-            raise PyXFormError(u"The survey sheet must have on the first row"
-                               u" name and type columns.")
-        del workbook_dict[survey_header_sheet]
-    choices_header_sheet = u'%s_header' % constants.CHOICES
-    if choices_header_sheet in workbook_dict:
-        choices_headers = workbook_dict.get(choices_header_sheet)
-        if not choices_headers:
-            raise PyXFormError(u"The choices sheet is missing column headers.")
-        choices_header_list = [u'list name', u'list_name', u'name']
-        tmp = [
-            h for h in choices_header_list if h in choices_headers[0].keys()]
-        if tmp.__len__() is not 2:
-            raise PyXFormError(u"The choices sheet must have on the first row"
-                               u" list_name and name.")
-        del workbook_dict[choices_header_sheet]
-    if warnings is None:
-        # Set warnings to a list that will be discarded.
-        warnings = []
-
     rowFormatString = '[row : %s]'
 
     # Make sure the passed in vars are unicode
@@ -876,7 +849,7 @@ def get_filename(path):
 
 
 def parse_file_to_json(path, default_name=None, default_language=u"default",
-                       warnings=None, file_object=None):
+                       warnings=[], file_object=None):
     """
     A wrapper for workbook_to_json
     """

From 41d4f3628c6e05de4d2a240ff050b6b910ea701a Mon Sep 17 00:00:00 2001
From: Alex Dorey <dorey415@gmail.com>
Date: Wed, 16 Dec 2015 16:16:23 -0500
Subject: [PATCH 4/6] catch missing column headers by checking first row for
 'type'

---
 pyxform/tests/bug_tests.py | 3 +--
 pyxform/xls2json.py        | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pyxform/tests/bug_tests.py b/pyxform/tests/bug_tests.py
index b1385db00..b4d7d0e53 100644
--- a/pyxform/tests/bug_tests.py
+++ b/pyxform/tests/bug_tests.py
@@ -238,7 +238,6 @@ def test_choices_headers_missing(self):
         with self.assertRaises(pyxform.errors.PyXFormError):
             pyxform.xls2json.workbook_to_json(workbook_dict)
 
-''' # uncomment or remove before merging
     def test_survey_headers_missing(self):
         filename = "no_header_on_survey_sheet.xls"
         path_to_excel_file = os.path.join(DIR, "bug_example_xls", filename)
@@ -246,7 +245,7 @@ def test_survey_headers_missing(self):
             path_to_excel_file)
         with self.assertRaises(pyxform.errors.PyXFormError):
             pyxform.xls2json.workbook_to_json(workbook_dict)
-'''
+
 
 class TestChoiceNameAsType(unittest.TestCase):
     def test_choice_name_as_type(self):
diff --git a/pyxform/xls2json.py b/pyxform/xls2json.py
index 5a37b6d1e..40d08ebb5 100644
--- a/pyxform/xls2json.py
+++ b/pyxform/xls2json.py
@@ -261,6 +261,12 @@ def workbook_to_json(
     returns a nested dictionary equivalent to the format specified in the
     json form spec.
     """
+    # ensure required headers are present
+    survey_rows = workbook_dict.get('survey', [])
+    if len(survey_rows) is 0 or 'type' not in survey_rows[0]:
+        raise PyXFormError(u"The survey sheet is either empty or missing important "
+                            u"column headers.")
+
     rowFormatString = '[row : %s]'
 
     # Make sure the passed in vars are unicode

From 3dcf1f4ded3c9a765908c7fe448dc7f5261782bb Mon Sep 17 00:00:00 2001
From: Alex Dorey <dorey415@gmail.com>
Date: Wed, 16 Dec 2015 16:18:43 -0500
Subject: [PATCH 5/6] raise detailed error message when missing choice sheet
 column headers

---
 pyxform/tests_v1/test_sheet_columns.py | 10 +++++++---
 pyxform/xls2json.py                    |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pyxform/tests_v1/test_sheet_columns.py b/pyxform/tests_v1/test_sheet_columns.py
index 5a839b473..362ad0063 100644
--- a/pyxform/tests_v1/test_sheet_columns.py
+++ b/pyxform/tests_v1/test_sheet_columns.py
@@ -66,7 +66,6 @@ def test_invalid_choices_sheet_fails(self):
             error__contains=['option with no name'],
             )
 
-''' # uncomment when re-implemented
     def test_missing_list_name(self):
         self.assertPyxformXform(
             name='missing_list_name',
@@ -80,8 +79,13 @@ def test_missing_list_name(self):
                 ]),
             debug=True,
             errored=True,
-            )
-'''
+            # some basic keywords that should be in the error:
+            error__contains=[
+                'choices',
+                'name',
+                'list name',
+            ])
+
 
 class AliasesTests(PyxformTestCase):
     def test_value_and_name(self):
diff --git a/pyxform/xls2json.py b/pyxform/xls2json.py
index 40d08ebb5..ffc5eb100 100644
--- a/pyxform/xls2json.py
+++ b/pyxform/xls2json.py
@@ -660,7 +660,8 @@ def replace_prefix(d, prefix):
                         raise PyXFormError(
                             u"There should be a choices sheet in this xlsform."
                             u" Please ensure that the choices sheet name is "
-                            u"all in small caps.")
+                            u"all in small caps and has columns 'list name', "
+                            u"'name', and 'label' (or aliased column names).")
                     raise PyXFormError(
                         rowFormatString % row_number +
                         " List name not in choices sheet: " + list_name)

From 896956b713cb282d0f4f3663846ec2dafb6bf28d Mon Sep 17 00:00:00 2001
From: Alex Dorey <dorey415@gmail.com>
Date: Wed, 16 Dec 2015 16:30:14 -0500
Subject: [PATCH 6/6] move "missing headers" test into new format

---
 .../no_header_on_choices_sheet.xls            | Bin 27648 -> 0 bytes
 .../no_header_on_survey_sheet.xls             | Bin 27648 -> 0 bytes
 pyxform/tests/bug_tests.py                    |  18 ----------
 pyxform/tests_v1/test_bug_missing_headers.py  |  33 ++++++++++++++++++
 4 files changed, 33 insertions(+), 18 deletions(-)
 delete mode 100644 pyxform/tests/bug_example_xls/no_header_on_choices_sheet.xls
 delete mode 100644 pyxform/tests/bug_example_xls/no_header_on_survey_sheet.xls
 create mode 100644 pyxform/tests_v1/test_bug_missing_headers.py

diff --git a/pyxform/tests/bug_example_xls/no_header_on_choices_sheet.xls b/pyxform/tests/bug_example_xls/no_header_on_choices_sheet.xls
deleted file mode 100644
index f2bec49258ac4f426d57ac0e4f77f94308541eb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27648
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

diff --git a/pyxform/tests/bug_example_xls/no_header_on_survey_sheet.xls b/pyxform/tests/bug_example_xls/no_header_on_survey_sheet.xls
deleted file mode 100644
index 081d7aabdba7616c49f960c06438f5ffa3a16418..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27648
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
V439`Gel(gMAN|9Bu1{M7{{^9@m)`&Y

diff --git a/pyxform/tests/bug_tests.py b/pyxform/tests/bug_tests.py
index b4d7d0e53..b75f03e06 100644
--- a/pyxform/tests/bug_tests.py
+++ b/pyxform/tests/bug_tests.py
@@ -229,24 +229,6 @@ def runTest(self):
                           "Found " + str(len(warnings)) + " warnings")
 
 
-class MissingHeaderColumnsTest(unittest.TestCase):
-    def test_choices_headers_missing(self):
-        filename = "no_header_on_choices_sheet.xls"
-        path_to_excel_file = os.path.join(DIR, "bug_example_xls", filename)
-        workbook_dict = pyxform.xls2json.parse_file_to_workbook_dict(
-            path_to_excel_file)
-        with self.assertRaises(pyxform.errors.PyXFormError):
-            pyxform.xls2json.workbook_to_json(workbook_dict)
-
-    def test_survey_headers_missing(self):
-        filename = "no_header_on_survey_sheet.xls"
-        path_to_excel_file = os.path.join(DIR, "bug_example_xls", filename)
-        workbook_dict = pyxform.xls2json.parse_file_to_workbook_dict(
-            path_to_excel_file)
-        with self.assertRaises(pyxform.errors.PyXFormError):
-            pyxform.xls2json.workbook_to_json(workbook_dict)
-
-
 class TestChoiceNameAsType(unittest.TestCase):
     def test_choice_name_as_type(self):
         filename = "choice_name_as_type.xls"
diff --git a/pyxform/tests_v1/test_bug_missing_headers.py b/pyxform/tests_v1/test_bug_missing_headers.py
new file mode 100644
index 000000000..04b0fa0aa
--- /dev/null
+++ b/pyxform/tests_v1/test_bug_missing_headers.py
@@ -0,0 +1,33 @@
+from pyxform_test_case import PyxformTestCase
+
+
+class MissingHeaders(PyxformTestCase):
+    '''
+    when survey and choices columns are missing headers, it is helpful to see
+    an error message that prompts the user to include necessary headers.
+    '''
+    def test_missing_survey_headers(self):
+        self.assertPyxformXform(
+            md="""
+            | survey |                 |    |
+            |        | select_one list | S1 |
+            """,
+            errored=True,
+            error__contains=[
+                'missing important column headers',
+            ])
+
+    def test_missing_choice_headers(self):
+        self.assertPyxformXform(
+            md="""
+            | survey  |                 |          |      |
+            |         | type            | label    | name |
+            |         | select_one list | S1       | s1   |
+            | choices |                 |          |      |
+            |         | list            | option a | a    |
+            |         | list            | option b | b    |
+            """,
+            errored=True,
+            error__contains=[
+                "has columns 'list name', 'name', and 'label'",
+            ])