Merge pull request #52 from thombashi/develop

Develop
thombashi · Nov 5, 2016 · 2d9a9c0 · 2d9a9c0
2 parents 660c352 + 356448b
commit 2d9a9c0
Show file tree

Hide file tree

Showing 12 changed files with 498 additions and 1,358 deletions.
diff --git a/docs/pages/reference/converter.rst b/docs/pages/reference/converter.rst
@@ -7,4 +7,3 @@ RecordConvertor class
 .. autoclass:: simplesqlite.converter.RecordConvertor
     :members:
     :undoc-members:
-    :show-inheritance:
diff --git a/docs/pages/reference/function.rst b/docs/pages/reference/function.rst
@@ -1,10 +1,6 @@
 Functions
 ----------------------------
 
-.. autofunction:: simplesqlite.validate_table_name
-
-.. autofunction:: simplesqlite.validate_attr_name
-
 .. autofunction:: simplesqlite.append_table
 
 .. autofunction:: simplesqlite.connect_sqlite_db_mem
diff --git a/docs/pages/reference/loader.rst b/docs/pages/reference/loader.rst
@@ -5,6 +5,4 @@ GoogleSheetsTableLoader class
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. autoclass:: simplesqlite.loader.GoogleSheetsTableLoader
-    :members:
-    :undoc-members:
-    :show-inheritance:
+    :inherited-members:
diff --git a/docs/pages/reference/simplesqlite.rst b/docs/pages/reference/simplesqlite.rst
@@ -4,4 +4,3 @@ SimpleSQLite class
 .. autoclass:: simplesqlite.SimpleSQLite
     :members:
     :undoc-members:
-    :show-inheritance:
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,8 +1,8 @@
 beautifulsoup4
-DataProperty>=0.10.1
+DataProperty>=0.11.2
 jsonschema
 pathvalidate>=0.8.3
-pytablereader>=0.3.0
+pytablereader>=0.4.2
 path.py
 six
 xlrd
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
 
 setuptools.setup(
     name="SimpleSQLite",
-    version="0.6.1",
+    version="0.6.2",
     url="https://github.com/thombashi/SimpleSQLite",
     bugtrack_url="https://github.com/thombashi/SimpleSQLite/issues",
 

diff --git a/simplesqlite/__init__.py b/simplesqlite/__init__.py
@@ -10,15 +10,18 @@
 
 import simplesqlite.loader
 from .core import SimpleSQLite
-from ._error import NullDatabaseConnectionError
-from ._error import TableNotFoundError
-from ._error import AttributeNotFoundError
-from ._error import InvalidTableNameError
-from ._error import InvalidAttributeNameError
-from ._error import SqlSyntaxError
-from ._error import OperationalError
-
-from ._func import validate_table_name
-from ._func import validate_attr_name
-from ._func import append_table
-from ._func import connect_sqlite_db_mem
+from ._error import (
+    NullDatabaseConnectionError,
+    TableNotFoundError,
+    AttributeNotFoundError,
+    InvalidTableNameError,
+    InvalidAttributeNameError,
+    SqlSyntaxError,
+    OperationalError
+)
+from ._func import (
+    validate_table_name,
+    validate_attr_name,
+    append_table,
+    connect_sqlite_db_mem
+)
diff --git a/simplesqlite/core.py b/simplesqlite/core.py
@@ -17,16 +17,20 @@
 
 from .sqlquery import SqlQuery
 from .converter import RecordConvertor
-from ._error import AttributeNotFoundError
-from ._error import NullDatabaseConnectionError
-from ._error import TableNotFoundError
-from ._error import InvalidTableNameError
-from ._error import InvalidAttributeNameError
-from ._error import OperationalError
-from ._func import connect_sqlite_db_mem
-from ._func import validate_table_name
-from ._func import validate_attr_name
-from ._func import MEMORY_DB_NAME
+from ._error import (
+    AttributeNotFoundError,
+    NullDatabaseConnectionError,
+    TableNotFoundError,
+    InvalidTableNameError,
+    InvalidAttributeNameError,
+    OperationalError
+)
+from ._func import (
+    connect_sqlite_db_mem,
+    validate_table_name,
+    validate_attr_name,
+    MEMORY_DB_NAME
+)
 
 
 class SimpleSQLite(object):

diff --git a/simplesqlite/sqlquery.py b/simplesqlite/sqlquery.py
@@ -174,15 +174,15 @@ def to_value_str(cls, value):
             >>> SqlQuery.to_value_str(None)
             'NULL'
         """
-        from dataproperty.type import IntegerTypeChecker
-        from dataproperty.type import FloatTypeChecker
+
+        from dataproperty import (IntegerType, FloatType)
 
         if value is None:
             return "NULL"
 
         if any([
-            IntegerTypeChecker(value).is_type(),
-            FloatTypeChecker(value).is_type()
+            IntegerType(value).is_type(),
+            FloatType(value).is_type()
         ]):
             return str(value)
 

diff --git a/test/data/Python (programming language) - Wikipedia, the free encyclopedia.html b/test/data/Python (programming language) - Wikipedia, the free encyclopedia.html
diff --git a/test/data/python - Wiktionary.html b/test/data/python - Wiktionary.html
diff --git a/test/test_from_file.py b/test/test_from_file.py
@@ -16,7 +16,7 @@
 class Test_SimpleSQLite_create_table_from_tabledata:
 
     @pytest.mark.parametrize(["filename"], [
-        ["Python (programming language) - Wikipedia, the free encyclopedia.html"],
+        ["python - Wiktionary.html"],
     ])
     def test_smoke(self, tmpdir, filename):
         p = tmpdir.join("tmp.db")
@@ -25,7 +25,7 @@ def test_smoke(self, tmpdir, filename):
         test_data_file_path = os.path.join(
             os.path.dirname(__file__), "data", filename)
         loader_factory = ptr.TableFileLoaderFactory(test_data_file_path)
-        loader = loader_factory.create_from_file_path()
+        loader = loader_factory.create_from_path()
 
         success_count = 0
 
@@ -39,8 +39,8 @@ def test_smoke(self, tmpdir, filename):
                 con.create_table_from_tabledata(
                     ptr.SQLiteTableDataSanitizer(tabledata).sanitize())
                 success_count += 1
-            except ValueError:
-                pass
+            except ValueError as e:
+                print(e)
 
         con.commit()