haml_coffee_assets 1.13.2 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 244655d1ebfa17865cc585942f8ac9e800b5b214
-  data.tar.gz: e5fa62da8b50078964471d159f1e64023b48e6b0
+  metadata.gz: ce5b67f40c2877808d6597bd2d7f766955a44c8f
+  data.tar.gz: 0692d7a99099b5e7a2c585259676ca46da402b39
 SHA512:
-  metadata.gz: a390d6ed8e7fee2ed48f197fab93b044c26a8fbff0ec0018ed5c75fca3c4745c533b4954ef93bb4e7dd45477df2f98a0ecb455d53aeed980a953e7f27dd86fc9
-  data.tar.gz: e920174d24da8a5922559c8ae8458b8c8c771848f7f72619b7bcda2d5492f5e4b3f507d34266eb6904c971eeaeaff8a014350c06a5c8ae946ea261387b7b754f
+  metadata.gz: d45d16bb55bc4e3bc5ee9ee5748ba2f85cca60005bd6b65d6dfe349b36488503142144e708c8ba6ee6888df462e46ad19e48dd167bd6a392b0500eb061cb2cdc
+  data.tar.gz: 97686ceeca292dab16192d62a24e78d5ef469dfedd994d7789908c8ccceb4189c10e6a6b76eeed85a210cfaacac9ae2f6e1e1994bb7a58a80637059c276ffe3b

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/hamlcoffee.js

@@ -454,7 +454,7 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
   indent = require('./util/text').indent;
 
   module.exports = HamlCoffee = (function() {
-    HamlCoffee.VERSION = '1.11.3';
+    HamlCoffee.VERSION = '1.12.0';
 
     function HamlCoffee(options) {
       var segment, segments, _base, _base1, _base10, _base11, _base12, _base13, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _i, _len;
@@ -674,7 +674,7 @@ require.define("/haml-coffee.coffee",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) && RegExp("^\\s{" + (this.tabSize + 2) + ",}").test(lines[0]) && !/^(\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];
@@ -834,7 +834,7 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
         if (this.options.customSurround) {
           fn += "surround = (start, end, fn) => " + this.options.customSurround + ".call(@, start, end, fn)\n";
         } else {
-          fn += "surround = (start, end, fn) => start + fn.call(@)?.replace(/^\s+|\s+$/g, '') + end\n";
+          fn += "surround = (start, end, fn) => start + fn.call(@)?.replace(/^\\s+|\\s+$/g, '') + end\n";
         }
       }
       if (code.indexOf('succeed') !== -1) {
@@ -1331,7 +1331,12 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
         } else {
           tokens.tag = tokens.tag.replace(/\/$/, '');
           prefix = this.buildHtmlTagPrefix(tokens);
-          return this.opener = this.markText("" + prefix + (this.format === 'xhtml' ? ' /' : '') + ">");
+          if (tokens.text) {
+            this.opener = this.markText("" + prefix + ">" + tokens.text);
+            return this.closer = this.markText("</" + tokens.tag + ">");
+          } else {
+            return this.opener = this.markText("" + prefix + (this.format === 'xhtml' ? ' /' : '') + ">" + tokens.text);
+          }
         }
       }
     };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.14.0
 platform: ruby
 authors:
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script