Merge pull request #44 from thombashi/develop

Develop
thombashi · Sep 18, 2016 · d20074c · d20074c
2 parents 0406aca + fe16da1
commit d20074c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
 
 setuptools.setup(
     name="SimpleSQLite",
-    version="0.5.0",
+    version="0.5.1",
     url="https://github.com/thombashi/SimpleSQLite",
     bugtrack_url="https://github.com/thombashi/SimpleSQLite/issues",
 

diff --git a/simplesqlite/loader/html/formatter.py b/simplesqlite/loader/html/formatter.py
@@ -30,7 +30,6 @@ def to_table_data(self):
 
         for table in self.__soup.find_all("table"):
             tabledata = self.__parse_html(table)
-            self._loader.inc_table_count()
 
             yield tabledata
 

diff --git a/test/loader/test_htmlloader.py b/test/loader/test_htmlloader.py
@@ -98,6 +98,19 @@
         ),
     ])
 
+test_data_03 = Data(
+    """
+<html>
+  <head>
+    header
+  </head>
+  <body>
+    hogehoge
+  </body>
+</html>
+""",
+    [])
+
 
 class Test_HtmlTableFileLoader_make_table_name:
 
@@ -169,6 +182,12 @@ class Test_HtmlTableFileLoader_load:
                 "%(key)s",
                 test_data_02.expected,
             ],
+            [
+                test_data_03.value,
+                "tmp.html",
+                "%(default)s",
+                test_data_03.expected,
+            ],
         ])
     def test_normal(
             self, tmpdir, table_text, filename,
@@ -272,6 +291,11 @@ class Test_HtmlTableTextLoader_load:
                 "%(default)s",
                 test_data_02.expected,
             ],
+            [
+                test_data_03.value,
+                "%(default)s",
+                test_data_03.expected,
+            ],
         ])
     def test_normal(self, table_text, table_name, expected_tabletuple_list):
         loader = sloader.HtmlTableTextLoader(table_text)