Merge pull request #188 from trengrj/master

Allow more liberal matching of template names
quirkey · Feb 1, 2014 · 7b44259 · 7b44259
2 parents fb196a1 + 6c045f9
commit 7b44259
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/sammy.js b/lib/sammy.js
@@ -1979,7 +1979,7 @@ $.extend(Sammy.DefaultLocationProxy.prototype , {
       if (_isFunction(engine)) { return engine; }
       // lookup engine name by path extension
       engine = (engine || context.app.template_engine).toString();
-      if ((engine_match = engine.match(/\.([^\.\?\#]+)$/))) {
+      if ((engine_match = engine.match(/\.([^\.\?\#]+)(\?|$)/))) {
         engine = engine_match[1];
       }
       // set the engine to the default template engine if no match is found

diff --git a/test/event_context_spec.js b/test/event_context_spec.js
@@ -95,6 +95,15 @@ describe('EventContext', function() {
       });
     });
 
+    it('runs through template() if Sammy.Template _is_ present _and_ GET parameters appended', function(done) {
+      app.use(Sammy.Template);
+      context = new app.context_prototype(app);
+      context.partial('./fixtures/../fixtures/partial.template?var1=09&var2=abc', {name: 'TEMPLATE!', class_name: 'test_template'}).then(function(data) {
+        expect(data).to.eql('<div class="test_template">TEMPLATE!</div>');
+        done();
+      });
+    });
+
     it('replaces the default app element if no callback is passed', function(done) {
       listenToChanged(app, {
         setup: function() {