stylus-source 0.20.1 → 0.21.0

data/VERSION

@@ -1 +1 @@
-0.20.1
+0.21.0

data/vendor/History.md

@@ -1,4 +1,9 @@
 
+0.21.0 / 2011-12-17 
+==================
+
+  * Added unit casting, ex: `(n * 5)%`. Closes #285
+
 0.20.1 / 2011-12-16 
 ==================
 

data/vendor/bin/stylus

@@ -8,6 +8,7 @@ var fs = require('fs')
   , stylus = require('../lib/stylus')
   , basename = require('path').basename
   , dirname = require('path').dirname
+  , resolve = require('path').resolve
   , join = require('path').join;
 
 /**
@@ -607,7 +608,7 @@ function usePlugins(style) {
   plugins.forEach(function(plugin){
     var path = plugin.path;
     var options = plugin.options;
-    fn = require(path);
+    fn = require(resolve(path));
     if ('function' != typeof fn) {
       throw new Error('plugin ' + path + ' does not export a function');
     }

data/vendor/docs/operators.md

@@ -410,6 +410,19 @@ The ternary operator works as we would expect in most languages, being the only
     num ? unit(num, 'px') : 20px
     // => 15px
 
+## Casting
+
+ As an terse alternative to the `unit()` built-in function, the syntax `(expr) unit` may be used to force the suffix. 
+
+    body
+      n = 5
+      foo: (n)em
+      foo: (n)%
+      foo: (n + 5)%
+      foo: (n * 5)px
+      foo: unit(n + 5, '%')
+      foo: unit(5 + 180 / 2, deg)
+
 ## Color Operations
 
  Operations on colors provide a terse, expressive way to alter components. For example we can operate on each RGB:

data/vendor/lib/lexer.js

@@ -11,7 +11,14 @@
 
 var Token = require('./token')
   , nodes = require('./nodes')
-  , errors = require('./errors');
+  , errors = require('./errors')
+  , units = require('./units');
+
+/**
+ * Expose `Lexer`.
+ */
+
+exports = module.exports = Lexer;
 
 /**
  * Operator aliases.
@@ -30,24 +37,7 @@ var alias = {
  * Units.
  */
 
-var units = [
-    'em'
-  , 'ex'
-  , 'px'
-  , 'mm'
-  , 'cm'
-  , 'in'
-  , 'pt'
-  , 'pc'
-  , 'deg'
-  , 'rad'
-  , 'grad'
-  , 'ms'
-  , 's'
-  , 'Hz'
-  , 'kHz'
-  , 'rem'
-  , '%'].join('|');
+units = units.join('|');
 
 /**
  * Unit RegExp.
@@ -63,7 +53,7 @@ var unit = new RegExp('^(-)?(\\d+\\.\\d+|\\d+|\\.\\d+)(' + units + ')?[ \\t]*');
  * @api private
  */
 
-var Lexer = module.exports = function Lexer(str, options) {
+function Lexer(str, options) {
   options = options || {};
   this.stash = [];
   this.indentStack = [];

data/vendor/lib/parser.js

@@ -1498,7 +1498,7 @@ Parser.prototype = {
    * | ident
    * | boolean
    * | literal
-   * | '(' expression ')'
+   * | '(' expression ')' '%'?
    */
 
   primary: function() {
@@ -1511,6 +1511,7 @@ Parser.prototype = {
       var expr = this.expression();
       this.expect(')');
       --this.parens;
+      if (this.accept('%')) expr.push(new nodes.Ident('%'));
       return expr;
     }
 

data/vendor/lib/stylus.js

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

data/vendor/lib/units.js

@@ -0,0 +1,26 @@
+
+/*!
+ * Stylus - units
+ * Copyright(c) 2010 LearnBoost <dev@learnboost.com>
+ * MIT Licensed
+ */
+
+module.exports = [
+    'em'
+  , 'ex'
+  , 'px'
+  , 'mm'
+  , 'cm'
+  , 'in'
+  , 'pt'
+  , 'pc'
+  , 'deg'
+  , 'rad'
+  , 'grad'
+  , 'ms'
+  , 's'
+  , 'Hz'
+  , 'kHz'
+  , 'rem'
+  , '%'
+];

data/vendor/lib/visitor/evaluator.js

@@ -10,6 +10,7 @@
  */
 
 var Visitor = require('./')
+  , units = require('../units')
   , nodes = require('../nodes')
   , Stack = require('../stack')
   , Frame = require('../stack/frame')
@@ -251,6 +252,8 @@ Evaluator.prototype.visitFunction = function(fn){
  */
 
 Evaluator.prototype.visitEach = function(each){
+  var _ = this.return;
+  this.return = true;
   var expr = utils.unwrap(this.visit(utils.unwrap(each.expr)))
     , len = expr.nodes.length
     , val = new nodes.Ident(each.val)
@@ -259,6 +262,7 @@ Evaluator.prototype.visitEach = function(each){
     , block = this.currentBlock
     , vals = []
     , body;
+  this.return = _;
 
   each.block.scope = false;
   for (var i = 0; i < len; ++i) {
@@ -449,6 +453,10 @@ Evaluator.prototype.visitExpression = function(expr){
   for (var i = 0, len = expr.nodes.length; i < len; ++i) {
     expr.nodes[i] = this.visit(expr.nodes[i]);
   }
+
+  // support (n * 5)px etc
+  if (this.castable(expr)) expr = this.cast(expr);
+
   return expr;
 };
 
@@ -1078,6 +1086,32 @@ Evaluator.prototype.propertyExpression = function(prop, name){
   return expr;
 };
 
+/**
+ * Cast `expr` to the trailing ident.
+ *
+ * @param {Expression} expr
+ * @return {Unit}
+ * @api private
+ */
+
+Evaluator.prototype.cast = function(expr){
+  return new nodes.Unit(expr.first.val, expr.nodes[1].name);
+};
+
+/**
+ * Check if `expr` is castable.
+ *
+ * @param {Expression} expr
+ * @return {Boolean}
+ * @api private
+ */
+
+Evaluator.prototype.castable = function(expr){
+  return 2 == expr.nodes.length
+    && 'unit' == expr.first.nodeName
+    && ~units.indexOf(expr.nodes[1].name);
+};
+
 /**
  * Warn with the given `msg`.
  *

data/vendor/package.json

@@ -1,6 +1,6 @@
 {   "name": "stylus"
   , "description": "Robust, expressive, and feature-rich CSS superset"
-  , "version": "0.20.1"
+  , "version": "0.21.0"
   , "author": "TJ Holowaychuk <tj@vision-media.ca>"
   , "keywords": ["css", "parser", "style", "stylesheets", "jade", "language"]
   , "repository": "git://github.com/learnboost/stylus"

data/vendor/test/cases/casting.css

@@ -0,0 +1,12 @@
+body {
+  foo: 5em;
+  foo: 5em;
+  foo: 5%;
+  foo: 5%;
+  foo: 10%;
+  foo: 25px;
+  foo: 95deg;
+}
+body {
+  foo: 25deg;
+}

data/vendor/test/cases/casting.styl

@@ -0,0 +1,14 @@
+
+body
+  n = 5
+  foo: (n)em
+  foo: (n) em
+  foo: (n)%
+  foo: (n) %
+  foo: (n + 5)%
+  foo: (n * 5)px
+  foo: (5 + 180 / 2)deg
+
+body
+  n = 5 * 5
+  foo: (n)deg

data/vendor/test/cases/regression.484.css

@@ -0,0 +1,9 @@
+body {
+  foo: 1;
+}
+body {
+  foo: 2;
+}
+body {
+  foo: 3;
+}

data/vendor/test/cases/regression.484.styl

@@ -0,0 +1,8 @@
+
+
+list()
+  1 2 3
+
+for n in list()
+  body
+    foo: n

data/vendor/testing/index.js

@@ -0,0 +1,15 @@
+
+/**
+ * Module dependencies.
+ */
+
+var stylus = require('../')
+  , fs = require('fs')
+  , str = fs.readFileSync('testing/test.styl', 'utf8');
+
+stylus(str)
+  .set('filename', 'testing/test.styl')
+  .render(function(err, css){
+    if (err) throw err;
+    console.log(css);
+  });

data/vendor/testing/test.styl

@@ -1,2 +1,2 @@
 
-@import utils
+body * foo { display: none; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus-source
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
   prerelease: 
 platform: ruby
 authors:
@@ -149,6 +149,7 @@ files:
 - vendor/lib/stack/scope.js
 - vendor/lib/stylus.js
 - vendor/lib/token.js
+- vendor/lib/units.js
 - vendor/lib/utils.js
 - vendor/lib/visitor/compiler.js
 - vendor/lib/visitor/evaluator.js
@@ -275,6 +276,8 @@ files:
 - vendor/test/cases/bifs.unquote.styl
 - vendor/test/cases/bifs.url.css
 - vendor/test/cases/bifs.url.styl
+- vendor/test/cases/casting.css
+- vendor/test/cases/casting.styl
 - vendor/test/cases/coercion.css
 - vendor/test/cases/coercion.styl
 - vendor/test/cases/comments.css
@@ -571,6 +574,8 @@ files:
 - vendor/test/cases/regression.475.styl
 - vendor/test/cases/regression.480.css
 - vendor/test/cases/regression.480.styl
+- vendor/test/cases/regression.484.css
+- vendor/test/cases/regression.484.styl
 - vendor/test/cases/reset.css
 - vendor/test/cases/reset.styl
 - vendor/test/cases/rule.charset.css
@@ -613,15 +618,8 @@ files:
 - vendor/test/images/squirrel.jpeg
 - vendor/test/images/tux.png
 - vendor/test/run.js
-- vendor/testing/foo.css
-- vendor/testing/index.html
-- vendor/testing/stylus.js
-- vendor/testing/test-js.js
-- vendor/testing/test.css
-- vendor/testing/test.js
+- vendor/testing/index.js
 - vendor/testing/test.styl
-- vendor/testing/utils.styl
-- vendor/testing/vendor.styl
 homepage: https://github.com/railsjedi/ruby-stylus-source
 licenses: []
 post_install_message: 

data/vendor/testing/foo.css

@@ -1,4 +0,0 @@
-
-foo {
-  bar: 'baz';
-}

data/vendor/testing/index.html

@@ -1,56 +0,0 @@
-<html>
-  <head>
-    <!--<link rel="stylesheet/stylus"></link>-->
-    <style type="text/stylus">
-fg = white
-body {
-  color: fg;
-  background: black;
-}
-    </style>
-    <script src="../stylus.js"></script>
-    <script>
-
-    function createStylesheet(css) {
-      var el = document.createElement('style');
-      el.type = 'text/css';
-      el.media = 'screen';
-      el.id = 'todo';
-      el.textContent = css;
-      document.getElementsByTagName('head')[0].appendChild(el);
-    }
-
-    onload = function(){
-      var styles = document.getElementsByTagName('style')
-        , indent
-        , styl;
-
-        // TODO: link tags like https://github.com/cloudhead/less.js/blob/master/dist/less-1.1.4.js#L2463
-        // TODO: strip indentation
-      for (var i = 0, len = styles.length; i < len; ++i) {
-        if ('text/stylus' == styles[i].type) {
-          styl = styles[i].textContent;
-          stylus(styl.trim())
-            .render(function(err, css){
-              if (err) throw err;
-              createStylesheet(css);
-            });
-        }
-      }
-    };
-    </script>
-  </head>
-  <body>
-    <div id="dialog">
-      <h1>Dialog</h1>
-      <p>Some random dialog</p>
-    </div>
-
-    <div class="tip username-tip">Please enter your username</div>
-    <div class="tip password-tip">Please enter your password</div>
-    <div id="content">
-      <p><input type="text" class="username" placeholder="Username:"></p>
-      <p><input type="text" class="password" placeholder="Password:"></p>
-    </div>
-  </body>
-</html>

data/vendor/testing/stylus.js

@@ -1,146 +0,0 @@
-
-var stylus = (function(){
-  function center(selector) {
-   jQuery(function(){
-     var el = jQuery(selector);
-
-     function center() {
-       var w = el.outerWidth()
-         , h = el.outerHeight();
-
-       el.css({
-           top: window.innerHeight / 2 - h / 2
-         , left: window.innerWidth / 2 - w / 2
-       });
-     }
-
-     jQuery(window).resize(center);
-     center();
-   });
-  }
-
-  function tip(selector, pos, color, width, height) {
-    width = parseInt(width, 10);
-    height = parseInt(height, 10);
-    jQuery(function(){
-      var el = jQuery(selector)
-        , tip = $('<canvas>')
-        , canvas = tip.get(0)
-        , ctx = canvas.getContext('2d')
-        , w = el.outerWidth()
-        , h = el.outerHeight()
-        , off = el.offset()
-        , top
-        , left;
-
-      el.append(canvas);
-      canvas.width = width;
-      canvas.height = height;
-
-      function calc() {
-        ctx.beginPath();
-        switch (pos) {
-          case 'top':
-            top = -height;
-            left = w / 2 - width / 2;
-            ctx.lineTo(width / 2, 0);
-            ctx.lineTo(width, height);
-            ctx.lineTo(0, height);
-            break;
-          case 'right':
-            top = h / 2 - height / 2;
-            left = w;
-            ctx.lineTo(0, 0);
-            ctx.lineTo(0, height);
-            ctx.lineTo(width, height / 2);
-            break;
-          case 'bottom':
-            top = h;
-            left = w / 2 - width / 2;
-            ctx.lineTo(width / 2, height);
-            ctx.lineTo(0, 0);
-            ctx.lineTo(width, 0);
-            break;
-          case 'left':
-            top = h / 2 - height / 2;
-            left = -width;
-            ctx.lineTo(0, height / 2);
-            ctx.lineTo(width, 0);
-            ctx.lineTo(width, height);
-            break;
-        }
-      }
-
-      calc();
-
-      tip.css({ top: top, left: left });
-      ctx.fillStyle = color;
-      ctx.fill();
-    });
-  }
-
-  function snapTo(selector, target, pos, pad) {
-    pad = parseInt(pad, 10);
-    jQuery(function(){
-      var el = jQuery(selector);
-      target = jQuery(target);
-
-      function snap() {
-        var w = el.outerWidth()
-          , h = el.outerHeight()
-          , tw = target.outerWidth()
-          , th = target.outerHeight()
-          , off = target.offset()
-          , ww = window.innerWidth
-          , wh = window.innerHeight
-          , auto = 'auto' == pos
-          , top
-          , left;
-
-        if (auto) pos = 'right';
-
-        function calc() {
-          switch (pos) {
-            case 'top':
-              top = off.top - h - pad;
-              left = off.left - w / 2 + tw / 2;
-              break;
-            case 'left':
-              top = off.top - h / 2 + th / 2;
-              left = off.left - w - pad;
-              break;
-             case 'bottom':
-              top = off.top + th + pad;
-              left = off.left - w / 2 + tw / 2;
-              break;
-            case 'right':
-              top = off.top - h / 2 + th / 2;
-              left = off.left + tw + pad;
-              break;
-          }
-        }
-
-        calc();
-
-        if (auto) {
-          // right
-          if (left + w > ww) {
-            pos = 'left';
-            calc();
-          }
-        }
-
-        el.css({ top: top, left: left });
-      }
-
-      jQuery(window).resize(snap);
-      snap();
-    });
-  }
-
-  return {
-      snapTo: snapTo
-    , tip: tip
-    , center: center
-  }
-})()

data/vendor/testing/test-js.js

@@ -1,23 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var connect = require('connect')
-  , stylus = require('../');
-
-// Setup server
-// $ curl http://localhost:3000/functions.css
-
-var server = connect.createServer(
-  stylus.middleware({
-      src: __dirname
-    , dest: __dirname
-    , compress: true
-    , debug: true
-  }),
-  connect.static(__dirname)
-);
-
-server.listen(3000);
-console.log('server listening on port 3000');

data/vendor/testing/test.css

@@ -1,6 +0,0 @@
-foo {
-bar: 'baz';
-}
-body {
-  foo: 'bar';
-}

data/vendor/testing/test.js

@@ -1,28 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var stylus = require('../')
-  , utils = stylus.utils
-  , nodes = stylus.nodes
-  , str = require('fs').readFileSync(__dirname + '/test.styl', 'utf8')
-  , fs = require('fs');
-
-stylus(str)
-  //.import(__dirname + '/mixins/vendor')
-  .set('filename', __dirname + '/test.styl')
-  // .set('compress', true)
-  // .set('firebug', true)
-  // .set('linenos', true)
-  // .set('warn', true)
-  .set('include css', true)
-  .define('string', 'some string')
-  .define('number', 15.5)
-  .define('some-bool', true)
-  .define('list', ['Helvetica Neue', 'Helvetica', 'sans-serif'])
-  .render(function(err, css, js){
-  if (err) throw err;
-  process.stdout.write(css);
-});
-

data/vendor/testing/utils.styl

@@ -1,3 +0,0 @@
-
-// bar
-

data/vendor/testing/vendor.styl

@@ -1,3 +0,0 @@
-
-body
-  foo: 'bar'