haml_coffee_assets 0.8.3 → 0.8.4

data/lib/haml_coffee_assets.rb

@@ -15,5 +15,6 @@ if defined?(Rails)
   require 'haml_coffee_assets/engine'
 else
   require 'sprockets'
+  require 'sprockets/engines'
   Sprockets.register_engine '.hamlc', HamlCoffeeAssets::HamlCoffeeTemplate
 end

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml-coffee.js

@@ -26,7 +26,8 @@ require.resolve = (function () {
         
         if (require._core[x]) return x;
         var path = require.modules.path();
-        var y = cwd || '.';
+        cwd = path.resolve('/', cwd);
+        var y = cwd || '/';
         
         if (x.match(/^(?:\.\.?\/|\/)/)) {
             var m = loadAsFileSync(path.resolve(y, x))
@@ -115,7 +116,11 @@ require.alias = function (from, to) {
     }
     var basedir = path.dirname(res);
     
-    var keys = Object_keys(require.modules);
+    var keys = (Object.keys || function (obj) {
+        var res = [];
+        for (var key in obj) res.push(key)
+        return res;
+    })(require.modules);
     
     for (var i = 0; i < keys.length; i++) {
         var key = keys[i];
@@ -160,17 +165,34 @@ require.define = function (filename, fn) {
     };
 };
 
-var Object_keys = Object.keys || function (obj) {
-    var res = [];
-    for (var key in obj) res.push(key)
-    return res;
-};
-
 if (typeof process === 'undefined') process = {};
 
-if (!process.nextTick) process.nextTick = function (fn) {
-    setTimeout(fn, 0);
-};
+if (!process.nextTick) process.nextTick = (function () {
+    var queue = [];
+    var canPost = typeof window !== 'undefined'
+        && window.postMessage && window.addEventListener
+    ;
+    
+    if (canPost) {
+        window.addEventListener('message', function (ev) {
+            if (ev.source === window && ev.data === 'browserify-tick') {
+                ev.stopPropagation();
+                if (queue.length > 0) {
+                    var fn = queue.shift();
+                    fn();
+                }
+            }
+        }, true);
+    }
+    
+    return function (fn) {
+        if (canPost) {
+            queue.push(fn);
+            window.postMessage('browserify-tick', '*');
+        }
+        else setTimeout(fn, 0);
+    };
+})();
 
 if (!process.title) process.title = 'browser';
 
@@ -182,7 +204,7 @@ if (!process.binding) process.binding = function (name) {
 if (!process.cwd) process.cwd = function () { return '.' };
 
 require.define("path", function (require, module, exports, __dirname, __filename) {
-    function filter (xs, fn) {
+function filter (xs, fn) {
     var res = [];
     for (var i = 0; i < xs.length; i++) {
         if (fn(xs[i], i, xs)) res.push(xs[i]);
@@ -320,7 +342,7 @@ exports.extname = function(path) {
 });
 
 require.define("/haml-coffee.js", function (require, module, exports, __dirname, __filename) {
-    (function() {
+(function() {
   var Code, Comment, Filter, Haml, HamlCoffee, Node, Text, indent, whitespace;
 
   Node = require('./nodes/node');
@@ -697,7 +719,7 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
 });
 
 require.define("/nodes/node.js", function (require, module, exports, __dirname, __filename) {
-    (function() {
+(function() {
   var Node, escapeHTML;
 
   escapeHTML = require('../util/text').escapeHTML;
@@ -868,7 +890,7 @@ require.define("/nodes/node.js", function (require, module, exports, __dirname,
 });
 
 require.define("/util/text.js", function (require, module, exports, __dirname, __filename) {
-    (function() {
+(function() {
 
   module.exports = {
     whitespace: function(n) {
@@ -884,6 +906,10 @@ require.define("/util/text.js", function (require, module, exports, __dirname, _
       if (!text) return '';
       return text.replace(/"/g, '\\"');
     },
+    unescapeQuotes: function(text) {
+      if (!text) return '';
+      return text.replace(/\\"/g, '"');
+    },
     escapeHTML: function(text) {
       if (!text) return '';
       return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\"/g, '&quot;');
@@ -905,7 +931,7 @@ require.define("/util/text.js", function (require, module, exports, __dirname, _
 });
 
 require.define("/nodes/text.js", function (require, module, exports, __dirname, __filename) {
-    (function() {
+(function() {
   var Node, Text, escapeQuotes,
     __hasProp = Object.prototype.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
@@ -935,7 +961,7 @@ require.define("/nodes/text.js", function (require, module, exports, __dirname,
 });
 
 require.define("/nodes/haml.js", function (require, module, exports, __dirname, __filename) {
-    (function() {
+(function() {
   var Haml, Node, escapeQuotes,
     __hasProp = Object.prototype.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
@@ -1246,7 +1272,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
 });
 
 require.define("/nodes/code.js", function (require, module, exports, __dirname, __filename) {
-    (function() {
+(function() {
   var Code, Node,
     __hasProp = Object.prototype.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
@@ -1299,7 +1325,7 @@ require.define("/nodes/code.js", function (require, module, exports, __dirname,
 });
 
 require.define("/nodes/comment.js", function (require, module, exports, __dirname, __filename) {
-    (function() {
+(function() {
   var Comment, Node,
     __hasProp = Object.prototype.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
@@ -1344,8 +1370,8 @@ require.define("/nodes/comment.js", function (require, module, exports, __dirnam
 });
 
 require.define("/nodes/filter.js", function (require, module, exports, __dirname, __filename) {
-    (function() {
-  var Filter, Node, whitespace,
+(function() {
+  var Filter, Node, unescapeQuotes, whitespace,
     __hasProp = Object.prototype.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
 
@@ -1353,6 +1379,8 @@ require.define("/nodes/filter.js", function (require, module, exports, __dirname
 
   whitespace = require('../util/text').whitespace;
 
+  unescapeQuotes = require('../util/text').unescapeQuotes;
+
   module.exports = Filter = (function(_super) {
 
     __extends(Filter, _super);
@@ -1451,7 +1479,7 @@ require.define("/nodes/filter.js", function (require, module, exports, __dirname
               output.push(this.markText("" + (whitespace(indent)) + line));
               break;
             case 'run':
-              output.push(this.markRunningCode("" + line));
+              output.push(this.markRunningCode("" + (unescapeQuotes(line))));
           }
           _results.push(empty = 0);
         }

data/vendor/assets/javascripts/hamlcoffee.js.coffee.erb

@@ -49,7 +49,7 @@ window.HAML.extend ||= (globals, locals) ->
 
   else if Object.append
     Object.append(Object.append({}, globals), locals)
-    
+
   else if Object.extend
     Object.extend(Object.extend({}, globals), locals)
 
@@ -97,7 +97,7 @@ window.HAML.findAndPreserve ||= (text) ->
 # @param [Function] fn the text generating function
 # @return [String] the surrounded text
 #
-surround: (start, end, fn) -> 
+window.HAML.surround ||= (start, end, fn) ->
   start + fn() + end
 
 # The succeed helper appends text to the function output
@@ -107,7 +107,7 @@ surround: (start, end, fn) ->
 # @param [Function] fn the text generating function
 # @return [String] the succeeded text
 #
-succeed: (end, fn) -> 
+window.HAML.succeed ||= (end, fn) ->
   fn() + end
 
 # The precede helper prepends text to the function output
@@ -117,5 +117,5 @@ succeed: (end, fn) ->
 # @param [Function] fn the text generating function
 # @return [String] the preeceded text
 #
-precede: (start, fn) -> 
+window.HAML.precede ||= (start, fn) ->
   start + fn()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70263946976220 !ruby/object:Gem::Requirement
+  requirement: &70318308640140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70263946976220
+  version_requirements: *70318308640140
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70263946975760 !ruby/object:Gem::Requirement
+  requirement: &70318308639220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70263946975760
+  version_requirements: *70318308639220
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70263946975300 !ruby/object:Gem::Requirement
+  requirement: &70318308637240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70263946975300
+  version_requirements: *70318308637240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70263946974920 !ruby/object:Gem::Requirement
+  requirement: &70318308636440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263946974920
+  version_requirements: *70318308636440
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70263946974380 !ruby/object:Gem::Requirement
+  requirement: &70318308620620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70263946974380
+  version_requirements: *70318308620620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70263946973960 !ruby/object:Gem::Requirement
+  requirement: &70318308619420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263946973960
+  version_requirements: *70318308619420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70263946973500 !ruby/object:Gem::Requirement
+  requirement: &70318308617980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263946973500
+  version_requirements: *70318308617980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70263946973080 !ruby/object:Gem::Requirement
+  requirement: &70318308617220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263946973080
+  version_requirements: *70318308617220
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70263946972660 !ruby/object:Gem::Requirement
+  requirement: &70318308616520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263946972660
+  version_requirements: *70318308616520
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70263946972240 !ruby/object:Gem::Requirement
+  requirement: &70318308615340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263946972240
+  version_requirements: *70318308615340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70263946971820 !ruby/object:Gem::Requirement
+  requirement: &70318308614080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263946971820
+  version_requirements: *70318308614080
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
 email:
 - michi@netzpiraten.ch