haml_coffee_assets 0.2.0 → 0.2.1

data/README.md

@@ -143,7 +143,7 @@ processor by using `.jst.hamlc` as extension, and if you do, the Haml Coffee tem
 By default all Haml Coffee templates are rendered to a HTML5 document. You can choose between the following output
 formats:
 
-* html
+* html5
 * html4
 * xhtml
 

data/lib/haml_coffee_assets/version.rb

@@ -1,5 +1,5 @@
 # coding: UTF-8
 
 module HamlCoffeeAssets
-  VERSION = '0.2.0' unless defined?(HamlCoffeeAssets::VERSION)
+  VERSION = '0.2.1' unless defined?(HamlCoffeeAssets::VERSION)
 end

data/lib/js/haml-coffee.js

@@ -499,6 +499,13 @@ require.define("/helper.js", function (require, module, exports, __dirname, __fi
     escapeHTML: function(text) {
       if (!text) return '';
       return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\"/g, '&quot;');
+    },
+    preserve: function(code) {
+      if (code) {
+        return code.replace(/<(pre|textarea)>(.*?)<\/\1>/g, function(text) {
+          return text.replace('\\n', '\&\#x000A;');
+        });
+      }
     }
   };
 
@@ -535,13 +542,15 @@ require.define("/nodes/text.js", function (require, module, exports, __dirname,
 
 require.define("/nodes/haml.js", function (require, module, exports, __dirname, __filename) {
     (function() {
-  var Haml, Node, eq;
+  var Haml, Node, eq, p;
   var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
 
   Node = require('./node');
 
   eq = require('../helper').escapeQuotes;
 
+  p = require('../helper').preserve;
+
   module.exports = Haml = (function() {
 
     __extends(Haml, Node);
@@ -555,7 +564,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
     Haml.preserveTags = ['pre', 'textarea'];
 
     Haml.prototype.evaluate = function() {
-      var code, prefix, tokens;
+      var assignment, code, identifier, match, prefix, tokens;
       tokens = this.parseExpression(this.expression);
       if (tokens.doctype) {
         return this.opener = this.markText("" + (eq(this.buildDocType(tokens.doctype))));
@@ -563,7 +572,16 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
         if (this.isNotSelfClosing(tokens.tag)) {
           prefix = eq(this.buildHtmlTagPrefix(tokens));
           if (tokens.assignment) {
-            code = this.escapeHtml ? "\#{e " + tokens.assignment + "}" : "\#{" + tokens.assignment + "}";
+            match = tokens.assignment.match(/^(=|!=|&=|~)\s*(.*)$/);
+            identifier = match[1];
+            assignment = match[2];
+            if (identifier === '~') {
+              code = p(assignment);
+            } else if (identifier === '&=' || (identifier === '=' && this.escapeHtml)) {
+              code = "\#{e " + assignment + "}";
+            } else if (identifier === '!=' || (identifier === '=' && !this.escapeHtml)) {
+              code = "\#{" + assignment + "}";
+            }
             this.opener = this.markText("" + prefix + ">" + code);
             return this.closer = this.markText("</" + tokens.tag + ">");
           } else if (tokens.text) {
@@ -618,7 +636,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
     };
 
     Haml.prototype.parseTag = function(exp) {
-      var assignment, attributes, classes, doctype, haml, id, ids, klass, tag, text, tokens, whitespace, _ref, _ref2, _ref3;
+      var assignment, attributes, classes, doctype, haml, id, ids, klass, tag, text, tokens, whitespace, _ref;
       try {
         doctype = (_ref = exp.match(/^(\!{3}.*)/)) != null ? _ref[1] : void 0;
         if (doctype) {
@@ -626,14 +644,14 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
             doctype: doctype
           };
         }
-        tokens = exp.match(/^((?:[#%\.][a-z0-9_:\-]*[\/]?)+)(?:([\(\{].*[\)\}])?([\<\>]{0,2})(?==)|([\(\{].*[\)\}])?([\<\>]{0,2}))(.*)?/i);
+        tokens = exp.match(/^((?:[#%\.][a-z0-9_:\-]*[\/]?)+)(?:([\(\{].*[\)\}])?([\<\>]{0,2})(?=[=&!~])(.*)?|([\(\{].*[\)\}])?([\<\>]{0,2}))(.*)?/i);
         haml = tokens[1];
-        attributes = tokens[2] || tokens[4];
-        whitespace = tokens[3] || tokens[5];
-        if (tokens[6] && !tokens[6].match(/^=/)) {
-          text = tokens[6].replace(/^ /, '');
-        } else {
-          assignment = (_ref2 = tokens[6]) != null ? (_ref3 = _ref2.match(/\=\s*(\S+.*)$/)) != null ? _ref3[1] : void 0 : void 0;
+        attributes = tokens[2] || tokens[5];
+        whitespace = tokens[3] || tokens[6];
+        assignment = tokens[4] || tokens[7];
+        if (assignment && !assignment.match(/^(=|!=|&=|~)/)) {
+          text = assignment.replace(/^ /, '');
+          assignment = void 0;
         }
         if (whitespace) {
           if (whitespace.indexOf('>') !== -1) this.wsRemoval.around = true;
@@ -805,11 +823,13 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
 
 require.define("/nodes/code.js", function (require, module, exports, __dirname, __filename) {
     (function() {
-  var Code, Node;
+  var Code, Node, p;
   var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
 
   Node = require('./node');
 
+  p = require('../helper').preserve;
+
   module.exports = Code = (function() {
 
     __extends(Code, Node);
@@ -829,7 +849,7 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
           return this.closer = this.markRunningCode("  ''");
         }
       } else if (identifier === '~') {
-        return this.opener = this.markInsertingCode(this.findAndPreserve(code));
+        return this.opener = this.markInsertingCode(p(code));
       } else if (identifier === '&=' || (identifier === '=' && this.escapeHtml)) {
         return this.opener = this.markInsertingCode(code, true);
       } else if (identifier === '!=' || (identifier === '=' && !this.escapeHtml)) {
@@ -837,12 +857,6 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
       }
     };
 
-    Code.prototype.findAndPreserve = function(code) {
-      return code.replace(/<(pre|textarea)>(.*?)<\/\1>/g, function(text) {
-        return text.replace('\\n', '\&\#x000A;');
-      });
-    };
-
     return Code;
 
   })();

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Michael Kessler