haml_coffee_assets 1.1.0 → 1.1.1

data/README.md

@@ -1,6 +1,6 @@
 # Haml Coffee Assets [![Build Status](https://secure.travis-ci.org/netzpirat/haml_coffee_assets.png)](http://travis-ci.org/netzpirat/haml_coffee_assets)
 
-Haml Coffee Assets compiles [Haml Coffee](https://github.com/9elements/haml-coffee) templates in the Rails 3.1
+Haml Coffee Assets compiles [Haml Coffee](https://github.com/netzpirat/haml-coffee) templates in the Rails 3.1
 asset pipeline, so you can use them as JavaScript templates in your JavaScript heavy Rails application. It also works as [Tilt](https://github.com/rtomayko/tilt/) template without Rails.
 
 Tested on MRI Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest version of JRuby.
@@ -344,7 +344,7 @@ display of the tag. In order to avoid this, the content is preserved by converti
 entity. You can set your own list of whitespace sensitive tags in your `config/application.rb`:
 
 ```ruby
-config.hamlcoffee.preserve = 'pre,textarea,abbr'
+config.hamlcoffee.preserveTags = 'pre,textarea,abbr'
 ```
 
 This list is also taken into account for the `HAML.preserveAndFind` helper function that is provided and its shortcut
@@ -376,7 +376,7 @@ to, you can set custom functions for:
 * config.hamlcoffee.customPrecede
 
 You can see the [default implementation](https://github.com/netzpirat/haml_coffee_assets/blob/master/vendor/assets/javascripts/hamlcoffee.js.coffee.erb)
-and the [Haml Coffee documentation](https://github.com/9elements/haml-coffee#custom-helper-function-compiler-options)
+and the [Haml Coffee documentation](https://github.com/netzpirat/haml-coffee#custom-helper-function-compiler-options)
 for more information about each helper function.
 
 ## Author
@@ -412,7 +412,7 @@ See the [CHANGELOG](https://github.com/netzpirat/haml_coffee_assets/blob/master/
 
 * [Jeremy Ashkenas](http://twitter.com/#!/jashkenas) for CoffeeScript, that little language that compiles into
   JavaScript.
-* The people at [9elements](https://github.com/9elements) who gave us
+* The people at [9elements](https://github.com/9elements) who started
   [haml-coffee](https://github.com/9elements/haml-coffee), an elegant JavaScript template solution.
 
 ## License

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/hamlcoffee.js

@@ -1235,7 +1235,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
     };
 
     Haml.prototype.parseAttributes = function(exp) {
-      var attributes, hasDataAttribute, inDataAttribute, key, keyValue, keys, pairs, quoted, type, value, _ref, _ref1;
+      var attributes, ch, hasDataAttribute, inDataAttribute, key, keyValue, keys, level, marker, markers, pairs, pos, quoted, start, type, value, _i, _j, _len, _ref, _ref1, _ref2, _ref3;
       attributes = {};
       if (exp === void 0) {
         return attributes;
@@ -1244,6 +1244,33 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       exp = exp.replace(/(=|:|=>)\s*('([^\\']|\\\\|\\')*'|"([^\\"]|\\\\|\\")*")/g, function(match, type, value) {
         return type + (value != null ? value.replace(/(:|=|=>)/, '\u0090$1') : void 0);
       });
+      level = 0;
+      start = 0;
+      markers = [];
+      for (pos = _i = 0, _ref = exp.length; 0 <= _ref ? _i <= _ref : _i >= _ref; pos = 0 <= _ref ? ++_i : --_i) {
+        ch = exp[pos];
+        if (ch === '(') {
+          level += 1;
+          start = pos;
+        }
+        if (ch === ')') {
+          if (level === 1) {
+            if (start !== 0 && pos - start !== 1) {
+              markers.push({
+                start: start,
+                end: pos
+              });
+            }
+          } else {
+            level -= 1;
+          }
+        }
+      }
+      _ref1 = markers.reverse();
+      for (_j = 0, _len = _ref1.length; _j < _len; _j++) {
+        marker = _ref1[_j];
+        exp = exp.substring(0, marker.start) + exp.substring(marker.start, marker.end).replace(/(:|=|=>)/, '\u0090$1') + exp.substring(marker.end);
+      }
       switch (type) {
         case '(':
           keys = /\(\s*([-\w]+[\w:-]*\w?)\s*=|\s+([-\w]+[\w:-]*\w?)\s*=|\(\s*('\w+[\w:-]*\w?')\s*=|\s+('\w+[\w:-]*\w?')\s*=|\(\s*("\w+[\w:-]*\w?")\s*=|\s+("\w+[\w:-]*\w?")\s*=/g;
@@ -1256,11 +1283,11 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       hasDataAttribute = false;
       while (pairs.length) {
         keyValue = pairs.splice(0, 2);
-        key = (_ref = keyValue[0]) != null ? _ref.replace(/^\s+|\s+$/g, '').replace(/^:/, '') : void 0;
+        key = (_ref2 = keyValue[0]) != null ? _ref2.replace(/^\s+|\s+$/g, '').replace(/^:/, '') : void 0;
         if (quoted = key.match(/^("|')(.*)\1$/)) {
           key = quoted[2];
         }
-        value = (_ref1 = keyValue[1]) != null ? _ref1.replace(/^\s+|[\s,]+$/g, '').replace(/\u0090/, '') : void 0;
+        value = (_ref3 = keyValue[1]) != null ? _ref3.replace(/^\s+|[\s,]+$/g, '').replace(/\u0090/, '') : void 0;
         if (key === 'data') {
           inDataAttribute = true;
           hasDataAttribute = true;
@@ -1390,7 +1417,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
         }
       } else {
         if (value.indexOf('#{') === -1) {
-          result = "'" + (value.replace(/'/g, '\\\"')) + "'";
+          result = "'" + (value.replace(/"/g, '\\\"').replace(/'/g, '\\\"')) + "'";
         } else {
           result = "'" + value + "'";
         }

metadata

@@ -1,87 +1,94 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: haml_coffee_assets
-version: !ruby/object:Gem::Version
-  version: 1.1.0
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
-authors:
+authors: 
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: execjs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.9
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: tilt
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.3
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sprockets
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 0
+        - 3
         version: 2.0.3
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
-email:
+email: 
 - michi@netzpiraten.ch
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/haml_coffee_assets/compiler.rb
 - lib/haml_coffee_assets/configuration.rb
 - lib/haml_coffee_assets/rails/engine.rb
@@ -97,30 +104,39 @@ files:
 - README.md
 homepage: https://github.com/netzpirat/haml_coffee_assets
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 845884151955554491
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: haml_coffee_assets
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Haml CoffeeScript templates
 test_files: []
+
 has_rdoc: