Merge branch 'pr/558'

Conflicts:
	docs/settings.rst
	pelican/signals.py

tests/support.py

@@ -3,11 +3,12 @@ __all__ = [
     'unittest',
 ]
 
-import os
-import subprocess
-import re
-import sys
 import cStringIO
+import importlib
+import os
+import re
+import subprocess
+import sys
 
 from functools import wraps
 from contextlib import contextmanager
@@ -138,3 +139,14 @@ def skipIfNoExecutable(executable):
         return unittest.skip('{0} executable not found'.format(executable))
 
     return lambda func: func
+
+
+def module_exists(module_name):
+    """Test if a module is importable."""
+
+    try:
+        importlib.import_module(module_name)
+    except ImportError:
+        return False
+    else:
+        return True

tests/test_generators.py

@@ -2,15 +2,16 @@
 
 from mock import MagicMock
 import os
-import re
+
+from codecs import open
 from tempfile import mkdtemp
 from shutil import rmtree
 
-from pelican.generators import ArticlesGenerator, LessCSSGenerator, \
-        PagesGenerator, TemplatePagesGenerator
+from pelican.generators import ArticlesGenerator, PagesGenerator, \
+    TemplatePagesGenerator
 from pelican.writers import Writer
 from pelican.settings import _DEFAULT_CONFIG
-from .support import unittest, skipIfNoExecutable
+from .support import unittest
 
 CUR_DIR = os.path.dirname(__file__)
 
@@ -238,55 +239,3 @@ class TestTemplatePagesGenerator(unittest.TestCase):
         # output content is correct
         with open(output_filename, 'r') as output_file:
             self.assertEquals(output_file.read(), 'foo: bar')
-
-
-class TestLessCSSGenerator(unittest.TestCase):
-
-    LESS_CONTENT = """
-        @color: #4D926F;
-
-        #header {
-          color: @color;
-        }
-        h2 {
-          color: @color;
-        }
-    """
-
-    def setUp(self):
-        self.temp_content = mkdtemp()
-        self.temp_output = mkdtemp()
-
-    def tearDown(self):
-        rmtree(self.temp_content)
-        rmtree(self.temp_output)
-
-    @skipIfNoExecutable('lessc')
-    def test_less_compiler(self):
-
-        settings = _DEFAULT_CONFIG.copy()
-        settings['STATIC_PATHS'] = ['static']
-        settings['LESS_GENERATOR'] = True
-
-        generator = LessCSSGenerator(None, settings, self.temp_content,
-                        _DEFAULT_CONFIG['THEME'], self.temp_output, None)
-
-        # create a dummy less file
-        less_dir = os.path.join(self.temp_content, 'static', 'css')
-        less_filename = os.path.join(less_dir, 'test.less')
-
-        less_output = os.path.join(self.temp_output, 'static', 'css',
-                            'test.css')
-
-        os.makedirs(less_dir)
-        with open(less_filename, 'w') as less_file:
-            less_file.write(self.LESS_CONTENT)
-
-        generator.generate_output()
-
-        # we have the file ?
-        self.assertTrue(os.path.exists(less_output))
-
-        # was it compiled ?
-        self.assertIsNotNone(re.search(r'^\s+color:\s*#4D926F;$',
-            open(less_output).read(), re.MULTILINE | re.IGNORECASE))

tests/test_webassets.py

@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+
+import hashlib
+import os
+from codecs import open
+from tempfile import mkdtemp
+from shutil import rmtree
+
+from pelican import Pelican
+from pelican.settings import read_settings
+from .support import unittest, skipIfNoExecutable, module_exists
+
+CUR_DIR = os.path.dirname(__file__)
+THEME_DIR = os.path.join(CUR_DIR, 'themes', 'assets')
+CSS_REF = open(os.path.join(THEME_DIR, 'static', 'css',
+                            'style.min.css')).read()
+CSS_HASH = hashlib.md5(CSS_REF).hexdigest()[0:8]
+
+
+@unittest.skipUnless(module_exists('webassets'), "webassets isn't installed")
+@skipIfNoExecutable(['scss', '-v'])
+@skipIfNoExecutable(['cssmin', '--version'])
+class TestWebAssets(unittest.TestCase):
+    """Base class for testing webassets."""
+
+    def setUp(self, override=None):
+        self.temp_path = mkdtemp()
+        settings = {
+            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
+            'OUTPUT_PATH': self.temp_path,
+            'PLUGINS': ['pelican.plugins.assets', ],
+            'THEME': THEME_DIR,
+        }
+        if override:
+            settings.update(override)
+
+        self.settings = read_settings(override=settings)
+        pelican = Pelican(settings=self.settings)
+        pelican.run()
+
+    def tearDown(self):
+        rmtree(self.temp_path)
+
+    def check_link_tag(self, css_file, html_file):
+        """Check the presence of `css_file` in `html_file`."""
+
+        link_tag = '<link rel="stylesheet" href="{css_file}">'.\
+                   format(css_file=css_file)
+        html = open(html_file).read()
+        self.assertRegexpMatches(html, link_tag)
+
+
+class TestWebAssetsRelativeURLS(TestWebAssets):
+    """Test pelican with relative urls."""
+
+    def test_jinja2_ext(self):
+        """Test that the Jinja2 extension was correctly added."""
+
+        from webassets.ext.jinja2 import AssetsExtension
+        self.assertIn(AssetsExtension, self.settings['JINJA_EXTENSIONS'])
+
+    def test_compilation(self):
+        """Compare the compiled css with the reference."""
+
+        gen_file = os.path.join(self.temp_path, 'theme', 'gen',
+                                'style.{0}.min.css'.format(CSS_HASH))
+        self.assertTrue(os.path.isfile(gen_file))
+
+        css_new = open(gen_file).read()
+        self.assertEqual(css_new, CSS_REF)
+
+    def test_template(self):
+        """Look in the output files for the link tag."""
+
+        css_file = './theme/gen/style.{0}.min.css'.format(CSS_HASH)
+        html_files = ['index.html', 'archives.html',
+                      'this-is-an-article-with-category.html']
+        for f in html_files:
+            self.check_link_tag(css_file, os.path.join(self.temp_path, f))
+
+        self.check_link_tag(
+            '.././theme/gen/style.{0}.min.css'.format(CSS_HASH),
+            os.path.join(self.temp_path, 'category/misc.html'))
+
+
+class TestWebAssetsAbsoluteURLS(TestWebAssets):
+    """Test pelican with absolute urls."""
+
+    def setUp(self):
+        TestWebAssets.setUp(self, override={'RELATIVE_URLS': False,
+                                            'SITEURL': 'http://localhost'})
+
+    def test_absolute_url(self):
+        """Look in the output files for the link tag with absolute url."""
+
+        css_file = 'http://localhost/theme/gen/style.{0}.min.css'.\
+                   format(CSS_HASH)
+        html_files = ['index.html', 'archives.html',
+                      'this-is-an-article-with-category.html']
+        for f in html_files:
+            self.check_link_tag(css_file, os.path.join(self.temp_path, f))

tests/themes/assets/static/css/style.min.css

@@ -0,0 +1 @@
+body{font:14px/1.5 "Droid Sans",sans-serif;background-color:#e4e4e4;color:#242424}a{color:red}a:hover{color:orange}

tests/themes/assets/static/css/style.scss

@@ -0,0 +1,19 @@
+/* -*- scss-compile-at-save: nil -*- */
+
+$baseFontFamily : "Droid Sans", sans-serif;
+$textColor      : #242424;
+$bodyBackground : #e4e4e4;
+
+body {
+  font: 14px/1.5 $baseFontFamily;
+  background-color: $bodyBackground;
+  color: $textColor;
+}
+
+a {
+  color: red;
+
+  &:hover {
+    color: orange;
+  }
+}

tests/themes/assets/templates/base.html

@@ -0,0 +1,7 @@
+{% extends "!simple/base.html" %}
+
+{% block head %}
+  {% assets filters="scss,cssmin", output="gen/style.%(version)s.min.css", "css/style.scss" %}
+    <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
+  {% endassets %}
+{% endblock %}