stylus-source 0.28.2 → 0.29.0

data/VERSION

@@ -1 +1 @@
-0.28.2
+0.29.0

data/vendor/Readme.md

@@ -111,7 +111,7 @@ form input {
 ### Framework Support
 
    - [Connect](/LearnBoost/stylus/blob/master/docs/middleware.md)
-   - [Play! 2.0](https://github.com/knuton/play-stylus)
+   - [Play! 2.0](https://github.com/patiencelabs/play-stylus)
    - [Ruby On Rails](https://github.com/lucasmazza/ruby-stylus)
 
 ### CMS Support

data/vendor/lib/functions/index.js

@@ -13,7 +13,9 @@ var Compiler = require('../visitor/compiler')
   , nodes = require('../nodes')
   , utils = require('../utils')
   , Image = require('./image')
-  , path = require('path');
+  , units = require('../units')
+  , path = require('path')
+  , fs = require('fs');
 
 /**
  * Color component name map.
@@ -376,6 +378,62 @@ exports.rgb = function rgb(red, green, blue){
   }
 };
 
+/**
+ * Convert a .json file into stylus variables
+ * Nested variable object keys are joined with a dash (-)
+ *
+ * Given this sample media-queries.json file:
+ * {
+ *   "small": "screen and (max-width:400px)",
+ *   "tablet": {
+ *     "landscape": "screen and (min-width:600px) and (orientation:landscape)",
+ *     "portrait": "screen and (min-width:600px) and (orientation:portrait)"
+ *   }
+ * }
+ *
+ * Examples:
+ *
+ *    json('media-queries.json')
+ *    
+ *    @media small
+ *    // => @media screen and (max-width:400px)
+ *
+ *    @media tablet-landscape
+ *    // => @media screen and (min-width:600px) and (orientation:landscape)
+ *       
+ * @param {String} path
+ * @api public
+*/
+
+exports.json = function(path){
+  utils.assertString(path, 'path');
+
+  // lookup
+  path = path.string;
+  var found = utils.lookup(path, this.options.paths, this.options.filename);
+  if (!found) throw new Error('failed to locate .json file ' + path);
+
+  // read
+  var str = fs.readFileSync(found, 'utf8');
+  convert.call(this, JSON.parse(str));
+  return;
+
+  function convert(obj, prefix){
+    prefix = prefix ? prefix + '-' : '';
+    for (var key in obj){
+      var val = obj[key];
+      var name = prefix + key;
+      if ('object' == typeof val) {
+        convert.call(this, val, name);
+      } else {
+        val = utils.coerce(val);
+        if ('string' == val.nodeName) val = parseUnit(val.string) || new nodes.Literal(val.string);
+        this.global.scope.add({ name: name, val: val });
+      }
+    }
+  }
+};
+
 /**
  * Unquote the given `str`.
  *
@@ -807,3 +865,19 @@ exports['-adjust'] = function adjust(color, prop, amount){
   
   return prop;
 }).raw = true;
+
+/**
+ * Attempt to parse unit `str`.
+ *
+ * @param {String} str
+ * @return {Unit}
+ * @api public
+ */
+
+function parseUnit(str){
+  var m = str.match(/^(\d+)(.*)/);
+  if (!m) return;
+  var n = parseInt(m[1], 10);
+  var type = m[2];
+  return new nodes.Unit(n, type);
+}

data/vendor/lib/functions/url.js

@@ -51,24 +51,23 @@ var mimes = {
 module.exports = function(options) {
   options = options || {};
 
-  var sizeLimit = options.limit || 30000
-    , _paths = options.paths || [];
+  var _paths = options.paths || [];
+  var sizeLimit = null != options.sizeLimit ? options.sizeLimit : 30000;
 
-  function url(url){
+  function fn(url){
     // Compile the url
     var compiler = new Compiler(url);
     compiler.isURL = true;
-    var url = url.nodes.map(function(node){
+    url = url.nodes.map(function(node){
       return compiler.visit(node);
     }).join('');
 
-    // Parse literal 
-    var url = parse(url)
-      , ext = extname(url.pathname)
+    // Parse literal
+    url = parse(url);
+    var ext = extname(url.pathname)
       , mime = mimes[ext]
       , literal = new nodes.Literal('url("' + url.href + '")')
       , paths = _paths.concat(this.paths)
-      , founds
       , buf;
 
     // Not supported
@@ -87,12 +86,12 @@ module.exports = function(options) {
     buf = fs.readFileSync(found);
 
     // To large
-    if (buf.length > sizeLimit) return literal;
+    if (false !== sizeLimit && buf.length > sizeLimit) return literal;
 
     // Encode
     return new nodes.Literal('url("data:' + mime + ';base64,' + buf.toString('base64') + '")');
   };
 
-  url.raw = true;
-  return url;
-};
+  fn.raw = true;
+  return fn;
+};

data/vendor/lib/lexer.js

@@ -61,7 +61,8 @@ function Lexer(str, options) {
   this.lineno = 1;
 
   function comment(str, val, offset, s) {
-    return s.lastIndexOf('/*', offset) > s.lastIndexOf('*/', offset)
+    var inComment = s.lastIndexOf('/*', offset) > s.lastIndexOf('*/', offset) || "//" == s.substr(0, 2);
+    return inComment
       ? str
       : val;
   };

data/vendor/lib/stylus.js

@@ -24,7 +24,7 @@ exports = module.exports = render;
  * Library version.
  */
 
-exports.version = '0.28.2';
+exports.version = '0.29.0';
 
 /**
  * Expose nodes.

data/vendor/lib/visitor/compiler.js

@@ -479,7 +479,7 @@ Compiler.prototype.compileSelectors = function(arr){
 
 Compiler.prototype.debugInfo = function(node){
 
-  var path = fs.realpathSync(node.filename)
+  var path = node.filename == 'stdin' ? 'stdin' : fs.realpathSync(node.filename)
     , line = node.nodes ? node.nodes[0].lineno : node.lineno;
 
   if (this.linenos){

data/vendor/lib/visitor/evaluator.js

@@ -188,6 +188,8 @@ Evaluator.prototype.visitReturn = function(ret){
 
 Evaluator.prototype.visitMedia = function(media){
   media.block = this.visit(media.block);
+  var query = this.lookup(media.val);
+  if (query) media.val = new nodes.Literal(query.first.string);
   return media;
 };
 

data/vendor/node_modules/cssom/package.json

@@ -46,8 +46,5 @@
   "_npmVersion": "1.1.21",
   "_nodeVersion": "v0.8.1",
   "_defaultsLoaded": true,
-  "dist": {
-    "shasum": "185f2c4c56220f73da355f7b3088e5e801d0dcd7"
-  },
   "_from": "cssom@0.2.x"
 }

data/vendor/node_modules/mocha/History.md

@@ -1,4 +1,25 @@
 
+1.3.2 / 2012-08-01 
+==================
+
+  * fix exports double-execution regression. Closes #531
+
+1.3.1 / 2012-08-01 
+==================
+
+  * add passes/failures toggling to HTML reporter
+  * add pending state to `xit()` and `xdescribe()` [Brian Moore]
+  * add the @charset "UTF-8"; to fix #522 with FireFox. [Jonathan Creamer]
+  * add border-bottom to #stats links
+  * add check for runnable in `Runner#uncaught()`. Closes #494
+  * add 0.4 and 0.6 back to travis.yml
+  * add `-E, --growl-errors` to growl on failures only
+  * add prefixes to debug() names. Closes #497
+  * add `Mocha#invert()` to js api
+  * change dot reporter to use sexy unicode dots
+  * fix error when clicking pending test in HTML reporter
+  * fix `make tm`
+
 1.3.0 / 2012-07-05 
 ==================
 

data/vendor/node_modules/mocha/Makefile

@@ -114,7 +114,7 @@ non-tty:
 	@cat /tmp/spec.out
 
 tm:
-	mkdir -p $(TM_DEST)/$(TM_BUNDLE)
-	cp -fr editors/$(TM_BUNDLE) $(TM_DEST)/$(TM_BUNDLE)
+	mkdir -p $(TM_DEST)
+	cp -fr editors/$(TM_BUNDLE) $(TM_DEST)
 
 .PHONY: test-cov test-jsapi test-compilers watch test test-all test-bdd test-tdd test-qunit test-exports test-unit non-tty test-grep tm clean