crass 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e719270a2f03c8171f158bb974f921f389fead1d
-  data.tar.gz: 70ec9d659187115cf1804d8df84f15009e753059
+  metadata.gz: 3371590f5953c99ef49044bb7866a70568707f5c
+  data.tar.gz: 16bab682ee608b24dda34b8181cf1a4733a9d9c5
 SHA512:
-  metadata.gz: c3063753119e9925cf7d81b1ee782d0aeb611ce8bbb1c14aa99e9a8421b67496a49966fff96d459945ecbde10f55589b60021dbb7f36ab49c34dab4c1a23c4dc
-  data.tar.gz: 26f18fe8034d8782c9c1156d4592006b11d097d29a995b843f6a15995c9ad13398fe7f2c086c74b7603828f281262f95bbab1cbb8c652603a67ebca9787bcaa0
+  metadata.gz: 77f57cca2304bf549e5ba35281364806634397b88ecdeda3310a1e38c17cff83346ef423db1b719b05c744281e4eedfbe85f5df4b9e5fb6883bf092efead5be2
+  data.tar.gz: 43d3a7ee5ae7670fffeb35c8843321a70d65447aea7f2ca8a650c8c772d2f8ad92804c20639137eae05296ad13a920a898f9735385d73d6811fdd026396c57fe

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.3
-  - 2.1.4
-  - 2.1.5
+  - 2.1.6
+  - 2.2.2
   - ruby-head

data/HISTORY.md

@@ -1,6 +1,14 @@
 Crass Change History
 ====================
 
+1.0.2 (2015-04-17)
+------------------
+
+* Fixed: An at-rule immediately followed by a `{}` simple block would have the
+  block (and subsequent tokens until a semicolon) incorrectly appended to its
+  prelude. This was super dumb and made me very sad.
+
+
 1.0.1 (2014-11-16)
 ------------------
 

data/lib/crass/parser.rb

@@ -133,7 +133,7 @@ module Crass
 
     # Consumes an at-rule and returns it.
     #
-    # 5.4.2. http://dev.w3.org/csswg/css-syntax-3/#consume-an-at-rule
+    # 5.4.2. http://dev.w3.org/csswg/css-syntax-3/#consume-at-rule
     def consume_at_rule(input = @tokens)
       rule = {}
 
@@ -142,15 +142,15 @@ module Crass
         rule[:prelude] = []
 
         while token = input.consume
-          case token[:node]
-          # Non-standard.
-          when :comment
+          node = token[:node]
+
+          if node == :comment # Non-standard.
             next
 
-          when :semicolon
+          elsif node == :semicolon
             break
 
-          when :'{'
+          elsif node === :'{'
             # Note: The spec says the block should _be_ the consumed simple
             # block, but Simon Sapin's CSS parsing tests and tinycss2 expect
             # only the _value_ of the consumed simple block here. I assume I'm
@@ -159,7 +159,7 @@ module Crass
             rule[:block] = consume_simple_block(input)[:value]
             break
 
-          when :simple_block && token[:start] == '{'
+          elsif node == :simple_block && token[:start] == '{'
             # Note: The spec says the block should _be_ the simple block, but
             # Simon Sapin's CSS parsing tests and tinycss2 expect only the
             # _value_ of the simple block here. I assume I'm interpreting the

data/lib/crass/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Crass
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/test/test_parse_properties.rb

@@ -67,6 +67,113 @@ describe 'Crass::Parser' do
       ], tree)
     end
 
+    it 'should parse at-rules with a {} simple block immediately following the prelude' do
+      tree = parse(%[
+        @page :right {
+          @top-center { content: "Preliminary edition" }
+          @bottom-center { content: counter(page) }
+        }
+      ].strip)
+
+      tree = parse(tree.first[:block])
+
+      assert_equal([
+        {:node=>:whitespace, :pos=>14, :raw=>"\n          "},
+        {:node=>:at_rule,
+         :name=>"top-center",
+         :prelude=>[{:node=>:whitespace, :pos=>36, :raw=>" "}],
+         :block=>
+          [{:node=>:whitespace, :pos=>38, :raw=>" "},
+           {:node=>:ident, :pos=>39, :raw=>"content", :value=>"content"},
+           {:node=>:colon, :pos=>46, :raw=>":"},
+           {:node=>:whitespace, :pos=>47, :raw=>" "},
+           {:node=>:string,
+            :pos=>48,
+            :raw=>"\"Preliminary edition\"",
+            :value=>"Preliminary edition"},
+           {:node=>:whitespace, :pos=>69, :raw=>" "}],
+         :tokens=>
+          [{:node=>:at_keyword, :pos=>25, :raw=>"@top-center", :value=>"top-center"},
+           {:node=>:whitespace, :pos=>36, :raw=>" "},
+           {:node=>:simple_block,
+            :start=>"{",
+            :end=>"}",
+            :value=>
+             [{:node=>:whitespace, :pos=>38, :raw=>" "},
+              {:node=>:ident, :pos=>39, :raw=>"content", :value=>"content"},
+              {:node=>:colon, :pos=>46, :raw=>":"},
+              {:node=>:whitespace, :pos=>47, :raw=>" "},
+              {:node=>:string,
+               :pos=>48,
+               :raw=>"\"Preliminary edition\"",
+               :value=>"Preliminary edition"},
+              {:node=>:whitespace, :pos=>69, :raw=>" "}],
+            :tokens=>
+             [{:node=>:"{", :pos=>37, :raw=>"{"},
+              {:node=>:whitespace, :pos=>38, :raw=>" "},
+              {:node=>:ident, :pos=>39, :raw=>"content", :value=>"content"},
+              {:node=>:colon, :pos=>46, :raw=>":"},
+              {:node=>:whitespace, :pos=>47, :raw=>" "},
+              {:node=>:string,
+               :pos=>48,
+               :raw=>"\"Preliminary edition\"",
+               :value=>"Preliminary edition"},
+              {:node=>:whitespace, :pos=>69, :raw=>" "},
+              {:node=>:"}", :pos=>70, :raw=>"}"}]}]},
+        {:node=>:whitespace, :pos=>71, :raw=>"\n          "},
+        {:node=>:at_rule,
+         :name=>"bottom-center",
+         :prelude=>[{:node=>:whitespace, :pos=>96, :raw=>" "}],
+         :block=>
+          [{:node=>:whitespace, :pos=>98, :raw=>" "},
+           {:node=>:ident, :pos=>99, :raw=>"content", :value=>"content"},
+           {:node=>:colon, :pos=>106, :raw=>":"},
+           {:node=>:whitespace, :pos=>107, :raw=>" "},
+           {:node=>:function,
+            :name=>"counter",
+            :value=>[{:node=>:ident, :pos=>116, :raw=>"page", :value=>"page"}],
+            :tokens=>
+             [{:node=>:function, :pos=>108, :raw=>"counter(", :value=>"counter"},
+              {:node=>:ident, :pos=>116, :raw=>"page", :value=>"page"},
+              {:node=>:")", :pos=>120, :raw=>")"}]},
+           {:node=>:whitespace, :pos=>121, :raw=>" "}],
+         :tokens=>
+          [{:node=>:at_keyword,
+            :pos=>82,
+            :raw=>"@bottom-center",
+            :value=>"bottom-center"},
+           {:node=>:whitespace, :pos=>96, :raw=>" "},
+           {:node=>:simple_block,
+            :start=>"{",
+            :end=>"}",
+            :value=>
+             [{:node=>:whitespace, :pos=>98, :raw=>" "},
+              {:node=>:ident, :pos=>99, :raw=>"content", :value=>"content"},
+              {:node=>:colon, :pos=>106, :raw=>":"},
+              {:node=>:whitespace, :pos=>107, :raw=>" "},
+              {:node=>:function,
+               :name=>"counter",
+               :value=>[{:node=>:ident, :pos=>116, :raw=>"page", :value=>"page"}],
+               :tokens=>
+                [{:node=>:function, :pos=>108, :raw=>"counter(", :value=>"counter"},
+                 {:node=>:ident, :pos=>116, :raw=>"page", :value=>"page"},
+                 {:node=>:")", :pos=>120, :raw=>")"}]},
+              {:node=>:whitespace, :pos=>121, :raw=>" "}],
+            :tokens=>
+             [{:node=>:"{", :pos=>97, :raw=>"{"},
+              {:node=>:whitespace, :pos=>98, :raw=>" "},
+              {:node=>:ident, :pos=>99, :raw=>"content", :value=>"content"},
+              {:node=>:colon, :pos=>106, :raw=>":"},
+              {:node=>:whitespace, :pos=>107, :raw=>" "},
+              {:node=>:function, :pos=>108, :raw=>"counter(", :value=>"counter"},
+              {:node=>:ident, :pos=>116, :raw=>"page", :value=>"page"},
+              {:node=>:")", :pos=>120, :raw=>")"},
+              {:node=>:whitespace, :pos=>121, :raw=>" "},
+              {:node=>:"}", :pos=>122, :raw=>"}"}]}]},
+        {:node=>:whitespace, :pos=>123, :raw=>"\n        "}
+      ], tree)
+    end
+
     it 'should parse values containing functions' do
       tree = parse("content: attr(data-foo) \" \";")
 

data/test/test_serialization.rb

@@ -42,4 +42,30 @@ describe 'Serialization' do
       Crass::Parser.stringify(tree)
     )
   end
+
+  it "should serialize a @page rule" do
+    css = %[
+      @page { margin: 2cm }
+
+      @page :right {
+        @top-center { content: "Preliminary edition" }
+        @bottom-center { content: counter(page) }
+      }
+
+      @page {
+        size: 8.5in 11in;
+        margin: 10%;
+
+        @top-left {
+          content: "Hamlet";
+        }
+        @top-right {
+          content: "Page " counter(page);
+        }
+      }
+    ].strip
+
+    tree = Crass.parse(css)
+    assert_equal(css, Crass::Parser.stringify(tree))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crass
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryan Grove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: CSS parser based on the CSS Syntax Level 3 spec.