stylus-source 0.22.3 → 0.22.4

data/VERSION

@@ -1 +1 @@
-0.22.3
+0.22.4

data/vendor/History.md

@@ -1,4 +1,10 @@
 
+0.22.4 / 2012-01-11 
+==================
+
+  * Fixed __@extends__ inheritance bug. Closes #499
+  * Fixed 'lineno' global leak due to missing `new` [teppeis]
+
 0.22.3 / 2012-01-11 
 ==================
 

data/vendor/lib/nodes/boolean.js

@@ -75,7 +75,7 @@ Boolean.prototype.__defineGetter__('isFalse', function(){
  */
 
 Boolean.prototype.negate = function(){
-  return Boolean(!this.val);
+  return new Boolean(!this.val);
 };
 
 /**

data/vendor/lib/nodes/selector.js

@@ -21,6 +21,7 @@ var Block = require('./block')
 
 var Selector = module.exports = function Selector(segs){
   Node.call(this);
+  this.inherits = true;
   this.segments = segs;
 };
 

data/vendor/lib/parser.js

@@ -95,6 +95,7 @@ var Parser = module.exports = function Parser(str, options) {
   this.state = ['root'];
   this.stash = [];
   this.parens = 0;
+  this.css = 0;
   this.state.pop = function(){
     self.prevState = [].pop.call(this);
   };
@@ -573,13 +574,13 @@ Parser.prototype = {
   block: function(node, scope) {
     var delim
       , stmt
-      , _ = this.css
       , block = this.parent = new nodes.Block(this.parent, node);
 
     if (false === scope) block.scope = false;
 
     // css-style
-    if (this.css = this.accept('{')) {
+    if (this.accept('{')) {
+      this.css++;
       delim = '}';
       this.skipWhitespace();
     } else {
@@ -608,7 +609,7 @@ Parser.prototype = {
       this.skipWhitespace();
       this.expect('}');
       this.skipSpaces();
-      this.css = _;
+      this.css--;
     } else {
       this.expect('outdent');
     }
@@ -786,13 +787,13 @@ Parser.prototype = {
    
   keyframes: function() {
     var pos
-      , _ = this.css
       , tok = this.expect('keyframes')
       , keyframes = new nodes.Keyframes(this.id(), tok.val)
       , vals = [];
 
     // css-style
-    if (this.css = this.accept('{')) {
+    if (this.accept('{')) {
+      this.css++;
       this.skipWhitespace();
     } else {
       this.expect('indent');
@@ -837,7 +838,7 @@ Parser.prototype = {
     if (this.css) {
       this.skipWhitespace();
       this.expect('}');
-      this.css = _;
+      this.css--;
     } else {
       this.expect('outdent');
     }

data/vendor/lib/stylus.js

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

data/vendor/lib/visitor/compiler.js

@@ -432,9 +432,13 @@ Compiler.prototype.compileSelectors = function(arr){
   function compile(arr, i) {
     if (i) {
       arr[i].forEach(function(selector){
-        buf.unshift(selector.val);
-        compile(arr, i - 1);
-        buf.shift();
+        if (selector.inherits) {
+          buf.unshift(selector.val);
+          compile(arr, i - 1);
+          buf.shift();
+        } else {
+          selectors.push(selector.val);
+        }
       });
     } else {
       arr[0].forEach(function(selector){

data/vendor/lib/visitor/normalizer.js

@@ -159,6 +159,7 @@ Normalizer.prototype.extend = function(group, selectors){
     selectors.forEach(function(selector){
       var node = new nodes.Selector;
       node.val = selector;
+      node.inherits = false;
       groups.forEach(function(group){
         self.extend(group, selectors);
         group.push(node);

data/vendor/package.json

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

@@ -0,0 +1,14 @@
+ul li a,
+a.button,
+input[type=submit] {
+  color: #00f;
+}
+html body h1,
+html body .title,
+html body .huge-title {
+  font-size: 22px;
+  color: #000;
+}
+html body .huge-title {
+  font-size: 33px;
+}

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

@@ -0,0 +1,20 @@
+
+ul
+  li
+    a
+      color: blue
+
+a.button
+input[type=submit]
+  @extends ul li a
+
+html
+  body
+    h1
+      font-size: 22px
+      color: black
+    .title
+      @extends html body h1
+    .huge-title
+      font-size: 33px
+      @extends html body .title

data/vendor/testing/index.js

@@ -5,7 +5,7 @@
 
 var stylus = require('../')
   , fs = require('fs')
-  , path = 'testing/extend.styl'
+  , path = 'testing/test.styl'
   , str = fs.readFileSync(path, 'utf8');
 
 stylus(str)

data/vendor/testing/test.styl

@@ -1,42 +1 @@
 
-@keyframes something
-  // foo
-  from
-    // foo
-    background: white
-  // foo
-  to
-    background: black
-
-// block @content, mixins with blocks
-// media bubbling
-// @extend
-
-// .sidebar {
-//   width: 300px;
-//   @media screen and (orientation: landscape) {
-//     &.right {
-//       width: 500px;
-//     }
-//   }
-// 
-//   @media print {
-//     display: none;
-//   }
-// }
-
-// @media screen {
-//   .sidebar {
-//     @media (orientation: landscape) {
-//       .something {
-//         width: 500px;
-//       }
-//     }
-//   }
-// }
-
-// @media normal {
-//   body {
-//     stuff: 'here';
-//   }
-// }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus-source
 version: !ruby/object:Gem::Version
-  version: 0.22.3
+  version: 0.22.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000 Z
+date: 2012-01-15 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.
@@ -600,6 +600,8 @@ files:
 - vendor/test/cases/regression.484.styl
 - vendor/test/cases/regression.498.css
 - vendor/test/cases/regression.498.styl
+- vendor/test/cases/regression.499.css
+- vendor/test/cases/regression.499.styl
 - vendor/test/cases/regression.503.css
 - vendor/test/cases/regression.503.styl
 - vendor/test/cases/regression.504.css
@@ -646,7 +648,6 @@ files:
 - vendor/test/images/squirrel.jpeg
 - vendor/test/images/tux.png
 - vendor/test/run.js
-- vendor/testing/extend.styl
 - vendor/testing/index.js
 - vendor/testing/test.styl
 homepage: https://github.com/railsjedi/ruby-stylus-source

data/vendor/testing/extend.styl

@@ -1,43 +0,0 @@
-
-button
-  padding: 10px
-  border: 1px solid #eee
-  font-size: 12px
-
-a.button
-input[type=submit]
-  @extends button
-
-.button
-  @extends a.button
-
-// TODO: with multiple definitions of the .message should work... etc
-
-// .error
-//   border: 1px #f00
-// 
-// .serious-error
-//   @extend .error
-//   border-width: 3px
-// 
-// .critical-error
-//   @extend .serious-error
-//   position: fixed
-//   top: 10%
-//   left: 10%
-
-// TODO: ^ should add .critical-error to .error
-
-// #content
-//   .dialog
-//     h1
-//       font-size: 22px
-//     p
-//       padding: 5px
-
-// #content
-//   .window
-//     h1
-//       @extends #content .dialog h1
-
-// TODO: ^ doesn't compile without properties