Merge pull request #14 from chaos-bodensee/flag

allow to toggle Flag and update libsass

README.md

@@ -24,7 +24,7 @@ lektor plugins add lektor-scss
 Or by hand, adding the plugin to the packages section in your lektorproject file:
 ```ini
 [packages]
-lektor-scss = 1.4.2
+lektor-scss = 1.5.0
 ```
  Usage
 ------
@@ -60,6 +60,7 @@ The Plugin has the following settings you can adjust to your needs:
 |source_comments|False              | whether to add comments about source lines                                                       |
 |precision      |5                  | precision for numbers                                                                            |
 |include_paths  |                   |If you want to include SASS libraries from a different directory, libsass's compile function has a parameter called `include_paths` to add those directories to the search path. |
+|use_compile_flag|True              | If True the flag '-scss' is needed. Otherwise not. |
 
 
 An example file with the default config can be found at ``configs/scss.ini``. For every parameter that is not specified in the config file the default value is used by the plugin.

configs/scss.ini

@@ -1,3 +1,4 @@
+use_compile_flag = True
 source_dir = assets/scss/
 output_dir = assets/css/
 output_style = compressed

lektor_scss.py

@@ -20,6 +20,7 @@ class scssPlugin(Plugin):
     def __init__(self, *args, **kwargs):
         Plugin.__init__(self, *args, **kwargs)
         config = self.get_config()
+        self.use_compile_flag = config.get('use_compile_flag', 'True')
         self.source_dir = config.get('source_dir', 'assets/scss/')
         self.output_dir = config.get('output_dir', 'assets/css/')
         self.output_style = config.get('output_style', 'compressed')
@@ -39,7 +40,10 @@ def __init__(self, *args, **kwargs):
         self.run_watcher = False
 
     def is_enabled(self, build_flags):
-        return bool(build_flags.get(COMPILE_FLAG))
+        if self.use_compile_flag == 'True' or self.use_compile_flag == 'true' or self.use_compile_flag == '1' or self.use_compile_flag == 'yes':
+            return bool(build_flags.get(COMPILE_FLAG))
+        else:
+            return True
 
     def find_dependencies(self, target):
         dependencies = [target]

setup.py

@@ -21,9 +21,9 @@
     packages=find_packages(),
     py_modules=['lektor_scss'],
     url='https://github.com/chaos-bodensee/lektor-scss.git',
-    version='1.4.2',
+    version='1.5.0',
     install_requires  =  [
-        "libsass==0.22.0", "termcolor",
+        "libsass==0.23.0", "termcolor",
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",