haml_coffee_assets 1.1.1 → 1.1.2

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/hamlcoffee.js

@@ -415,7 +415,9 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
         throw "Indentation error in line " + this.lineNumber;
       }
       if ((this.currentIndent - this.previousIndent) / this.tabSize > 1) {
-        throw "Block level too deep in line " + this.lineNumber;
+        if (!this.node.isCommented()) {
+          throw "Block level too deep in line " + this.lineNumber;
+        }
       }
       return this.delta = this.previousBlockLevel - this.currentBlockLevel;
     };
@@ -496,7 +498,7 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
       if (source == null) {
         source = '';
       }
-      this.line_number = this.previousIndent = this.tabSize = this.currentBlockLevel = this.previousBlockLevel = 0;
+      this.lineNumber = this.previousIndent = this.tabSize = this.currentBlockLevel = this.previousBlockLevel = 0;
       this.currentCodeBlockLevel = this.previousCodeBlockLevel = 0;
       this.node = null;
       this.stack = [];
@@ -536,13 +538,13 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
             attributes = lines.shift();
             expression = expression.replace(/(\s)+\|\s*$/, '');
             expression += ' ' + attributes.match(/^\s*(.*?)(\s+\|\s*)?$/)[1];
-            this.line_number++;
+            this.lineNumber++;
           }
           if (expression.match(/(\s)+\|\s*$/)) {
             expression = expression.replace(/(\s)+\|\s*$/, ' ');
             while ((_ref = lines[0]) != null ? _ref.match(/(\s)+\|$/) : void 0) {
               expression += lines.shift().match(/^(\s*)(.*)/)[2].replace(/(\s)+\|\s*$/, '');
-              this.line_number++;
+              this.lineNumber++;
             }
           }
           this.currentIndent = ws.length;
@@ -556,7 +558,7 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
           this.previousBlockLevel = this.currentBlockLevel;
           this.previousIndent = this.currentIndent;
         }
-        this.line_number++;
+        this.lineNumber++;
       }
       return this.evaluate(this.root);
     };
@@ -837,6 +839,17 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
       }
     };
 
+    Node.prototype.isCommented = function() {
+      if (this.constructor.name === 'Comment') {
+        return true;
+      }
+      if (this.parentNode) {
+        return this.parentNode.isCommented();
+      } else {
+        return false;
+      }
+    };
+
     Node.prototype.markText = function(text, escape) {
       if (escape == null) {
         escape = false;

metadata

@@ -1,94 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: haml_coffee_assets
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: execjs
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sprockets
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 0
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -104,39 +97,30 @@ 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4075879259960313731
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: haml_coffee_assets
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Haml CoffeeScript templates
 test_files: []
-
 has_rdoc: