version bump 1.2.1

HISTORY.md

@@ -1,5 +1,10 @@
+[1.2.1](https://github.com/paularmstrong/swig/tree/v1.2.1) / 2013-12-02
+-----------------------------------------------------------------------
+
+* Fix scoping for Express. gh-363
+
 [1.2.0](https://github.com/paularmstrong/swig/tree/v1.2.0) / 2013-12-01
--------------------------------------------------------------------------------
+-----------------------------------------------------------------------
 
 * **Added** Filepath parameter can be passed to swig.run to allow extends in-browser. gh-349
 * **Changed** Use local-context first for var lookups. gh-344, gh-347
@@ -10,14 +15,14 @@
 * **Fixed** Fix misc documentation issues. gh-359, gh-358
 
 [1.1.0](https://github.com/paularmstrong/swig/tree/v1.1.0) / 2013-10-02
--------------------------------------------------------------------------------
+-----------------------------------------------------------------------
 
 * **Added** Allow logic in default parsing. gh-326
 * **Fixed** Error when attempting to wrap spaceless tag around macro/function output. gh-336
 * **Fixed** Don't overwrite keys on the locals object. gh-337
 
 [1.0.0](https://github.com/paularmstrong/swig/tree/v1.0.0) / 2013-09-23
--------------------------------------------------------------------------------
+-----------------------------------------------------------------------
 
 * **Fixed** Allow parent and other tags to work correctly nested in other tags. gh-331
 * **Fixed** Prevent lexer from matching partial logic/words in variables. gh-330

browser/comments.js

@@ -1,2 +1,2 @@
-/*! Swig v1.2.0 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
+/*! Swig v1.2.1 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
 /*! DateZ (c) 2011 Tomo Universalis | @license https://github.com/TomoUniversalis/DateZ/blob/master/LISENCE */

docs/docs.json

@@ -1,3 +1,3 @@
 {
-  "version": "v1.2.0"
+  "version": "v1.2.1"
 }

docs/index.json

@@ -1,3 +1,3 @@
 {
-  "version": "v1.2.0"
+  "version": "v1.2.1"
 }

lib/swig.js

@@ -9,11 +9,11 @@ var fs = require('fs'),
 /**
  * Swig version number as a string.
  * @example
- * if (swig.version === "1.2.0") { ... }
+ * if (swig.version === "1.2.1") { ... }
  *
  * @type {String}
  */
-exports.version = "1.2.0";
+exports.version = "1.2.1";
 
 /**
  * Swig Options Object. This object can be passed to many of the API-level Swig methods to control various aspects of the engine. All keys are optional.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swig",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A simple, powerful, and extendable templating engine for node.js and browsers, similar to Django, Jinja2, and Twig.",
   "keywords": [
     "template",

tests/basic.test.js

@@ -13,8 +13,8 @@ function resetOptions() {
 }
 
 describe('version', function () {
-  it('is 1.2.0', function () {
-    expect(swig.version).to.equal('1.2.0');
+  it('is 1.2.1', function () {
+    expect(swig.version).to.equal('1.2.1');
   });
 });