fix #4: passing on extra keywords

Author: chfw

pyexcel_webio/__init__.py

@@ -204,10 +204,11 @@ def get_params(self, field_name=None, **keywords):
         if file_type is not None and file_handle is not None:
             content = file_handle.read()
             if content:
-                keywords = {
+                params = {
                     'file_type': file_type,
                     'file_content': content
                 }
+                keywords.update(params)
                 return keywords
             else:
                 raise IOError("No content was uploaded")

tests/common.py

@@ -0,0 +1,14 @@
+import pyexcel_webio as webio
+
+
+class TestInput(webio.ExcelInput):
+    """This is sample implementation that read excel source from file"""
+    def get_params(self, **keywords):
+        """Load a single sheet"""
+        return keywords
+
+
+class TestExtendedInput(webio.ExcelInputInMultiDict):
+    """This is sample implementation that read excel source from file"""
+    def get_file_tuple(self, field_name):
+        return field_name

tests/fixtures/issue4-broken.csv

@@ -0,0 +1 @@
+Last Name,First Name,Company,Email,Job TitleTest,Th�s,Cool Co,test.this@example.com,Founder

tests/test_bug_fixes.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+import os
+from common import TestExtendedInput
+from nose.tools import eq_
+
+
+def test_issue_4():
+    myinput = TestExtendedInput()
+    fixture = os.path.join("tests", "fixtures", "issue4-broken.csv")
+    with open(fixture, "r") as f:
+        array = myinput.get_array(field_name=('csv', f), encoding='latin1')
+        expected = [
+            [u'Last Name', u'First Name', u'Company', u'Email', u'Job Title'],
+            [u'Test', u'Th\xefs', u'Cool Co',
+             u'test.this@example.com', u'Founder']
+        ]
+        eq_(array, expected)

tests/test_webio.py

@@ -3,6 +3,7 @@
 from unittest import TestCase
 import pyexcel as pe
 import pyexcel_webio as webio
+from common import TestInput, TestExtendedInput
 from db import Session, Base, Signature, Signature2, engine
 from nose.tools import raises, eq_
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
@@ -14,19 +15,6 @@
 OUTPUT = "%s.xls" % FILE_NAME
 
 
-class TestInput(webio.ExcelInput):
-    """This is sample implementation that read excel source from file"""
-    def get_params(self, **keywords):
-        """Load a single sheet"""
-        return keywords
-
-
-class TestExtendedInput(webio.ExcelInputInMultiDict):
-    """This is sample implementation that read excel source from file"""
-    def get_file_tuple(self, field_name):
-        return field_name
-
-
 def dumpy_response(content, content_type=None, status=200, file_name=None):
     """A dummy response"""
     with open(file_name, 'wb') as f:
@@ -52,32 +40,32 @@ def test_excel_input_get_file_tuple(self):
         testinput = webio.ExcelInputInMultiDict()
         testinput.get_file_tuple(field_name="test")  # booom
 
-    @raises(NotImplementedError)
+    @raises(pe.sources.factory.UnknownParameters)
     def test_get_sheet(self):
         myinput = TestInput()
         myinput.get_sheet(unrelated="foo bar")
 
-    @raises(NotImplementedError)
+    @raises(pe.sources.factory.UnknownParameters)
     def test_get_array(self):
         myinput = TestInput()
         myinput.get_array(unrelated="foo bar")
 
-    @raises(NotImplementedError)
+    @raises(pe.sources.factory.UnknownParameters)
     def test_get_dict(self):
         myinput = TestInput()
         myinput.get_dict(unrelated="foo bar")
 
-    @raises(NotImplementedError)
+    @raises(pe.sources.factory.UnknownParameters)
     def test_get_records(self):
         myinput = TestInput()
         myinput.get_records(unrelated="foo bar")
 
-    @raises(NotImplementedError)
+    @raises(pe.sources.factory.UnknownParameters)
     def test_get_book(self):
         myinput = TestInput()
         myinput.get_book(unrelated="foo bar")
 
-    @raises(NotImplementedError)
+    @raises(pe.sources.factory.UnknownParameters)
     def test_get_book_dict(self):
         myinput = TestInput()
         myinput.get_book_dict(unrelated="foo bar")