haml_coffee_assets 0.8.1 → 0.8.2

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml-coffee.js

@@ -615,22 +615,22 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
         this.lines = this.lines.concat(child.render());
       }
       this.lines = this.combineText(this.lines);
-      this.block = false;
+      this.blockLevel = 0;
       _ref2 = this.lines;
       for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
         line = _ref2[_j];
         if (line !== null) {
           switch (line.type) {
             case 'text':
-              if (this.block) {
-                code.push("" + (whitespace(line.cw)) + "$b.push \"" + (whitespace(line.hw)) + line.text + "\"");
-              } else {
-                code.push("" + (whitespace(line.cw)) + "$o.push \"" + (whitespace(line.hw)) + line.text + "\"");
-              }
+              code.push("" + (whitespace(line.cw)) + (this.getBuffer(this.blockLevel)) + ".push \"" + (whitespace(line.hw)) + line.text + "\"");
               break;
             case 'run':
-              code.push("" + (whitespace(line.cw)) + line.code);
-              if (line.block === 'end') this.block = false;
+              if (line.block !== 'end') {
+                code.push("" + (whitespace(line.cw)) + line.code);
+              } else {
+                code.push("" + (whitespace(line.cw)) + (line.code.replace('$buffer', this.getBuffer(this.blockLevel))));
+                this.blockLevel -= 1;
+              }
               break;
             case 'insert':
               processors = '';
@@ -638,10 +638,10 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
               if (line.preserve) processors += '$p ';
               if (line.escape) processors += '$e ';
               if (this.options.cleanValue) processors += '$c ';
-              code.push("" + (whitespace(line.cw)) + "$o.push \"" + (whitespace(line.hw)) + "\" + " + processors + line.code);
+              code.push("" + (whitespace(line.cw)) + (this.getBuffer(this.blockLevel)) + ".push \"" + (whitespace(line.hw)) + "\" + " + processors + line.code);
               if (line.block === 'start') {
-                this.block = true;
-                code.push("" + (whitespace(line.cw + 1)) + "$b = []");
+                this.blockLevel += 1;
+                code.push("" + (whitespace(line.cw + 1)) + (this.getBuffer(this.blockLevel)) + " = []");
               }
           }
         }
@@ -649,6 +649,14 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
       return code.join('\n');
     };
 
+    HamlCoffee.prototype.getBuffer = function(level) {
+      if (level > 0) {
+        return "$o" + level;
+      } else {
+        return '$o';
+      }
+    };
+
     HamlCoffee.prototype.combineText = function(lines) {
       var combined, line, nextLine;
       combined = [];
@@ -1274,7 +1282,7 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
         if (this.children.length !== 0 && code.match(/(->|=>)$/)) {
           this.opener = this.markInsertingCode(code, escape, false, false);
           this.opener.block = 'start';
-          this.closer = this.markRunningCode("  $b.join \"\\n\"");
+          this.closer = this.markRunningCode("  $buffer.join \"\\n\"");
           return this.closer.block = 'end';
         } else {
           return this.opener = this.markInsertingCode(code, escape);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 +01:00
-default_executable: 
+date: 2012-02-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70095221533480 !ruby/object:Gem::Requirement
+  requirement: &70142697361200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70095221533480
+  version_requirements: *70142697361200
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70095221533020 !ruby/object:Gem::Requirement
+  requirement: &70142697360740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70095221533020
+  version_requirements: *70142697360740
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70095221532560 !ruby/object:Gem::Requirement
+  requirement: &70142697360280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70095221532560
+  version_requirements: *70142697360280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70095221532160 !ruby/object:Gem::Requirement
+  requirement: &70142697359900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095221532160
+  version_requirements: *70142697359900
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70095221531620 !ruby/object:Gem::Requirement
+  requirement: &70142697359360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70095221531620
+  version_requirements: *70142697359360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70095221531200 !ruby/object:Gem::Requirement
+  requirement: &70142697358940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095221531200
+  version_requirements: *70142697358940
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70095221530600 !ruby/object:Gem::Requirement
+  requirement: &70142697358480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095221530600
+  version_requirements: *70142697358480
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70095221530180 !ruby/object:Gem::Requirement
+  requirement: &70142697358060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095221530180
+  version_requirements: *70142697358060
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70095221529740 !ruby/object:Gem::Requirement
+  requirement: &70142697357640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095221529740
+  version_requirements: *70142697357640
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70095221529300 !ruby/object:Gem::Requirement
+  requirement: &70142697357220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095221529300
+  version_requirements: *70142697357220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70095221512980 !ruby/object:Gem::Requirement
+  requirement: &70142697356800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095221512980
+  version_requirements: *70142697356800
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
 email:
 - michi@netzpiraten.ch
@@ -152,7 +151,6 @@ files:
 - vendor/assets/javascripts/hamlcoffee.js.coffee.erb
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: https://github.com/netzpirat/haml_coffee_assets
 licenses: []
 post_install_message: 
@@ -173,8 +171,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: haml_coffee_assets
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Haml CoffeeScript templates
 test_files: []
+has_rdoc: