csspool 3.0.2 → 4.0.0.pre

data/test/test_declaration.rb

@@ -0,0 +1,39 @@
+require 'helper'
+
+module CSSPool
+  class TestSelector < CSSPool::TestCase
+
+    def test_multiple_semicolons
+      doc = CSSPool.CSS <<-eocss
+        a { background: red;; color: blue; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 2, rs.declarations.size
+    end
+
+    def test_leading_semicolon
+      doc = CSSPool.CSS <<-eocss
+        a { ; background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 1, rs.declarations.size
+    end
+
+    def test_no_trailing_semicolon
+      doc = CSSPool.CSS <<-eocss
+        a { background: red }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 1, rs.declarations.size
+    end
+
+    def test_only_semicolon
+      doc = CSSPool.CSS <<-eocss
+        a { ; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 0, rs.declarations.size
+    end
+
+  end
+end

data/test/test_parser.rb

@@ -35,7 +35,7 @@ module CSSPool
           div { background: red, blue; }
         }
       eocss
-      assert_equal 1, doc.rule_sets.first.media.length
+      assert_equal 1, doc.rule_sets.first.media.media_list.length
     end
 
     def test_universal_to_css
@@ -88,24 +88,37 @@ module CSSPool
       assert_match('foo(1, 2)', doc.to_css)
     end
 
-    def test_missing_semicolon
+    def test_url
       doc = CSSPool.CSS <<-eocss
-        div { border: none }
+        div { background: url(http://example.com); }
       eocss
-      assert_match('none', doc.to_css)
-      doc = CSSPool.CSS <<-eocss
-        div { border: none; background: #fff }
-      eocss
-      assert_match('none', doc.to_css)
-      assert_match('#fff', doc.to_css)
+      assert_match 'http://example.com', doc.to_css
     end
 
-    def test_whitespaces
+    def test_url_capitalized
       doc = CSSPool.CSS <<-eocss
-        div { border : none; }
+        div { background: URL(http://example.com); }
       eocss
-      assert_match('none', doc.to_css)
-      assert_match('border:', doc.to_css)
+      assert_match 'http://example.com', doc.to_css
     end
+
+    def test_uri_linefeed_n
+      doc = CSSPool.CSS "div { background: url('http://\\\nexample.com/image.png') }"
+      # FIXME: (mt) Sort this out; these tests don't currently run, but should both run and pass
+      #assert_equal "http://\\\nexample.com/image.png", doc.rule_sets.first.declarations.first.expressions.first.value
+    end
+
+    def test_uri_linefeed_r
+      doc = CSSPool.CSS "div { background: url('http://\\\rexample.com/image.png') }"
+      # FIXME: (mt) Sort this out; these tests don't currently run, but should both run and pass
+      #assert_equal "http://\\\rexample.com/image.png", doc.rule_sets.first.declarations.first.expressions.first.value
+    end
+
+    def test_uri_linefeed_rn
+      doc = CSSPool.CSS "div { background: url('http://\\\r\nexample.com/image.png') }"
+      # FIXME: (mt) Sort this out; these tests don't currently run, but should both run and pass
+      #assert_equal "http://\\\r\nexample.com/image.png", doc.rule_sets.first.declarations.first.expressions.first.value
+    end
+
   end
 end

data/test/test_selector.rb

@@ -4,20 +4,24 @@ module CSSPool
   class TestSelector < CSSPool::TestCase
     def test_specificity
       doc = CSSPool.CSS <<-eocss
-        *, foo > bar, #hover, :hover, div#a, a.foo, a:hover, a[href][int="10"]{ background: red; }
+        *, foo > bar, #hover, :hover, div#a, a.foo, a:hover, a[href][int="10"], :before, ::before { background: red; }
       eocss
       selectors = doc.rule_sets.first.selectors
       specs = selectors.map do |sel|
         sel.specificity
       end
-      assert_equal [[0, 0, 1],
+      assert_equal [
+       [0, 0, 1],
        [0, 0, 2],
-       [1, 0, 1],
-       [0, 1, 1],
+       [1, 0, 0],
+       [0, 1, 0],
        [1, 0, 1],
        [0, 1, 1],
        [0, 1, 1],
-       [0, 2, 1]], specs
+       [0, 2, 1],
+       [0, 0, 1],
+       [0, 0, 1]
+      ], specs
     end
 
     def test_selector_knows_its_ruleset
@@ -43,5 +47,201 @@ module CSSPool
       rs = doc.rule_sets.first
       rs.declarations.each { |del| assert_equal rs, del.rule_set }
     end
+
+    def test_general_sibling_selector
+      doc = CSSPool.CSS <<-eocss
+        a ~ b { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal :~, rs.selectors.first.simple_selectors[1].combinator
+    end
+
+    def test_attribute_prefix_match
+      doc = CSSPool.CSS <<-eocss
+        a[href^="http"] { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal Selectors::Attribute, rs.selectors.first.simple_selectors.first.additional_selectors.first.class
+      assert_equal Selectors::Attribute::PREFIXMATCH, rs.selectors.first.simple_selectors.first.additional_selectors.first.match_way
+    end
+
+    def test_attribute_suffix_match
+      doc = CSSPool.CSS <<-eocss
+        a[href$="http"] { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal Selectors::Attribute, rs.selectors.first.simple_selectors.first.additional_selectors.first.class
+      assert_equal Selectors::Attribute::SUFFIXMATCH, rs.selectors.first.simple_selectors.first.additional_selectors.first.match_way
+    end
+
+    def test_attribute_substring_match
+      doc = CSSPool.CSS <<-eocss
+        a[href*="http"] { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal Selectors::Attribute, rs.selectors.first.simple_selectors.first.additional_selectors.first.class
+      assert_equal Selectors::Attribute::SUBSTRINGMATCH, rs.selectors.first.simple_selectors.first.additional_selectors.first.match_way
+    end
+
+    def test_not_pseudo_class
+      doc = CSSPool.CSS <<-eocss
+        a:not(b) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'a', rs.selectors.first.simple_selectors.first.name
+      assert_equal ':not(b)', rs.selectors.first.simple_selectors.first.additional_selectors.first.to_s
+    end
+
+    def test_nth_integer
+      doc = CSSPool.CSS <<-eocss
+        a:nth-child(1) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'nth-child', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+      assert_equal '1', rs.selectors.first.simple_selectors.first.additional_selectors.first.extra
+    end
+
+    def test_nth_negative_integer
+      doc = CSSPool.CSS <<-eocss
+        a:nth-child(-1) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'nth-child', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+      assert_equal '-1', rs.selectors.first.simple_selectors.first.additional_selectors.first.extra
+    end
+
+    def test_nth_n_syntax
+      doc = CSSPool.CSS <<-eocss
+        a:nth-child(-2n-1) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'nth-child', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+      assert_equal '-2n-1', rs.selectors.first.simple_selectors.first.additional_selectors.first.extra
+    end
+
+    def test_nth_n_syntax_with_whitespace
+      doc = CSSPool.CSS <<-eocss
+        a:nth-child( -2n - 1 ) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'nth-child', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+      assert_equal ' -2n - 1 ', rs.selectors.first.simple_selectors.first.additional_selectors.first.extra
+    end
+
+    def test_nth_odd
+      doc = CSSPool.CSS <<-eocss
+        a:nth-child(odd) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'nth-child', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+      assert_equal 'odd', rs.selectors.first.simple_selectors.first.additional_selectors.first.extra
+    end
+
+    def test_nth_even
+      doc = CSSPool.CSS <<-eocss
+        a:nth-child(even) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'nth-child', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+      assert_equal 'even', rs.selectors.first.simple_selectors.first.additional_selectors.first.extra
+    end
+
+    def test_element_with_namespace
+      doc = CSSPool.CSS <<-eocss
+        a|b { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'b', rs.selectors.first.simple_selectors.first.name
+      assert_equal 'a', rs.selectors.first.simple_selectors.first.namespace
+    end
+
+    def test_element_with_no_namespace
+      doc = CSSPool.CSS <<-eocss
+        |b { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'b', rs.selectors.first.simple_selectors.first.name
+      assert_equal nil, rs.selectors.first.simple_selectors.first.namespace
+    end
+
+    def test_element_with_any_namespace
+      doc = CSSPool.CSS <<-eocss
+        *|b { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'b', rs.selectors.first.simple_selectors.first.name
+      assert_equal '*', rs.selectors.first.simple_selectors.first.namespace
+    end
+
+    def test_universal_with_namespace
+      doc = CSSPool.CSS <<-eocss
+        a|* { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal Selectors::Universal, rs.selectors.first.simple_selectors.first.class
+      assert_equal 'a', rs.selectors.first.simple_selectors.first.namespace
+    end
+
+    def test_universal_with_no_namespace
+      doc = CSSPool.CSS <<-eocss
+        |* { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal Selectors::Universal, rs.selectors.first.simple_selectors.first.class
+      assert_equal nil, rs.selectors.first.simple_selectors.first.namespace
+    end
+
+    def test_universal_with_any_namespace
+      doc = CSSPool.CSS <<-eocss
+        *|* { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal Selectors::Universal, rs.selectors.first.simple_selectors.first.class
+      assert_equal '*', rs.selectors.first.simple_selectors.first.namespace
+    end
+
+    def test_attribute_with_namespace
+      doc = CSSPool.CSS <<-eocss
+        a[b|c] { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'b', rs.selectors.first.simple_selectors.first.additional_selectors.first.namespace
+      assert_equal 'c', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+    end
+
+    def test_attribute_with_no_namespace
+      doc = CSSPool.CSS <<-eocss
+        a[|c] { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal nil, rs.selectors.first.simple_selectors.first.additional_selectors.first.namespace
+      assert_equal 'c', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+    end
+
+    def test_attribute_with_any_namespace
+      doc = CSSPool.CSS <<-eocss
+        a[*|c] { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal '*', rs.selectors.first.simple_selectors.first.additional_selectors.first.namespace
+      assert_equal 'c', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
+    end
+
+    def test_matches_pseudoclass
+      doc = CSSPool.CSS <<-eocss
+        :matches(section, article, aside, nav) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal 'section, article, aside, nav', rs.selectors.first.simple_selectors.first.additional_selectors.first.extra
+    end
+
+    def test_matches_pseudoclass_complex
+      doc = CSSPool.CSS <<-eocss
+        :matches(#id[attribute="selector"], #main-id[another="attribute"]) { background: red; }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal '#id[attribute="selector"], #main-id[another="attribute"]', rs.selectors.first.simple_selectors.first.additional_selectors.first.extra
+    end
+
   end
 end

data/test/test_term.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+module CSSPool
+  class TestTerm < CSSPool::TestCase
+
+    def test_math_simple
+      doc = CSSPool.CSS <<-eocss
+        a { top: calc(100% + 15px) }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal '100% + 15px', rs.declarations.first.expressions.first.expression
+    end
+
+    def test_math_complex
+      doc = CSSPool.CSS <<-eocss
+        a { top: calc(100%/3 - 2*1em - 2*1px) }
+      eocss
+      rs = doc.rule_sets.first
+      assert_equal '100%/3 - 2*1em - 2*1px', rs.declarations.first.expressions.first.expression
+    end
+
+  end
+end

data/test/visitors/test_to_css.rb

@@ -16,18 +16,24 @@ module CSSPool
           doc.rule_sets.first.declarations.first.to_css.strip
       end
 
-      # FIXME: this is a bug in libcroco
-      #def test_ident_followed_by_id
-      #  doc = CSSPool.CSS 'p#div { font: foo, #666; }'
-      #  assert_equal 'p#div', doc.rule_sets.first.selectors.first.to_css
+      def test_combinators
 
-      #  p doc.rule_sets.first.selectors
+        selectors = %w{* p #id .cl :hover ::selection [href]}
+        combinators = ['', ' ', ' > ', ' + ']
 
-      #  doc = CSSPool.CSS 'p #div { font: foo, #666; }'
+        combinations = selectors.product(combinators).map do |s,c| 
+          if s != '*' && c != '' then
+            s + c
+          end
+        end.compact
+        combinations = combinations.product(selectors).map { |s,c| s + c}
 
-      #  p doc.rule_sets.first.selectors
-      #  assert_equal 'p #div', doc.rule_sets.first.selectors.first.to_css
-      #end
+        combinations.each do |s|
+          doc = CSSPool.CSS s + ' { }'
+          assert_equal s, doc.rule_sets.first.selectors.first.to_css
+        end
+
+      end
 
       def test_hash_operator
         doc = CSSPool.CSS 'p { font: foo, #666; }'
@@ -99,10 +105,10 @@ module CSSPool
             div { background: red, blue; }
           }
         eocss
-        assert_equal 1, doc.rule_sets.first.media.length
+        assert_equal 1, doc.rule_sets.first.media.media_list.length
 
         doc = CSSPool.CSS(doc.to_css)
-        assert_equal 1, doc.rule_sets.first.media.length
+        assert_equal 1, doc.rule_sets.first.media.media_list.length
       end
 
       def test_multiple_media
@@ -115,12 +121,12 @@ module CSSPool
             div { background: red, blue; }
           }
         eocss
-        assert_equal 2, doc.rule_sets.first.media.length
-        assert_equal 1, doc.rule_sets[1].media.length
+        assert_equal 2, doc.rule_sets.first.media.media_list.length
+        assert_equal 1, doc.rule_sets[1].media.media_list.length
 
         doc = CSSPool.CSS(doc.to_css)
-        assert_equal 2, doc.rule_sets.first.media.length
-        assert_equal 1, doc.rule_sets[1].media.length
+        assert_equal 2, doc.rule_sets.first.media.media_list.length
+        assert_equal 1, doc.rule_sets[1].media.media_list.length
       end
 
       def test_import
@@ -131,12 +137,12 @@ module CSSPool
         eocss
 
         assert_equal 3, doc.import_rules.length
-        assert_equal 2, doc.import_rules.last.media.length
+        assert_equal 2, doc.import_rules.last.media_list.length
 
         doc = CSSPool.CSS(doc.to_css)
 
         assert_equal 3, doc.import_rules.length
-        assert_equal 2, doc.import_rules.last.media.length
+        assert_equal 2, doc.import_rules.last.media_list.length
       end
 
       def test_charsets
@@ -166,7 +172,8 @@ module CSSPool
           "new\nline" => "[new\\00000aline=\"value\"]"
         }
         input_output.each_pair do |input, output|
-          Selectors::Attribute.new input, 'value', Selectors::Attribute::EQUALS
+          node = Selectors::Attribute.new input, 'value', Selectors::Attribute::EQUALS
+          assert_equal output, node.to_css
         end
       end
 
@@ -182,14 +189,18 @@ module CSSPool
         end
 
         input_output = {
-          "" => ":psuedo()",
-          "ident" => ":psuedo(ident)",
-          " " => ":psuedo(\\ )",
-          "\"quote\"" => ":psuedo(\\000022quoted\\000022)"
+          "" => ":pseudo()",
+          "ident" => ":pseudo(ident)",
+          " " => ":pseudo(\\ )",
+          "\"quoted\"" => ":pseudo(\\000022quoted\\000022)"
         }
         input_output.each_pair do |input, output|
-          Selectors::Attribute.new input, 'value', Selectors::Attribute::EQUALS
+          node = Selectors::PseudoClass.new "pseudo", input
+          assert_equal output, node.to_css
         end
+
+        assert_equal "::before", Selectors::PseudoElement.new("before").to_css
+        assert_equal ":before", Selectors::PseudoElement.new("before", true).to_css
       end
 
       def test_selector_other