stylus-source 0.22.6 → 0.23.0

data/vendor/docs/operators.md

@@ -56,7 +56,7 @@ The logical `not` operator has low precedence, therefore the following example c
     // => false
     // pased as: (!a) and (!b)
 
-with:
+With:
 
     not a or b
     // => false
@@ -66,9 +66,9 @@ with:
 
 ### Subscript []
 
- The subscript operator allows us to grab a value in an expression via index. Parenthesized expressions may act as tuples, so for example `(15px 5px)`, `(1 2 3)`.
+ The subscript operator allows us to grab a value inside an expression via index. Parenthesized expressions may act as tuples (e.g. `(15px 5px)`, `(1 2 3)`).
  
- Below is an example where we utilize tuples for error handling, showing the versatility of such a construct. As 
+ Below is an example that uses tuples for error handling (and showcasing the versatility of this construct):
  
      add(a, b)
        if a is a 'unit' and b is a 'unit'
@@ -89,7 +89,7 @@ with:
        padding add(1,'5')[1]
        // => padding: "a and b must be units";
 
- A more complex example, invoking the `error()` built-in function with the error message returned, when the ident (the first value) equals `error`.
+ Here's a more complex example. Now we're invoking the built-in `error()` function with the return error message, whenever the ident (the first value) equals `error`.
  
  
      if (val = add(1,'5'))[0] == error
@@ -107,7 +107,7 @@ with:
 
 ### Additive: + -
 
-multiplicative and additive binary operators work as expected, and type conversion is applied within unit type classes, or default to the literal value. For example if we perform `5s - 2px` we will get `3s`.
+Multiplicative and additive binary operators work as expected. Type conversion is applied within unit type classes, or default to the literal value. For example `5s - 2px` results in `3s`.
 
     15px - 5px
     // => 10px
@@ -141,15 +141,15 @@ multiplicative and additive binary operators work as expected, and type conversi
     4 % 2
     // => 0
 
-When using `/` within a property value you must wrap with parens. The following for example is taken literally, to support css line-height:
+When using `/` within a property value, you **must** wrap with parens. Otherwise the `/` is taken literally (to support CSS `line-height`):
 
     font: 14px/1.5;
 
-whereas the following is evaluated, dividing `14px` by `1.5`:
+But the following is evaluated as `14px` ÷ `1.5`:
 
     font: (14px/1.5);
 
-this exception is _only_ required for the `/` operator.
+This is _only_ required for the `/` operator.
 
 ### Exponent: **
 
@@ -160,7 +160,7 @@ The Exponent operator:
 
 ### Equality & Relational: == != >= <= > <
 
-Equality operators can be used to equate units, colors, strings, and even identifiers. This is a powerful concept, as even arbitrary identifiers such as as `wahoo` can be utilized as atoms, a function could return `yes` or `no` instead of `true` or `false` (although not advised). 
+Equality operators can be used to equate units, colors, strings, and even identifiers. This is a powerful concept, as even arbitrary identifiers (such as as `wahoo`) can be utilized as atoms. A function could return `yes` or `no` instead of `true` or `false` (although not advised). 
 
     5 == 5
     // => true
@@ -201,7 +201,7 @@ Equality operators can be used to equate units, colors, strings, and even identi
     (1 2 3) == (1 1 3)
     // => false
 
-Only exact values match, for example `0 == false`, and `null == false` are both `false`.
+Only exact values match. For example, `0 == false` and `null == false` are both `false`.
 
 Aliases:
 
@@ -211,7 +211,11 @@ Aliases:
 
 ## Truthfulness
 
- Nearly everything within Stylus resolves to `true`, including units with a suffix, for example even `0%`, `0px`, etc will resolve to `true`, since commonly in Stylus a mixin or function may accept such units as valid, however `0` itself is `false` in terms of arithmetic. Expressions or "lists" with a length greater than 1 are considered truthy.
+ Nearly everything within Stylus resolves to `true`, including units with a suffix. Even `0%`, `0px`, etc. will resolve to `true` (because it's common in Stylus for mixins or functions to accept units as valid). 
+ 
+ However, `0` itself is `false` in terms of arithmetic. 
+ 
+ Expressions (or "lists") with a length greater than 1 are considered truthy.
 
 `true` examples:
 
@@ -302,7 +306,7 @@ Example usage in mixin:
       body
         pad(padding margin, 10px)
 
-yielding:
+Yielding:
 
       body {
         padding: 5px;
@@ -317,13 +321,15 @@ yielding:
 
 ### Conditional Assignment: ?= :=
 
-The conditional assignment operator `?=` (aliased as `:=`) lets us define variables without clobbering old values (when present). This operator expands to an `is defined` binary operation within a ternary, for example the following are equivalent:
+The conditional assignment operator `?=` (aliased as `:=`) lets us define variables without clobbering old values (if present). This operator expands to an `is defined` binary operation within a ternary. 
+
+For example, the following are equivalent:
 
     color := white
     color ?= white
     color = color is defined ? color : white
 
-For example when using `=` we simply re-assign:
+When using plain `=`, we simply reassign:
 
     color = white
     color = black
@@ -331,7 +337,7 @@ For example when using `=` we simply re-assign:
     color
     // => black
 
-However when using `?=` our second attempt fails since the variable is already defined:
+But when using `?=`, our second attempt fails (since the variable is already defined):
 
     color = white
     color ?= black
@@ -352,12 +358,12 @@ Stylus provides a binary operator named `is a` used to type check.
     15 is a 'rgba'
     // => false
 
-Alternatively we could use the `type()` BIF:
+Alternatively, we could use the `type()` BIF:
 
     type(#fff) == 'rgba'
     // => true                                                                            
 
-'color' is the one special-case, evaluating to true when the
+**Note:** `color` is the only special-case, evaluating to `true` when the
 left-hand operand is an `RGBA` or `HSLA` node.
 
 ### Variable Definition: is defined
@@ -374,7 +380,7 @@ This pseudo binary operator does not accept a right-hand operator, and does _not
     #fff is defined
     // => 'invalid "is defined" check on non-variable #fff'
 
-Alternatively one can use the `lookup(name)` built-in function to do this, or to perform dynamic lookups:
+Alternatively, one can use the `lookup(name)` built-in function to do this—or to perform dynamic lookups:
 
     name = 'blue'
     lookup('light-' + name)
@@ -390,13 +396,13 @@ This operator is essential, as an undefined identifier is still a truthy value.
       if ohnoes
         padding 5px
 
-_will_ yield the following css when undefined:
+_Will_ yield the following CSS when undefined:
 
     body {
       padding: 5px;
     }
 
-however this will be safe:
+However this will be safe:
 
     body
       if ohnoes is defined
@@ -404,7 +410,7 @@ however this will be safe:
 
 ## Ternary
 
-The ternary operator works as we would expect in most languages, being the only operator with three operands, the _condition_ expression, the _truth_ expression and the _false_ expression.
+The ternary operator works as we would expect in most languages. It's the only operator with three operands (the _condition_ expression, the _truth_ expression, and the _false_ expression).
 
     num = 15
     num ? unit(num, 'px') : 20px
@@ -425,12 +431,12 @@ The ternary operator works as we would expect in most languages, being the only
 
 ## Color Operations
 
- Operations on colors provide a terse, expressive way to alter components. For example we can operate on each RGB:
+ Operations on colors provide a terse, expressive way to alter components. For example, we can operate on each RGB:
  
     #0e0 + #0e0
     // => #0f0
 
- Another example is adjust the lightness value by adding or subtracting a percentage. To lighten a color we add, to darken we subtract.
+ Another example is adjust the lightness value by adding or subtracting a percentage. To lighten a color, add; to darken, subtract.
  
     #888 + 50%
     // => #c3c3c3
@@ -438,14 +444,14 @@ The ternary operator works as we would expect in most languages, being the only
     #888 - 50%
     // => #444
 
-  Adjust the hue is also possible by adding or subtracting with degrees, for example adding `50deg` to this red value, resulting in a yellow:
+  Adjust the hue is also possible by adding or subtracting with degrees. For example, adding `50deg` to this red value results in a yellow:
   
      #f00 + 50deg
      // => #ffd500
 
-  Values clamp appropriately, for example we can "spin" the hue 180 degrees, and if the current value is `320deg`, it will resolve to `140deg`.
+  Values clamp appropriately. For example, we can "spin" the hue 180 degrees, and if the current value is `320deg`, it will resolve to `140deg`.
 
-  We may also tweak several values at once, including the alpha by using `rgb()`, `rgba()`, `hsl()`, or `hsla()`:
+  We may also tweak several values at once (including the alpha) by using `rgb()`, `rgba()`, `hsl()`, or `hsla()`:
   
       #f00 - rgba(100,0,0,0.5)
       // => rgba(155,0,0,0.5)

data/vendor/docs/selectors.md

@@ -2,25 +2,25 @@
 
 ### Indentation
 
-Stylus is "pythonic" aka indentation-based. Whitespace is significant, so we substitute { and } with an _indent_, and an _outdent_ as shown below:
+Stylus is "pythonic" (i.e. indentation-based). Whitespace is significant, so we substitute `{` and `}` with an _indent_, and an _outdent_ as shown below:
 
     body
       color white
 
-which compiles to:
+Which compiles to:
 
     body {
       color: #fff;
     }
 
-Optionally if preferred we may utilize colons to separate properties and their values:
+If preferred, you can use colons to separate properties and values:
 
     body
       color: white
 
 ### Rule Sets
 
-Stylus, just like css allows you to define properties for several selectors at once through comma separation.
+Stylus, just like CSS, allows you to define properties for several selectors at once through comma separation.
 
     textarea, input
       border 1px solid #eee
@@ -31,20 +31,20 @@ The same can be done with a newline:
     input
       border 1px solid #eee
 
-both compiling to:
+Both compile to:
 
     textarea,
     input {
       border: 1px solid #eee;
     }
 
-The one exception to this rule, are selectors that look like properties, for example `foo bar baz` in the following may be a property, or a selector:
+**The only exception to this rule** are selectors that look like properties. For example, the following `foo bar baz` might be a property **or** a selector:
 
     foo bar baz
     > input
       border 1px solid
 
-so for this reason, or if simply preferred we may trail with a comma:
+So for this reason (or simply if preferred), we may trail with a comma:
 
     foo bar baz,
     form input,
@@ -53,7 +53,7 @@ so for this reason, or if simply preferred we may trail with a comma:
 
 ### Parent Reference
 
-The `&` character references the parent selector(s). In the example below our two selectors `textarea`, and `input` both alter the `color` on the `:hover` pseudo selector. 
+The `&` character references the parent selector(s). In the example below our two selectors (`textarea` and `input`) both alter the `color` on the `:hover` pseudo selector. 
 
     textarea
     input
@@ -61,7 +61,7 @@ The `&` character references the parent selector(s). In the example below our tw
       &:hover
         color #000
 
-compiles to:
+Compiles to:
 
     textarea,
     input {
@@ -72,7 +72,7 @@ compiles to:
       color: #000;
     }
 
-below is an example providing a simple `2px` border for internet exploder utilizing the parent reference within a mixin:
+Below is an example providing a simple `2px` border for Internet Exploder utilizing the parent reference within a mixin:
 
       box-shadow()
         -webkit-box-shadow arguments
@@ -87,7 +87,7 @@ below is an example providing a simple `2px` border for internet exploder utiliz
         #login
           box-shadow 1px 1px 3px #eee
 
-yielding:
+Yielding:
 
       body #login {
         -webkit-box-shadow: 1px 1px 3px #eee;
@@ -102,7 +102,7 @@ yielding:
 
 ### Disambiguation
 
-Expressions such as `padding - n` could be interpreted both as a subtraction operation, as well as a property with an unary minus. To disambiguate we can wrap the expression with parens:
+Expressions such as `padding - n` could be interpreted both as a subtraction operation, as well as a property with an unary minus. To disambiguate, wrap the expression with parens:
 
     pad(n)
       padding (- n)
@@ -110,22 +110,24 @@ Expressions such as `padding - n` could be interpreted both as a subtraction ope
     body
       pad(5px)
 
-compiles to:
+Compiles to:
 
     body {
       padding: -5px;
     }
 
-however this is only true in functions, since functions act both as mixins, or calls with return values. For example this is fine, and will yield the same results as above:
+However, this is only true in functions (since functions act both as mixins, or calls with return values). 
+
+For example, the following is fine (and yields the same results as above):
 
     body
       padding -5px
 
-Have weird property values that Stylus cannot process? `unquote()` can help you out:
+Have weird property values that Stylus can't process? `unquote()` can help you out:
 
     filter unquote('progid:DXImageTransform.Microsoft.BasicImage(rotation=1)')
 
-yields:
+Yields:
 
     filter progid:DXImageTransform.Microsoft.BasicImage(rotation=1)
     

data/vendor/docs/textmate.md

@@ -1,4 +1,4 @@
 
 ## TextMate Bundle
 
- Stylus ships with a TextMate bundle, located within `./editors`. To install simply execute `make install-bundle`, or place `./editors/Stylus.tmbundle` in the appropriate location.
+ Stylus ships with a TextMate bundle, located within `./editors`. To install, simply execute `make install-bundle`, or place `./editors/Stylus.tmbundle` in the appropriate location.

data/vendor/docs/vargs.md

@@ -1,10 +1,10 @@
 
 ## Rest Parameters
 
- Stylus supports rest parameters in the form of `name...`. These params consume the remaining arguments passed to a mixin or function. This is useful for example when utilizing the implicit function call support to apply vendor prefixes like `-webkit` or `-moz`.
+ Stylus supports rest parameters in the form of `name...`. These params consume the remaining arguments passed to a mixin or function. This is useful when utilizing (for example) the implicit function call support to apply vendor prefixes like `-webkit` or `-moz`.
  
 
-In the example below we consume all the arguments passed and simply apply them to multiple properties.
+In the example below, we consume all the arguments passed, and simply apply them to multiple properties.
 
      box-shadow(args...)
        -webkit-box-shadow args
@@ -14,7 +14,7 @@ In the example below we consume all the arguments passed and simply apply them t
      #login
        box-shadow 1px 2px 5px #eee
 
-yielding:
+Yielding:
 
       #login {
         -webkit-box-shadow: 1px 2px 5px #eee;
@@ -22,7 +22,7 @@ yielding:
         box-shadow: 1px 2px 5px #eee;
       }
 
-If we wanted to peek at a specific argument, for example the x-offset we could simply use `args[0]`, or for example we may wish to re-define the mixin:
+If we wanted to peek at a specific argument—say, `x-offset`—we could simply use `args[0]`. Or, we may wish to redefine the mixin:
 
         box-shadow(offset-x, args...)
           got-offset-x offset-x
@@ -33,7 +33,7 @@ If we wanted to peek at a specific argument, for example the x-offset we could s
         #login
           box-shadow 1px 2px 5px #eee
 
-yielding:
+Yielding:
 
         #login {
           got-offset-x: 1px;
@@ -44,9 +44,9 @@ yielding:
 
 ### arguments
 
-  The `arguments` variable is injected into mixin and function bodies, containing the exact expression passed. This is useful for several reasons, primarily for vendor support, as you get the _exact_ expression, commas and all.
+  The `arguments` variable is injected into mixin and function bodies, containing the exact expression passed. This is useful for several reasons (especially vendor support) as you get the _exact_ expression, commas and all.
 
-  For example, if we use a rest param, the comma is simply consumed since it is an expression delimiter:
+  For example, if we use a rest param, the comma is consumed (since it is an expression delimiter):
   
       box-shadow(args...)
         -webkit-box-shadow args
@@ -56,7 +56,7 @@ yielding:
       #login
         box-shadow #ddd 1px 1px, #eee 2px 2px 
 
-yielding slightly unexpected results:
+Yielding undesired results:
 
       #login {
         -webkit-box-shadow: #ddd 1px 1px #eee 2px 2px;
@@ -74,7 +74,7 @@ Let's redefine the mixin using `arguments`:
       body
         box-shadow #ddd 1px 1px, #eee 2px 2px
 
-now yielding the desired result:
+Now, yielding the desired result:
 
       body {
         -webkit-box-shadow: #ddd 1px 1px, #eee 2px 2px;

data/vendor/docs/variables.md

@@ -8,7 +8,7 @@ We may assign expressions to variables and use them throughout our stylesheet:
      body
        font font-size Arial, sans-serif
 
-compiles to:
+Compiles to:
 
      body {
        font: 14px Arial, sans-serif;
@@ -22,13 +22,13 @@ Variables can even consist of an expression list:
     body
       font font sans-serif
 
-compiles to:
+Compiles to:
 
     body {
       font: 14px "Lucida Grande", Arial sans-serif;
     }
 
-identifiers (variable names, functions, etc) may also include the `$` character, for example:
+Identifiers (variable names, functions, etc.) may also include the `$` character. For example:
 
     $font-size = 14px
     body {
@@ -38,7 +38,7 @@ identifiers (variable names, functions, etc) may also include the `$` character,
 ## Property Lookup
 
  Another cool feature unique to Stylus is the ability to reference
- properties defined _without_ assigning their values to variables. A great example of this is the logic required for vertically and horizontally center an element, which is typically done by using percentages and negative margins as shown:
+ properties defined _without_ assigning their values to variables. A great example of this is the logic required for vertically and horizontally center an element (typically done using percentages and negative margins, as follows):
 
      #logo
        position: absolute
@@ -49,7 +49,7 @@ identifiers (variable names, functions, etc) may also include the `$` character,
        margin-left: -(w / 2)
        margin-top: -(h / 2)
 
-  Instead of assigning the variables `w` and `h` we can simply prepend the `@`
+  Instead of assigning the variables `w` and `h`, we can simply prepend the `@`
   character to the property name to access the value:
 
      #logo
@@ -61,7 +61,7 @@ identifiers (variable names, functions, etc) may also include the `$` character,
        margin-left: -(@width / 2)
        margin-top: -(@height / 2)
 
-  Another useful use-case is conditionally defining properties based on the existence of others within mixins. In the following example we apply a default `z-index` of `1`, but _only_ if `z-index` was not previously specified.
+  Another use-case is conditionally defining properties within mixins based on the existence of others . In the following example, we apply a default `z-index` of `1`—but _only_ if `z-index` was not previously specified:
 
       position()
         position: arguments
@@ -74,7 +74,7 @@ identifiers (variable names, functions, etc) may also include the `$` character,
       #logo2
         position: absolute
 
-  Property lookup will "bubble" up the stack until found, or return `null` if the property cannot be resolved. In the following example `@color` will resolve to `blue`.
+  Property lookup will "bubble up" the stack until found, or return `null` if the property cannot be resolved. In the following example, `@color` will resolve to `blue`:
   
       body
         color: red

data/vendor/lib/nodes/extend.js

@@ -29,6 +29,17 @@ var Extend = module.exports = function Extend(selector){
 
 Extend.prototype.__proto__ = Node.prototype;
 
+/**
+ * Return a clone of this node.
+ * 
+ * @return {Node}
+ * @api public
+ */
+
+Extend.prototype.clone = function(){
+  return new Extend(this.selector);
+};
+
 /**
  * Return `@extend selector`.
  *

data/vendor/lib/renderer.js

@@ -10,6 +10,7 @@
  */
 
 var Parser = require('./parser')
+  , EventEmitter = require('events').EventEmitter
   , Compiler = require('./visitor/compiler')
   , Evaluator = require('./visitor/evaluator')
   , Normalizer = require('./visitor/normalizer')
@@ -18,6 +19,12 @@ var Parser = require('./parser')
   , path = require('path')
   , join = path.join;
 
+/**
+ * Expose `Renderer`.
+ */
+
+module.exports = Renderer;
+
 /**
  * Initialize a new `Renderer` with the given `str` and `options`.
  *
@@ -26,7 +33,7 @@ var Parser = require('./parser')
  * @api public
  */
 
-var Renderer = module.exports = function Renderer(str, options) {
+function Renderer(str, options) {
   options = options || {};
   options.globals = {};
   options.functions = {};
@@ -37,6 +44,12 @@ var Renderer = module.exports = function Renderer(str, options) {
   this.str = str;
 };
 
+/**
+ * Inherit from `EventEmitter.prototype`.
+ */
+
+Renderer.prototype.__proto__ = EventEmitter.prototype;
+
 /**
  * Parse and evaluate AST, then callback `fn(err, css, js)`.
  *
@@ -61,10 +74,10 @@ Renderer.prototype.render = function(fn){
 
     // compile
     var compiler = new Compiler(ast, this.options)
-      , css = compiler.compile()
-      , js = compiler.js;
+      , css = compiler.compile();
 
-    fn(null, css, js);
+    this.emit('end', css);
+    fn(null, css);
   } catch (err) {
     var options = {};
     options.input = err.input || this.str;

data/vendor/lib/stylus.js

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

data/vendor/lib/visitor/evaluator.js

@@ -772,7 +772,7 @@ Evaluator.prototype.invokeBuiltin = function(fn, args){
   }
 
   // Invoke the BIF
-  var body = fn.apply(this, args);
+  var body = nodes.cast(fn.apply(this, args));
 
   // Always wrapping allows js functions
   // to return several values with a single

data/vendor/package.json

@@ -1,6 +1,6 @@
 {   "name": "stylus"
   , "description": "Robust, expressive, and feature-rich CSS superset"
-  , "version": "0.22.6"
+  , "version": "0.23.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/dumb.css

@@ -0,0 +1,10 @@
+body {
+  color: #f00;
+  color: #008000;
+  color: #00f;
+}
+body {
+  color: #f00;
+  color: #008000;
+  color: #00f;
+}

data/vendor/test/cases/dumb.styl

@@ -0,0 +1,11 @@
+list = red green blue
+no-colors = false
+
+body
+  color: color for color in list if length(list) > 2 unless no-colors
+
+mixin()
+  color: color for color in list if length(list) > 2 unless no-colors
+
+body
+  mixin()

data/vendor/testing/test.js

@@ -20,7 +20,11 @@ stylus(str)
   .define('string', 'some string')
   .define('number', 15.5)
   .define('some-bool', true)
-  .define('list', ['Helvetica Neue', 'Helvetica', 'sans-serif'])
+  .define('list', function(){
+    return function(){
+      return ['Helvetica Neue', 'Helvetica', 'sans-serif']
+    }
+  })
   .render(function(err, css, js){
   if (err) throw err;
   process.stdout.write(css);

data/vendor/testing/test.styl

@@ -1,4 +1,6 @@
 
+val = list()
+p(val)
 
 // 
 // obj = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus-source
 version: !ruby/object:Gem::Version
-  version: 0.22.6
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies: []
 description: Robust, expressive, and feature-rich CSS superset. This gem packages
   up stylus for use with the stylus gem.
@@ -328,6 +328,8 @@ files:
 - vendor/test/cases/css.selectors.styl
 - vendor/test/cases/css.whitespace.css
 - vendor/test/cases/css.whitespace.styl
+- vendor/test/cases/dumb.css
+- vendor/test/cases/dumb.styl
 - vendor/test/cases/eol-escape.css
 - vendor/test/cases/eol-escape.styl
 - vendor/test/cases/escape.css