haml_coffee_assets 1.8.2 → 1.9.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Michael Kessler <michi@netzpiraten.ch>
+Copyright (c) 2011-2013 Michael Kessler <michi@netzpiraten.ch>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -436,7 +436,7 @@ by default. This allows you to render a template within another template like:
 
 ```
 %h1 Comments for this article
-- for comment in @article.comments 
+- for comment in @article.comments
   != JST['articles/comment'](comment)
 ```
 
@@ -508,7 +508,7 @@ See the [CHANGELOG](https://github.com/netzpirat/haml_coffee_assets/blob/master/
 
 (The MIT License)
 
-Copyright (c) 2011-2012 Michael Kessler
+Copyright (c) 2011-2013 Michael Kessler
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/haml_coffee_assets/compiler.rb

@@ -26,7 +26,7 @@ module HamlCoffeeAssets
                      config.escapeHtml, config.escapeAttributes, config.cleanValue, config.placement, config.dependencies,
                      config.customHtmlEscape, config.customCleanValue,
                      config.customPreserve, config.customFindAndPreserve,
-                     config.customSurround, config.customSucceed, config.customPrecede,
+                     config.customSurround, config.customSucceed, config.customPrecede, config.customReference,
                      config.preserveTags, config.selfCloseTags,
                      config.context, config.extendScope)
       end

data/lib/haml_coffee_assets/configuration.rb

@@ -33,6 +33,7 @@ module HamlCoffeeAssets
       self.customSurround         = 'window.HAML.surround'
       self.customSucceed          = 'window.HAML.succeed'
       self.customPrecede          = 'window.HAML.precede'
+      self.customReference        = 'window.HAML.reference'
       self.preserveTags           = 'textarea,pre'
       self.selfCloseTags          = 'meta,img,link,br,hr,input,area,param,col,base'
       self.context                = 'window.HAML.context'
@@ -100,6 +101,10 @@ module HamlCoffeeAssets
     #
     attr_accessor :customPreserve
 
+    # Custom object reference function
+    #
+    attr_accessor :customReference
+
     # Custom find and preserve function
     #
     attr_accessor :customFindAndPreserve

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml_coffee_assets.js

@@ -27,6 +27,7 @@ var HamlCoffeeAssets = (function(){
        * @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 customReference [String] the name of the function for the object reference 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
@@ -35,7 +36,7 @@ var HamlCoffeeAssets = (function(){
       compile: function(name, source, jst, namespace, format, uglify, basename,
                         escapeHtml, escapeAttributes, cleanValue, placement, dependencies,
                         customHtmlEscape, customCleanValue, customPreserve, customFindAndPreserve,
-                        customSurround, customSucceed, customPrecede,
+                        customSurround, customSucceed, customPrecede, customReference,
                         preserveTags, selfCloseTags,
                         context, extendScope) {
 
@@ -55,6 +56,7 @@ var HamlCoffeeAssets = (function(){
           customSurround: customSurround,
           customSucceed: customSucceed,
           customPrecede: customPrecede,
+          customReference: customReference,
           preserveTags: preserveTags,
           selfCloseTags: selfCloseTags,
           extendScope: extendScope
@@ -78,7 +80,7 @@ var HamlCoffeeAssets = (function(){
         }
 
         if (context !== '' && context !== false) {
-          // With AMD we replace the context function with the one from the hamlcoffee AMD module if not set explicit 
+          // With AMD we replace the context function with the one from the hamlcoffee AMD module if not set explicit
           if (placement === 'amd' && context === 'window.HAML.context' && /^hamlcoffee/.test(dependencies['hc'])) {
               context = 'hc.context';
           }

data/lib/js/hamlcoffee.js

@@ -363,7 +363,7 @@ require.define("/haml-coffee.coffee", function (require, module, exports, __dirn
 
   module.exports = HamlCoffee = (function() {
 
-    HamlCoffee.VERSION = '1.8.2';
+    HamlCoffee.VERSION = '1.9.1';
 
     function HamlCoffee(options) {
       var _base, _base10, _base11, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _ref, _ref10, _ref11, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9;
@@ -591,6 +591,7 @@ require.define("/haml-coffee.coffee", function (require, module, exports, __dirn
         this.options.customSurround = 'hc.surround';
         this.options.customSucceed = 'hc.succeed';
         this.options.customPrecede = 'hc.precede';
+        this.options.customReference = 'hc.reference';
       }
       modules = [];
       params = [];
@@ -711,6 +712,13 @@ require.define("/haml-coffee.coffee", function (require, module, exports, __dirn
           fn += "precede = (start, fn) => start + fn.call(@)?.replace(/^\s+/g, '')\n";
         }
       }
+      if (code.indexOf('$r') !== -1) {
+        if (this.options.customReference) {
+          fn += "$r = " + this.options.customReference + "\n";
+        } else {
+          fn += "$r = (object, prefix) ->\n  name = if prefix then prefix + '_' else ''\n\n  if typeof(object.hamlObjectRef) is 'function'\n    name += object.hamlObjectRef()\n  else\n    name += (object.constructor?.name || 'object').replace(/\W+/g, '_').replace(/([a-z\d])([A-Z])/g, '$1_$2').toLowerCase()\n\n  id = if typeof(object.to_key) is 'function'\n         object.to_key()\n       else if typeof(object.id) is 'function'\n         object.id()\n       else if object.id\n         object.id\n      else\n        object\n\n  result  = \"class='\#{ name }'\"\n  result += \" id='\#{ name }_\#{ id }'\" if id\n";
+        }
+      }
       fn += "$o = []\n";
       fn += "" + code + "\n";
       return fn += "return $o.join(\"\\n\")" + (this.convertBooleans(code)) + (this.removeEmptyIDAndClass(code)) + (this.cleanupWhitespace(code)) + "\n";
@@ -1187,12 +1195,13 @@ require.define("/nodes/haml.coffee", function (require, module, exports, __dirna
         classes: classes,
         text: escapeQuotes(tag.text),
         attributes: attributes,
-        assignment: tag.assignment
+        assignment: tag.assignment,
+        reference: tag.reference
       };
     };
 
     Haml.prototype.parseTag = function(exp) {
-      var assignment, attributes, ch, classes, doctype, end, haml, id, ids, klass, level, pos, rest, start, tag, text, whitespace, _ref, _ref2, _ref3;
+      var assignment, attr, attributes, ch, classes, doctype, end, haml, htmlAttributes, id, ids, key, klass, level, pos, reference, rest, rubyAttributes, start, tag, text, val, whitespace, _i, _j, _len, _len2, _ref, _ref2, _ref3, _ref4, _ref5;
       try {
         doctype = (_ref = exp.match(/^(\!{3}.*)/)) != null ? _ref[1] : void 0;
         if (doctype) {
@@ -1202,35 +1211,68 @@ require.define("/nodes/haml.coffee", function (require, module, exports, __dirna
         }
         haml = exp.match(/^((?:[#%\.][a-z0-9_:\-]*[\/]?)+)/i)[0];
         rest = exp.substring(haml.length);
-        if (rest.match(/^[{(]/)) {
-          start = rest[0];
-          end = (function() {
-            switch (start) {
-              case '{':
-                return '}';
-              case '(':
-                return ')';
-            }
-          })();
-          level = 0;
-          for (pos = 0, _ref2 = rest.length; 0 <= _ref2 ? pos <= _ref2 : pos >= _ref2; 0 <= _ref2 ? pos++ : pos--) {
-            ch = rest[pos];
-            if (ch === start) level += 1;
-            if (ch === end) {
-              if (level === 1) {
-                break;
-              } else {
-                level -= 1;
+        if (rest.match(/^[{([]/)) {
+          reference = '';
+          htmlAttributes = '';
+          rubyAttributes = '';
+          _ref2 = ['[', '{', '(', '[', '{', '('];
+          for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+            start = _ref2[_i];
+            if (start === rest[0]) {
+              end = (function() {
+                switch (start) {
+                  case '{':
+                    return '}';
+                  case '(':
+                    return ')';
+                  case '[':
+                    return ']';
+                }
+              })();
+              level = 0;
+              for (pos = 0, _ref3 = rest.length; 0 <= _ref3 ? pos <= _ref3 : pos >= _ref3; 0 <= _ref3 ? pos++ : pos--) {
+                ch = rest[pos];
+                if (ch === start) level += 1;
+                if (ch === end) {
+                  if (level === 1) {
+                    break;
+                  } else {
+                    level -= 1;
+                  }
+                }
+              }
+              switch (start) {
+                case '{':
+                  rubyAttributes += rest.substring(0, pos + 1);
+                  rest = rest.substring(pos + 1);
+                  break;
+                case '(':
+                  htmlAttributes += rest.substring(0, pos + 1);
+                  rest = rest.substring(pos + 1);
+                  break;
+                case '[':
+                  reference = rest.substring(1, pos);
+                  rest = rest.substring(pos + 1);
               }
             }
           }
-          attributes = rest.substring(0, pos + 1);
-          assignment = rest.substring(pos + 1);
+          assignment = rest || '';
         } else {
-          attributes = '';
+          reference = '';
+          htmlAttributes = '';
+          rubyAttributes = '';
           assignment = rest;
         }
-        if (whitespace = (_ref3 = assignment.match(/^[<>]{0,2}/)) != null ? _ref3[0] : void 0) {
+        attributes = {};
+        _ref4 = [this.parseAttributes(htmlAttributes), this.parseAttributes(rubyAttributes)];
+        for (_j = 0, _len2 = _ref4.length; _j < _len2; _j++) {
+          attr = _ref4[_j];
+          for (key in attr) {
+            val = attr[key];
+            attributes[key] = val;
+          }
+        }
+        if (whitespace = (_ref5 = assignment.match(/^[<>]{0,2}/)) != null ? _ref5[0] : void 0) {
           assignment = assignment.substring(whitespace.length);
         }
         if (assignment[0] === ' ') assignment = assignment.substring(1);
@@ -1251,25 +1293,26 @@ require.define("/nodes/haml.coffee", function (require, module, exports, __dirna
         return {
           tag: tag ? tag[1] : 'div',
           ids: ids ? (function() {
-            var _i, _len, _results;
+            var _k, _len3, _results;
             _results = [];
-            for (_i = 0, _len = ids.length; _i < _len; _i++) {
-              id = ids[_i];
+            for (_k = 0, _len3 = ids.length; _k < _len3; _k++) {
+              id = ids[_k];
               _results.push("'" + (id.substr(1)) + "'");
             }
             return _results;
           })() : void 0,
           classes: classes ? (function() {
-            var _i, _len, _results;
+            var _k, _len3, _results;
             _results = [];
-            for (_i = 0, _len = classes.length; _i < _len; _i++) {
-              klass = classes[_i];
+            for (_k = 0, _len3 = classes.length; _k < _len3; _k++) {
+              klass = classes[_k];
               _results.push("'" + (klass.substr(1)) + "'");
             }
             return _results;
           })() : void 0,
-          attributes: this.parseAttributes(attributes),
+          attributes: attributes,
           assignment: assignment,
+          reference: reference,
           text: text
         };
       } catch (error) {
@@ -1385,6 +1428,13 @@ require.define("/nodes/haml.coffee", function (require, module, exports, __dirna
         tagParts.push("class='" + classes + "'");
       }
       if (tokens.id) tagParts.push("id='" + tokens.id + "'");
+      if (tokens.reference) {
+        if (tokens.attributes) {
+          delete tokens.attributes['class'];
+          delete tokens.attributes['id'];
+        }
+        tagParts.push("\#{$r(" + tokens.reference + ")}");
+      }
       if (tokens.attributes) {
         _ref = tokens.attributes;
         for (key in _ref) {

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

@@ -108,3 +108,30 @@ class window.HAML
   #
   @precede: (start, fn) ->
     start + fn.call(@)?.replace(/^\s+/g, '')
+
+  # The reference helper creates id and class attributes
+  # for an object reference.
+  #
+  # @param [Object] object the referenced object
+  # @param [String] prefix the optional id and class prefix
+  # @return [String] the id and class attributes
+  #
+  @reference: (object, prefix) ->
+    name = if prefix then prefix + '_' else ''
+
+    if typeof(object.hamlObjectRef) is 'function'
+      name += object.hamlObjectRef()
+    else
+      name += (object.constructor?.name || 'object').replace(/\W+/g, '_').replace(/([a-z\d])([A-Z])/g, '$1_$2').toLowerCase()
+
+    id = if typeof(object.to_key) is 'function'
+           object.to_key()
+         else if typeof(object.id) is 'function'
+            object.id()
+         else if object.id
+           object.id
+         else
+           object
+
+    result  = "class='#{ name }'"
+    result += " id='#{ name }_#{ id }'" if id

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

@@ -89,3 +89,30 @@ define ->
   # @return [Object] the merged context
   #
   context: (locals) -> locals
+
+  # The reference helper creates id and class attributes
+  # for an object reference.
+  #
+  # @param [Object] object the referenced object
+  # @param [String] prefix the optional id and class prefix
+  # @return [String] the id and class attributes
+  #
+  reference: (object, prefix) ->
+    name = if prefix then prefix + '_' else ''
+
+    if typeof(object.hamlObjectRef) is 'function'
+      name += object.hamlObjectRef()
+    else
+      name += (object.constructor?.name || 'object').replace(/\W+/g, '_').replace(/([a-z\d])([A-Z])/g, '$1_$2').toLowerCase()
+
+    id = if typeof(object.to_key) is 'function'
+           object.to_key()
+         else if typeof(object.id) is 'function'
+           object.id()
+         else if object.id
+           object.id
+         else
+           object
+
+    result  = "class='#{ name }'"
+    result += " id='#{ name }_#{ id }'" if i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: haml_coffee_assets
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Haml CoffeeScript templates