Merge pull request #74 from mrjoelkemp/fix_sass_root

Add a trailing slash to all roots.
dependents · Dec 12, 2014 · 596a860 · 596a860
2 parents ed45288 + 5a578da
commit 596a860
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Dependents.py b/Dependents.py
@@ -18,9 +18,6 @@ def run(self, modifier=''):
         settings = get_project_settings(base_path)
 
         self.window.root = settings['root']
-        if self.window.root[-1] != '/':
-            self.window.root += '/'
-
         self.window.config = settings['config']
         self.window.sass_root = settings['sass_root']
 

diff --git a/JumpToDependency.py b/JumpToDependency.py
@@ -19,11 +19,8 @@ def run(self):
 
         settings = get_project_settings(base_path)
 
-        self.window.root    = settings['root']
-        self.window.sass_root    = settings['sass_root']
-
-        if self.window.root[-1] != '/':
-            self.window.root += '/'
+        self.window.root = settings['root']
+        self.window.sass_root = settings['sass_root']
 
         if self.window.root == './' or self.window.root == '.':
             self.window.root = base_path

diff --git a/project_settings.py b/project_settings.py
@@ -5,12 +5,20 @@
 def get_settings_from_source(source):
     settings = {}
 
-    settings['root'] = source.get('root', '')
+    settings['root'] = normalize_trailing_slash(source.get('root', ''))
+    settings['sass_root'] = normalize_trailing_slash(source.get('sass_root', ''))
     settings['config'] = source.get('config', '')
-    settings['sass_root'] = source.get('sass_root', '')
 
     return settings
 
+def normalize_trailing_slash(string):
+    normalized = string
+
+    if normalized and normalized[-1] != '/':
+        normalized += '/'
+
+    return normalized
+
 def get_project_settings(base_path):
     """
     Returns a settings map that contains project settings