Merge branch 'master' of github.com:/buxx/synergine2

README.md

@@ -1,6 +1,6 @@
 # synergine2
 
-[![Build Status](https://travis-ci.org/buxx/synergine2.svg?branch=master)](https://travis-ci.org/buxx/synergine2) [![Coverage Status](https://coveralls.io/repos/github/buxx/synergine2/badge.svg?branch=master)](https://coveralls.io/github/buxx/synergine2?branch=master)
+[![Build Status](https://travis-ci.org/buxx/synergine2.svg?branch=master)](https://travis-ci.org/buxx/synergine2) [![Coverage Status](https://coveralls.io/repos/github/buxx/synergine2/badge.svg?branch=master)](https://coveralls.io/github/buxx/synergine2?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3ebc962adf294ebdb5f6ac052ad5300e)](https://www.codacy.com/app/sevajol.bastien/synergine2?utm_source=github.com&utm_medium=referral&utm_content=buxx/synergine2&utm_campaign=Badge_Grade)
 
 A framework to build simulation with subject focused.
 

synergine2_cocos2d/middleware.py

@@ -1,9 +1,13 @@
 # coding: utf-8
 import os
+import typing
 
-import cocos
 from synergine2.config import Config
 from synergine2.log import get_logger
+from synergine2_cocos2d.util import get_map_file_path_from_dir
+
+if typing.TYPE_CHECKING:
+    import cocos
 
 
 class MapMiddleware(object):
@@ -18,22 +22,23 @@ class MapMiddleware(object):
         self.tmx = None
 
     def get_map_file_path(self) -> str:
-        return os.path.join(
-            self.map_dir_path,
-            '{}.tmx'.format(os.path.basename(self.map_dir_path)),
-        )
+        return get_map_file_path_from_dir(self.map_dir_path)
 
     def init(self) -> None:
+        # import cocos here for prevent test crash when no X server is
+        # present
+        import cocos
+
         map_file_path = self.get_map_file_path()
         self.tmx = cocos.tiles.load(map_file_path)
 
-    def get_background_sprite(self) -> cocos.sprite.Sprite:
+    def get_background_sprite(self) -> 'cocos.sprite.Sprite':
         raise NotImplementedError()
 
-    def get_ground_layer(self) -> cocos.tiles.RectMapLayer:
+    def get_ground_layer(self) -> 'cocos.tiles.RectMapLayer':
         raise NotImplementedError()
 
-    def get_top_layer(self) -> cocos.tiles.RectMapLayer:
+    def get_top_layer(self) -> 'cocos.tiles.RectMapLayer':
         raise NotImplementedError()
 
     def get_world_height(self) -> int:
@@ -50,25 +55,25 @@ class MapMiddleware(object):
 
 
 class TMXMiddleware(MapMiddleware):
-    def get_background_sprite(self) -> cocos.sprite.Sprite:
+    def get_background_sprite(self) -> 'cocos.sprite.Sprite':
         # TODO: Extract it from tmx
         return cocos.sprite.Sprite(os.path.join(
             self.map_dir_path,
             'background.png',
         ))
 
-    def get_interior_sprite(self) -> cocos.sprite.Sprite:
+    def get_interior_sprite(self) -> 'cocos.sprite.Sprite':
         # TODO: Extract it from tmx
         return cocos.sprite.Sprite(os.path.join(
             self.map_dir_path,
             'background_interiors.png',
         ))
 
-    def get_ground_layer(self) -> cocos.tiles.RectMapLayer:
+    def get_ground_layer(self) -> 'cocos.tiles.RectMapLayer':
         assert self.tmx
         return self.tmx['ground']
 
-    def get_top_layer(self) -> cocos.tiles.RectMapLayer:
+    def get_top_layer(self) -> 'cocos.tiles.RectMapLayer':
         assert self.tmx
         return self.tmx['top']
 

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_middleware.py

@@ -0,0 +1,10 @@
+from synergine2.config import Config
+from synergine2_cocos2d.middleware import MapMiddleware
+
+class TestMapMiddleware:
+    def test_get_map_file_path(self):
+        test = MapMiddleware(Config(), 'map/003')
+        assert test.get_map_file_path() == 'map/003/003.tmx'
+        test = MapMiddleware(Config(), 'map/003/')
+        assert test.get_map_file_path() == 'map/003/003.tmx'
+

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'