haml_coffee_assets 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa1d0b5711934334f380182e359ac63089a72088
-  data.tar.gz: 01a3abf96358488270710cb049da8d00a02050e6
+  metadata.gz: 0bd89ca47ef24516c5d86be7ee18b2c9335790db
+  data.tar.gz: 0d3f9c245d5eccdca1117824862ea11c59779e2f
 SHA512:
-  metadata.gz: b4ff7a8c49889be4a7e1d887ba0ca53ea8d70127d52640b1082b59607d1af512979b0ebda52a751e5b67aeecf3af5d0bb27917d5c023aaa241d8e8f6350b5d77
-  data.tar.gz: a4736ab36203046a86b84a5a2911210a807666fcb530c507329f18c58557a5250bf1e74d5905d7574a09d11ebd473b3cf2b75db68ec6f5344d9e1da290df678d
+  metadata.gz: 92896b473f7f10ee4fbbfbe58506cf345dd621c487ffe33943726148a6325ee8d8206169613106742e034e872ea5ed3a3363a754a318383d07366c9ea4018a00
+  data.tar.gz: afd6d4a27b9cff42b150c83b0f56f3842d0a5f1f06d392da4ed2f12737a2a3c4e0ef4c464a48f8f82295e920b9d32cc446f2ab2961e858fe799dd16a8f96c7d6

data/lib/haml_coffee_assets/action_view/patches.rb

@@ -25,15 +25,11 @@ class ::ActionView::Template
         template = refresh(view)
         template.encode!
       end
-      if ::ActionView::Template::Error.instance_method(:initialize).arity == 3
-        # Rails < 4.0 expects three arguments here
+
+      if Rails::VERSION::STRING < "4"
         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
+        raise ::ActionView::Template::Error.new(template, e)
       end
     end
   end

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/hamlcoffee.js

@@ -454,7 +454,7 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
   indent = require('./util/text').indent;
 
   module.exports = HamlCoffee = (function() {
-    HamlCoffee.VERSION = '1.12.0';
+    HamlCoffee.VERSION = '1.13.3';
 
     function HamlCoffee(options) {
       var segment, segments, _base, _base1, _base10, _base11, _base12, _base13, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _i, _len;
@@ -674,13 +674,13 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
           if (/^\s*$/.test(line)) {
             continue;
           }
-          while (/^[%.#].*[{(]/.test(expression) && RegExp("^\\s{" + (this.tabSize + 2) + ",}").test(lines[0]) && !/^(\s*)[-=&!~.%#</]/.test(lines[0]) && /([-\w]+[\w:-]*\w?)\s*=|('\w+[\w:-]*\w?')\s*=|("\w+[\w:-]*\w?")\s*=|(\w+[\w:-]*\w?):|('[-\w]+[\w:-]*\w?'):|("[-\w]+[\w:-]*\w?"):|:(\w+[\w:-]*\w?)\s*=>|:?'([-\w]+[\w:-]*\w?)'\s*=>|:?"([-\w]+[\w:-]*\w?)"\s*=>/.test(lines[0])) {
+          while (/^[%.#].*[{(]/.test(expression) && RegExp("^\\s{" + (this.previousIndent + (this.tabSize || 2)) + "}").test(lines[0]) && !/^(\s*)[-=&!~.%#</]/.test(lines[0]) && /([-\w]+[\w:-]*\w?)\s*=|('\w+[\w:-]*\w?')\s*=|("\w+[\w:-]*\w?")\s*=|(\w+[\w:-]*\w?):|('[-\w]+[\w:-]*\w?'):|("[-\w]+[\w:-]*\w?"):|:(\w+[\w:-]*\w?)\s*=>|:?'([-\w]+[\w:-]*\w?)'\s*=>|:?"([-\w]+[\w:-]*\w?)"\s*=>/.test(lines[0]) && !/;\s*$/.test(lines[0])) {
             attributes = lines.shift();
             expression = expression.replace(/(\s)+\|\s*$/, '');
             expression += ' ' + attributes.match(/^\s*(.*?)(\s+\|\s*)?$/)[1];
             this.lineNumber++;
           }
-          while (/^-#/.test(expression) && !/^(\s*)[-=&!~.%#</]/.test(lines[0]) && lines.length > 0) {
+          while (/^-#/.test(expression) && RegExp("^\\s{" + (this.previousIndent + (this.tabSize || 2)) + "}").test(lines[0]) && lines.length > 0) {
             lines.shift();
             this.lineNumber++;
           }
@@ -2093,7 +2093,7 @@ require.define("/nodes/filter.coffee",function(require,module,exports,__dirname,
 });
 
 require.define("/nodes/directive.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
-  var Directive, Node, path, _ref,
+  var CoffeeScript, Directive, Node, fs, path, _ref,
     __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; };
 
@@ -2101,6 +2101,11 @@ require.define("/nodes/directive.coffee",function(require,module,exports,__dirna
 
   Node = require('./node');
 
+  if (!process.browser) {
+    fs = require('fs');
+    CoffeeScript = require('coffee-script');
+  }
+
   module.exports = Directive = (function(_super) {
     __extends(Directive, _super);
 
@@ -2111,7 +2116,7 @@ require.define("/nodes/directive.coffee",function(require,module,exports,__dirna
 
     Directive.prototype.directives = {
       include: function(expression) {
-        var context, e, name, statement, _ref1;
+        var Compiler, code, compiler, context, e, error, name, source, statement, _ref1;
         try {
           _ref1 = expression.match(/\s*['"](.*?)['"](?:,\s*(.*))?\s*/), _ref1[0], name = _ref1[1], context = _ref1[2];
         } catch (_error) {
@@ -2127,6 +2132,26 @@ require.define("/nodes/directive.coffee",function(require,module,exports,__dirna
               return "" + this.namespace + "['" + name + "'].apply(" + context + ")";
             case 'amd':
               return "require('" + name + "').apply(" + context + ")";
+            case 'standalone':
+              if (browser.process) {
+                throw new Error("Include directive not available in the Browser when placement is standalone.");
+              } else {
+                try {
+                  source = fs.readFileSync(name).toString();
+                } catch (_error) {
+                  error = _error;
+                  console.error("  Error opening file: %s", error);
+                  console.error(error);
+                }
+                Compiler = require('../haml-coffee');
+                compiler = new Compiler(this.options);
+                compiler.parse(source);
+                code = CoffeeScript.compile(compiler.precompile(), {
+                  bare: true
+                });
+                return statement = "`(function(){" + code + "}).apply(" + context + ")`";
+              }
+              break;
             default:
               throw new Error("Include directive not available when placement is " + this.placement);
           }
@@ -2155,6 +2180,10 @@ require.define("/nodes/directive.coffee",function(require,module,exports,__dirna
 
 });
 
+require.define("fs",function(require,module,exports,__dirname,__filename,process,global){// nothing to see here... no file methods for the browser
+
+});
+
 require.define("/hamlc.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
   var CoffeeScript, Compiler, fs, __expressCache;
 
@@ -2171,6 +2200,22 @@ require.define("/hamlc.coffee",function(require,module,exports,__dirname,__filen
   __expressCache = {};
 
   module.exports = {
+    render: function(source, context, options) {
+      var compiler, template;
+      if (context == null) {
+        context = {};
+      }
+      if (options == null) {
+        options = {};
+      }
+      options.placement = 'standalone';
+      compiler = new Compiler(options);
+      compiler.parse(source);
+      template = new Function(CoffeeScript.compile(compiler.precompile(), {
+        bare: true
+      }));
+      return template.call(context);
+    },
     compile: function(source, options) {
       var compiler, template;
       if (options == null) {
@@ -2225,7 +2270,3 @@ require.define("/hamlc.coffee",function(require,module,exports,__dirname,__filen
 }).call(this);
 
 });
-
-require.define("fs",function(require,module,exports,__dirname,__filename,process,global){// nothing to see here... no file methods for the browser
-
-});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -91,7 +91,8 @@ files:
 - LICENSE
 - README.md
 homepage: https://github.com/netzpirat/haml_coffee_assets
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: haml_coffee_assets
-rubygems_version: 2.1.5
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Haml CoffeeScript templates