Merge pull request #6 from ohbarye/0.1.2

Prepare release 0.1.2

README.rst

@@ -30,7 +30,7 @@ Just try
 Start server
 ------------
 
-You don't need any special preparation to try to start server. Just execute below comands.
+You don't need any special preparation to try to start server. Just execute below commands.
 
 ::
 
@@ -43,6 +43,16 @@ You don't need any special preparation to try to start server. Just execute belo
         Bottle v0.12.8 server starting up (using WSGIRefServer())...
         Listening on http://localhost:8009/
 
+Or, you can install from PyPi.
+
+::
+
+    (.venv)$ pip install markdown-server
+    (.venv)$ markdownserver
+        Bottle v0.12.8 server starting up (using WSGIRefServer())...
+        Listening on http://localhost:8009/
+
+
 If server start up successfully, browse below URL and check the converted result.
 
 ::

markdownserver/__init__.py

@@ -9,7 +9,7 @@ converter = MarkdownConverter()
 def gfmize(resource):
 
     html_file_name = os.path.basename(converter.convert(resource))
-    return static_file(os.path.join(html_dir, html_file_name), root=root_path)
+    return static_file(os.path.join('resources/html', html_file_name), root=root_path)
 
 def main():
     run(host=ms_host,port=ms_port,debug=ms_debug,reloader=ms_reloader)

markdownserver/markdown_converter.py

@@ -36,7 +36,7 @@ class MarkdownConverter(object):
         return md_file.read()
 
     def write_html(self,body,file_name,dst):
-        html_path = os.path.join(html_root, file_name + html_extension)
+        html_path = os.path.join(html_dir, file_name + html_extension)
 
         if dst != "":
             html_path = dst

setup.py

@@ -11,7 +11,7 @@ def read_file(filename):
 
 setup(
     name = 'markdown-server',
-    version  = '0.1.1',
+    version  = '0.1.2',
     description = 'A simple markdown server.',
     long_description = read_file('README.rst'),
     author = 'Masato Ohba',