stylus-source 0.19.8 → 0.20.0

data/VERSION

@@ -1 +1 @@
-0.19.8
+0.20.0

data/vendor/History.md

@@ -1,4 +1,10 @@
 
+0.20.0 / 2011-12-11 
+==================
+
+  * Added `--include-css` to literally include imported CSS. Closes #448
+  * Fixed coercion bug with expression. Closes #480
+
 0.19.8 / 2011-12-01 
 ==================
 

data/vendor/bin/stylus

@@ -88,6 +88,12 @@ var plugins = [];
 
 var urlFunction = false;
 
+/**
+ * Include css on import.
+ */
+
+var includeCSS = false;
+
 /**
  * Usage docs.
  */
@@ -119,6 +125,7 @@ var usage = [
   , '                            can be used by the FireStylus Firebug plugin'
   , '    -l, --line-numbers      Emits comments in the generated css'
   , '                            indicating the corresponding stylus line'
+  , '    --include-css           Include regular css on @import'
   , '    -V, --version           Display the version of stylus'
   , '    -h, --help              Display help information'
   , ''
@@ -179,6 +186,9 @@ while (args.length) {
       if (!name) throw new Error('help <property> required');
       help(name);
       break;
+    case '--include-css':
+      includeCSS = true;
+      break;
     case '-i':
     case '--repl':
     case '--interactive':
@@ -472,6 +482,7 @@ function compileStdio() {
   process.stdin.on('end', function(){
     // Compile to css
     var style = stylus(str, options);
+    if (includeCSS) style.set('include css', true);
     usePlugins(style);
     style.render(function(err, css){
       if (err) throw err;
@@ -509,6 +520,7 @@ function compileFile(file) {
         options.filename = file;
         options._imports = [];
         var style = stylus(str, options);
+        if (includeCSS) style.set('include css', true);
         usePlugins(style);
         style.render(function(err, css){
           watchImports(file, options._imports);

data/vendor/lib/nodes/unit.js

@@ -83,7 +83,7 @@ Unit.prototype.clone = function(){
  */
 
 Unit.prototype.operate = function(op, right){
-  var type = this.type || right.type;
+  var type = this.type || right.first.type;
 
   // swap color
   if ('rgba' == right.nodeName || 'hsla' == right.nodeName) {

data/vendor/lib/stylus.js

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

data/vendor/package.json

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

@@ -0,0 +1,9 @@
+body {
+  foo: 25px;
+  foo: 25px;
+}
+body {
+  foo: 10em;
+  foo: 10em;
+  foo: 10px;
+}

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

@@ -0,0 +1,12 @@
+n = 5px
+
+body
+  foo: n * 5
+  foo: 5 * n
+
+n = 5em 5px 5
+
+body
+  foo: n * 2
+  foo: 2 * n
+  foo: 2px * 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,14 +1,9 @@
 
-only = webkit
+#example
+  width: 400px
 
 body
-  foo: webkit in only
-  foo: (webkit in only)
-  foo: true or false
-  foo: (webkit in only) or false
-  foo: (foo bar baz) or false
-  foo: (foo (bar ((baz)))) or false
-  foo: (foo) or false
-  foo: ((foo)) or false
-  foo: (0) or false
-  foo: (1) or false
+  width: 200px
+  #prompt
+    position: absolute
+    width: @width

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus-source
 version: !ruby/object:Gem::Version
-  version: 0.19.8
+  version: 0.20.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 Z
+date: 2011-12-12 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.
@@ -567,6 +567,8 @@ files:
 - vendor/test/cases/regression.472.styl
 - vendor/test/cases/regression.475.css
 - vendor/test/cases/regression.475.styl
+- vendor/test/cases/regression.480.css
+- vendor/test/cases/regression.480.styl
 - vendor/test/cases/reset.css
 - vendor/test/cases/reset.styl
 - vendor/test/cases/rule.charset.css
@@ -609,15 +611,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,4 +0,0 @@
-
-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,4 +0,0 @@
-
-/*!
- * foo
- */

data/vendor/testing/vendor.styl

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