test cases written

Author: chfw

.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+*~
+.coverage

.travis.yml

@@ -0,0 +1,19 @@
+language: python
+notifications:
+  email: false
+env:
+  global:
+python:
+  - 2.6
+  - 2.7
+  - 3.3
+  - 3.4
+  - pypy
+install:
+  - pip install git+https://github.com/chfw/pyexcel-io.git  
+  - pip install git+https://github.com/chfw/pyexcel.git
+  - pip install -r tests/requirements.txt
+script:
+  make test
+after_success:
+  coveralls

README.rst

@@ -30,3 +30,4 @@ or clone it and install it::
 Dependencies
 ============
 
+* pyexcel

pyexcel_webio/__init__.py

@@ -24,7 +24,7 @@ class ExcelInput(object):
 
     The source could be from anywhere, memory or file system
     """
-    def load_single_sheet(self, file_name, sheet_name=None, **keywords):
+    def load_single_sheet(self, sheet_name=None, **keywords):
         """Abstract method
         
         :param form_field_name: the file field name in the html form for file upload
@@ -36,7 +36,7 @@ def load_single_sheet(self, file_name, sheet_name=None, **keywords):
         """
         raise NotImplementedError("Please implement this function")
 
-    def load_book(self, file_name, **keywords):
+    def load_book(self, **keywords):
         """Abstract method
         
         :param form_field_name: the file field name in the html form for file upload
@@ -45,7 +45,7 @@ def load_book(self, file_name, **keywords):
         """
         raise NotImplementedError("Please implement this function")
 
-    def get_sheet(self, file_name, sheet_name=None, **keywords):
+    def get_sheet(self, sheet_name=None, **keywords):
         """
         Get a :class:`Sheet` instance from the file
         
@@ -56,9 +56,9 @@ def get_sheet(self, file_name, sheet_name=None, **keywords):
         :param keywords: additional key words
         :returns: A sheet object
         """
-        return self.load_single_sheet(file_name, sheet_name, **keywords)
+        return self.load_single_sheet(sheet_name=sheet_name, **keywords)
 
-    def get_array(self, file_name, sheet_name=None, **keywords):
+    def get_array(self, sheet_name=None, **keywords):
         """
         Get a list of lists from the file
         
@@ -69,10 +69,13 @@ def get_array(self, file_name, sheet_name=None, **keywords):
         :param keywords: additional key words
         :returns: A list of lists
         """
-        sheet = self.get_sheet(file_name, sheet_name, **keywords)
-        return sheet.to_array()
+        sheet = self.get_sheet(sheet_name=sheet_name, **keywords)
+        if sheet:
+            return sheet.to_array()
+        else:
+            return None
 
-    def get_dict(self, file_name, sheet_name=None, name_columns_by_row=0, name_rows_by_column=-1, **keywords):
+    def get_dict(self, sheet_name=None, name_columns_by_row=0, **keywords):
         """Get a dictionary from the file
         
         :param form_field_name: the file field name in the html form for file upload
@@ -82,12 +85,13 @@ def get_dict(self, file_name, sheet_name=None, name_columns_by_row=0, name_rows_
         :param keywords: additional key words
         :returns: A dictionary
         """
-        sheet = self.load_single_sheet(file_name, sheet_name,
-                                        name_columns_by_row=name_columns_by_row,
-                                        name_rows_by_column=name_rows_by_column, **keywords)
-        return sheet.to_dict()
+        sheet = self.load_single_sheet(sheet_name=sheet_name, name_columns_by_row=name_columns_by_row, **keywords)
+        if sheet:
+            return sheet.to_dict()
+        else:
+            return None
 
-    def get_records(self, file_name, sheet_name=None, name_columns_by_row=0, name_rows_by_column=-1, **keywords):
+    def get_records(self, sheet_name=None, name_columns_by_row=0, **keywords):
         """Get a list of records from the file
   
         :param form_field_name: the file field name in the html form for file upload
@@ -97,52 +101,78 @@ def get_records(self, file_name, sheet_name=None, name_columns_by_row=0, name_ro
         :param keywords: additional key words
         :returns: A list of records
         """
-        sheet = self.load_single_sheet(file_name, sheet_name,
-                                        name_columns_by_row=name_columns_by_row,
-                                        name_rows_by_column=name_rows_by_column, **keywords)
-        return sheet.to_records()
+        sheet = self.load_single_sheet(sheet_name=sheet_name, name_columns_by_row=name_columns_by_row, **keywords)
+        if sheet:
+            return sheet.to_records()
+        else:
+            return None
 
-    def get_book(self, file_name, **keywords):
+    def save_to_database(self, session=None, table=None, sheet_name=None, name_columns_by_row=0, **keywords):
+        sheet = self.load_single_sheet(sheet_name=sheet_name, name_columns_by_row=name_columns_by_row, **keywords)
+        sheet.save_to_database(session, table)
+
+    def get_book(self, **keywords):
         """Get a instance of :class:`Book` from the file
+
         :param form_field_name: the file field name in the html form for file upload
         :param keywords: additional key words
         :returns: A instance of :class:`Book`
         """
-        return self.load_book(file_name, **keywords)
+        return self.load_book(**keywords)
 
-    def get_book_dict(self, file_name, **keywords):
+    def get_book_dict(self, **keywords):
         """Get a dictionary of two dimensional array from the file
 
         :param form_field_name: the file field name in the html form for file upload
         :param keywords: additional key words
         :returns: A dictionary of two dimensional arrays
         """
-        book = self.get_book(file_name, **keywords)
-        return book.to_dict()
+        book = self.load_book(**keywords)
+        if book:
+            return book.to_dict()
+        else:
+            return None
+
+    def save_book_to_database(self, session, tables, **keywords):
+        book = self.load_book(**keywords)
+        book.save_to_database(session, tables)
+
 
 def dumpy_func(content, content_type=None, status=200):
     return None
 
+
 ExcelResponse = dumpy_func
 
-def make_response(pyexcel_instance, file_type, status=200):
+
+def make_response(pyexcel_instance, file_type, status=200, **keywords):
     io = BytesIO()
-    pyexcel_instance.save_to_memory(file_type, io)
+    pyexcel_instance.save_to_memory(file_type, io, **keywords)
     io.seek(0)
     return ExcelResponse(io.read(), content_type=FILE_TYPE_MIME_TABLE[file_type], status=status)
 
 
-def make_response_from_array(array, file_type, status=200):
-    return make_response(pe.Sheet(array), file_type, status)
+def make_response_from_array(array, file_type, status=200, **keywords):
+    return make_response(pe.Sheet(array), file_type, status, **keywords)
 
 
-def make_response_from_dict(adict, file_type, status=200):
-    return make_response(pe.load_from_dict(adict), file_type, status)
+def make_response_from_dict(adict, file_type, status=200, **keywords):
+    return make_response(pe.load_from_dict(adict), file_type, status, **keywords)
+
+
+def make_response_from_records(records, file_type, status=200, **keywords):
+    return make_response(pe.load_from_records(records), file_type, status, **keywords)
+
+
+def make_response_from_book_dict(adict, file_type, status=200, **keywords):
+    return make_response(pe.Book(adict), file_type, status, **keywords)
 
 
-def make_response_from_records(records, file_type, status=200):
-    return make_response(pe.load_from_records(records), file_type, status)
+def make_response_from_a_table(session, table, file_type, status=200, **keywords):
+    sheet = pe.get_sheet(session=session, table=table, **keywords)
+    return make_response(sheet, file_type, status, **keywords)
 
 
-def make_response_from_book_dict(adict, file_type, status=200):
-    return make_response(pe.Book(adict), file_type, status)
+def make_response_from_tables(session, tables, file_type, status=200, **keywords):
+    book = pe.get_book(session=session, tables=tables, **keywords)
+    return make_response(book, file_type, status, **keywords)

setup.py

@@ -17,7 +17,7 @@
     author="C. W.",
     version='0.0.1',
     author_email="wangc_2011@hotmail.com",
-    url="https://github.com/chfw/flask-pyexcel",
+    url="https://github.com/chfw/pyexcel-webio",
     description='A generic web extension for pyexcel.',
     install_requires=dependencies,
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),

test.bat

@@ -0,0 +1 @@
+nosetests --with-cov --with-doctest --doctest-extension=.rst

test.sh

@@ -0,0 +1 @@
+nosetests --rednose --with-cov --with-doctest --doctest-extension=.rst

tests/db.py

@@ -0,0 +1,22 @@
+from sqlalchemy import create_engine
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import Column , Integer, String, Float, Date
+from sqlalchemy.orm import sessionmaker
+
+engine=create_engine("sqlite:///tmp.db")
+Base=declarative_base()
+
+class Signature(Base):
+    __tablename__="signature"
+    X=Column(Integer, primary_key=True)
+    Y=Column(Integer)
+    Z=Column(Integer)
+
+class Signature2(Base):
+    __tablename__="signature2"
+    A=Column(Integer, primary_key=True)
+    B=Column(Integer)
+    C=Column(Integer)
+    
+Session=sessionmaker(bind=engine)
+

tests/requirements.txt

@@ -0,0 +1,6 @@
+nose
+rednose
+nose-cov
+python-coveralls
+coverage
+pyexcel-xls