haml_coffee_assets 1.2.0 → 1.3.0

data/README.md

@@ -1,7 +1,8 @@
 # Haml Coffee Assets [![Build Status](https://secure.travis-ci.org/netzpirat/haml_coffee_assets.png)](http://travis-ci.org/netzpirat/haml_coffee_assets)
 
 Haml Coffee Assets compiles [Haml Coffee](https://github.com/netzpirat/haml-coffee) templates in the Rails 3.1
-asset pipeline, so you can use them as JavaScript templates in your JavaScript heavy Rails application. It also works as [Tilt](https://github.com/rtomayko/tilt/) template without Rails.
+asset pipeline, so you can use them as JavaScript templates in your JavaScript heavy Rails application. It also works as
+a pure [Sprockets](https://github.com/sstephenson/sprockets) engine without Rails.
 
 Tested on MRI Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest version of JRuby.
 
@@ -25,6 +26,8 @@ Haml Coffee allows you to write inline [CoffeeScript](http://jashkenas.github.co
               = I18n.t('js.cart.item.remove')
 ```
 
+You can try Haml Coffee online by visiting [Haml Coffee Online](http://haml-coffee-online.herokuapp.com/).
+
 Please note that the `I18n` object in the above example is not part ot Haml Coffee Assets, the internationalization
 functions are provided by the [i18n.js](https://github.com/fnando/i18n-js) library.
 
@@ -52,6 +55,9 @@ below.
 Please have a look at the [CHANGELOG](https://github.com/netzpirat/haml_coffee_assets/blob/master/CHANGELOG.md) when
 upgrading to a newer Haml Coffee Assets version.
 
+If you want to use Haml Coffee with Sinatra, please have a look at the
+[Haml Coffee Sinatra](https://github.com/netzpirat/haml-coffee-sinatra) demo application.
+
 ## Usage
 
 Haml Coffee Assets allows two different ways of generating your JavaScript templates:
@@ -108,8 +114,8 @@ rake assets:clean
 ```
 
 For Rails, you can set the configuration options in your environment by accessing `config.hamlcoffee`, whereas
-if you just use the Tilt template you can access the configuration with `HamlCoffeeAssets.config`. All the following
-examples use the Rails way.
+if you just use the plain Sprockets engine you can access the configuration with `HamlCoffeeAssets.config`. All the
+following examples use the Rails way.
 
 **Please note:** When you put Haml Coffee Assets into the `:assets` group within your `Gemfile` and precompile the
 assets (the default Rails behaviour), then Haml Coffee Assets is not loaded in production and you can't set any

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/hamlcoffee.js

@@ -363,6 +363,8 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
 
   module.exports = HamlCoffee = (function() {
 
+    HamlCoffee.VERSION = '1.3.0';
+
     function HamlCoffee(options) {
       var _base, _base1, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _ref, _ref1, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8;
       this.options = options != null ? options : {};
@@ -534,7 +536,7 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
           if (/^\s*$/.test(line)) {
             continue;
           }
-          while (/^[%.#].*[{(]/.test(expression) && !/^(\s*)[-=&!~.%#<]/.test(lines[0]) && /([-\w]+[\w:-]*\w?)\s*=|('\w+[\w:-]*\w?')\s*=|("\w+[\w:-]*\w?")\s*=|(\w+[\w:-]*\w?):|('[-\w]+[\w:-]*\w?'):|("[-\w]+[\w:-]*\w?"):|:(\w+[\w:-]*\w?)\s*=>|:?'([-\w]+[\w:-]*\w?)'\s*=>|:?"([-\w]+[\w:-]*\w?)"\s*=>/.test(lines[0])) {
+          while (/^[%.#].*[{(]/.test(expression) && !/^(\s*)[-=&!~.%#</]/.test(lines[0]) && /([-\w]+[\w:-]*\w?)\s*=|('\w+[\w:-]*\w?')\s*=|("\w+[\w:-]*\w?")\s*=|(\w+[\w:-]*\w?):|('[-\w]+[\w:-]*\w?'):|("[-\w]+[\w:-]*\w?"):|:(\w+[\w:-]*\w?)\s*=>|:?'([-\w]+[\w:-]*\w?)'\s*=>|:?"([-\w]+[\w:-]*\w?)"\s*=>/.test(lines[0])) {
             attributes = lines.shift();
             expression = expression.replace(/(\s)+\|\s*$/, '');
             expression += ' ' + attributes.match(/^\s*(.*?)(\s+\|\s*)?$/)[1];
@@ -979,7 +981,7 @@ require.define("/util/text.js", function (require, module, exports, __dirname, _
       if (!text) {
         return '';
       }
-      return text.replace(/"/g, '\\"').replace(/\\\\\"/g, '"');
+      return text.replace(/"/g, '\\"').replace(/\\\\\"/g, '\\"');
     },
     unescapeQuotes: function(text) {
       if (!text) {
@@ -1255,7 +1257,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       }
       type = exp.substring(0, 1);
       exp = exp.replace(/(=|:|=>)\s*('([^\\']|\\\\|\\')*'|"([^\\"]|\\\\|\\")*")/g, function(match, type, value) {
-        return type + (value != null ? value.replace(/(:|=|=>)/, '\u0090$1') : void 0);
+        return type + (value != null ? value.replace(/(:|=|=>)/g, '\u0090$1') : void 0);
       });
       level = 0;
       start = 0;
@@ -1289,7 +1291,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       _ref = markers.reverse();
       for (_j = 0, _len = _ref.length; _j < _len; _j++) {
         marker = _ref[_j];
-        exp = exp.substring(0, marker.start) + exp.substring(marker.start, marker.end).replace(/(:|=|=>)/, '\u0090$1') + exp.substring(marker.end);
+        exp = exp.substring(0, marker.start) + exp.substring(marker.start, marker.end).replace(/(:|=|=>)/g, '\u0090$1') + exp.substring(marker.end);
       }
       switch (type) {
         case '(':
@@ -1307,7 +1309,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
         if (quoted = key.match(/^("|')(.*)\1$/)) {
           key = quoted[2];
         }
-        value = (_ref2 = keyValue[1]) != null ? _ref2.replace(/^\s+|[\s,]+$/g, '').replace(/\u0090/, '') : void 0;
+        value = (_ref2 = keyValue[1]) != null ? _ref2.replace(/^\s+|[\s,]+$/g, '').replace(/\u0090/g, '') : void 0;
         if (key === 'data') {
           inDataAttribute = true;
           hasDataAttribute = true;
@@ -1419,7 +1421,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
     };
 
     Haml.prototype.quoteAndEscapeAttributeValue = function(value, code) {
-      var quoted, result;
+      var escaped, hasDoubleQuotes, hasInterpolation, hasSingleQuotes, quoted, result, token, tokens, _i, _len;
       if (code == null) {
         code = false;
       }
@@ -1429,22 +1431,92 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       if (quoted = value.match(/^("|')(.*)\1$/)) {
         value = quoted[2];
       }
+      tokens = this.splitInterpolations(value);
+      hasSingleQuotes = false;
+      hasDoubleQuotes = false;
+      hasInterpolation = false;
+      for (_i = 0, _len = tokens.length; _i < _len; _i++) {
+        token = tokens[_i];
+        if (token.slice(0, 2) === '#{') {
+          hasInterpolation = true;
+        } else {
+          if (!hasSingleQuotes) {
+            hasSingleQuotes = token.indexOf("'") !== -1;
+          }
+          if (!hasDoubleQuotes) {
+            hasDoubleQuotes = token.indexOf('"') !== -1;
+          }
+        }
+      }
       if (code) {
-        if (value.indexOf('#{') === -1) {
-          result = "'" + value + "'";
+        if (hasInterpolation) {
+          result = "\"" + (tokens.join('')) + "\"";
         } else {
-          result = "\"" + value + "\"";
+          result = "'" + (tokens.join('')) + "'";
         }
       } else {
-        if (value.indexOf('#{') === -1) {
-          result = "'" + (value.replace(/"/g, '\\\"').replace(/'/g, '\\\"')) + "'";
-        } else {
-          result = "'" + value + "'";
+        if (!hasDoubleQuotes && !hasSingleQuotes) {
+          result = "'" + (tokens.join('')) + "'";
+        }
+        if (hasSingleQuotes && !hasDoubleQuotes) {
+          result = "\\\"" + (tokens.join('')) + "\\\"";
+        }
+        if (hasDoubleQuotes && !hasSingleQuotes) {
+          escaped = (function() {
+            var _j, _len1, _results;
+            _results = [];
+            for (_j = 0, _len1 = tokens.length; _j < _len1; _j++) {
+              token = tokens[_j];
+              _results.push(escapeQuotes(token));
+            }
+            return _results;
+          })();
+          result = "'" + (escaped.join('')) + "'";
+        }
+        if (hasSingleQuotes && hasDoubleQuotes) {
+          escaped = (function() {
+            var _j, _len1, _results;
+            _results = [];
+            for (_j = 0, _len1 = tokens.length; _j < _len1; _j++) {
+              token = tokens[_j];
+              _results.push(escapeQuotes(token).replace(/'/g, '&#39;'));
+            }
+            return _results;
+          })();
+          result = "'" + (escaped.join('')) + "'";
         }
       }
       return result;
     };
 
+    Haml.prototype.splitInterpolations = function(value) {
+      var ch, ch2, level, pos, quoted, start, tokens, _i, _ref;
+      level = 0;
+      start = 0;
+      tokens = [];
+      quoted = false;
+      for (pos = _i = 0, _ref = value.length; 0 <= _ref ? _i < _ref : _i > _ref; pos = 0 <= _ref ? ++_i : --_i) {
+        ch = value[pos];
+        ch2 = value.slice(pos, (pos + 1) + 1 || 9e9);
+        if (ch === '{') {
+          level += 1;
+        }
+        if (ch2 === '#{' && level === 0) {
+          tokens.push(value.slice(start, pos));
+          start = pos;
+        }
+        if (ch === '}') {
+          level -= 1;
+          if (level === 0) {
+            tokens.push(value.slice(start, pos + 1 || 9e9));
+            start = pos + 1;
+          }
+        }
+      }
+      tokens.push(value.slice(start, value.length));
+      return tokens.filter(Boolean);
+    };
+
     Haml.prototype.buildDocType = function(doctype) {
       switch ("" + this.format + " " + doctype) {
         case 'xhtml !!! XML':
@@ -1541,12 +1613,14 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
 
 require.define("/nodes/comment.js", function (require, module, exports, __dirname, __filename) {
 (function() {
-  var Comment, Node,
+  var Comment, Node, escapeQuotes,
     __hasProp = {}.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');
 
+  escapeQuotes = require('../util/text').escapeQuotes;
+
   module.exports = Comment = (function(_super) {
 
     __extends(Comment, _super);
@@ -1567,7 +1641,7 @@ require.define("/nodes/comment.js", function (require, module, exports, __dirnam
           return this.closer = this.markText('<![endif]-->');
         case '\/':
           if (comment) {
-            this.opener = this.markText("<!-- " + comment);
+            this.opener = this.markText("<!-- " + (escapeQuotes(comment)));
             return this.closer = this.markText(' -->');
           } else {
             this.opener = this.markText("<!--");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -107,6 +107,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3865159740158855570
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: