stylus-source 0.19.2 → 0.19.3

data/VERSION

@@ -1 +1 @@
-0.19.2
+0.19.3

data/vendor/History.md

@@ -1,4 +1,11 @@
 
+0.19.3 / 2011-11-17 
+==================
+
+  * Added "include css" setting (need docs) to literally include imported css. Closes #448
+  * Added EOL escape. Related to #195
+  * Fixed tab support in lexical analysis (trailing colors etc). Closes #460
+
 0.19.2 / 2011-11-09 
 ==================
 

data/vendor/lib/lexer.js

@@ -53,7 +53,7 @@ var units = [
  * Unit RegExp.
  */
 
-var unit = new RegExp('^(-)?(\\d+\\.\\d+|\\d+|\\.\\d+)(' + units + ')? *');
+var unit = new RegExp('^(-)?(\\d+\\.\\d+|\\d+|\\.\\d+)(' + units + ')?[ \\t]*');
 
 /**
  * Initialize a new `Lexer` with the given `str` and `options`.
@@ -65,11 +65,13 @@ var unit = new RegExp('^(-)?(\\d+\\.\\d+|\\d+|\\.\\d+)(' + units + ')? *');
 
 var Lexer = module.exports = function Lexer(str, options) {
   options = options || {};
-  this.str = str.replace(/\r\n?/g, '\n');
   this.stash = [];
   this.indentStack = [];
   this.indentRe = null;
   this.lineno = 1;
+  this.str = str
+    .replace(/\r\n?/g, '\n')
+    .replace(/\\ *\n/g, ' ');
 };
 
 /**
@@ -228,12 +230,12 @@ Lexer.prototype = {
   },
 
   /**
-   * ';' ' '*
+   * ';' [ \t]*
    */
 
   sep: function() {
     var captures;
-    if (captures = /^; */.exec(this.str)) {
+    if (captures = /^;[ \t]*/.exec(this.str)) {
       this.skip(captures);
       return new Token(';');
     }
@@ -245,7 +247,7 @@ Lexer.prototype = {
 
   space: function() {
     var captures;
-    if (captures = /^( +)/.exec(this.str)) {
+    if (captures = /^([ \t]+)/.exec(this.str)) {
       this.skip(captures);
       return new Token('space');
     }
@@ -257,7 +259,7 @@ Lexer.prototype = {
    
   escaped: function() {
     var captures;
-    if (captures = /^\\(.) */.exec(this.str)) {
+    if (captures = /^\\(.)[ \t]*/.exec(this.str)) {
       var c = captures[1];
       this.skip(captures);
       return new Token('ident', new nodes.Literal(c));
@@ -271,7 +273,7 @@ Lexer.prototype = {
   literal: function() {
     // HACK attack !!!
     var captures;
-    if (captures = /^@css *\{/.exec(this.str)) {
+    if (captures = /^@css[ \t]*\{/.exec(this.str)) {
       this.skip(captures);
       var c
         , braces = 1
@@ -296,7 +298,7 @@ Lexer.prototype = {
   
   important: function() {
     var captures;
-    if (captures = /^!important */.exec(this.str)) {
+    if (captures = /^!important[ \t]*/.exec(this.str)) {
       this.skip(captures);
       return new Token('ident', new nodes.Literal('!important'));
     }
@@ -321,7 +323,7 @@ Lexer.prototype = {
   
   paren: function() {
     var captures;
-    if (captures = /^([()]) */.exec(this.str)) {
+    if (captures = /^([()])[ \t]*/.exec(this.str)) {
       var paren = captures[1];
       this.skip(captures);
       if (')' == paren) this.isURL = false;
@@ -335,7 +337,7 @@ Lexer.prototype = {
   
   null: function() {
     var captures;
-    if (captures = /^(null)\b */.exec(this.str)) {
+    if (captures = /^(null)\b[ \t]*/.exec(this.str)) {
       this.skip(captures);
       return new Token('null', nodes.null);
     }
@@ -352,7 +354,7 @@ Lexer.prototype = {
   
   keyword: function() {
     var captures;
-    if (captures = /^(return|if|else|unless|for|in)\b */.exec(this.str)) {
+    if (captures = /^(return|if|else|unless|for|in)\b[ \t]*/.exec(this.str)) {
       var keyword = captures[1];
       this.skip(captures);
       return new Token(keyword, keyword);
@@ -372,7 +374,7 @@ Lexer.prototype = {
   
   namedop: function() {
     var captures;
-    if (captures = /^(not|and|or|is a|is defined|isnt|is not|is)\b( *)/.exec(this.str)) {
+    if (captures = /^(not|and|or|is a|is defined|isnt|is not|is)\b([ \t]*)/.exec(this.str)) {
       var op = captures[1];
       this.skip(captures);
       op = alias[op] || op;
@@ -420,7 +422,7 @@ Lexer.prototype = {
   
   op: function() {
     var captures;
-    if (captures = /^([.]{2,3}|&&|\|\||[!<>=?:]=|\*\*|[-+*\/%]=?|[,=?:!~<>&\[\]])( *)/.exec(this.str)) {
+    if (captures = /^([.]{2,3}|&&|\|\||[!<>=?:]=|\*\*|[-+*\/%]=?|[,=?:!~<>&\[\]])([ \t]*)/.exec(this.str)) {
       var op = captures[1];
       this.skip(captures);
       op = alias[op] || op;
@@ -436,7 +438,7 @@ Lexer.prototype = {
   
   media: function() {
     var captures;
-    if (captures = /^@media *([^\/{\n]+)/.exec(this.str)) {
+    if (captures = /^@media[ \t]*([^\/{\n]+)/.exec(this.str)) {
       this.skip(captures);
       return new Token('media', captures[1].trim());
     }
@@ -448,7 +450,7 @@ Lexer.prototype = {
   
   scope: function() {
     var captures;
-    if (captures = /^@scope *([^\/{\n]+)/.exec(this.str)) {
+    if (captures = /^@scope[ \t]*([^\/{\n]+)/.exec(this.str)) {
       this.skip(captures);
       return new Token('scope', captures[1].trim());
     }
@@ -460,7 +462,7 @@ Lexer.prototype = {
   
   atrule: function() {
     var captures;
-    if (captures = /^@(import|(?:-(\w+)-)?keyframes|charset|font-face|page) */.exec(this.str)) {
+    if (captures = /^@(import|(?:-(\w+)-)?keyframes|charset|font-face|page)[ \t]*/.exec(this.str)) {
       this.skip(captures);
       var vendor = captures[2]
         , type = captures[1];
@@ -506,7 +508,7 @@ Lexer.prototype = {
   
   boolean: function() {
     var captures;
-    if (captures = /^(true|false)\b( *)/.exec(this.str)) {
+    if (captures = /^(true|false)\b([ \t]*)/.exec(this.str)) {
       var val = nodes.Boolean('true' == captures[1]);
       this.skip(captures);
       var tok = new Token('boolean', val);
@@ -521,7 +523,7 @@ Lexer.prototype = {
   
   function: function() {
     var captures;
-    if (captures = /^(-?[a-zA-Z$][-\w\d$]*)\(( *)/.exec(this.str)) {
+    if (captures = /^(-?[a-zA-Z$][-\w\d$]*)\(([ \t]*)/.exec(this.str)) {
       var name = captures[1];
       this.skip(captures);
       this.isURL = 'url' == name;
@@ -560,12 +562,12 @@ Lexer.prototype = {
     // figure out if we are using tabs or spaces
     } else {
       // try tabs
-      re = /^\n([\t]*) */;
+      re = /^\n([\t]*)[ \t]*/;
       captures = re.exec(this.str);
 
       // nope, try spaces
       if (captures && !captures[1].length) {
-        re = /^\n( *)/;
+        re = /^\n([ \t]*)/;
         captures = re.exec(this.str);
       }
 
@@ -633,7 +635,7 @@ Lexer.prototype = {
 
   string: function() {
     var captures;
-    if (captures = /^("[^"]*"|'[^']*') */.exec(this.str)) {
+    if (captures = /^("[^"]*"|'[^']*')[ \t]*/.exec(this.str)) {
       var str = captures[1]
         , quote = captures[0][0];
       this.skip(captures);
@@ -661,7 +663,7 @@ Lexer.prototype = {
   
   n: function() {
     var captures;
-    if (captures = /^#([a-fA-F0-9]{1}) */.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{1})[ \t]*/.exec(this.str)) {
       this.skip(captures);
       var n = parseInt(captures[1] + captures[1], 16)
         , color = new nodes.RGBA(n, n, n, 1);
@@ -676,7 +678,7 @@ Lexer.prototype = {
   
   nn: function() {
     var captures;
-    if (captures = /^#([a-fA-F0-9]{2}) */.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{2})[ \t]*/.exec(this.str)) {
       this.skip(captures);
       var n = parseInt(captures[1], 16)
         , color = new nodes.RGBA(n, n, n, 1);
@@ -691,7 +693,7 @@ Lexer.prototype = {
   
   rgb: function() {
     var captures;
-    if (captures = /^#([a-fA-F0-9]{3}) */.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{3})[ \t]*/.exec(this.str)) {
       this.skip(captures);
       var rgb = captures[1]
         , r = parseInt(rgb[0] + rgb[0], 16)
@@ -709,7 +711,7 @@ Lexer.prototype = {
   
   rgba: function() {
     var captures;
-    if (captures = /^#([a-fA-F0-9]{4}) */.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{4})[ \t]*/.exec(this.str)) {
       this.skip(captures);
       var rgb = captures[1]
         , r = parseInt(rgb[0] + rgb[0], 16)
@@ -728,7 +730,7 @@ Lexer.prototype = {
   
   rrggbb: function() {
     var captures;
-    if (captures = /^#([a-fA-F0-9]{6}) */.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{6})[ \t]*/.exec(this.str)) {
       this.skip(captures);
       var rgb = captures[1]
         , r = parseInt(rgb.substr(0, 2), 16)
@@ -746,7 +748,7 @@ Lexer.prototype = {
   
   rrggbbaa: function() {
     var captures;
-    if (captures = /^#([a-fA-F0-9]{8}) */.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{8})[ \t]*/.exec(this.str)) {
       this.skip(captures);
       var rgb = captures[1]
         , r = parseInt(rgb.substr(0, 2), 16)

data/vendor/lib/stylus.js

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

data/vendor/lib/visitor/evaluator.js

@@ -43,6 +43,7 @@ var Evaluator = module.exports = function Evaluator(root, options) {
   this.globals = options.globals || {};
   this.paths = options.paths || [];
   this.filename = options.filename;
+  this.includeCSS = options['include css'];
   this.paths.push(dirname(options.filename || '.'));
   this.stack.push(this.global = new Frame(root));
   this.warnings = options.warn;
@@ -572,7 +573,9 @@ Evaluator.prototype.visitImport = function(imported){
   var found
     , root = this.root
     , Parser = require('../parser')
-    , path = this.visit(imported.path).first;
+    , path = this.visit(imported.path).first
+    , includeCSS = this.includeCSS
+    , literal;
 
   this.return = _;
 
@@ -584,8 +587,13 @@ Evaluator.prototype.visitImport = function(imported){
   var name = path = path.string;
 
   // Literal
-  if (~path.indexOf('.css')) return imported;
-  if (!~path.indexOf('.styl')) path += '.styl';
+  if (~path.indexOf('.css')) {
+    literal = true;
+    if (!includeCSS) return imported;
+  }
+
+  // support optional .styl
+  if (!literal && !~path.indexOf('.styl')) path += '.styl';
 
   // Lookup
   found = utils.lookup(path, this.paths, this.filename);
@@ -604,8 +612,11 @@ Evaluator.prototype.visitImport = function(imported){
   this.importStack.push(found);
   nodes.filename = found;
 
-  var str = fs.readFileSync(found, 'utf8')
-    , block = new nodes.Block
+  var str = fs.readFileSync(found, 'utf8');
+  if (literal) return new nodes.Literal(str);
+
+  // parse
+  var block = new nodes.Block
     , parser = new Parser(str, utils.merge({ root: block }, this.options));
 
   try {

data/vendor/package.json

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

data/vendor/test/cases/eol-escape.css

@@ -0,0 +1,11 @@
+body {
+  foo: foo bar baz;
+  one: 0;
+  two: 1;
+  three: 2;
+}
+button {
+  padding: 1px 2px;
+  box-shadow: 0 -2px 2px #f00, 0 0 2px #f00, 0 0 5px #f00;
+  color: #f00;
+}

data/vendor/test/cases/eol-escape.styl

@@ -0,0 +1,27 @@
+
+list = foo \
+       bar \
+       baz
+
+map = (one 1) \
+      (two 2) \
+      (three 3)
+
+body
+  foo: list
+  for val, key in map
+    {val}: key
+
+foo( \
+  a, \
+  b)
+  padding: unit(a, px) \
+           unit(b, px)
+
+button
+  foo: 1 2
+  box-shadow: \
+    0 -2px 2px red, \  
+    0 0 2px red, \
+    0 0 5px red
+  color: red

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

@@ -0,0 +1,13 @@
+#top {
+  width: 500px;
+  height: 40px;
+}
+#bottom {
+  height: 40px;
+}
+body {
+  foo: bar #fff baz;
+}
+body {
+  foo: 1;
+}

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

@@ -0,0 +1,18 @@
+
+#top
+  width 		500px		
+  height 40px;	
+
+#bottom
+  height 40px		
+
+body	{	
+	foo	bar	#fff	baz
+}
+
+foo(	one)	{
+	foo:	one
+}
+
+body
+  foo(1)

data/vendor/testing/test.css

@@ -1,8 +1,4 @@
-#content{text-align:center}
-body{font:14px "Helvetica Neue";padding:30px;}
-body #dialog{z-index:20;background:#fff;padding:5px 20px;border-radius:10px;border:1px solid #eee;position:fixed;}
-body .tip{padding:10px 20px;background:#303030;border-radius:10px;color:#fff;font-size:.8em;text-shadow:-1px -1px 0 rgba(0,0,0,0.4);}
-body .tip.username-tip{position:fixed;}
-body .tip.username-tip canvas{position:absolute}
-body .tip.password-tip{position:fixed;}
-body .tip.password-tip canvas{position:absolute}
+
+body {
+  foo: bar;
+}

data/vendor/testing/test.js

@@ -16,6 +16,7 @@ stylus(str)
   // .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)

data/vendor/testing/test.styl

@@ -1,3 +1,5 @@
 
-#bin
-  background: green
+bools = true false
+
+body
+  foo: bools[1] is null ? bools[0] : bools[1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus-source
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.19.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2011-11-18 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.
@@ -315,6 +315,8 @@ files:
 - vendor/test/cases/css.selectors.styl
 - vendor/test/cases/css.whitespace.css
 - vendor/test/cases/css.whitespace.styl
+- vendor/test/cases/eol-escape.css
+- vendor/test/cases/eol-escape.styl
 - vendor/test/cases/escape.css
 - vendor/test/cases/escape.styl
 - vendor/test/cases/fontface.css
@@ -557,6 +559,8 @@ files:
 - vendor/test/cases/regression.440.styl
 - vendor/test/cases/regression.458.css
 - vendor/test/cases/regression.458.styl
+- vendor/test/cases/regression.460.css
+- vendor/test/cases/regression.460.styl
 - vendor/test/cases/reset.css
 - vendor/test/cases/reset.styl
 - vendor/test/cases/rule.charset.css