stylus-source 0.22.1 → 0.22.2

data/VERSION

@@ -1 +1 @@
-0.22.1
+0.22.2

data/vendor/History.md

@@ -1,4 +1,10 @@
 
+0.22.2 / 2012-01-08 
+==================
+
+  * Added: allow newlines in place of commas for keyframes
+  * Fixed: skip comment newlines between keyframe positions. Closes #504
+
 0.22.1 / 2012-01-08 
 ==================
 

data/vendor/lib/parser.js

@@ -314,6 +314,15 @@ Parser.prototype = {
       this.next();
   },
 
+  /**
+   * Consume newlines.
+   */
+
+  skipNewlines: function() {
+    while ('newline' == this.peek().type)
+      this.next();
+  },
+
   /**
    * Consume spaces.
    */
@@ -789,6 +798,8 @@ Parser.prototype = {
       this.expect('indent');
     }
 
+    this.skipNewlines();
+
     while (pos = this.accept('unit') || this.accept('ident')) {
       // from | to
       if ('ident' == pos.type) {
@@ -810,7 +821,7 @@ Parser.prototype = {
       vals.push(pos);
 
       // ','
-      if (this.accept(',')) continue;
+      if (this.accept(',') || this.accept('newline')) continue;
 
       // block
       this.state.push('keyframe');
@@ -819,6 +830,7 @@ Parser.prototype = {
       vals = [];
       this.state.pop();
       if (this.css) this.skipWhitespace();
+      this.skipNewlines();
     }
 
     // css-style

data/vendor/lib/stylus.js

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

data/vendor/package.json

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

data/vendor/test/cases/keyframes.newlines.css

@@ -0,0 +1,45 @@
+@-moz-keyframes something {
+  0%, 50%, 100% {
+    background: #fff;
+  }
+
+  100% {
+    background: #000;
+  }
+}
+@-webkit-keyframes something {
+  0%, 50%, 100% {
+    background: #fff;
+  }
+
+  100% {
+    background: #000;
+  }
+}
+@-o-keyframes something {
+  0%, 50%, 100% {
+    background: #fff;
+  }
+
+  100% {
+    background: #000;
+  }
+}
+@-ms-keyframes something {
+  0%, 50%, 100% {
+    background: #fff;
+  }
+
+  100% {
+    background: #000;
+  }
+}
+@keyframes something {
+  0%, 50%, 100% {
+    background: #fff;
+  }
+
+  100% {
+    background: #000;
+  }
+}

data/vendor/test/cases/keyframes.newlines.styl

@@ -0,0 +1,7 @@
+@keyframes something
+  from
+  50%
+  100%
+    background: white
+  to
+    background: black

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

@@ -0,0 +1,65 @@
+@-moz-keyframes tada {
+  0% {
+    transform: scale(1);
+  }
+
+  10%, 20% {
+    transform: scale(0.9) rotate(-3deg);
+  }
+
+  0%, 100% {
+    background: scale(0.5);
+  }
+}
+@-webkit-keyframes tada {
+  0% {
+    transform: scale(1);
+  }
+
+  10%, 20% {
+    transform: scale(0.9) rotate(-3deg);
+  }
+
+  0%, 100% {
+    background: scale(0.5);
+  }
+}
+@-o-keyframes tada {
+  0% {
+    transform: scale(1);
+  }
+
+  10%, 20% {
+    transform: scale(0.9) rotate(-3deg);
+  }
+
+  0%, 100% {
+    background: scale(0.5);
+  }
+}
+@-ms-keyframes tada {
+  0% {
+    transform: scale(1);
+  }
+
+  10%, 20% {
+    transform: scale(0.9) rotate(-3deg);
+  }
+
+  0%, 100% {
+    background: scale(0.5);
+  }
+}
+@keyframes tada {
+  0% {
+    transform: scale(1);
+  }
+
+  10%, 20% {
+    transform: scale(0.9) rotate(-3deg);
+  }
+
+  0%, 100% {
+    background: scale(0.5);
+  }
+}

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

@@ -0,0 +1,12 @@
+@keyframes tada
+  // something
+  0%
+    transform: scale(1)
+  // foo
+  // bar
+  10%, 20%
+    transform: scale(.9) rotate(-3deg)
+  // bar
+  // baz
+  from, to
+    background: scale(.5)

data/vendor/testing/test.styl

@@ -1,12 +1,12 @@
 
-@keyframes tada
-  0%
-    transform: scale(1)
-  10%, 20%
-    transform: scale(.9) rotate(-3deg)
-  from, to
-    background: scale(.5)
-
+@keyframes something
+  // foo
+  from
+    // foo
+    background: white
+  // foo
+  to
+    background: black
 
 // block @content, mixins with blocks
 // media bubbling

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stylus-source
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 67
   prerelease: false
   segments: 
   - 0
   - 22
-  - 1
-  version: 0.22.1
+  - 2
+  version: 0.22.2
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -436,6 +436,8 @@ files:
 - vendor/test/cases/keyframes.fabrication.defaults.css
 - vendor/test/cases/keyframes.fabrication.defaults.styl
 - vendor/test/cases/keyframes.fabrication.styl
+- vendor/test/cases/keyframes.newlines.css
+- vendor/test/cases/keyframes.newlines.styl
 - vendor/test/cases/keyframes.styl
 - vendor/test/cases/kwargs.css
 - vendor/test/cases/kwargs.styl
@@ -608,6 +610,8 @@ files:
 - vendor/test/cases/regression.484.styl
 - vendor/test/cases/regression.503.css
 - vendor/test/cases/regression.503.styl
+- vendor/test/cases/regression.504.css
+- vendor/test/cases/regression.504.styl
 - vendor/test/cases/reset.css
 - vendor/test/cases/reset.styl
 - vendor/test/cases/rule.charset.css