Issue 110: Modified combined plugin to process during begin_text_resource

CHANGELOG.rst

@@ -1,3 +1,8 @@
+Version 0.8.5a3
+============================================================
+
+*   Bug Fix:  Modified combined plugin to process during `begin_text_resource`. (Issue #110)
+
 Version 0.8.5a2
 ============================================================
 

README.rst

@@ -1,4 +1,4 @@
-Version 0.8.5a2
+Version 0.8.5a3
 
 A brand new **hyde**
 ====================

hyde/ext/plugins/combine.py

@@ -96,7 +96,7 @@ class CombinePlugin(Plugin):
                             "Resource [%s] removed because combined" % r)
                         r.is_processable = False
 
-    def text_resource_complete(self, resource, text):
+    def begin_text_resource(self, resource, text):
         """
         When generating a resource, add combined file if needed.
         """

hyde/tests/ext/combine/script.3.js

@@ -1 +1,2 @@
-var c = a + 5;
+{% set five = 5 %}
+var c = a + {{ five }};

hyde/tests/ext/test_combine.py

@@ -65,7 +65,6 @@ combine:
 ---
 
 First line
-
 """)
         expected = """First line
 var a = 1 + 2;
@@ -73,7 +72,7 @@ var b = a + 3;
 var c = a + 5;
 """
 
-        assert text == expected
+        assert text.strip() == expected.strip()
         return
 
     def test_combine_remove(self):
@@ -119,7 +118,6 @@ combine:
 ---
 
 Last line""")
-        print text
         assert text == """var a = 1 + 2;
 var b = a + 3;
 var c = a + 5;

hyde/version.py

@@ -3,4 +3,4 @@
 Handles hyde version
 TODO: Use fabric like versioning scheme
 """
-__version__ = '0.8.5a2'
+__version__ = '0.8.5a3'