Merge pull request #21 from tomlowshang/trailing_slash

synergine2_cocos2d/util.py

@@ -10,7 +10,8 @@ from synergine2_cocos2d.exception import FileNotFound
 
 def get_map_file_path_from_dir(map_dir_path: str) -> str:
     # TODO: path is temp here
-    return '{}.tmx'.format(os.path.join(map_dir_path, os.path.basename(map_dir_path)))
+    return '{}.tmx'.format(os.path.join(map_dir_path,
+        os.path.basename(map_dir_path.rstrip('/'))))
 
 
 class PathManager(object):

tests/test_utils.py

@@ -6,6 +6,7 @@ import pytest
 from synergine2.utils import ChunkManager
 from synergine2_cocos2d.exception import FileNotFound
 from synergine2_cocos2d.util import PathManager
+from synergine2_cocos2d.util import get_map_file_path_from_dir
 from tests import BaseTest
 
 
@@ -44,3 +45,7 @@ class TestUtils(BaseTest):
         path_manager.add_included_path('tests/fixtures/some_media2')
         # it is prior on path finding
         assert 'tests/fixtures/some_media2/foo.txt' == path_manager.path('foo.txt')
+
+    def test_get_map_file_path_from_dir(self):
+        assert get_map_file_path_from_dir('map/003') == 'map/003/003.tmx'
+        assert get_map_file_path_from_dir('map/003/') == 'map/003/003.tmx'