haml_coffee_assets 0.6.1 → 0.7.0

data/README.md

@@ -295,90 +295,19 @@ config.hamlcoffee.autoclose = 'meta,img,link,br,hr,input,area,param,col,base'
 
 Haml Coffee Assets provides a set of custom functions for Haml Coffee, so that the templates doesn't have to be self
 contained and can make use of the global functions. In general you don't have to customize them further, but if you need
-to, you can.
-
-#### Custom escape function
-
-By default your code block in your Haml Coffee template will be escaped through the `HAML.escape` function that is
-provided in the `hamlcoffee.js` script.
-
-You can set a custom escaping function in your `config/application.rb`:
-
-```ruby
-config.hamlcoffee.customHtmlEscape = 'App.myEscape'
-```
-
-Your custom escape function must take the unescaped text as parameter and returns the escaped text.
-The following default implementation comes with `hamlcoffee.js`:
-
-```coffeescript
-App.myEscape = (text) ->
-  ('' + text)
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/'/g, '&apos;')
-    .replace(/"/g, '&quot;')
-```
-
-#### Custom clean value function
-
-All your evaluated CoffeeScript code will go through the clean value function. By default this simply cleans `undefined`
-and `null` values, so that they appear as empty string in your template.
-
-You can set a custom clean value function in your `config/application.rb`:
-
-```ruby
-config.hamlcoffee.customCleanValue = 'App.myCleanValue'
-```
-
-Your custom clean value function must take the value as parameter and returns the cleaned value.
-The following default implementation comes with `hamlcoffee.js`:
-
-```coffeescript
-App.myCleanValue = (value) -> if value is null or value is undefined then '' else value
-```
-
-#### Custom preserve function
-
-All the content from the HTML tags that are contained in the whitespace sensitive tag list are passed through the
-preserve function.
-
-You can set a custom preserve function in your `config/application.rb`:
-
-```ruby
-config.hamlcoffee.customPreserve = 'App.myPreserve'
-```
-
-Your custom preserve function must take the text to be preserved as parameter and returns the preserved content.
-The following default implementation comes with `hamlcoffee.js`:
-
-```coffeescript
-App.myPreserve = (value) -> text.replace /\\n/g, '&#x000A;'
-```
-
-#### Custom find and preserve function
-
-The findAndPreserve function is a specialized preserve function, that you can pass a text containing HTML, and only the
-newlines in between a whitespace sensitive tag are preserved. This function uses the previous preserve function to do
-the final preservation.
-
-You can set a custom find and preserve function in your `config/application.rb`:
-
-```ruby
-config.hamlcoffee.customFindAndPreserve = 'App.myFindAndPreserve'
-```
-
-Your custom find and preserve function must take the text to search for whitespace sensitive tags as parameter and
-returns the preserved content.
-
-The following default implementation comes with `hamlcoffee.js`:
-
-```coffeescript
-App.myPreserve = (value) ->
-  text.replace /<(textarea|pre)>([^]*?)<\/\1>/g, (str, tag, content) ->
-    "<#{ tag }>#{ HAML.preserve(content) }</#{ tag }>"
-```
+to, you can set custom functions for:
+
+* config.hamlcoffee.customHtmlEscape
+* config.hamlcoffee.customCleanValue
+* config.hamlcoffee.customPreserve
+* config.hamlcoffee.customFindAndPreserve
+* config.hamlcoffee.customSurround
+* config.hamlcoffee.customSucceed
+* config.hamlcoffee.customPrecede
+
+You can see the [default implementation](https://github.com/netzpirat/haml_coffee_assets/blob/master/vendor/assets/javascripts/hamlcoffee.js.coffee.erb)
+and the [Haml Coffee documentation](https://github.com/9elements/haml-coffee#custom-helper-function-compiler-options)
+for more information about each helper function.
 
 ## Development
 

data/lib/haml_coffee_assets/engine.rb

@@ -20,6 +20,9 @@ module HamlCoffeeAssets
         :customCleanValue      => 'HAML.cleanValue',
         :customPreserve        => 'HAML.escape',
         :customFindAndPreserve => 'HAML.findAndPreserve',
+        :customSurround        => 'HAML.surround',
+        :customSucceed         => 'HAML.succeed',
+        :customPrecede         => 'HAML.precede',
         :preserve              => 'textarea,pre',
         :autoclose             => 'meta,img,link,br,hr,input,area,param,col,base',
         :context               => 'HAML.context'
@@ -48,6 +51,9 @@ module HamlCoffeeAssets
         config.customCleanValue      = options[:customCleanValue]
         config.customPreserve        = options[:customPreserve]
         config.customFindAndPreserve = options[:customFindAndPreserve]
+        config.customPreserve        = options[:customSurround]
+        config.customSucceed         = options[:customSucceed]
+        config.customPrecede         = options[:customPrecede]
         config.preserveTags          = options[:preserve]
         config.selfCloseTags         = options[:autoclose]
         config.context               = options[:context]

data/lib/haml_coffee_assets/haml_coffee.rb

@@ -21,6 +21,9 @@ module HamlCoffeeAssets
         self.customCleanValue       = 'window.HAML.cleanValue'
         self.customPreserve         = 'window.HAML.preserve'
         self.customFindAndPreserve  = 'window.HAML.findAndPreserve'
+        self.customSurround         = 'window.HAML.surround'
+        self.customSucceed          = 'window.HAML.succeed'
+        self.customPrecede          = 'window.HAML.precede'
         self.preserveTags           = 'textarea,pre'
         self.selfCloseTags          = 'meta,img,link,br,hr,input,area,param,col,base'
         self.context                = ''
@@ -62,6 +65,18 @@ module HamlCoffeeAssets
       #
       attr_accessor :customCleanValue
 
+      # Custom global surround function
+      #
+      attr_accessor :customSurround
+
+      # Custom global succeed function
+      #
+      attr_accessor :customSucceed
+
+      # Custom global precede function
+      #
+      attr_accessor :customPrecede
+
       # Custom preserve function
       #
       attr_accessor :customPreserve
@@ -104,10 +119,12 @@ module HamlCoffeeAssets
       #
       def compile(name, source, jst = true)
         self.configuration ||= Configuration.new
-        runtime.call('HamlCoffeeAssets.compile', name, source, jst, configuration.namespace, configuration.format, configuration.uglify, configuration.basename,
+        runtime.call('HamlCoffeeAssets.compile', name, source, jst,
+                     configuration.namespace, configuration.format, configuration.uglify, configuration.basename,
                      configuration.escapeHtml, configuration.escapeAttributes, configuration.cleanValue,
                      configuration.customHtmlEscape, configuration.customCleanValue,
                      configuration.customPreserve, configuration.customFindAndPreserve,
+                     configuration.customSurround, configuration.customSucceed, configuration.customPrecede,
                      configuration.preserveTags, configuration.selfCloseTags,
                      configuration.context)
       end

data/lib/haml_coffee_assets/haml_coffee_assets.js

@@ -30,6 +30,9 @@ var HamlCoffeeAssets = (function(){
        * @param escapeAttributes [Boolean] whether to escape HTML attributes output by default or not
        * @param customHtmlEscape [String] the name of the function to escape the output
        * @param customCleanValue [String] the name of the function to clean the code output
+       * @param customSurround [String] the name of the function for the surround helper
+       * @param customSucceed [String] the name of the function for the succeed helper
+       * @param customPrecede [String] the name of the function for the precede helper
        * @param preserveTags [String] comma separated list of tags to preserve whitespace
        * @param selfCloseTags [String] comma separated list of tags to self-closing tags
        * @param context [String] the name of the function to merge contexts
@@ -37,6 +40,7 @@ var HamlCoffeeAssets = (function(){
       compile: function(name, source, jst, namespace, format, uglify, basename,
                         escapeHtml, escapeAttributes, cleanValue,
                         customHtmlEscape, customCleanValue, customPreserve, customFindAndPreserve,
+                        customSurround, customSucceed, customPrecede,
                         preserveTags, selfCloseTags,
                         context) {
 
@@ -51,6 +55,9 @@ var HamlCoffeeAssets = (function(){
           customCleanValue: customCleanValue,
           customPreserve: customPreserve,
           customFindAndPreserve: customFindAndPreserve,
+          customSurround: customSurround,
+          customSucceed: customSucceed,
+          customPrecede: customPrecede,
           preserveTags: preserveTags,
           selfCloseTags: selfCloseTags
         });

data/lib/haml_coffee_assets/haml_coffee_template.rb

@@ -32,7 +32,7 @@ module HamlCoffeeAssets
     # Compile the template.
     #
     def evaluate(scope, locals = { }, &block)
-      jst = scope.pathname.to_s =~ /\.jst\.hamlc$/ ? false : true
+      jst = scope.pathname.to_s =~ /\.jst\.hamlc(?:\.|$)/ ? false : true
       @output ||= HamlCoffee.compile(scope.logical_path, data, jst)
     end
 

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml-coffee.js

@@ -342,28 +342,20 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
   module.exports = HamlCoffee = (function() {
 
     function HamlCoffee(options) {
-      var _base, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _ref, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8;
+      var _base, _base2, _base3, _base4, _base5, _base6, _base7, _base8;
       this.options = options != null ? options : {};
-      if ((_ref = (_base = this.options).escapeHtml) == null) {
-        _base.escapeHtml = true;
-      }
-      if ((_ref2 = (_base2 = this.options).escapeAttributes) == null) {
+      if ((_base = this.options).escapeHtml == null) _base.escapeHtml = true;
+      if ((_base2 = this.options).escapeAttributes == null) {
         _base2.escapeAttributes = true;
       }
-      if ((_ref3 = (_base3 = this.options).cleanValue) == null) {
-        _base3.cleanValue = true;
-      }
-      if ((_ref4 = (_base4 = this.options).uglify) == null) _base4.uglify = false;
-      if ((_ref5 = (_base5 = this.options).basename) == null) {
-        _base5.basename = false;
-      }
-      if ((_ref6 = (_base6 = this.options).format) == null) {
-        _base6.format = 'html5';
-      }
-      if ((_ref7 = (_base7 = this.options).preserveTags) == null) {
+      if ((_base3 = this.options).cleanValue == null) _base3.cleanValue = true;
+      if ((_base4 = this.options).uglify == null) _base4.uglify = false;
+      if ((_base5 = this.options).basename == null) _base5.basename = false;
+      if ((_base6 = this.options).format == null) _base6.format = 'html5';
+      if ((_base7 = this.options).preserveTags == null) {
         _base7.preserveTags = 'pre,textarea';
       }
-      if ((_ref8 = (_base8 = this.options).selfCloseTags) == null) {
+      if ((_base8 = this.options).selfCloseTags == null) {
         _base8.selfCloseTags = 'meta,img,link,br,hr,input,area,param,col,base';
       }
     }
@@ -495,7 +487,7 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
           ws = result[1];
           expression = result[2];
           if (/^(\s)*$/.test(line)) continue;
-          while (/^%.*[{(]/.test(expression) && !/^(\s*)[-=&!~.%#<]/.test(lines[0]) && /(?:(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(:\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)|(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|'\w+[\w:-]*\w?'):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+))/.test(lines[0])) {
+          while (/^%.*[{(]/.test(expression) && !/^(\s*)[-=&!~.%#<]/.test(lines[0]) && /(?:([-\w]+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|"[-\w]+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(:\w+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|"[-\w]+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^},]+)|(\w+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|'[-\w]+[\w:-]*\w?'):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^},]+))/.test(lines[0])) {
             attributes = lines.shift();
             expression += ' ' + attributes.match(/^(\s*)(.*)/)[2];
             this.line_number++;
@@ -587,6 +579,27 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
           fn += "$fp = (text) ->\n  text.replace /<(" + (this.options.preserveTags.split(',').join('|')) + ")>([^]*?)<\\/\\1>/g, (str, tag, content) ->\n    \"<\#{ tag }>\#{ $p content }</\#{ tag }>\"\n";
         }
       }
+      if (code.indexOf('surround') !== -1) {
+        if (this.options.customSurround) {
+          fn += "surround = " + this.options.customSurround + "\n";
+        } else {
+          fn += "surround = (start, end, fn) -> start + fn() + end\n";
+        }
+      }
+      if (code.indexOf('succeed') !== -1) {
+        if (this.options.customSucceed) {
+          fn += "succeed = " + this.options.customSucceed + "\n";
+        } else {
+          fn += "succeed = (end, fn) -> fn() + end\n";
+        }
+      }
+      if (code.indexOf('precede') !== -1) {
+        if (this.options.customPrecede) {
+          fn += "precede = " + this.options.customPrecede + "\n";
+        } else {
+          fn += "precede = (start, fn) -> start + fn()\n";
+        }
+      }
       fn += "$o = []\n";
       fn += "" + code + "\n";
       return fn += "return $o.join(\"\\n\")" + (this.convertBooleans(code)) + (this.cleanupWhitespace(code)) + "\n";
@@ -602,16 +615,22 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
         this.lines = this.lines.concat(child.render());
       }
       this.lines = this.combineText(this.lines);
+      this.block = false;
       _ref2 = this.lines;
       for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
         line = _ref2[_j];
         if (line !== null) {
           switch (line.type) {
             case 'text':
-              code.push("" + (whitespace(line.cw)) + "$o.push \"" + (whitespace(line.hw)) + line.text + "\"");
+              if (this.block) {
+                code.push("" + (whitespace(line.cw)) + "$b.push \"" + (whitespace(line.hw)) + line.text + "\"");
+              } else {
+                code.push("" + (whitespace(line.cw)) + "$o.push \"" + (whitespace(line.hw)) + line.text + "\"");
+              }
               break;
             case 'run':
               code.push("" + (whitespace(line.cw)) + line.code);
+              if (line.block === 'end') this.block = false;
               break;
             case 'insert':
               processors = '';
@@ -620,6 +639,10 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
               if (line.escape) processors += '$e ';
               if (this.options.cleanValue) processors += '$c ';
               code.push("" + (whitespace(line.cw)) + "$o.push \"" + (whitespace(line.hw)) + "\" + " + processors + line.code);
+              if (line.block === 'start') {
+                this.block = true;
+                code.push("" + (whitespace(line.cw + 1)) + "$b = []");
+              }
           }
         }
       }
@@ -837,7 +860,8 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
 });
 
 require.define("/util/text.js", function (require, module, exports, __dirname, __filename) {
-    
+    (function() {
+
   module.exports = {
     whitespace: function(n) {
       var a;
@@ -868,20 +892,23 @@ require.define("/util/text.js", function (require, module, exports, __dirname, _
     }
   };
 
+}).call(this);
+
 });
 
 require.define("/nodes/text.js", function (require, module, exports, __dirname, __filename) {
     (function() {
-  var Node, Text, escapeQuotes;
-  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; };
+  var Node, Text, escapeQuotes,
+    __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');
 
   escapeQuotes = require('../util/text').escapeQuotes;
 
-  module.exports = Text = (function() {
+  module.exports = Text = (function(_super) {
 
-    __extends(Text, Node);
+    __extends(Text, _super);
 
     function Text() {
       Text.__super__.constructor.apply(this, arguments);
@@ -893,7 +920,7 @@ require.define("/nodes/text.js", function (require, module, exports, __dirname,
 
     return Text;
 
-  })();
+  })(Node);
 
 }).call(this);
 
@@ -901,16 +928,17 @@ 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, escapeQuotes;
-  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; };
+  var Haml, Node, escapeQuotes,
+    __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');
 
   escapeQuotes = require('../util/text').escapeQuotes;
 
-  module.exports = Haml = (function() {
+  module.exports = Haml = (function(_super) {
 
-    __extends(Haml, Node);
+    __extends(Haml, _super);
 
     function Haml() {
       Haml.__super__.constructor.apply(this, arguments);
@@ -1074,7 +1102,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       attributes = [];
       if (exp === void 0) return attributes;
       _ref = this.getDataAttributes(exp), exp = _ref[0], datas = _ref[1];
-      findAttributes = /(?:(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(:\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)|(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?"):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+))/g;
+      findAttributes = /(?:([-\w]+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(:\w+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|"[-\w]+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^},]+)|(\w+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|"[-\w]+[\w:-]*\w?"):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^},]+))/g;
       while (match = findAttributes.exec(exp)) {
         key = (match[1] || match[3] || match[5]).replace(/^:/, '');
         value = match[2] || match[4] || match[6];
@@ -1203,7 +1231,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
 
     return Haml;
 
-  })();
+  })(Node);
 
 }).call(this);
 
@@ -1211,21 +1239,22 @@ 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 __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; };
+  var Code, Node,
+    __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');
 
-  module.exports = Code = (function() {
+  module.exports = Code = (function(_super) {
 
-    __extends(Code, Node);
+    __extends(Code, _super);
 
     function Code() {
       Code.__super__.constructor.apply(this, arguments);
     }
 
     Code.prototype.evaluate = function() {
-      var code, codeBlock, identifier;
+      var code, codeBlock, escape, identifier;
       codeBlock = this.expression.match(/(-|!=|\&=|=|~)\s?(.*)?/);
       identifier = codeBlock[1];
       code = codeBlock[2];
@@ -1240,16 +1269,22 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
         } else {
           return this.opener = this.markInsertingCode(code, false, false, true);
         }
-      } else if (identifier === '&=' || (identifier === '=' && this.escapeHtml)) {
-        return this.opener = this.markInsertingCode(code, true);
-      } else if (identifier === '!=' || (identifier === '=' && !this.escapeHtml)) {
-        return this.opener = this.markInsertingCode(code);
+      } else {
+        escape = identifier === '&=' || (identifier === '=' && this.escapeHtml);
+        if (this.children.length !== 0 && code.match(/(->|=>)$/)) {
+          this.opener = this.markInsertingCode(code, escape, false, false);
+          this.opener.block = 'start';
+          this.closer = this.markRunningCode("  $b.join \"\\n\"");
+          return this.closer.block = 'end';
+        } else {
+          return this.opener = this.markInsertingCode(code, escape);
+        }
       }
     };
 
     return Code;
 
-  })();
+  })(Node);
 
 }).call(this);
 
@@ -1257,14 +1292,15 @@ 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 __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; };
+  var Comment, Node,
+    __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');
 
-  module.exports = Comment = (function() {
+  module.exports = Comment = (function(_super) {
 
-    __extends(Comment, Node);
+    __extends(Comment, _super);
 
     function Comment() {
       Comment.__super__.constructor.apply(this, arguments);
@@ -1293,7 +1329,7 @@ require.define("/nodes/comment.js", function (require, module, exports, __dirnam
 
     return Comment;
 
-  })();
+  })(Node);
 
 }).call(this);
 
@@ -1301,16 +1337,17 @@ require.define("/nodes/comment.js", function (require, module, exports, __dirnam
 
 require.define("/nodes/filter.js", function (require, module, exports, __dirname, __filename) {
     (function() {
-  var Filter, Node, whitespace;
-  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; };
+  var Filter, Node, whitespace,
+    __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');
 
   whitespace = require('../util/text').whitespace;
 
-  module.exports = Filter = (function() {
+  module.exports = Filter = (function(_super) {
 
-    __extends(Filter, Node);
+    __extends(Filter, _super);
 
     function Filter() {
       Filter.__super__.constructor.apply(this, arguments);
@@ -1416,7 +1453,7 @@ require.define("/nodes/filter.js", function (require, module, exports, __dirname
 
     return Filter;
 
-  })();
+  })(Node);
 
 }).call(this);
 

data/vendor/assets/javascripts/hamlcoffee.js.coffee.erb

@@ -88,3 +88,34 @@ window.HAML.findAndPreserve ||= (text) ->
   tags = '<%= configuration.preserveTags %>'.split(',').join('|')
   text.replace ///<(#{ tags })>([^]*?)<\/\1>///g, (str, tag, content) ->
     "<#{ tag }>#{ <%= configuration.customPreserve %>(content) }</#{ tag }>"
+
+# The surround helper surrounds the function output
+# with the start and end string without whitespace in between.
+#
+# @param [String] start the text to prepend to the text
+# @param [String] end the text to append to the text
+# @param [Function] fn the text generating function
+# @return [String] the surrounded text
+#
+surround: (start, end, fn) -> 
+  start + fn() + end
+
+# The succeed helper appends text to the function output
+# without whitespace in between.
+#
+# @param [String] end the text to append to the text
+# @param [Function] fn the text generating function
+# @return [String] the succeeded text
+#
+succeed: (end, fn) -> 
+  fn() + end
+
+# The precede helper prepends text to the function output
+# without whitespace in between.
+#
+# @param [String] start the text to prepend to the text
+# @param [Function] fn the text generating function
+# @return [String] the preeceded text
+#
+precede: (start, fn) -> 
+  start + fn()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
+date: 2012-01-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70203212710020 !ruby/object:Gem::Requirement
+  requirement: &70356011006040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70203212710020
+  version_requirements: *70356011006040
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70203212709160 !ruby/object:Gem::Requirement
+  requirement: &70356011005580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70203212709160
+  version_requirements: *70356011005580
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70203212708480 !ruby/object:Gem::Requirement
+  requirement: &70356011005120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70203212708480
+  version_requirements: *70356011005120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70203212707880 !ruby/object:Gem::Requirement
+  requirement: &70356011004740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203212707880
+  version_requirements: *70356011004740
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70203212706500 !ruby/object:Gem::Requirement
+  requirement: &70356011004200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,73 +65,73 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70203212706500
+  version_requirements: *70356011004200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70203212704700 !ruby/object:Gem::Requirement
+  requirement: &70356011003780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203212704700
+  version_requirements: *70356011003780
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70203212703800 !ruby/object:Gem::Requirement
+  requirement: &70356011037600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203212703800
+  version_requirements: *70356011037600
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70203212701740 !ruby/object:Gem::Requirement
+  requirement: &70356011037180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203212701740
+  version_requirements: *70356011037180
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70203212700740 !ruby/object:Gem::Requirement
+  requirement: &70356011036760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203212700740
+  version_requirements: *70356011036760
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70203212699560 !ruby/object:Gem::Requirement
+  requirement: &70356011036340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.6.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203212699560
+  version_requirements: *70356011036340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70203212698500 !ruby/object:Gem::Requirement
+  requirement: &70356011035920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203212698500
+  version_requirements: *70356011035920
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
 email:
 - michi@netzpiraten.ch