haml_coffee_assets 0.2.2 → 0.2.3

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml-coffee.js

@@ -697,7 +697,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       attributes = [];
       if (exp === void 0) return attributes;
       _ref = this.getDataAttributes(exp), exp = _ref[0], datas = _ref[1];
-      findAttributes = /(?:(['"]?\w+[\w:-]*['"]?)\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(['"]?\w+[\w:-]*['"]?)\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()'"]+)|(['"]?\w+[\w:-]*['"]?):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()'"]+))/g;
+      findAttributes = /(?:(['"]?\w+[\w:-]*['"]?)\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(['"]?\w+[\w:-]*['"]?)\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)|(['"]?\w+[\w:-]*['"]?):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+))/g;
       while (match = findAttributes.exec(exp)) {
         key = match[1] || match[3] || match[5];
         value = match[2] || match[4] || match[6];
@@ -1162,7 +1162,7 @@ require.define("/compiler.js", function (require, module, exports, __dirname, __
       lines = source.split("\n");
       while ((line = lines.shift()) !== void 0) {
         if ((this.node instanceof Filter) && !this.exitFilter) {
-          if (line === '') {
+          if (/^(\s)*$/.test(line)) {
             this.node.addChild(new Text('', this.getNodeOptions({
               parentNode: this.node
             })));
@@ -1187,8 +1187,8 @@ require.define("/compiler.js", function (require, module, exports, __dirname, __
           result = line.match(/^(\s*)(.*)/);
           whitespace = result[1];
           expression = result[2];
-          if (line === '') continue;
-          while (/^%.*[{(]/.test(expression) && !/^(\s*)[%<]/.test(lines[0]) && /(?:(['"]?\w+[\w:-]*['"]?)\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(['"]?\w+[\w:-]*['"]?)\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()'"]+)|(['"]?\w+[\w:-]*['"]?):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()'"]+))/.test(lines[0])) {
+          if (/^(\s)*$/.test(line)) continue;
+          while (/^%.*[{(]/.test(expression) && !/^(\s*)[%<]/.test(lines[0]) && /(?:(['"]?\w+[\w:-]*['"]?)\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(['"]?\w+[\w:-]*['"]?)\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)|(['"]?\w+[\w:-]*['"]?):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+))/.test(lines[0])) {
             attributes = lines.shift();
             expression += ' ' + attributes.match(/^(\s*)(.*)/)[2];
             this.line_number++;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70254474854840 !ruby/object:Gem::Requirement
+  requirement: &70133201775140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70254474854840
+  version_requirements: *70133201775140
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70254474853020 !ruby/object:Gem::Requirement
+  requirement: &70133201774200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70254474853020
+  version_requirements: *70133201774200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70254474851720 !ruby/object:Gem::Requirement
+  requirement: &70133201773780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254474851720
+  version_requirements: *70133201773780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70254474850280 !ruby/object:Gem::Requirement
+  requirement: &70133201773240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70254474850280
+  version_requirements: *70133201773240
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70254474849520 !ruby/object:Gem::Requirement
+  requirement: &70133201772540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70254474849520
+  version_requirements: *70133201772540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70254474849020 !ruby/object:Gem::Requirement
+  requirement: &70133201771800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70254474849020
+  version_requirements: *70133201771800
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70254474848440 !ruby/object:Gem::Requirement
+  requirement: &70133201771100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70254474848440
+  version_requirements: *70133201771100
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70254474847820 !ruby/object:Gem::Requirement
+  requirement: &70133201770220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70254474847820
+  version_requirements: *70133201770220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70254474847320 !ruby/object:Gem::Requirement
+  requirement: &70133201769400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70254474847320
+  version_requirements: *70133201769400
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
 email:
 - michi@netzpiraten.ch