haml_coffee_assets 1.5.1 → 1.6.0

data/README.md

@@ -6,6 +6,13 @@ a pure [Sprockets](https://github.com/sstephenson/sprockets) engine without Rail
 
 Tested on MRI Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest version of JRuby.
 
+## Features
+
+* Seamless integration of [Haml-Coffee](https://github.com/netzpirat/haml-coffee) into the Rails asset pipeline or as
+standalone Sprockets engine.
+* Manifold options to configure Haml Coffee Assets to your needs.
+* AMD support.
+
 ## Haml Coffee
 
 Haml Coffee allows you to write inline [CoffeeScript](http://jashkenas.github.com/coffee-script/) in your
@@ -13,24 +20,20 @@ Haml Coffee allows you to write inline [CoffeeScript](http://jashkenas.github.co
 
 ```haml
 #cart
-  %h2= I18n.t('js.cart.title')
-  - if @cart.length == 0
-    %p.empty= I18n.t('js.cart.empty')
+  %h2 Cart
+  - if @cart.length is 0
+    %p.empty Your cart is empty
   - else
     %ul
       - for item in @cart
         %li
           .item
             = item.name
-            %a{ :href => "/cart/item/remove/#{ item.id }" }
-              = I18n.t('js.cart.item.remove')
+            %a{ :href => "/cart/item/remove/#{ item.id }" } Remove Item
 ```
 
 You can try Haml Coffee online by visiting [Haml Coffee Online](http://haml-coffee-online.herokuapp.com/).
 
-Please note that the `I18n` object in the above example is not part ot Haml Coffee Assets, the internationalization
-functions are provided by the [i18n.js](https://github.com/fnando/i18n-js) library.
-
 ## Installation
 
 The simplest way to install Haml Coffee Assets is to use [Bundler](http://gembundler.com/).
@@ -147,6 +150,17 @@ If you prefer another HTML format than HTML5, you can set it in your `config/app
 config.hamlcoffee.format = 'xhtml'
 ```
 
+### Template Placement
+
+By default all Haml Coffee templates are placed under the configured template namespace. You can choose between the
+following placements:
+
+* global
+* amd
+
+By setting the placement option to `amd`, each template will be wrapped within a `define` function, enabling the usage
+of a module loader.
+
 ### Template namespace
 
 By default all Haml Coffee templates are registered under the `JST` namespace. A template

data/lib/haml_coffee_assets/compiler.rb

@@ -20,10 +20,10 @@ module HamlCoffeeAssets
       #
       def compile(name, source, jst = true)
         config = HamlCoffeeAssets.config
-        
+
         runtime.call('HamlCoffeeAssets.compile', name, source, jst,
                      config.namespace, config.format, config.uglify, config.basename,
-                     config.escapeHtml, config.escapeAttributes, config.cleanValue,
+                     config.escapeHtml, config.escapeAttributes, config.cleanValue, config.placement,
                      config.customHtmlEscape, config.customCleanValue,
                      config.customPreserve, config.customFindAndPreserve,
                      config.customSurround, config.customSucceed, config.customPrecede,

data/lib/haml_coffee_assets/configuration.rb

@@ -7,7 +7,7 @@ module HamlCoffeeAssets
   def self.config
     @config ||= ::HamlCoffeeAssets::Configuration.new
   end
-  
+
   # Haml Coffee configuration object that contains the default values.
   # It's a plain Ruby object so a Sinatra app doesn't have to depend
   # on ActiveSupport just because of the Rails engine configuration.
@@ -24,6 +24,7 @@ module HamlCoffeeAssets
       self.escapeHtml             = true
       self.escapeAttributes       = true
       self.cleanValue             = true
+      self.placement              = 'global'
       self.customHtmlEscape       = 'window.HAML.escape'
       self.customCleanValue       = 'window.HAML.cleanValue'
       self.customPreserve         = 'window.HAML.preserve'
@@ -66,6 +67,10 @@ module HamlCoffeeAssets
     #
     attr_accessor :cleanValue
 
+    # Define the function placement, either `global` or `amd`
+    #
+    attr_accessor :placement
+
     # Custom global HTML escaping function
     #
     attr_accessor :customHtmlEscape

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml_coffee_assets.js

@@ -19,6 +19,8 @@ var HamlCoffeeAssets = (function(){
        * @param basename [Boolean] ignore path when generate JST
        * @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 cleanValue [String] the name of the function to clean the values
+       * @param placement [String] where to place the function, either `global` or `amd`
        * @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
@@ -30,7 +32,7 @@ var HamlCoffeeAssets = (function(){
        * @param extendScope [Boolean] extend the scope with the context
        */
       compile: function(name, source, jst, namespace, format, uglify, basename,
-                        escapeHtml, escapeAttributes, cleanValue,
+                        escapeHtml, escapeAttributes, cleanValue, placement,
                         customHtmlEscape, customCleanValue, customPreserve, customFindAndPreserve,
                         customSurround, customSucceed, customPrecede,
                         preserveTags, selfCloseTags,
@@ -43,6 +45,7 @@ var HamlCoffeeAssets = (function(){
           escapeHtml: escapeHtml,
           escapeAttributes: escapeAttributes,
           cleanValue: cleanValue,
+          placement: placement,
           customHtmlEscape: customHtmlEscape,
           customCleanValue: customCleanValue,
           customPreserve: customPreserve,

data/lib/js/hamlcoffee.js

@@ -363,35 +363,38 @@ require.define("/haml-coffee.coffee", function (require, module, exports, __dirn
 
   module.exports = HamlCoffee = (function() {
 
-    HamlCoffee.VERSION = '1.5.1';
+    HamlCoffee.VERSION = '1.6.0';
 
     function HamlCoffee(options) {
-      var _base, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _ref, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9;
+      var _base, _base10, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _ref, _ref10, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9;
       this.options = options != null ? options : {};
-      if ((_ref = (_base = this.options).escapeHtml) == null) {
-        _base.escapeHtml = true;
+      if ((_ref = (_base = this.options).placement) == null) {
+        _base.placement = 'global';
       }
-      if ((_ref2 = (_base2 = this.options).escapeAttributes) == null) {
-        _base2.escapeAttributes = true;
+      if ((_ref2 = (_base2 = this.options).escapeHtml) == null) {
+        _base2.escapeHtml = true;
       }
-      if ((_ref3 = (_base3 = this.options).cleanValue) == null) {
-        _base3.cleanValue = true;
+      if ((_ref3 = (_base3 = this.options).escapeAttributes) == null) {
+        _base3.escapeAttributes = true;
       }
-      if ((_ref4 = (_base4 = this.options).uglify) == null) _base4.uglify = false;
-      if ((_ref5 = (_base5 = this.options).basename) == null) {
-        _base5.basename = false;
+      if ((_ref4 = (_base4 = this.options).cleanValue) == null) {
+        _base4.cleanValue = true;
       }
-      if ((_ref6 = (_base6 = this.options).extendScope) == null) {
-        _base6.extendScope = false;
+      if ((_ref5 = (_base5 = this.options).uglify) == null) _base5.uglify = false;
+      if ((_ref6 = (_base6 = this.options).basename) == null) {
+        _base6.basename = false;
       }
-      if ((_ref7 = (_base7 = this.options).format) == null) {
-        _base7.format = 'html5';
+      if ((_ref7 = (_base7 = this.options).extendScope) == null) {
+        _base7.extendScope = false;
       }
-      if ((_ref8 = (_base8 = this.options).preserveTags) == null) {
-        _base8.preserveTags = 'pre,textarea';
+      if ((_ref8 = (_base8 = this.options).format) == null) {
+        _base8.format = 'html5';
       }
-      if ((_ref9 = (_base9 = this.options).selfCloseTags) == null) {
-        _base9.selfCloseTags = 'meta,img,link,br,hr,input,area,param,col,base';
+      if ((_ref9 = (_base9 = this.options).preserveTags) == null) {
+        _base9.preserveTags = 'pre,textarea';
+      }
+      if ((_ref10 = (_base10 = this.options).selfCloseTags) == null) {
+        _base10.selfCloseTags = 'meta,img,link,br,hr,input,area,param,col,base';
       }
     }
 
@@ -564,6 +567,20 @@ require.define("/haml-coffee.coffee", function (require, module, exports, __dirn
     };
 
     HamlCoffee.prototype.render = function(templateName, namespace) {
+      if (namespace == null) namespace = 'window.HAML';
+      switch (this.options.placement) {
+        case 'amd':
+          return this._render_amd();
+        default:
+          return this._render_global(templateName, namespace);
+      }
+    };
+
+    HamlCoffee.prototype._render_amd = function() {
+      return "define ->\n  (context) ->\n    render = ->\n      \n" + (indent(this.precompile(), 4)) + "\n    render.call(context)";
+    };
+
+    HamlCoffee.prototype._render_global = function(templateName, namespace) {
       var segment, segments, template, _i, _len;
       if (namespace == null) namespace = 'window.HAML';
       template = '';

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 591423817109157098
+      hash: 46178287923779691
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: