bug fixes

Author: chfw

pyexcel_webio/__init__.py

@@ -277,8 +277,7 @@ def make_response(pyexcel_instance, file_type,
 
 
 def make_response_from_array(array, file_type,
-                             status=200, file_name=None,
-                             **keywords):
+                             status=200, **keywords):
     """
     Make a http response from an array
     
@@ -292,8 +291,7 @@ def make_response_from_array(array, file_type,
 
 
 def make_response_from_dict(adict, file_type,
-                            status=200, file_name=None,
-                            **keywords):
+                            status=200, **keywords):
     """
     Make a http response from a dictionary of lists
     
@@ -308,8 +306,7 @@ def make_response_from_dict(adict, file_type,
 
 
 def make_response_from_records(records, file_type,
-                               status=200, file_name=None,
-                               **keywords):
+                               status=200, **keywords):
     """
     Make a http response from a list of dictionaries
     
@@ -340,7 +337,7 @@ def make_response_from_book_dict(adict,
 
 
 def make_response_from_query_sets(query_sets, column_names,
-                                  file_type, status=200, file_name=None,
+                                  file_type, status=200,
                                   **keywords):
     """
     Make a http response from a dictionary of two dimensional
@@ -358,7 +355,7 @@ def make_response_from_query_sets(query_sets, column_names,
 
 
 def make_response_from_a_table(session, table,
-                               file_type, status=200,
+                               file_type, status=200, file_name=None,
                                **keywords):
     """
     Make a http response from sqlalchmey table
@@ -370,7 +367,7 @@ def make_response_from_a_table(session, table,
     :returns: a http response
     """
     sheet = pe.get_sheet(session=session, table=table, **keywords)
-    return make_response(sheet, file_type, status, **keywords)
+    return make_response(sheet, file_type, status, file_name=file_name, **keywords)
 
 
 def make_response_from_tables(session, tables,
@@ -386,4 +383,4 @@ def make_response_from_tables(session, tables,
     :returns: a http response
     """
     book = pe.get_book(session=session, tables=tables, **keywords)
-    return make_response(book, file_type, status, **keywords)
+    return make_response(book, file_type, status, file_name=file_name, **keywords)

tests/test_webio.py

@@ -10,8 +10,8 @@
     from collections import OrderedDict
 from nose.tools import raises
 
-
-OUTPUT = "response_test.xls"
+FILE_NAME = "response_test"
+OUTPUT = "%s.xls" % FILE_NAME
 
 
 class TestInput(webio.ExcelInput):
@@ -31,11 +31,10 @@ def get_file_tuple(self, field_name):
         return field_name
 
 
-def dumpy_response(content, content_type=None, status=200):
+def dumpy_response(content, content_type=None, status=200, file_name=None):
     """A dummy response"""
-    f = open(OUTPUT, 'wb')
-    f.write(content)
-    f.close()
+    with open(file_name, 'wb') as f:
+        f.write(content)
 
 
 webio.ExcelResponse = dumpy_response
@@ -236,19 +235,19 @@ def setUp(self):
 
     def test_make_response_from_sheet(self):
         sheet = pe.Sheet(self.data)
-        webio.make_response(sheet, "xls")
+        webio.make_response(sheet, "xls", file_name=FILE_NAME)
         self.verify()
 
     def test_make_response_from_array(self):
-        webio.make_response_from_array(self.data, "xls")
+        webio.make_response_from_array(self.data, "xls", file_name=FILE_NAME)
         self.verify()
 
     def test_make_response_from_records(self):
         records = [
             {"X": 1, "Y": 2, "Z": 3},
             {"X": 4, "Y": 5, "Z": 6}
         ]
-        webio.make_response_from_records(records, "xls")
+        webio.make_response_from_records(records, "xls", file_name=FILE_NAME)
         self.verify()
 
     def test_make_response_from_dict(self):
@@ -257,7 +256,7 @@ def test_make_response_from_dict(self):
             "Y": [2, 5],
             "Z": [3, 6]
         }
-        webio.make_response_from_dict(adict, "xls")
+        webio.make_response_from_dict(adict, "xls", file_name=FILE_NAME)
         self.verify()
 
     def test_make_response_from_table(self):
@@ -269,7 +268,7 @@ def test_make_response_from_table(self):
         session.add(row1)
         session.add(row2)
         session.commit()
-        webio.make_response_from_a_table(session, Signature, "xls")
+        webio.make_response_from_a_table(session, Signature, "xls", file_name=FILE_NAME)
         self.verify()
         session.close()
 
@@ -284,7 +283,7 @@ def test_make_response_from_query_sets(self):
         session.commit()
         query_sets=session.query(Signature).filter_by(X=1).all()
         column_names= ["X", "Y", "Z"]
-        webio.make_response_from_query_sets(query_sets, column_names, "xls")
+        webio.make_response_from_query_sets(query_sets, column_names, "xls", file_name=FILE_NAME)
         sheet2=pe.get_sheet(file_name=OUTPUT)
         assert sheet2.to_array() == [
             ["X", "Y", "Z"],
@@ -310,11 +309,11 @@ def setUp(self):
 
     def test_make_response_from_book(self):
         book = pe.get_book(bookdict=self.content)
-        webio.make_response(book, "xls")
+        webio.make_response(book, "xls", file_name=FILE_NAME)
         self.verify()
 
     def test_make_response_from_book_dict(self):
-        webio.make_response_from_book_dict(self.content, "xls")
+        webio.make_response_from_book_dict(self.content, "xls", file_name=FILE_NAME)
         self.verify()
 
     def verify(self):
@@ -340,7 +339,7 @@ def test_make_response_from_tables(self):
         session.add(row3)
         session.add(row4)
         session.commit()
-        webio.make_response_from_tables(session, [Signature, Signature2], "xls")
+        webio.make_response_from_tables(session, [Signature, Signature2], "xls", file_name=FILE_NAME)
         book = pe.get_book(file_name=OUTPUT)
         expected = OrderedDict()
         expected.update({'signature': [['X', 'Y', 'Z'], [1, 2, 3], [4, 5, 6]]})