haml_coffee_assets 0.9.5 → 1.0.0

data/README.md

@@ -314,6 +314,22 @@ App.globalTemplateContext = (locals) -> HAML.extend({}, {
 Please have a look at the wiki for [further examples](https://github.com/netzpirat/haml_coffee_assets/wiki) on how to
 use the global context.
 
+#### Extending the template scope with the context
+
+Pure haml-coffee cannot extend the template scope with the context, since CoffeeScript doesn't have the `with`
+statement. But when you're using Haml Coffee Assets, then you can have the scope to be extended
+with the context by enable it in the configuration:
+
+```ruby
+config.hamlcoffee.extendContext = true
+```
+
+With this option enabled, you don't need to use `@` or `this` to reference context data:
+
+```Haml
+%p= name
+```
+
 ### 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

data/lib/haml_coffee_assets/compiler.rb

@@ -26,7 +26,7 @@ module HamlCoffeeAssets
                      config.customPreserve, config.customFindAndPreserve,
                      config.customSurround, config.customSucceed, config.customPrecede,
                      config.preserveTags, config.selfCloseTags,
-                     config.context)
+                     config.context, config.extendScope)
       end
 
       private

data/lib/haml_coffee_assets/configuration.rb

@@ -26,6 +26,7 @@ module HamlCoffeeAssets
       self.preserveTags           = 'textarea,pre'
       self.selfCloseTags          = 'meta,img,link,br,hr,input,area,param,col,base'
       self.context                = 'window.HAML.context'
+      self.extendScope            = false
       self.name_filter            = lambda { |n| n.sub /^templates\//, '' }
     end
 
@@ -97,6 +98,10 @@ module HamlCoffeeAssets
     #
     attr_accessor :context
 
+    # Extend the template scope with the context
+    #
+    attr_accessor :extendScope
+
     # A proc that is called to modify the template name used as the
     # JST key. The proc is passed the name as an argument and should
     # return the modified name (or unmodified) name.

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml_coffee_assets.js

@@ -36,14 +36,15 @@ var HamlCoffeeAssets = (function(){
        * @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
+       * @param extendScope [Boolean] extend the scope with the context
        */
       compile: function(name, source, jst, namespace, format, uglify, basename,
                         escapeHtml, escapeAttributes, cleanValue,
                         customHtmlEscape, customCleanValue, customPreserve, customFindAndPreserve,
                         customSurround, customSucceed, customPrecede,
                         preserveTags, selfCloseTags,
-                        context) {
-
+                        context, extendScope) {
+        
         var compiler = new Compiler({
           format: format,
           uglify: uglify,
@@ -59,7 +60,8 @@ var HamlCoffeeAssets = (function(){
           customSucceed: customSucceed,
           customPrecede: customPrecede,
           preserveTags: preserveTags,
-          selfCloseTags: selfCloseTags
+          selfCloseTags: selfCloseTags,
+          extendScope: extendScope
         });
 
         compiler.parse(source);
@@ -68,9 +70,15 @@ var HamlCoffeeAssets = (function(){
 
         if (jst) {
           template = CoffeeScript.compile(compiler.render(name, namespace));
+            
         } else {
           var hamlc = CoffeeScript.compile(compiler.precompile(), { bare: true });
-          template = '(function(context) {\n  return (function() {\n' + hamlc.replace(/^(.*)$/mg, '    $1') + '\n  }).call(context);\n});';
+            
+          if (extendScope) {
+            template = '(function(context) {\n  with(context || {}) {\n    return (function() {\n' + hamlc.replace(/^(.*)$/mg, '      $1') + '\n    };\n  }).call(context);\n});';
+          } else {
+            template = '(function(context) {\n  return (function() {\n' + hamlc.replace(/^(.*)$/mg, '    $1') + '\n  }).call(context);\n});';
+          }
         }
 
         if (context !== '' && context !== false) {

data/lib/js/hamlcoffee.js

@@ -363,34 +363,35 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
 
   module.exports = HamlCoffee = (function() {
 
-    HamlCoffee.name = 'HamlCoffee';
-
     function HamlCoffee(options) {
-      var _base, _base1, _base2, _base3, _base4, _base5, _base6, _base7;
+      var _base, _base1, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _ref, _ref1, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8;
       this.options = options != null ? options : {};
-      if ((_base = this.options).escapeHtml == null) {
+      if ((_ref = (_base = this.options).escapeHtml) == null) {
         _base.escapeHtml = true;
       }
-      if ((_base1 = this.options).escapeAttributes == null) {
+      if ((_ref1 = (_base1 = this.options).escapeAttributes) == null) {
         _base1.escapeAttributes = true;
       }
-      if ((_base2 = this.options).cleanValue == null) {
+      if ((_ref2 = (_base2 = this.options).cleanValue) == null) {
         _base2.cleanValue = true;
       }
-      if ((_base3 = this.options).uglify == null) {
+      if ((_ref3 = (_base3 = this.options).uglify) == null) {
         _base3.uglify = false;
       }
-      if ((_base4 = this.options).basename == null) {
+      if ((_ref4 = (_base4 = this.options).basename) == null) {
         _base4.basename = false;
       }
-      if ((_base5 = this.options).format == null) {
-        _base5.format = 'html5';
+      if ((_ref5 = (_base5 = this.options).extendScope) == null) {
+        _base5.extendScope = false;
+      }
+      if ((_ref6 = (_base6 = this.options).format) == null) {
+        _base6.format = 'html5';
       }
-      if ((_base6 = this.options).preserveTags == null) {
-        _base6.preserveTags = 'pre,textarea';
+      if ((_ref7 = (_base7 = this.options).preserveTags) == null) {
+        _base7.preserveTags = 'pre,textarea';
       }
-      if ((_base7 = this.options).selfCloseTags == null) {
-        _base7.selfCloseTags = 'meta,img,link,br,hr,input,area,param,col,base';
+      if ((_ref8 = (_base8 = this.options).selfCloseTags) == null) {
+        _base8.selfCloseTags = 'meta,img,link,br,hr,input,area,param,col,base';
       }
     }
 
@@ -588,9 +589,17 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
       } else {
         template += "" + namespace + " ?= {}\n";
       }
-      template += "" + namespace + "['" + templateName + "'] = (context) -> ( ->\n";
-      template += "" + (indent(this.precompile(), 1));
-      template += ").call(context)";
+      if (this.options.extendScope) {
+        template += "" + namespace + "['" + templateName + "'] = (context) -> ( ->\n";
+        template += "  `with (context || {}) {`\n";
+        template += "" + (indent(this.precompile(), 1));
+        template += "`}`\n";
+        template += ").call(context)";
+      } else {
+        template += "" + namespace + "['" + templateName + "'] = (context) -> ( ->\n";
+        template += "" + (indent(this.precompile(), 1));
+        template += ").call(context)";
+      }
       return template;
     };
 
@@ -759,8 +768,6 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
 
   module.exports = Node = (function() {
 
-    Node.name = 'Node';
-
     Node.CLEAR_WHITESPACE_LEFT = '\u0091';
 
     Node.CLEAR_WHITESPACE_RIGHT = '\u0092';
@@ -989,7 +996,7 @@ require.define("/nodes/text.js", function (require, module, exports, __dirname,
 (function() {
   var Node, Text, 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; };
+    __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');
 
@@ -999,8 +1006,6 @@ require.define("/nodes/text.js", function (require, module, exports, __dirname,
 
     __extends(Text, _super);
 
-    Text.name = 'Text';
-
     function Text() {
       return Text.__super__.constructor.apply(this, arguments);
     }
@@ -1408,7 +1413,7 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
 (function() {
   var Code, Node,
     __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; };
+    __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');
 
@@ -1416,8 +1421,6 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
 
     __extends(Code, _super);
 
-    Code.name = 'Code';
-
     function Code() {
       return Code.__super__.constructor.apply(this, arguments);
     }
@@ -1463,7 +1466,7 @@ require.define("/nodes/comment.js", function (require, module, exports, __dirnam
 (function() {
   var Comment, Node,
     __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; };
+    __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');
 
@@ -1471,8 +1474,6 @@ require.define("/nodes/comment.js", function (require, module, exports, __dirnam
 
     __extends(Comment, _super);
 
-    Comment.name = 'Comment';
-
     function Comment() {
       return Comment.__super__.constructor.apply(this, arguments);
     }
@@ -1510,7 +1511,7 @@ require.define("/nodes/filter.js", function (require, module, exports, __dirname
 (function() {
   var Filter, Node, unescapeQuotes, whitespace,
     __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; };
+    __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');
 
@@ -1522,8 +1523,6 @@ require.define("/nodes/filter.js", function (require, module, exports, __dirname
 
     __extends(Filter, _super);
 
-    Filter.name = 'Filter';
-
     function Filter() {
       return Filter.__super__.constructor.apply(this, arguments);
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -189567978419904399
+      hash: -738589441708461623
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: