haml_coffee_assets 0.5.1 → 0.5.2

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml-coffee.js

@@ -492,7 +492,7 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
           ws = result[1];
           expression = result[2];
           if (/^(\s)*$/.test(line)) continue;
-          while (/^%.*[{(]/.test(expression) && !/^(\s*)[-=~.%#<]/.test(lines[0]) && /(?:(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(:\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)|(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|'\w+[\w:-]*\w?'):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+))/.test(lines[0])) {
+          while (/^%.*[{(]/.test(expression) && !/^(\s*)[-=&!~.%#<]/.test(lines[0]) && /(?:(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(:\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)|(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|'\w+[\w:-]*\w?'):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+))/.test(lines[0])) {
             attributes = lines.shift();
             expression += ' ' + attributes.match(/^(\s*)(.*)/)[2];
             this.line_number++;
@@ -535,7 +535,7 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
       if (namespace == null) namespace = 'window.HAML';
       template = '';
       segments = ("" + namespace + "." + templateName).replace(/(\s|-)+/g, '_').split(/\./);
-      templateName = segments.pop();
+      templateName = this.options.basename ? segments.pop() : segments.pop().split(/\/|\\/).pop();
       namespace = segments.shift();
       if (segments.length !== 0) {
         for (_i = 0, _len = segments.length; _i < _len; _i++) {
@@ -1123,7 +1123,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
             klass = _ref[_i];
             if (interpolation = klass.match(/#{(.*)}/)) {
-              classes += interpolation[1] + ',';
+              classes += "(" + interpolation[1] + "),";
             } else {
               classes += "'" + klass + "',";
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2011-12-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70240176301400 !ruby/object:Gem::Requirement
+  requirement: &70339708662680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70240176301400
+  version_requirements: *70339708662680
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70240176295380 !ruby/object:Gem::Requirement
+  requirement: &70339708661640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70240176295380
+  version_requirements: *70339708661640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70240176291220 !ruby/object:Gem::Requirement
+  requirement: &70339708646600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240176291220
+  version_requirements: *70339708646600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240176289800 !ruby/object:Gem::Requirement
+  requirement: &70339708645420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70240176289800
+  version_requirements: *70339708645420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70240176287800 !ruby/object:Gem::Requirement
+  requirement: &70339708644520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70240176287800
+  version_requirements: *70339708644520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70240176285540 !ruby/object:Gem::Requirement
+  requirement: &70339708643120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70240176285540
+  version_requirements: *70339708643120
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70240176284680 !ruby/object:Gem::Requirement
+  requirement: &70339708642040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70240176284680
+  version_requirements: *70339708642040
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70240176283380 !ruby/object:Gem::Requirement
+  requirement: &70339708639580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70240176283380
+  version_requirements: *70339708639580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70240176281400 !ruby/object:Gem::Requirement
+  requirement: &70339708638140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70240176281400
+  version_requirements: *70339708638140
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
 email:
 - michi@netzpiraten.ch