Updated main function to not need data file

If no data file is present it defaults to an empty dictionary

diff --git a/chevron/chevron.py b/chevron/chevron.py
index 921d8ee3d39ed3b143acfbdbc01d3571cdec6db5..23efd000edf78e4b5ffd4183c7e34005cb3bb151 100755 (executable)
--- a/chevron/chevron.py
+++ b/chevron/chevron.py
@@ -379,19 +379,22 @@ def render(template='', data={}, partials_path='.', partials_ext='mustache',
         return output.encode('utf-8')
 
 
-def main(data, template, **kwargs):
-    data = data
-    template = template
-
+def main(template, data=None, **kwargs):
     with open(template, 'r') as template_file:
-        with open(data, 'r') as data_file:
-            args = {
-                'template': template_file,
-                'data': json.load(data_file)
-            }
-
-            args.update(kwargs)
-            return render(**args)
+        if data is not None:
+            data_file = open(data, 'r')
+            data = json.load(data_file)
+            data_file.close()
+        else:
+            data = {}
+
+        args = {
+            'template': template_file,
+            'data': data
+        }
+
+        args.update(kwargs)
+        return render(**args)
 
 
 def cli_main():

diff --git a/test_spec.py b/test_spec.py
index e5c88106306ca8745ea18bde28c467bf44d8f93c..eb780e2837681a6f811bf8f63a8eb84b5e5b6ff5 100755 (executable)
--- a/test_spec.py
+++ b/test_spec.py
@@ -107,7 +107,7 @@ class ExpandedCoverage(unittest.TestCase):
         self.assertEqual(result, expected)
 
     def test_main(self):
-        result = chevron.main('tests/data.json', 'tests/test.mustache',
+        result = chevron.main('tests/test.mustache', 'tests/data.json',
                               partials_path='tests')
 
         with open('tests/test.rendered', 'r') as f: