haml_coffee_assets 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f2ccc92329ca9b444dfee07f4e9a41dbd4ae6c
-  data.tar.gz: 801901d64e1274b52947117848a341821f715994
+  metadata.gz: f16bd71b0c4e027ca2945067b211a9c3475f01fc
+  data.tar.gz: d08c4a18c98bb10899d6a034a18969b1c0dfe26a
 SHA512:
-  metadata.gz: 85cc9b88742800121bacf533bf23c3db55705300c53949af219045ab9ece3f682bd5619d6e009e47dd61ac64107173ca06dc09fe57c8706c9250b4b7c86079ad
-  data.tar.gz: 18445a4f5229d2ec3bc7827701d7d860da37526d01f7670a3e5b81c9b960d6cc7c3284f95014183120344b37b03415e997f464ce078319d86bca3e5cc0309fae
+  metadata.gz: 6cda2dc44bc2fbbe5d7f95a0fd3848fb98c2b7b01339f4322c764a42c832d7320b5aca103a43c8cccb39a2d6496f845dbd8f2fb6adc8a93960f83376084d3b2c
+  data.tar.gz: 49bddad7bd2cf83626e817f2c488837f4afbbe44b00ab872b5bc2d89ab380a194aa1e0ecd81a0bb33ec74cbabec66a234c6db353dcb2f0afc28421f0a1128508

data/README.md

@@ -49,7 +49,7 @@ group :assets do
 end
 ```
 
-And require the `hamlcoffee.js` in your `app/assets/javascripts/application.js.coffee`:
+And require the `hamlcoffee.js` in your `app/assets/javascripts/templates/context.js.coffee`:
 
 ```coffeescript
 #= require hamlcoffee
@@ -126,15 +126,22 @@ Given a Haml Coffee template at `app/assets/javascripts/templates/books/_book.ha
   %dd= @author
 ```
 
-Rendering `books#index`:
+And a Haml Coffee context at `app/assets/javascripts/templates/context.js`:
+
+```javascript
+//= require hamlcoffee
+```
+
+To render on server in `books#index`:
 
 ```haml
 = render "book", :name => "A Tale of Two Cities", :author => "Charles Dickens"
 ```
 
-Require and render the same file on the client using the asset pipeline:
+To render and render the same file on the client using the asset pipeline:
 
 ```coffeescript
+#= require hamlcoffee
 #= require templates/books/_book
 
 JST["books/book"](name: "A Tale of Two Cities", author: "Charles Dickens")
@@ -372,6 +379,14 @@ Now you can use the properties from the global context in every template:
     %p Please log into your account.
 ```
 
+When rendering on the server, haml_coffee_assets will expect the global context to be overriden with the `global_context_asset`. Located by default at `templates/context`.
+
+You can configure the path to this asset in your `config/application.rb`:
+
+```ruby
+config.hamlcoffee.global_context_asset = 'templates/context'
+```
+
 If you like to use your own implementation, simply configure your context function in your `config/application.rb`:
 
 ```ruby
@@ -397,22 +412,6 @@ 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.extendScope = 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
@@ -462,13 +461,13 @@ You can see the [default implementation](https://github.com/netzpirat/haml_coffe
 and the [Haml Coffee documentation](https://github.com/netzpirat/haml-coffee#custom-helper-function-options)
 for more information about each helper function.
 
-### Shared template path
+### Templates path
 
 Rails will look for templates in `app/assets/javascripts/templates` when rendering on the server side. If you store your
  templates in another directory, you can change this location:
 
 ```ruby
-config.hamlcoffee.shared_template_path = "custom/template/path"
+config.hamlcoffee.templates_path = "custom/template/path"
 ```
 
 ## Partial rendering
@@ -538,6 +537,16 @@ Pull requests are very welcome! Please try to follow these simple rules if appli
 
 For questions please join `#haml` on irc.freenode.net
 
+### Open Commit Bit
+
+Guard has an open commit bit policy: Anyone with an accepted pull request gets added as a repository collaborator.
+Please try to follow these simple rules:
+
+* Commit directly onto the master branch only for typos, improvements to the readme and documentation (please add
+  `[ci skip]` to the commit message).
+* Create a feature branch and open a pull-request early for any new features to get feedback.
+* Make sure you adhere to the general pull request rules above.
+
 ## Contributors
 
 See the [CHANGELOG](https://github.com/netzpirat/haml_coffee_assets/blob/master/CHANGELOG.md) and the GitHub list of

data/lib/haml_coffee_assets/action_view/patches.rb

@@ -0,0 +1,40 @@
+# Monkey patches for rails to support our template engine.
+# Hopefully these fixes will make it into rails or we find a
+# better way to avoid this.
+#
+# TODO: Don't monkey patch rails
+
+# See patch notes inline
+class ::ActionView::Template
+
+  # Patch, it's almost exaclty the same with a small tweak
+  def handle_render_error(view, e) #:nodoc:
+    if e.is_a?(::ActionView::Template::Error)
+      e.sub_template_of(self)
+      raise e
+    else
+      assigns  = view.respond_to?(:assigns) ? view.assigns : {}
+      template = self
+
+      # Here's the patch: if the javascript runtime throws an error
+      # during compilation, we get to this handler but our view 
+      # doesn't have a lookup_context - thus throwing a very hard
+      # to debug error in Template#refresh. To circumvent, ensure the
+      # view responds to lookup_context before refreshing.
+      if view.respond_to?(:lookup_context) and template.source.nil?
+        template = refresh(view)
+        template.encode!
+      end
+      if ::ActionView::Template::Error.instance_method(:initialize).arity == 3
+        # Rails < 4.0 expects three arguments here
+        raise ::ActionView::Template::Error.new(template, assigns, e)
+      elsif ::ActionView::Template::Error.instance_method(:initialize).arity == 2
+        # and Rails >= 4.0 expects two arguments
+        raise ::ActionView::Template::Error.new(template, e)
+      else
+        # try and fail graciously if this changes in the future
+        raise e
+      end
+    end
+  end
+end

data/lib/haml_coffee_assets/action_view/resolver.rb

@@ -9,6 +9,7 @@ module HamlCoffeeAssets
     class Resolver < ::ActionView::FileSystemResolver
       def find_templates(name, prefix, partial, details)
         if details[:formats].include?(:html)
+          clear_cache if ::Rails.env == "development"
           super
         else
           []

data/lib/haml_coffee_assets/action_view/template_handler.rb

@@ -7,6 +7,10 @@ module HamlCoffeeAssets
         new(template).render
       end
 
+      def self.stale?(last_compile_time)
+        GlobalContext.mtime > last_compile_time
+      end
+
       def initialize(template, partial = false, dependencies = [])
         @template     = template
         @partial      = partial
@@ -48,7 +52,7 @@ module HamlCoffeeAssets
       end
 
       def helpers
-        ::HamlCoffeeAssets.helpers
+        GlobalContext.to_s
       end
 
       def compiled_template
@@ -99,7 +103,7 @@ module HamlCoffeeAssets
 
       def partial_source(path)
         ::Rails.root.join(
-          ::HamlCoffeeAssets.config.shared_template_path,
+          ::HamlCoffeeAssets.config.templates_path,
           partial_path(path) + '.hamlc'
         ).read
       end

data/lib/haml_coffee_assets/compiler.rb

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

data/lib/haml_coffee_assets/configuration.rb

@@ -37,8 +37,8 @@ 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.shared_template_path   = 'app/assets/javascripts/templates'
+      self.templates_path         = 'app/assets/javascripts/templates'
+      self.global_context_asset   = 'templates/context'
       self.name_filter            = lambda { |n|
         parts = n.sub(/^templates\//, '').split('/')
         parts.last.sub!(/^_/, '')
@@ -126,10 +126,6 @@ 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.
@@ -138,7 +134,11 @@ module HamlCoffeeAssets
 
     # Path to templates shared by Rails and JS.
     #
-    attr_accessor :shared_template_path
+    attr_accessor :templates_path
+
+    # Path to custom helpers shared by Rails and JS.
+    #
+    attr_accessor :global_context_asset
 
   end
 

data/lib/haml_coffee_assets/global_context.rb

@@ -0,0 +1,38 @@
+module HamlCoffeeAssets
+  class GlobalContext
+    def self.asset
+      find_asset(asset_path)
+    end
+
+    def self.asset_path
+      ::HamlCoffeeAssets.config.global_context_asset
+    end
+
+    def self.mtime
+      return nil unless asset.respond_to?(:mtime)
+      asset.mtime
+    end
+
+    def self.body
+      return "" if asset.blank?
+      asset.body
+    end
+
+    def self.to_s
+      return "" if asset.blank?
+      asset.to_s
+    end
+
+    private
+
+    def self.env
+      ::Rails.application.assets
+    end
+
+    def self.find_asset(name)
+      return "" unless ::Rails.respond_to?(:application)
+      return "" unless ::Rails.application.respond_to?(:assets)
+      env.find_asset(name)
+    end
+  end
+end

data/lib/haml_coffee_assets/rails/engine.rb

@@ -27,12 +27,56 @@ module HamlCoffeeAssets
 
           # Add template path to ActionController's view paths.
           ActiveSupport.on_load(:action_controller) do
-            path = ::HamlCoffeeAssets.config.shared_template_path
+            path = ::HamlCoffeeAssets.config.templates_path
             resolver = ::HamlCoffeeAssets::ActionView::Resolver.new(path)
             ::ActionController::Base.append_view_path(resolver)
           end
         end
 
+        if ::Rails.env == "development"
+          # Monkey patch rails so it busts the server cache for templates
+          # depending on the global_context_asset.
+          #
+          # Currently, the only way to force rails to recompile a server template is to
+          # touch it. This is problematic because when the global_context_asset
+          # changes we need to manually touch every template that uses the congtext
+          # in some way.
+          #
+          # To ease development, make rails 'touch' and recompile hamlc templates
+          # when the global context has changed.
+          #
+          # Do this ONLY in development.
+          #
+          # TODO: Don't monkey patch rails.
+          module ::ActionView
+            class Template
+              def stale?
+                return false unless ::Rails.env == "development"
+                return false unless handler.respond_to?(:stale?)
+                handler.stale?(updated_at)
+              end
+
+              alias_method :old_render, :render
+
+              # by default, rails will only compile a template once
+              # path render so it recompiles the template if 'stale'
+              def render(view, locals, buffer=nil, &block)
+                if @compiled and stale?
+                  now = Time.now
+                  File.utime(now, now, identifier) # touch file
+                  ::Rails.logger.info "Busted cache for #{identifier} by touching it"
+
+                  view = refresh(view)
+                  @source = view.source
+                  @compiled = false
+                end
+                old_render(view, locals, buffer, &block)
+              end
+
+            end
+          end
+        end
+
         next unless app.assets
 
         # Register Tilt template (for Sprockets)

data/lib/haml_coffee_assets/version.rb

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

data/lib/haml_coffee_assets.rb

@@ -6,15 +6,17 @@ require 'tilt'
 require 'sprockets'
 require 'execjs'
 
-require 'haml_coffee_assets/version'
+require 'haml_coffee_assets/global_context'
 require 'haml_coffee_assets/configuration'
 require 'haml_coffee_assets/compiler'
+require 'haml_coffee_assets/version'
 
 require 'haml_coffee_assets/tilt/template_handler'
 
-if defined?(Rails)
+if defined?(Rails) && Rails.version >= '3.0.0'
   require 'rails'
   require 'haml_coffee_assets/rails/engine'
+  require 'haml_coffee_assets/action_view/patches'
 else
   require 'sprockets/engines'
   Sprockets.register_engine '.hamlc', ::HamlCoffeeAssets::Tilt::TemplateHandler
@@ -24,32 +26,4 @@ end
 # its configuration settings.
 #
 module HamlCoffeeAssets
-
-  # Get the path to the `hamlcoffee.js.coffee.erb` helper file.
-  #
-  # @return [String] the absolute path to the helpers file
-  #
-  def self.helpers_path
-    File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'assets', 'javascripts', 'hamlcoffee.js.coffee.erb'))
-  end
-
-  # Get the Haml Coffee Assets helper file
-  #
-  # @param [Boolean] compile whether to compile the CS helpers or not
-  # @return [String] the helpers content
-  #
-  def self.helpers(compile=true)
-    require 'erb'
-
-    content = File.read(HamlCoffeeAssets.helpers_path)
-    script = ERB.new(content).result(binding)
-
-    if compile
-      require 'coffee-script'
-      script = CoffeeScript.compile(script)
-    end
-
-    script
-  end
-
 end

data/lib/js/hamlcoffee.js

@@ -454,55 +454,54 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
   indent = require('./util/text').indent;
 
   module.exports = HamlCoffee = (function() {
-    HamlCoffee.VERSION = '1.11.0';
+    HamlCoffee.VERSION = '1.11.3';
 
     function HamlCoffee(options) {
-      var segment, segments, _base, _base1, _base10, _base11, _base12, _base13, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _i, _len, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9;
-
+      var segment, segments, _base, _base1, _base10, _base11, _base12, _base13, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _i, _len;
       this.options = options != null ? options : {};
-      if ((_ref = (_base = this.options).placement) == null) {
+      if ((_base = this.options).placement == null) {
         _base.placement = 'global';
       }
-      if ((_ref1 = (_base1 = this.options).dependencies) == null) {
+      if ((_base1 = this.options).dependencies == null) {
         _base1.dependencies = {
           hc: 'hamlcoffee'
         };
       }
-      if ((_ref2 = (_base2 = this.options).escapeHtml) == null) {
+      if ((_base2 = this.options).escapeHtml == null) {
         _base2.escapeHtml = true;
       }
-      if ((_ref3 = (_base3 = this.options).escapeAttributes) == null) {
+      if ((_base3 = this.options).escapeAttributes == null) {
         _base3.escapeAttributes = true;
       }
-      if ((_ref4 = (_base4 = this.options).cleanValue) == null) {
+      if ((_base4 = this.options).cleanValue == null) {
         _base4.cleanValue = true;
       }
-      if ((_ref5 = (_base5 = this.options).uglify) == null) {
+      if ((_base5 = this.options).uglify == null) {
         _base5.uglify = false;
       }
-      if ((_ref6 = (_base6 = this.options).basename) == null) {
+      if ((_base6 = this.options).basename == null) {
         _base6.basename = false;
       }
-      if ((_ref7 = (_base7 = this.options).extendScope) == null) {
+      if ((_base7 = this.options).extendScope == null) {
         _base7.extendScope = false;
       }
-      if ((_ref8 = (_base8 = this.options).format) == null) {
+      if ((_base8 = this.options).format == null) {
         _base8.format = 'html5';
       }
-      if ((_ref9 = (_base9 = this.options).hyphenateDataAttrs) == null) {
+      if ((_base9 = this.options).hyphenateDataAttrs == null) {
         _base9.hyphenateDataAttrs = true;
       }
-      if ((_ref10 = (_base10 = this.options).preserveTags) == null) {
+      if ((_base10 = this.options).preserveTags == null) {
         _base10.preserveTags = 'pre,textarea';
       }
-      if ((_ref11 = (_base11 = this.options).selfCloseTags) == null) {
+      if ((_base11 = this.options).selfCloseTags == null) {
         _base11.selfCloseTags = 'meta,img,link,br,hr,input,area,param,col,base';
       }
       if (this.options.placement === 'global') {
-        if ((_ref12 = (_base12 = this.options).name) == null) {
+        if ((_base12 = this.options).name == null) {
           _base12.name = 'test';
         }
-        if ((_ref13 = (_base13 = this.options).namespace) == null) {
+        if ((_base13 = this.options).namespace == null) {
           _base13.namespace = 'window.HAML';
         }
         segments = ("" + this.options.namespace + "." + this.options.name).replace(/(\s|-)+/g, '_').split(/\./);
@@ -537,11 +536,11 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.updateBlockLevel = function() {
       this.currentBlockLevel = this.currentIndent / this.tabSize;
-      if (this.currentBlockLevel - Math.floor(this.currentBlockLevel) > 0) {
-        throw "Indentation error in line " + this.lineNumber;
-      }
-      if ((this.currentIndent - this.previousIndent) / this.tabSize > 1) {
-        if (!this.node.isCommented()) {
+      if (!this.node.isCommented()) {
+        if (this.currentBlockLevel - Math.floor(this.currentBlockLevel) > 0) {
+          throw "Indentation error in line " + this.lineNumber;
+        }
+        if ((this.currentIndent - this.previousIndent) / this.tabSize > 1) {
           throw "Block level too deep in line " + this.lineNumber;
         }
       }
@@ -571,7 +570,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.popParent = function() {
       var i, _i, _ref, _results;
-
       _results = [];
       for (i = _i = 0, _ref = this.delta - 1; 0 <= _ref ? _i <= _ref : _i >= _ref; i = 0 <= _ref ? ++_i : --_i) {
         _results.push(this.parentNode = this.stack.pop());
@@ -603,7 +601,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.nodeFactory = function(expression) {
       var node, options, _ref;
-
       if (expression == null) {
         expression = '';
       }
@@ -628,8 +625,7 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
     };
 
     HamlCoffee.prototype.parse = function(source) {
-      var attributes, expression, line, lines, result, text, ws, _ref;
-
+      var attributes, expression, line, lines, range, result, tabsize, text, ws, _i, _j, _len, _ref, _ref1, _results;
       if (source == null) {
         source = '';
       }
@@ -638,7 +634,7 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
       this.node = null;
       this.stack = [];
       this.root = this.parentNode = new Node('', this.getNodeOptions());
-      lines = source.split("\n");
+      lines = source.replace(/\r/g, '').split("\n");
       while ((line = lines.shift()) !== void 0) {
         if ((this.node instanceof Filter) && !this.exitFilter) {
           if (/^(\s)*$/.test(line)) {
@@ -654,11 +650,20 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
               lines.unshift(line);
               continue;
             }
-            text = line.match(RegExp("^\\s{" + ((this.node.blockLevel * 2) + 2) + "}(.*)"));
-            if (text) {
-              this.node.addChild(new Text(text[1], this.getNodeOptions({
-                parentNode: this.node
-              })));
+            range = this.tabSize > 2 ? (function() {
+              _results = [];
+              for (var _i = _ref = this.tabSize; _ref <= 1 ? _i <= 1 : _i >= 1; _ref <= 1 ? _i++ : _i--){ _results.push(_i); }
+              return _results;
+            }).apply(this) : [2, 1];
+            for (_j = 0, _len = range.length; _j < _len; _j++) {
+              tabsize = range[_j];
+              text = line.match(RegExp("^\\s{" + ((this.node.blockLevel * tabsize) + tabsize) + "}(.*)"));
+              if (text) {
+                this.node.addChild(new Text(text[1], this.getNodeOptions({
+                  parentNode: this.node
+                })));
+                break;
+              }
             }
           }
         } else {
@@ -675,9 +680,13 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
             expression += ' ' + attributes.match(/^\s*(.*?)(\s+\|\s*)?$/)[1];
             this.lineNumber++;
           }
+          while (/^-#/.test(expression) && !/^(\s*)[-=&!~.%#</]/.test(lines[0]) && lines.length > 0) {
+            lines.shift();
+            this.lineNumber++;
+          }
           if (expression.match(/(\s)+\|\s*$/)) {
             expression = expression.replace(/(\s)+\|\s*$/, ' ');
-            while ((_ref = lines[0]) != null ? _ref.match(/(\s)+\|$/) : void 0) {
+            while ((_ref1 = lines[0]) != null ? _ref1.match(/(\s)+\|$/) : void 0) {
               expression += lines.shift().match(/^(\s*)(.*)/)[2].replace(/(\s)+\|\s*$/, '');
               this.lineNumber++;
             }
@@ -700,7 +709,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.evaluate = function(node) {
       var child, _i, _len, _ref;
-
       _ref = node.children;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         child = _ref[_i];
@@ -722,13 +730,11 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.renderStandalone = function() {
       var template;
-
       return template = "return (context) ->\n  (->\n" + (indent(this.precompile(), 2)) + "\n  ).call(context)";
     };
 
     HamlCoffee.prototype.renderAmd = function() {
       var m, module, modules, param, params, template, _ref, _ref1;
-
       if (/^hamlcoffee/.test(this.options.dependencies['hc'])) {
         this.options.customHtmlEscape = 'hc.escape';
         this.options.customCleanValue = 'hc.cleanValue';
@@ -757,7 +763,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
       if (modules.length !== 0) {
         modules = (function() {
           var _i, _len, _results;
-
           _results = [];
           for (_i = 0, _len = modules.length; _i < _len; _i++) {
             m = modules[_i];
@@ -774,7 +779,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.renderGlobal = function() {
       var template;
-
       template = this.intro;
       if (this.options.extendScope) {
         template += "" + this.options.namespace + "['" + this.options.name + "'] = (context) -> ( ->\n";
@@ -792,7 +796,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.precompile = function() {
       var code, fn;
-
       fn = '';
       code = this.createCode();
       if (code.indexOf('$e') !== -1) {
@@ -862,7 +865,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.createCode = function() {
       var child, code, line, processors, _i, _j, _len, _len1, _ref, _ref1;
-
       code = [];
       this.lines = [];
       _ref = this.root.children;
@@ -923,7 +925,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.combineText = function(lines) {
       var combined, line, nextLine;
-
       combined = [];
       while ((line = lines.shift()) !== void 0) {
         if (line.type === 'text') {
@@ -967,7 +968,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
 
     HamlCoffee.prototype.findDependencies = function(code) {
       var dependencies, match, module, name, requireRegexp;
-
       requireRegexp = /require(?:\s+|\()(['"])(.+?)(\1)\)?/gm;
       dependencies = {};
       while (match = requireRegexp.exec(code)) {
@@ -1117,7 +1117,6 @@ require.define("/nodes/node.coffee",function(require,module,exports,__dirname,__
 
     Node.prototype.render = function() {
       var child, output, rendered, tag, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _m, _ref, _ref1, _ref2, _ref3, _ref4;
-
       output = [];
       if (this.silent) {
         return output;
@@ -1189,7 +1188,6 @@ require.define("/util/text.coffee",function(require,module,exports,__dirname,__f
   module.exports = {
     whitespace: function(n) {
       var a;
-
       n = n * 2;
       a = [];
       while (a.length < n) {
@@ -1217,6 +1215,7 @@ require.define("/util/text.coffee",function(require,module,exports,__dirname,__f
     },
     preserve: function(code) {
       if (code) {
+        code.replace(/\r/g, '');
         return code.replace(/<(pre|textarea)>(.*?)<\/\1>/g, function(text) {
           return text.replace('\\n', '\&\#x000A;');
         });
@@ -1279,7 +1278,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
 
     Haml.prototype.evaluate = function() {
       var assignment, code, identifier, match, prefix, tokens;
-
       tokens = this.parseExpression(this.expression);
       if (tokens.doctype) {
         return this.opener = this.markText("" + (escapeQuotes(this.buildDocType(tokens.doctype))));
@@ -1340,7 +1338,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
 
     Haml.prototype.parseExpression = function(exp) {
       var attributes, classes, id, key, tag, value, _ref1, _ref2;
-
       tag = this.parseTag(exp);
       if (this.preserveTags.indexOf(tag.tag) !== -1) {
         this.preserve = true;
@@ -1380,7 +1377,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
 
     Haml.prototype.parseTag = function(exp) {
       var assignment, attr, attributes, ch, classes, doctype, end, error, haml, htmlAttributes, id, ids, key, klass, level, pos, reference, rest, rubyAttributes, start, tag, text, val, whitespace, _i, _j, _k, _len, _len1, _ref1, _ref2, _ref3, _ref4, _ref5;
-
       try {
         doctype = (_ref1 = exp.match(/^(\!{3}.*)/)) != null ? _ref1[1] : void 0;
         if (doctype) {
@@ -1479,7 +1475,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
           tag: tag ? tag[1] : 'div',
           ids: ids ? (function() {
             var _l, _len2, _results;
-
             _results = [];
             for (_l = 0, _len2 = ids.length; _l < _len2; _l++) {
               id = ids[_l];
@@ -1489,7 +1484,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
           })() : void 0,
           classes: classes ? (function() {
             var _l, _len2, _results;
-
             _results = [];
             for (_l = 0, _len2 = classes.length; _l < _len2; _l++) {
               klass = classes[_l];
@@ -1510,7 +1504,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
 
     Haml.prototype.parseAttributes = function(exp) {
       var attr, attributes, ch, endPos, hasDataAttribute, inDataAttribute, key, keyValue, keys, level, marker, markers, pairs, pos, quote, quoted, start, startPos, type, value, _i, _j, _k, _len, _len1, _ref1, _ref2, _ref3, _ref4, _ref5;
-
       attributes = {};
       if (exp === void 0) {
         return attributes;
@@ -1617,13 +1610,11 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
 
     Haml.prototype.buildHtmlTagPrefix = function(tokens) {
       var classList, classes, hasDynamicClass, key, klass, name, tagParts, value, _i, _len, _ref1;
-
       tagParts = ["<" + tokens.tag];
       if (tokens.classes) {
         hasDynamicClass = false;
         classList = (function() {
           var _i, _len, _ref1, _results;
-
           _ref1 = tokens.classes;
           _results = [];
           for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
@@ -1680,7 +1671,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
 
     Haml.prototype.interpolateCodeAttribute = function(text, unwrap) {
       var quoted;
-
       if (unwrap == null) {
         unwrap = false;
       }
@@ -1712,7 +1702,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
 
     Haml.prototype.quoteAndEscapeAttributeValue = function(value, code) {
       var escaped, hasDoubleQuotes, hasInterpolation, hasSingleQuotes, quoted, result, token, tokens;
-
       if (code == null) {
         code = false;
       }
@@ -1728,7 +1717,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
       hasInterpolation = false;
       tokens = (function() {
         var _i, _len, _results;
-
         _results = [];
         for (_i = 0, _len = tokens.length; _i < _len; _i++) {
           token = tokens[_i];
@@ -1775,7 +1763,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
         if (hasDoubleQuotes && !hasSingleQuotes) {
           escaped = (function() {
             var _i, _len, _results;
-
             _results = [];
             for (_i = 0, _len = tokens.length; _i < _len; _i++) {
               token = tokens[_i];
@@ -1788,7 +1775,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
         if (hasSingleQuotes && hasDoubleQuotes) {
           escaped = (function() {
             var _i, _len, _results;
-
             _results = [];
             for (_i = 0, _len = tokens.length; _i < _len; _i++) {
               token = tokens[_i];
@@ -1804,7 +1790,6 @@ require.define("/nodes/haml.coffee",function(require,module,exports,__dirname,__
 
     Haml.prototype.splitInterpolations = function(value) {
       var ch, ch2, level, pos, start, tokens, _i, _ref1;
-
       level = 0;
       start = 0;
       tokens = [];
@@ -1888,7 +1873,6 @@ require.define("/nodes/code.coffee",function(require,module,exports,__dirname,__
 
     Code.prototype.evaluate = function() {
       var code, codeBlock, escape, identifier;
-
       codeBlock = this.expression.match(/(-|!=|\&=|=|~)\s?(.*)?/);
       identifier = codeBlock[1];
       code = codeBlock[2];
@@ -1943,7 +1927,6 @@ require.define("/nodes/comment.coffee",function(require,module,exports,__dirname
 
     Comment.prototype.evaluate = function() {
       var comment, expression, identifier, _ref1;
-
       _ref1 = this.expression.match(/(-#|\/\[|\/)\s?(.*)?/), expression = _ref1[0], identifier = _ref1[1], comment = _ref1[2];
       switch (identifier) {
         case '-#':
@@ -1992,13 +1975,11 @@ require.define("/nodes/filter.coffee",function(require,module,exports,__dirname,
 
     Filter.prototype.evaluate = function() {
       var _ref1;
-
       return this.filter = (_ref1 = this.expression.match(/:(escaped|preserve|css|javascript|coffeescript|plain|cdata|coffeescript)(.*)?/)) != null ? _ref1[1] : void 0;
     };
 
     Filter.prototype.render = function() {
       var child, indent, output, preserve, _i, _j, _len, _len1, _ref1, _ref2;
-
       output = [];
       switch (this.filter) {
         case 'escaped':
@@ -2066,7 +2047,6 @@ require.define("/nodes/filter.coffee",function(require,module,exports,__dirname,
 
     Filter.prototype.renderFilterContent = function(indent, output, type) {
       var child, content, e, empty, line, _i, _j, _k, _len, _len1, _ref1, _results;
-
       if (type == null) {
         type = 'text';
       }
@@ -2127,9 +2107,8 @@ require.define("/nodes/directive.coffee",function(require,module,exports,__dirna
     Directive.prototype.directives = {
       include: function(expression) {
         var context, e, name, statement, _ref1;
-
         try {
-          _ref1 = expression.match(/\s*['"](.*)['"](?:,\s*(.*))?\s*/), _ref1[0], name = _ref1[1], context = _ref1[2];
+          _ref1 = expression.match(/\s*['"](.*?)['"](?:,\s*(.*))?\s*/), _ref1[0], name = _ref1[1], context = _ref1[2];
         } catch (_error) {
           e = _error;
           throw new Error("Failed to parse the include directive from " + expression);
@@ -2153,7 +2132,6 @@ require.define("/nodes/directive.coffee",function(require,module,exports,__dirna
 
     Directive.prototype.evaluate = function() {
       var directives, e, name, rest, _ref1;
-
       directives = Object.keys(this.directives).join('|');
       try {
         _ref1 = this.expression.match(RegExp("\\+(" + directives + ")(.*)")), _ref1[0], name = _ref1[1], rest = _ref1[2];
@@ -2190,7 +2168,6 @@ require.define("/hamlc.coffee",function(require,module,exports,__dirname,__filen
   module.exports = {
     compile: function(source, options) {
       var compiler, template;
-
       if (options == null) {
         options = {};
       }
@@ -2205,7 +2182,6 @@ require.define("/hamlc.coffee",function(require,module,exports,__dirname,__filen
     },
     template: function(source, name, namespace, options) {
       var compiler;
-
       if (options == null) {
         options = {};
       }
@@ -2217,7 +2193,6 @@ require.define("/hamlc.coffee",function(require,module,exports,__dirname,__filen
     },
     __express: function(filename, options, callback) {
       var err, source;
-
       if (!!(options && options.constructor && options.call && options.apply)) {
         callback = options;
         options = {};

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

@@ -75,7 +75,7 @@ class window.HAML
   #
   @findAndPreserve: (text) ->
     tags = '<%= ::HamlCoffeeAssets.config.preserveTags %>'.split(',').join('|')
-    text = text.replace ///<(#{ tags })>([^]*?)<\/\1>///g, (str, tag, content) ->
+    text = text.replace(/\r/g, '').replace ///<(#{ tags })>([^]*?)<\/\1>///g, (str, tag, content) ->
         "<#{ tag }>#{ <%= ::HamlCoffeeAssets.config.customPreserve %>(content) }</#{ tag }>"
 
   # The surround helper surrounds the function output

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

@@ -48,7 +48,7 @@ define ->
   #
   findAndPreserve: (text) ->
     tags = '<%= ::HamlCoffeeAssets.config.preserveTags %>'.split(',').join('|')
-    text = text.replace ///<(#{ tags })>([^]*?)<\/\1>/// g, (str, tag, content) ->
+    text = text.replace(/\r/g, '').replace ///<(#{ tags })>([^]*?)<\/\1>/// g, (str, tag, content) ->
       "<#{ tag }>#{ <%= ::HamlCoffeeAssets.config.customPreserve %>(content) }</#{ tag }>"
 
   # The surround helper surrounds the function output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -73,10 +73,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/haml_coffee_assets/action_view/patches.rb
 - lib/haml_coffee_assets/action_view/resolver.rb
 - lib/haml_coffee_assets/action_view/template_handler.rb
 - lib/haml_coffee_assets/compiler.rb
 - lib/haml_coffee_assets/configuration.rb
+- lib/haml_coffee_assets/global_context.rb
 - lib/haml_coffee_assets/rails/engine.rb
 - lib/haml_coffee_assets/tilt/template_handler.rb
 - lib/haml_coffee_assets/version.rb
@@ -107,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: haml_coffee_assets
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Haml CoffeeScript templates