haml_coffee_assets 0.3.0 → 0.4.0

data/README.md

@@ -160,14 +160,14 @@ A template `app/assets/templates/header.hamlc` with the given content:
 
 ```haml
 %header
-  %h2= title
+  %h2= @title
 ```
 
 will be accessible in your browser as `JST['header']`. You can now render the precompiled template and pass the data
 to be rendered:
 
 ```javascript
-JST['header'].render({ title: 'Hello Haml Coffee' })
+JST['header']({ title: 'Hello Haml Coffee' })
 ```
 
 If you prefer another namespace, you can set it in your `config/application.rb`:
@@ -209,45 +209,13 @@ You can toggle HTML escaping in your `config/application.rb`:
 config.hamlcoffee.escapeHtml = false
 ```
 
-#### 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.
+### Uglify generated HTML
 
-You can set a custom escaping function in your `config/application.rb`:
+By default all generated HTML is indented to have a nice reading experience. If you like to ignore indention to have a
+better rendering performance, you can enable the uglify option 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, '&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
+config.hamlcoffee.uglify = true
 ```
 
 ### Global context
@@ -307,15 +275,151 @@ App.globalTemplateContext = (locals) -> _.extend({}, {
 }, locals)
 ```
 
-## Using on Heroku
+### Customize the tag lists
+
+Haml Coffee contains two list of HTML tags that you can customize. In general you're fine with the defaults, but if
+you need to extend the list, you can instruct Haml Coffee Assets to do so.
+
+#### Whitespace sensitive tag list
+
+* Tags: `textarea`, `pre`
+
+Some HTML tags are whitespace sensitive, which means that whitespace used for proper indention results in a wrong
+display of the tag. In order to avoid this, the content is preserved by converting the nerwlines to a HTML
+entity. You can set your own list of whitespace sensitive tags in your `config/application.rb`:
+
+```ruby
+config.hamlcoffee.preserve = 'pre,textarea,abbr'
+```
+
+This list is also taken into account for the `HAML.preserveAndFind` helper function that is provided and its shortcut
+notation `~`.
+
+#### Auto-closing tag list
+
+Tags: `meta`, `img`, `link`, `br`, `hr`, `input`, `area`, `param`, `col`, `base`
+
+The auto-closing tag list will contains the tags that will be self-closes if they have no content. You can set the
+list of self closing tags in your `config/application.rb`:
+
+```ruby
+config.hamlcoffee.autoclose = 'meta,img,link,br,hr,input,area,param,col,base'
+```
+
+### Custom helper functions
+
+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, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/'/g, '&apos;')
+    .replace(/"/g, '&quot;')
+```
+
+#### Custom clean value function
 
-Using haml_coffee_assets on Heroku with Ruby on Rails 3.1 requires you to set
+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 }>"
+```
+
+## Prepare your assets for production
+
+Using haml_coffee_assets requires you to set
 
     config.assets.initialize_on_precompile = true
 
 in your `config/environments/production.rb`. Read more about the it at the
 [Asset Pipeline Guide](http://guides.rubyonrails.org/asset_pipeline.html#precompiling-assets).
 
+## Development
+
+* Issues and feature request hosted at [GitHub Issues](https://github.com/netzpirat/haml_coffee_assets/issues).
+* Documentation hosted at [RubyDoc](http://rubydoc.info/github/netzpirat/haml_coffee_assets/master/frames).
+* Source hosted at [GitHub](https://github.com/netzpirat/haml_coffee_assets).
+
+Pull requests are very welcome! Please try to follow these simple rules if applicable:
+
+* Please create a topic branch for every separate change you make.
+* Make sure your patches are well tested. All specs must pass.
+* Update the [Yard](http://yardoc.org/) documentation.
+* Update the README.
+* Please **do not change** the version number.
+
+For questions please join `#haml` on irc.freenode.net
+
 ## Acknowledgement
 
 * [Jeremy Ashkenas](http://twitter.com/#!/jashkenas) for CoffeeScript, that little language that compiles into

data/lib/haml_coffee_assets/engine.rb

@@ -9,13 +9,18 @@ module HamlCoffeeAssets
     config.hamlcoffee = ActiveSupport::OrderedOptions.new
 
     DEFAULT_CONFIG = {
-        :format           => 'html5',
-        :namespace        => 'window.JST',
-        :escapeHtml       => true,
-        :escapeAttributes => true,
-        :customHtmlEscape => 'HAML.escape',
-        :customCleanValue => 'HAML.cleanValue',
-        :context          => 'HAML.context'
+        :format                => 'html5',
+        :namespace             => 'window.JST',
+        :uglify                => false,
+        :escapeHtml            => true,
+        :escapeAttributes      => true,
+        :customHtmlEscape      => 'HAML.escape',
+        :customCleanValue      => 'HAML.cleanValue',
+        :customPreserve        => 'HAML.escape',
+        :customFindAndPreserve => 'HAML.findAndPreserve',
+        :preserve              => 'textarea,pre',
+        :autoclose             => 'meta,img,link,br,hr,input,area,param,col,base',
+        :context               => 'HAML.context'
     }
 
     # Initialize Haml Coffee Assets after Sprockets
@@ -30,13 +35,18 @@ module HamlCoffeeAssets
       options = DEFAULT_CONFIG.merge(app.config.hamlcoffee)
 
       HamlCoffee.configure do |config|
-        config.namespace        = options[:namespace]
-        config.format           = options[:format]
-        config.escapeHtml       = options[:escapeHtml]
-        config.escapeAttributes = options[:escapeAttributes]
-        config.customHtmlEscape = options[:customHtmlEscape]
-        config.customCleanValue = options[:customCleanValue]
-        config.context          = options[:context]
+        config.namespace             = options[:namespace]
+        config.format                = options[:format]
+        config.uglify                = options[:uglify]
+        config.escapeHtml            = options[:escapeHtml]
+        config.escapeAttributes      = options[:escapeAttributes]
+        config.customHtmlEscape      = options[:customHtmlEscape]
+        config.customCleanValue      = options[:customCleanValue]
+        config.customPreserve        = options[:customPreserve]
+        config.customFindAndPreserve = options[:customFindAndPreserve]
+        config.preserveTags          = options[:preserve]
+        config.selfCloseTags         = options[:autoclose]
+        config.context               = options[:context]
       end
     end
 

data/lib/haml_coffee_assets/haml_coffee.rb

@@ -16,6 +16,11 @@ module HamlCoffeeAssets
     mattr_accessor :format
     self.format = 'html5'
 
+    # Uglify HTML output by skip indention
+    #
+    mattr_accessor :uglify
+    self.uglify = false
+
     # Escape template code output
     #
     mattr_accessor :escapeHtml
@@ -36,6 +41,26 @@ module HamlCoffeeAssets
     mattr_accessor :customCleanValue
     self.customCleanValue = 'window.HAML.cleanValue'
 
+    # Custom preserve function
+    #
+    mattr_accessor :customPreserve
+    self.customPreserve = 'window.HAML.preserve'
+
+    # Custom find and preserve function
+    #
+    mattr_accessor :customFindAndPreserve
+    self.customFindAndPreserve = 'window.HAML.findAndPreserve'
+
+    # List of tags to preserve
+    #
+    mattr_accessor :preserveTags
+    self.preserveTags = 'textarea,pre'
+
+    # List of self closing tags
+    #
+    mattr_accessor :selfCloseTags
+    self.selfCloseTags = 'meta,img,link,br,hr,input,area,param,col,base'
+
     # Custom global context to merge
     #
     mattr_accessor :context
@@ -56,9 +81,12 @@ module HamlCoffeeAssets
       # @return [String] the compiled template in JavaScript
       #
       def compile(name, source)
-        runtime.call('HamlCoffeeAssets.compile', name, source,
-                     HamlCoffee.namespace, HamlCoffee.format, HamlCoffee.escapeHtml, HamlCoffee.escapeAttributes,
-                     HamlCoffee.customHtmlEscape, HamlCoffee.customCleanValue, HamlCoffee.context)
+        runtime.call('HamlCoffeeAssets.compile', name, source, HamlCoffee.namespace, HamlCoffee.format, HamlCoffee.uglify,
+                     HamlCoffee.escapeHtml, HamlCoffee.escapeAttributes,
+                     HamlCoffee.customHtmlEscape, HamlCoffee.customCleanValue,
+                     HamlCoffee.customPreserve, HamlCoffee.customFindAndPreserve,
+                     HamlCoffee.preserveTags, HamlCoffee.selfCloseTags,
+                     HamlCoffee.context)
       end
 
       private

data/lib/haml_coffee_assets/haml_coffee_assets.js

@@ -19,23 +19,36 @@ var HamlCoffeeAssets = (function(){
       /**
        * Compile the HAML Coffee template to JavaScript
        *
-       * @param namespace [String] the template namespace
        * @param name [String] the name of the template that is registered to the namespace
        * @param source [String] the template source code to be compiled
+       * @param namespace [String] the template namespace
+       * @param format [String] output HTML format
+       * @param uglify [Boolean] skip HTML indention
        * @param escapeHtml [Boolean] whether to escape HTML output by default or not
        * @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 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
        */
-      compile: function(name, source, namespace, format, escapeHtml, escapeAttributes, customHtmlEscape, customCleanValue, context) {
+      compile: function(name, source, namespace, format, uglify,
+                        escapeHtml, escapeAttributes,
+                        customHtmlEscape, customCleanValue, customPreserve, customFindAndPreserve,
+                        preserveTags, selfCloseTags,
+                        context) {
 
         var compiler = new Compiler({
           format: format,
+          uglify: uglify,
           escapeHtml: escapeHtml,
           escapeAttributes: escapeAttributes,
           customHtmlEscape: customHtmlEscape,
-          customCleanValue: customCleanValue
+          customCleanValue: customCleanValue,
+          customPreserve: customPreserve,
+          customFindAndPreserve: customFindAndPreserve,
+          preserveTags: preserveTags,
+          selfCloseTags: selfCloseTags
         });
 
         compiler.parse(source);

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml-coffee.js

@@ -340,6 +340,7 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
       this.children = [];
       this.opener = this.closer = null;
       this.silent = false;
+      this.preserveTags = options.preserveTags.split(',');
       this.preserve = false;
       this.wsRemoval = {
         around: false,
@@ -348,6 +349,8 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
       this.escapeHtml = options.escapeHtml;
       this.escapeAttributes = options.escapeAttributes;
       this.format = options.format;
+      this.selfCloseTags = options.selfCloseTags.split(',');
+      this.uglify = options.uglify;
       this.codeBlockLevel = options.codeBlockLevel;
       this.blockLevel = options.blockLevel;
     }
@@ -391,7 +394,7 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
       return {
         type: 'text',
         cw: this.codeBlockLevel,
-        hw: this.blockLevel - this.codeBlockLevel + 2,
+        hw: this.uglify ? 0 : this.blockLevel - this.codeBlockLevel + 2,
         text: escape ? e(text) : text
       };
     };
@@ -404,13 +407,17 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
       };
     };
 
-    Node.prototype.markInsertingCode = function(code, escape) {
+    Node.prototype.markInsertingCode = function(code, escape, preserve, findAndPreserve) {
       if (escape == null) escape = false;
+      if (preserve == null) preserve = false;
+      if (findAndPreserve == null) findAndPreserve = false;
       return {
         type: 'insert',
         cw: this.codeBlockLevel,
-        hw: this.blockLevel,
+        hw: this.uglify ? 0 : this.blockLevel,
         escape: escape,
+        preserve: preserve,
+        findAndPreserve: findAndPreserve,
         code: code
       };
     };
@@ -418,7 +425,7 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
     Node.prototype.evaluate = function() {};
 
     Node.prototype.render = function() {
-      var child, output, preserve, tag, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4;
+      var child, output, rendered, tag, _i, _j, _k, _l, _len, _len2, _len3, _len4, _len5, _m, _ref, _ref2, _ref3, _ref4, _ref5;
       output = [];
       if (this.silent) return output;
       if (this.children.length === 0) {
@@ -436,35 +443,39 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
       } else {
         if (this.opener && this.closer) {
           if (this.preserve) {
-            preserve = this.getOpener().text;
+            this.wsRemoval.inside = true;
+            output.push(this.getOpener());
             _ref = this.children;
             for (_i = 0, _len = _ref.length; _i < _len; _i++) {
               child = _ref[_i];
-              preserve += "" + (child.render()[0].text) + "\\n" + (w(this.blockLevel));
+              _ref2 = child.render();
+              for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
+                rendered = _ref2[_j];
+                rendered.hw = this.blockLevel;
+                output.push(rendered);
+              }
             }
-            preserve = preserve.replace(/\\n\s*$/, '');
-            preserve += this.getCloser().text;
-            output.push(this.markText(preserve));
+            output.push(this.getCloser());
           } else {
             output.push(this.getOpener());
-            _ref2 = this.children;
-            for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
-              child = _ref2[_j];
+            _ref3 = this.children;
+            for (_k = 0, _len3 = _ref3.length; _k < _len3; _k++) {
+              child = _ref3[_k];
               output = output.concat(child.render());
             }
             output.push(this.getCloser());
           }
         } else if (this.opener) {
           output.push(this.getOpener());
-          _ref3 = this.children;
-          for (_k = 0, _len3 = _ref3.length; _k < _len3; _k++) {
-            child = _ref3[_k];
-            output = output.concat(child.render());
-          }
-        } else {
           _ref4 = this.children;
           for (_l = 0, _len4 = _ref4.length; _l < _len4; _l++) {
             child = _ref4[_l];
+            output = output.concat(child.render());
+          }
+        } else {
+          _ref5 = this.children;
+          for (_m = 0, _len5 = _ref5.length; _m < _len5; _m++) {
+            child = _ref5[_m];
             output.push(this.markText(child.render().text));
           }
         }
@@ -559,10 +570,6 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       Haml.__super__.constructor.apply(this, arguments);
     }
 
-    Haml.selfCloseTags = ['meta', 'img', 'link', 'br', 'hr', 'input', 'area', 'param', 'col', 'base'];
-
-    Haml.preserveTags = ['pre', 'textarea'];
-
     Haml.prototype.evaluate = function() {
       var assignment, code, identifier, match, prefix, tokens;
       tokens = this.parseExpression(this.expression);
@@ -576,11 +583,19 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
             identifier = match[1];
             assignment = match[2];
             if (identifier === '~') {
-              code = p(assignment);
+              code = "\#{fp(" + assignment + ")}";
             } else if (identifier === '&=' || (identifier === '=' && this.escapeHtml)) {
-              code = "\#{e(c(" + assignment + "))}";
+              if (this.preserve) {
+                code = "\#{p(e(c(" + assignment + ")))}";
+              } else {
+                code = "\#{e(c(" + assignment + "))}";
+              }
             } else if (identifier === '!=' || (identifier === '=' && !this.escapeHtml)) {
-              code = "\#{c(" + assignment + ")}";
+              if (this.preserve) {
+                code = "\#{p(c(" + assignment + "))}";
+              } else {
+                code = "\#{c(" + assignment + ")}";
+              }
             }
             this.opener = this.markText("" + prefix + ">" + code);
             return this.closer = this.markText("</" + tokens.tag + ">");
@@ -602,7 +617,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
     Haml.prototype.parseExpression = function(exp) {
       var attribute, attributes, classes, id, tag, _i, _len, _ref, _ref2;
       tag = this.parseTag(exp);
-      if (Haml.preserveTags.indexOf(tag.tag) !== -1) this.preserve = true;
+      if (this.preserveTags.indexOf(tag.tag) !== -1) this.preserve = true;
       id = (_ref = tag.ids) != null ? _ref.pop() : void 0;
       classes = tag.classes;
       attributes = [];
@@ -813,7 +828,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
     };
 
     Haml.prototype.isNotSelfClosing = function(tag) {
-      return Haml.selfCloseTags.indexOf(tag) === -1 && !tag.match(/\/$/);
+      return this.selfCloseTags.indexOf(tag) === -1 && !tag.match(/\/$/);
     };
 
     return Haml;
@@ -852,7 +867,11 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
           return this.closer = this.markRunningCode("  ''");
         }
       } else if (identifier === '~') {
-        return this.opener = this.markInsertingCode(p(code));
+        if (this.escapeHtml) {
+          return this.opener = this.markInsertingCode(code, true, false, true);
+        } 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)) {
@@ -1056,7 +1075,7 @@ require.define("/compiler.js", function (require, module, exports, __dirname, __
   module.exports = Compiler = (function() {
 
     function Compiler(options) {
-      var _base, _base2, _base3, _ref, _ref2, _ref3;
+      var _base, _base2, _base3, _base4, _base5, _base6, _ref, _ref2, _ref3, _ref4, _ref5, _ref6;
       this.options = options != null ? options : {};
       if ((_ref = (_base = this.options).escapeHtml) == null) {
         _base.escapeHtml = true;
@@ -1064,8 +1083,15 @@ require.define("/compiler.js", function (require, module, exports, __dirname, __
       if ((_ref2 = (_base2 = this.options).escapeAttributes) == null) {
         _base2.escapeAttributes = true;
       }
-      if ((_ref3 = (_base3 = this.options).format) == null) {
-        _base3.format = 'html5';
+      if ((_ref3 = (_base3 = this.options).uglify) == null) _base3.uglify = false;
+      if ((_ref4 = (_base4 = this.options).format) == null) {
+        _base4.format = 'html5';
+      }
+      if ((_ref5 = (_base5 = this.options).preserveTags) == null) {
+        _base5.preserveTags = 'pre,textarea';
+      }
+      if ((_ref6 = (_base6 = this.options).selfCloseTags) == null) {
+        _base6.selfCloseTags = 'meta,img,link,br,hr,input,area,param,col,base';
       }
     }
 
@@ -1132,7 +1158,10 @@ require.define("/compiler.js", function (require, module, exports, __dirname, __
         codeBlockLevel: override.codeBlockLevel || this.currentCodeBlockLevel,
         escapeHtml: override.escapeHtml || this.options.escapeHtml,
         escapeAttributes: override.escapeAttributes || this.options.escapeAttributes,
-        format: override.format || this.options.format
+        format: override.format || this.options.format,
+        preserveTags: override.preserveTags || this.options.preserveTags,
+        selfCloseTags: override.selfCloseTags || this.options.selfCloseTags,
+        uglify: override.uglify || this.options.uglify
       };
     };
 
@@ -1230,7 +1259,7 @@ require.define("/compiler.js", function (require, module, exports, __dirname, __
     };
 
     Compiler.prototype.render = function(templateName, namespace) {
-      var cleanFn, code, escapeFn, output, segment, segments, _i, _len;
+      var cleanFn, code, escapeFn, findAndPreserveFn, output, preserveFn, segment, segments, _i, _len;
       if (namespace == null) namespace = 'window.HAML';
       output = '';
       segments = ("" + namespace + "." + templateName).replace(/(\s|-)+/g, '_').split(/\./);
@@ -1257,11 +1286,25 @@ require.define("/compiler.js", function (require, module, exports, __dirname, __
         cleanFn = "" + namespace + ".cleanValue";
         output += cleanFn + '||= (text) -> if text is null or text is undefined then \'\' else text\n';
       }
+      if (this.options.customPreserve) {
+        preserveFn = this.options.customPreserve;
+      } else {
+        preserveFn = "" + namespace + ".preserve";
+        output += preserveFn + "||= (text) -> text.replace /\\n/g, '&#x000A;'\n";
+      }
+      if (this.options.customFindAndPreserve) {
+        findAndPreserveFn = this.options.customFindAndPreserve;
+      } else {
+        findAndPreserveFn = "" + namespace + ".findAndPreserve";
+        output += findAndPreserveFn + ("||= (text) ->\n  text.replace /<(" + (this.options.preserveTags.split(',').join('|')) + ")>([^]*?)<\\/\\1>/g, (str, tag, content) ->\n    \"<\#{ tag }>\#{ " + preserveFn + "(content) }</\#{ tag }>\"\n");
+      }
       output += "" + namespace + "['" + templateName + "'] = (context) ->\n";
       output += "  fn = (context) ->\n";
       output += "    o = []\n";
       output += "    e = " + escapeFn + "\n";
       output += "    c = " + cleanFn + "\n";
+      output += "    p = " + preserveFn + "\n";
+      output += "    fp = findAndPreserve = " + findAndPreserveFn + "\n";
       code = this.createCode();
       output += "" + code + "\n";
       output += "    return o.join(\"\\n\")" + (this.cleanupWhitespace(code)) + "\n";
@@ -1291,9 +1334,9 @@ require.define("/compiler.js", function (require, module, exports, __dirname, __
               break;
             case 'insert':
               if (line.hw === 0) {
-                code.push("" + (w(line.cw)) + "o.push " + (w(line.escape) ? 'e ' : '') + "c(" + line.code + ")");
+                code.push("" + (w(line.cw)) + "o.push " + (w(line.findAndPreserve) ? 'fp ' : '') + (w(line.preserve) ? 'p ' : '') + (w(line.escape) ? 'e ' : '') + "c " + line.code);
               } else {
-                code.push("" + (w(line.cw)) + "o.push " + (w(line.escape) ? 'e' : '') + " \"" + (w(line.hw - line.cw + 2)) + "\" + c(" + line.code + ")");
+                code.push("" + (w(line.cw)) + "o.push \"" + (w(line.hw - line.cw + 2)) + "\" + " + (w(line.findAndPreserve) ? 'fp ' : '') + (w(line.preserve) ? 'p ' : '') + (w(line.escape) ? 'e ' : '') + "c " + line.code);
               }
           }
         }

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

@@ -0,0 +1,88 @@
+# HAML Coffee namespace
+#
+window.HAML ||= {}
+
+# HAML Coffee html escape function
+#
+# @param text [String] the text to escape
+# @return [String] the escaped text
+#
+window.HAML.escape ||= (text) ->
+  ("" + text)
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+
+# HAML Coffee clean value function
+#
+# @param text [String] the text to be cleaned
+# @return [String] the cleaned text
+#
+window.HAML.cleanValue ||= (text) ->
+  if text is null or text is undefined then '' else text
+
+# HAML Coffee extend function.
+#
+# This will reuse the extend function from either:
+#
+# - jQuery
+# - Underscore.js
+# - Prototype
+# - MooTools
+# - Zepto.js
+#
+# You can assign a custom extend function if your framework
+# is not supported out of the box.
+#
+window.HAML.extend ||= (globals, locals) ->
+  if jQuery?.extend
+    jQuery.extend {}, globals, locals
+
+  else if _?.extend
+    _.extend {}, globals, locals
+
+  else if Zepto?.extend
+    Zepto.extend(Zepto.extend({}, globals), locals)
+
+  else if Object.extend
+    Object.extend(Object.extend({}, globals), locals)
+
+  else if Object.append
+    Object.append(Object.append({}, globals), locals)
+
+  else
+    locals
+
+# HAML Coffee global template context.
+#
+# @return [Object] the global template context
+#
+window.HAML.globals ||= -> {}
+
+# Get the HAML template context. This merges the local
+# and the global template context into a new context.
+#
+# @param locals [Object] the local template context
+# @return [Object] the merged context
+#
+window.HAML.context ||= (locals) ->
+  HAML.extend(HAML.globals(), locals)
+
+# Preserve newlines in the text
+#
+# @param text [String] the text to preserve
+# @return [String] the preserved text
+#
+window.HAML.preserve ||= (text) ->
+  text.replace /\\n/g, '&#x000A;'
+
+# Find and preserve newlines in the preserving tags
+#
+# @param text [String] the text to preserve
+# @return [String] the preserved text
+#
+window.HAML.findAndPreserve ||= ->
+  tags = '<%= HamlCoffeeAssets::HamlCoffee.preserveTags %>'.split(',').join('|')
+  text.replace ///<(#{ tags })>([^]*?)<\/\1>///g, (str, tag, content) ->
+    "<#{ tag }>#{ <%= HamlCoffeeAssets::HamlCoffee.customPreserve %>(content) }</#{ tag }>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70271110267660 !ruby/object:Gem::Requirement
+  requirement: &70174079146660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70271110267660
+  version_requirements: *70174079146660
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70271110266700 !ruby/object:Gem::Requirement
+  requirement: &70174079146160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70271110266700
+  version_requirements: *70174079146160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70271110264040 !ruby/object:Gem::Requirement
+  requirement: &70174079145700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271110264040
+  version_requirements: *70174079145700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70271110263360 !ruby/object:Gem::Requirement
+  requirement: &70174079145120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70271110263360
+  version_requirements: *70174079145120
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70271110262780 !ruby/object:Gem::Requirement
+  requirement: &70174079144540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70271110262780
+  version_requirements: *70174079144540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70271110262040 !ruby/object:Gem::Requirement
+  requirement: &70174079144040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70271110262040
+  version_requirements: *70174079144040
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70271110261360 !ruby/object:Gem::Requirement
+  requirement: &70174079143520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70271110261360
+  version_requirements: *70174079143520
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70271110260900 !ruby/object:Gem::Requirement
+  requirement: &70174079143000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70271110260900
+  version_requirements: *70174079143000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70271110225480 !ruby/object:Gem::Requirement
+  requirement: &70174079142540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70271110225480
+  version_requirements: *70174079142540
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
 email:
 - michi@netzpiraten.ch
@@ -126,7 +126,7 @@ files:
 - lib/js/coffee-script.js
 - lib/js/haml-coffee.js
 - lib/tasks/haml-coffee-rails_tasks.rake
-- vendor/assets/javascripts/hamlcoffee.js
+- vendor/assets/javascripts/hamlcoffee.js.coffee.erb
 - LICENSE
 - README.md
 homepage: https://github.com/netzpirat/haml_coffee_assets

data/vendor/assets/javascripts/hamlcoffee.js

@@ -1,85 +0,0 @@
-/**
- * HAML Coffee namespace
- */
-window.HAML || (window.HAML = {});
-
-/**
- * HAML Coffee html escape function
- *
- * @param text [String] the text to escape
- * @return [String] the escaped text
- */
-window.HAML.escape || (window.HAML.escape = function(text) {
-  return ("" + text)
-    .replace(/&/g, "&")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;");
-});
-
-/**
- * HAML Coffee clean value function
- *
- * @param text [String] the text to be cleaned
- * @return [String] the cleaned text
- */
-window.HAML.cleanValue || (window.HAML.cleanValue = function(text) {
-  if (text === null || text === void 0) {
-    return '';
-  } else {
-    return text;
-  }
-});
-
-/**
- * HAML Coffee extend function.
- *
- * This will reuse the extend function from either:
- *
- * - jQuery
- * - Underscore.js
- * - Prototype
- * - MooTools
- * - Zepto.js
- *
- * You can assign a custom extend function if your framework
- * is not supported out of the box.
- */
-window.HAML.extend || (window.HAML.extend = function(globals, locals) {
-  if (jQuery && jQuery.extend) {
-    return jQuery.extend({}, globals, locals);
-  }
-  else if (_ && _.extend) {
-    return _.extend({}, globals, locals);
-  }
-  else if (Zepto && Zepto.extend) {
-    return Zepto.extend(Zepto.extend({}, globals), locals);
-  }
-  else if (Object.extend) {
-    return Object.extend(Object.extend({}, globals), locals)
-  }
-  else if (Object.append) {
-    return Object.append(Object.append({}, globals), locals)
-  }
-  else { return locals }
-});
-
-/**
- * HAML Coffee global template context.
- *
- * @return [Object] the global template context
- */
-window.HAML.globals || (window.HAML.globals = function() {
-  return {}
-});
-
-/**
- * Get the HAML template context. This merges the local
- * and the global template context into a new context.
- *
- * @param locals [Object] the local template context
- * @return [Object] the merged context
- */
-window.HAML.context || (window.HAML.context = function(locals) {
-  return HAML.extend(HAML.globals(), locals)
-});