stylus-source 0.41.0 → 0.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc25bf64229cb7a5b88f91652c80fce9221c418
-  data.tar.gz: b61839581185e9cf961ef398f12a5a58c99840fe
+  metadata.gz: 0da3837b5a10b414fbb523315a3b063b991a2128
+  data.tar.gz: 4ac5f533a2c295655371b692d30bcec8710dcf17
 SHA512:
-  metadata.gz: 3f9ee44003e1e0d285459cc622c6e2f46fbad96d59af16de9df4791089077fc5752b3a46ade4507ffe5d59fb966682c022fe3b2ad6fa5f842c9d935a5a71057b
-  data.tar.gz: 7381b865c290243fe2495b0a296287557f903e0bbe47559ac8344ca42b27324a9dbe3e2365c8909f0830813b34708738aaedf9d16c6221be512e076d72707a3c
+  metadata.gz: f2d6c0f2593ebe2d7fd5bd61381bf2728ae0ad824f44174271a9a0f531c5ed902a36ca42117138de0093aa70e71fcc1f3d6680f4420c743e9b9ab97da4994500
+  data.tar.gz: 8339b72b05ecc3531a9a01e37cd2091ffd50929d2a1a691e277397617d61ecc1042b5a6720526ab2d560dba76dab052c5254283fc1261de7cb919880ae821bdb

data/VERSION

@@ -1 +1 @@
-0.41.0
+0.41.1

data/vendor/lib/functions/url.js

@@ -71,6 +71,7 @@ module.exports = function(options) {
     url = parse(url);
     var ext = extname(url.pathname)
       , mime = mimes[ext]
+      , hash = url.hash || ''
       , literal = new nodes.Literal('url("' + url.href + '")')
       , paths = _paths.concat(this.paths)
       , buf;
@@ -101,7 +102,7 @@ module.exports = function(options) {
     if (false !== sizeLimit && buf.length > sizeLimit) return literal;
 
     // Encode
-    return new nodes.Literal('url("data:' + mime + ';base64,' + buf.toString('base64') + '")');
+    return new nodes.Literal('url("data:' + mime + ';base64,' + buf.toString('base64') + hash + '")');
   };
 
   fn.raw = true;

data/vendor/lib/nodes/block.js

@@ -47,6 +47,23 @@ Block.prototype.__defineGetter__('hasProperties', function(){
   }
 });
 
+/**
+ * Check if this block has bubbling nodes.
+ *
+ * @return {Boolean}
+ * @api public
+ */
+
+Block.prototype.__defineGetter__('hasBubbling', function(){
+  for (var i = 0, len = this.nodes.length; i < len; ++i) {
+    var nodeName = this.nodes[i].nodeName;
+    if ('media' == nodeName || 'fontface' == nodeName) {
+      return true;
+    }
+  }
+  return false;
+});
+
 /**
  * Check if this block is empty.
  *

data/vendor/lib/utils.js

@@ -350,7 +350,6 @@ exports.compileSelectors = function(arr, leaveHidden){
   function compile(arr, i) {
     if (i) {
       arr[i].forEach(function(selector){
-        selector.val = selector.val || selector.toString();
         if (!leaveHidden && selector.val.match(hiddenSelectorRegexp)) return;
         if (selector.inherits) {
           buf.unshift(selector.val);
@@ -362,7 +361,6 @@ exports.compileSelectors = function(arr, leaveHidden){
       });
     } else {
       arr[0].forEach(function(selector){
-        selector.val = selector.val || selector.toString();
         if (!leaveHidden && selector.val.match(hiddenSelectorRegexp)) return;
         var str = interpolateParent(selector, buf);
         if (~str.indexOf('&')) str = str.replace(/&/g, '').trim();

data/vendor/lib/visitor/evaluator.js

@@ -679,8 +679,10 @@ Evaluator.prototype.visitIf = function(node){
     }
   }
 
-  // mixin conditional statements within a selector group
-  if (ret && !node.postfix && block.node && 'group' == block.node.nodeName) {
+  // mixin conditional statements within
+  // a selector group, @font-face block or @page block
+  if (ret && !node.postfix && block.node
+    && ~['group', 'fontface', 'page'].indexOf(block.node.nodeName)) {
     this.mixin(ret.nodes, block);
     return nodes.null;
   }
@@ -810,6 +812,7 @@ Evaluator.prototype.invokeFunction = function(fn, args, content){
   // Clone the function body
   // to prevent mutation of subsequent calls
   var body = fn.block.clone();
+  body.scope = fn.block.hasBubbling;
 
   // mixin block
   var mixinBlock = this.stack.currentFrame.block;
@@ -1177,11 +1180,13 @@ Evaluator.prototype.__defineGetter__('currentSelector', function(){
   for (var i = 0, len = this.stack.length; i < len; ++i) {
     block = this.stack[i].block;
     if (block.node && 'group' == block.node.nodeName) {
+      block.node.nodes.forEach(function(selector) {
+        if (!selector.val) selector.val = this.interpolate(selector);
+      }, this);
       stack.push(block.node.nodes);
     }
   }
-  if (!stack.length) return '&';
-  return utils.compileSelectors(stack).join(',');
+  return stack.length ? utils.compileSelectors(stack).join(',') : '&';
 });
 
 /**
@@ -1223,9 +1228,13 @@ Evaluator.prototype.interpolate = function(node){
       case 'unit':
         return node.val;
       case 'expression':
+        // Prevent cyclic `selector()` calls.
+        var selectorCall = ('call' == node.first.nodeName && 'selector' == node.first.name);
+        if (selectorCall && this._selector) return this._selector;
         self.return++;
         var ret = toString(self.visit(node).first);
         self.return--;
+        if (selectorCall) this._selector = ret;
         return ret;
     }
   }

data/vendor/node_modules/mkdirp/package.json

@@ -29,9 +29,5 @@
     "url": "https://github.com/substack/node-mkdirp/issues"
   },
   "_id": "mkdirp@0.3.5",
-  "dist": {
-    "shasum": "3ca8fc91ed924e281236eec99e74505873ac5a45"
-  },
-  "_from": "mkdirp@0.3.x",
-  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+  "_from": "mkdirp@0.3.x"
 }

data/vendor/node_modules/mocha/node_modules/glob/package.json

@@ -35,5 +35,9 @@
     "url": "https://github.com/isaacs/node-glob/issues"
   },
   "_id": "glob@3.2.3",
-  "_from": "glob@3.2.3"
+  "dist": {
+    "shasum": "d8225c774cac17a9d50c83e739b3b9ac0f2216cf"
+  },
+  "_from": "glob@3.2.3",
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz"
 }

data/vendor/node_modules/should/package.json

@@ -34,9 +34,5 @@
     "url": "https://github.com/visionmedia/should.js/issues"
   },
   "_id": "should@3.1.2",
-  "dist": {
-    "shasum": "4bc206253d736c2fb902153477982c2b2e988c02"
-  },
-  "_from": "should@*",
-  "_resolved": "https://registry.npmjs.org/should/-/should-3.1.2.tgz"
+  "_from": "should@*"
 }

data/vendor/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stylus",
   "description": "Robust, expressive, and feature-rich CSS superset",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "keywords": [
     "css",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus-source
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.41.1
 platform: ruby
 authors:
 - TJ Holowaychuk