csspool 3.0.2 → 4.0.0.pre

data/lib/csspool/terms/math.rb

@@ -0,0 +1,18 @@
+# http://dev.w3.org/csswg/css3-values/#calc-notation
+module CSSPool
+  module Terms
+    class Math < CSSPool::Node
+      attr_accessor :name
+      attr_accessor :expression
+      attr_accessor :operator
+      attr_accessor :parse_location
+
+      def initialize name, expression, operator = nil, parse_location = {}
+        @name       = name
+        @expression = expression
+        @operator = operator
+        @parse_location = parse_location
+      end
+    end
+  end
+end

data/lib/csspool/terms.rb

@@ -5,3 +5,4 @@ require 'csspool/terms/function'
 require 'csspool/terms/uri'
 require 'csspool/terms/rgb'
 require 'csspool/terms/hash'
+require 'csspool/terms/math'

data/lib/csspool/visitors/children.rb

@@ -10,7 +10,7 @@ module CSSPool
       end
 
       visitor_for CSS::ImportRule do |target|
-        target.media
+        target.media_list
       end
 
       visitor_for CSS::Media,

data/lib/csspool/visitors/comparable.rb

@@ -27,7 +27,7 @@ module CSSPool
       end
 
       visitor_for CSS::ImportRule do |target|
-        [:uri, :namespace, :media].all? { |m|
+        [:uri, :namespace, :media_list].all? { |m|
           target.send(m) == @other.send(m)
         }
       end
@@ -38,7 +38,13 @@ module CSSPool
         }
       end
 
-      visitor_for CSS::Media, Selectors::Id, Selectors::Class do |target|
+      visitor_for CSS::Media do |target|
+        [:media_list].all? { |m|
+          target.send(m) == @other.send(m)
+        }
+      end
+
+      visitor_for Selectors::Id, Selectors::Class do |target|
         target.name == @other.name
       end
 

data/lib/csspool/visitors/iterator.rb

@@ -26,7 +26,7 @@ module CSSPool
       end
 
       visitor_for CSS::ImportRule do |target|
-        target.media.each do |node|
+        target.media_list.each do |node|
           node.accept self
         end
         @block.call target

data/lib/csspool/visitors/to_css.rb

@@ -33,8 +33,8 @@ module CSSPool
 
         target.rule_sets.each { |rs|
           if rs.media != current_media_type
-            media = " " + rs.media.map do |medium|
-              escape_css_identifier medium.name.value
+            media = " " + rs.media.media_list.map do |medium|
+              escape_css_identifier medium.value
             end.join(', ')
             tokens << "#{indent}@media#{media} {"
             @indent_level += 1
@@ -57,13 +57,25 @@ module CSSPool
 
       visitor_for CSS::ImportRule do |target|
         media = ''
-        media = " " + target.media.map do |medium|
-          escape_css_identifier medium.name.value
-        end.join(', ') if target.media.length > 0
+        media = " " + target.media_list.map do |medium|
+          escape_css_identifier medium.value
+        end.join(', ') if target.media_list.length > 0
 
         "#{indent}@import #{target.uri.accept(self)}#{media};"
       end
 
+      visitor_for CSS::DocumentQuery do |target|
+        "#{indent}@document #{target.url_functions.join(', ')} {}"
+      end
+
+      visitor_for CSS::NamespaceRule do |target|
+        if target.prefix.nil?
+          "#{indent}@namespace #{target.uri.accept(self)}"
+        else
+          "#{indent}@namespace #{target.prefix.value} #{target.uri.accept(self)}"
+        end
+      end
+
       visitor_for CSS::RuleSet do |target|
         "#{indent}" +
           target.selectors.map { |sel| sel.accept self }.join(", ") + " {#{line_break}" +
@@ -95,12 +107,6 @@ module CSSPool
         "##{target.value}"
       end
 
-      visitor_for Selectors::Simple, Selectors::Universal do |target|
-        ([target.name] + target.additional_selectors.map { |x|
-          x.accept self
-        }).join
-      end
-
       visitor_for Terms::URI do |target|
         "url(\"#{escape_css_string target.value}\")"
       end
@@ -131,30 +137,30 @@ module CSSPool
         "\"#{escape_css_string target.value}\""
       end
 
+      visitor_for Terms::Number do |target|
+        [
+          target.unary_operator == :minus ? '-' : nil,
+          target.value,
+          target.type
+        ].compact.join
+      end
+
       visitor_for Selector do |target|
         target.simple_selectors.map { |ss| ss.accept self }.join
       end
 
-      visitor_for Selectors::Type do |target|
+      visitor_for Selectors::Simple, Selectors::Universal, Selectors::Type do |target|
         combo = {
           :s => ' ',
           :+ => ' + ',
           :> => ' > '
         }[target.combinator]
 
-        name = target.name == '*' ? '*' : escape_css_identifier(target.name)
+        name = [nil, '*'].include?(target.name) ? target.name : escape_css_identifier(target.name)
         [combo, name].compact.join +
           target.additional_selectors.map { |as| as.accept self }.join
       end
 
-      visitor_for Terms::Number do |target|
-        [
-          target.unary_operator == :minus ? '-' : nil,
-          target.value,
-          target.type
-        ].compact.join
-      end
-
       visitor_for Selectors::Id do |target|
         "##{escape_css_identifier target.name}"
       end
@@ -171,6 +177,14 @@ module CSSPool
         end
       end
 
+      visitor_for Selectors::PseudoElement do |target|
+        if target.css2.nil?
+          "::#{escape_css_identifier target.name}"
+        else
+          ":#{escape_css_identifier target.name}"
+        end
+      end
+
       visitor_for Selectors::Attribute do |target|
         case target.match_way
         when Selectors::Attribute::SET
@@ -181,6 +195,12 @@ module CSSPool
           "[#{escape_css_identifier target.name} ~= \"#{escape_css_string target.value}\"]"
         when Selectors::Attribute::DASHMATCH
           "[#{escape_css_identifier target.name} |= \"#{escape_css_string target.value}\"]"
+        when Selectors::Attribute::PREFIXMATCH
+          "[#{escape_css_identifier target.name} ^= \"#{escape_css_string target.value}\"]"
+        when Selectors::Attribute::SUFFIXMATCH
+          "[#{escape_css_identifier target.name} $= \"#{escape_css_string target.value}\"]"
+        when Selectors::Attribute::SUBSTRINGMATCH
+          "[#{escape_css_identifier target.name} *= \"#{escape_css_string target.value}\"]"
         else
           raise "no matching matchway"
         end

data/lib/csspool.rb

@@ -13,7 +13,7 @@ require 'csspool/visitors'
 require 'csspool/collection'
 
 module CSSPool
-  VERSION = "3.0.2"
+  VERSION = "4.0.0"
 
   def self.CSS doc
     CSSPool::CSS::Document.parse doc

data/test/_local_helper.rb

@@ -0,0 +1,2 @@
+gem "minitest"
+require "minitest/autorun"

data/test/css/test_document_query.rb

@@ -0,0 +1,76 @@
+require 'helper'
+
+module CSSPool
+  module CSS
+    class TestDocumentQuery < CSSPool::TestCase
+
+      def test_function
+        doc = CSSPool.CSS <<-eocss
+					@document domain("example.com") {
+						* { color: blue; }
+					}
+        eocss
+        assert_equal 1, doc.document_queries.size
+				assert_equal 1, doc.document_queries[0].url_functions.size
+				assert_equal CSSPool::Terms::Function, doc.document_queries[0].url_functions[0].class
+				assert_equal 'domain', doc.document_queries[0].url_functions[0].name
+				assert_equal 'example.com', doc.document_queries[0].url_functions[0].params[0].value
+				assert_equal 1, doc.document_queries[0].rule_sets.size
+      end
+
+      def test_function_no_quote
+        doc = CSSPool.CSS <<-eocss
+					@document domain(example.com) {
+						* { color: blue; }
+					}
+        eocss
+        assert_equal 1, doc.document_queries.size
+				assert_equal 1, doc.document_queries[0].url_functions.size
+				assert_equal CSSPool::Terms::Function, doc.document_queries[0].url_functions[0].class
+				assert_equal 'domain', doc.document_queries[0].url_functions[0].name
+				assert_equal 'example.com', doc.document_queries[0].url_functions[0].params[0].value
+				assert_equal 1, doc.document_queries[0].rule_sets.size
+      end
+
+      def test_multiple
+        doc = CSSPool.CSS <<-eocss
+					@document domain(example.com), url-prefix(http://example.com) {
+						* { color: blue; }
+					}
+        eocss
+        assert_equal 1, doc.document_queries.size
+				assert_equal 2, doc.document_queries[0].url_functions.size
+				assert_equal CSSPool::Terms::Function, doc.document_queries[0].url_functions[0].class
+				assert_equal 'domain', doc.document_queries[0].url_functions[0].name
+				assert_equal 'example.com', doc.document_queries[0].url_functions[0].params[0].value
+				assert_equal CSSPool::Terms::Function, doc.document_queries[0].url_functions[1].class
+				assert_equal 'url-prefix', doc.document_queries[0].url_functions[1].name
+				assert_equal 'http://example.com', doc.document_queries[0].url_functions[1].params[0].value
+				assert_equal 1, doc.document_queries[0].rule_sets.size
+      end
+
+      def test_url
+        doc = CSSPool.CSS <<-eocss
+					@document url("http://www.example.com") {
+						* { color: blue; }
+					}
+        eocss
+        assert_equal 1, doc.document_queries.size
+				assert_equal 1, doc.document_queries[0].url_functions.size
+				assert_equal CSSPool::Terms::URI, doc.document_queries[0].url_functions[0].class
+				assert_equal 'http://www.example.com', doc.document_queries[0].url_functions[0].value
+				assert_equal 1, doc.document_queries[0].rule_sets.size
+      end
+
+      def test_empty
+        doc = CSSPool.CSS <<-eocss
+					@document url("http://www.example.com") {
+					}
+        eocss
+        assert_equal 1, doc.document_queries.size
+				assert_equal true, doc.document_queries[0].rule_sets.empty?
+      end
+
+    end
+  end
+end

data/test/css/test_import_rule.rb

@@ -33,7 +33,7 @@ module CSSPool
             "div { background: red; }"
           end
           new_doc.rule_sets.each do |rs|
-            assert_equal ir.media, rs.media
+            assert_equal ir.media_list, rs.media.media_list
           end
         end
       end

data/test/css/test_keyframes_rule.rb

@@ -0,0 +1,93 @@
+require 'helper'
+
+# CSS keyframes - http://dev.w3.org/csswg/css3-animations/#keyframes
+module CSSPool
+  module CSS
+    class TestKeyframesRule < CSSPool::TestCase
+
+      def test_empty
+        doc = CSSPool.CSS <<-eocss
+          @keyframes id {}
+        eocss
+        assert_equal 1, doc.keyframes_rules.size
+        assert_equal 'id', doc.keyframes_rules.first.name
+        assert_equal 0, doc.keyframes_rules.first.rule_sets.size
+      end
+
+      def test_from
+        doc = CSSPool.CSS <<-eocss
+          @keyframes id {
+            from {
+              top: 0;
+            }
+          }
+        eocss
+        assert_equal 1, doc.keyframes_rules.first.rule_sets.size
+        assert_equal 'from', doc.keyframes_rules.first.rule_sets.first.keyText
+        assert_equal 1, doc.keyframes_rules.first.rule_sets.first.declarations.size
+      end
+
+      def test_to
+        doc = CSSPool.CSS <<-eocss
+          @keyframes id {
+            to {
+              top: 0;
+            }
+          }
+        eocss
+        assert_equal 1, doc.keyframes_rules.first.rule_sets.size
+        assert_equal 'to', doc.keyframes_rules.first.rule_sets.first.keyText
+        assert_equal 1, doc.keyframes_rules.first.rule_sets.first.declarations.size
+      end
+
+      def test_percent
+        doc = CSSPool.CSS <<-eocss
+          @keyframes id {
+            50% {
+              top: 0;
+            }
+          }
+        eocss
+        assert_equal 1, doc.keyframes_rules.first.rule_sets.size
+        assert_equal '50%', doc.keyframes_rules.first.rule_sets.first.keyText
+        assert_equal 1, doc.keyframes_rules.first.rule_sets.first.declarations.size
+      end
+
+      def test_multiple_selector
+        doc = CSSPool.CSS <<-eocss
+          @keyframes id {
+            from, to, 50% {
+              top: 0;
+            }
+          }
+        eocss
+        assert_equal 1, doc.keyframes_rules.first.rule_sets.size
+        assert_equal 'from, to, 50%', doc.keyframes_rules.first.rule_sets.first.keyText
+        assert_equal 1, doc.keyframes_rules.first.rule_sets.first.declarations.size
+      end
+
+      def test_multiple_blocks
+        doc = CSSPool.CSS <<-eocss
+          @keyframes id {
+            from {
+              top: 0;
+            }
+            to {
+              top: 0;
+            }
+          }
+        eocss
+        assert_equal 2, doc.keyframes_rules.first.rule_sets.size
+      end
+
+      def test_vendor_prefix
+        doc = CSSPool.CSS <<-eocss
+          @-moz-keyframes id {}
+        eocss
+        assert_equal 1, doc.keyframes_rules.size
+        assert_equal 'id', doc.keyframes_rules.first.name
+        assert_equal 0, doc.keyframes_rules.first.rule_sets.size
+      end
+    end
+  end
+end

data/test/css/test_namespace_rule.rb

@@ -0,0 +1,54 @@
+require 'helper'
+
+# CSS namespaces - http://www.w3.org/TR/css3-namespace/
+module CSSPool
+  module CSS
+    class TestNamespaceRule < CSSPool::TestCase
+
+      def test_default_string
+        doc = CSSPool.CSS <<-eocss
+          @namespace "http://www.w3.org/1999/xhtml/";
+        eocss
+        assert_equal 1, doc.namespaces.size
+        assert_equal CSSPool::CSS::NamespaceRule, doc.namespaces[0].class
+        assert_equal nil, doc.namespaces[0].prefix
+        assert_equal CSSPool::Terms::String, doc.namespaces[0].uri.class
+        assert_equal 'http://www.w3.org/1999/xhtml/', doc.namespaces[0].uri.value
+      end
+
+      def test_default_uri
+        doc = CSSPool.CSS <<-eocss
+          @namespace url("http://www.w3.org/1999/xhtml/");
+        eocss
+        assert_equal 1, doc.namespaces.size
+        assert_equal CSSPool::CSS::NamespaceRule, doc.namespaces[0].class
+        assert_equal nil, doc.namespaces[0].prefix
+        assert_equal CSSPool::Terms::URI, doc.namespaces[0].uri.class
+        assert_equal 'http://www.w3.org/1999/xhtml/', doc.namespaces[0].uri.value
+      end
+
+      def test_prefix
+        doc = CSSPool.CSS <<-eocss
+          @namespace xhtml url("http://www.w3.org/1999/xhtml/");
+        eocss
+        assert_equal 1, doc.namespaces.size
+        assert_equal CSSPool::CSS::NamespaceRule, doc.namespaces[0].class
+        assert_equal CSSPool::Terms::Ident, doc.namespaces[0].prefix.class
+        assert_equal 'xhtml', doc.namespaces[0].prefix.value
+        assert_equal CSSPool::Terms::URI, doc.namespaces[0].uri.class
+        assert_equal 'http://www.w3.org/1999/xhtml/', doc.namespaces[0].uri.value
+      end
+
+      def test_multiple
+        doc = CSSPool.CSS <<-eocss
+          @namespace url("http://www.w3.org/1999/xhtml/");
+          @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+        eocss
+        assert_equal 2, doc.namespaces.size
+        assert_equal CSSPool::CSS::NamespaceRule, doc.namespaces[0].class
+        assert_equal CSSPool::CSS::NamespaceRule, doc.namespaces[1].class
+      end
+
+    end
+  end
+end

data/test/css/test_parser.rb

@@ -193,7 +193,7 @@ module CSSPool
         assert_attribute 'div:foo[a] { }'
         assert_attribute 'div#foo[a] { }'
         assert_attribute 'div.foo[a] { }'
-        assert_attribute 'div.foo[a] { }'
+        assert_attribute 'div[a]::foo { }'
       end
 
       def test_additional_selectors_id_pesuedoclass
@@ -252,6 +252,10 @@ module CSSPool
           { Selectors::PseudoClass => 'foo' }, ':foo() { }')
         assert_additional_selector(
           { Selectors::PseudoClass => 'foo' }, ':foo(a) { }')
+        assert_additional_selector(
+          { Selectors::PseudoElement => 'foo' }, '::foo { }')
+        assert_additional_selector(
+          { Selectors::PseudoElement => 'before' }, ':before { }')
       end
 
       def test_additional_selectors_id
@@ -356,6 +360,20 @@ module CSSPool
         assert_equal :import_style, doc.calls[1].first
       end
 
+      def test_missing_semicolon
+        @parser.scan_str 'div { border: none }'
+        assert_equal 'div', doc.calls[1][1][0].join
+        assert_equal 'border', doc.calls[2][1][0]
+        assert_equal 'none', doc.calls[2][1][1].join
+      end
+
+      def test_whitespaces
+        @parser.scan_str 'div { border : none }'
+        assert_equal 'div', doc.calls[1][1][0].join
+        assert_equal 'border', doc.calls[2][1][0]
+        assert_equal 'none', doc.calls[2][1][1].join
+      end
+
       def test_import_medium
         @parser.scan_str '@import "foo" page;'
         assert_equal :import_style, doc.calls[1].first
@@ -371,6 +389,33 @@ module CSSPool
         assert_equal 'print', doc.calls[1][1].first[1].value
       end
 
+      def test_document_query_url
+        @parser.scan_str '@document url("http://example.com") { div {} }'
+        assert_equal :start_document_query, doc.calls[1].first
+        assert_equal 1, doc.calls[1][1][0].size
+        assert_equal CSSPool::Terms::URI, doc.calls[1][1][0][0].class
+      end
+
+      def test_document_query_function
+        @parser.scan_str '@document domain("example.com") { div {} }'
+        assert_equal :start_document_query, doc.calls[1].first
+        assert_equal 1, doc.calls[1][1][0].size
+        assert_equal CSSPool::Terms::Function, doc.calls[1][1][0][0].class
+      end
+
+      def test_document_query_function_no_quotes
+        @parser.scan_str '@document domain(example.com) { div {} }'
+        assert_equal :start_document_query, doc.calls[1].first
+        assert_equal 1, doc.calls[1][1][0].size
+        assert_equal CSSPool::Terms::Function, doc.calls[1][1][0][0].class
+      end
+
+      def test_document_query_multiple
+        @parser.scan_str '@document url("http://example.com"), domain("example.com") { div {} }'
+        assert_equal :start_document_query, doc.calls[1].first
+        assert_equal 2, doc.calls[1][1][0].size
+      end
+
       def test_start_stop
         @parser.scan_str "@import 'foo';"
         assert_equal [:start_document, []], @doc.calls.first

data/test/css/test_tokenizer.rb

@@ -162,16 +162,6 @@ module CSSPool
         ], @scanner)
       end
 
-      def test_negation
-        @scanner.scan("p:not(.a)")
-        assert_tokens([ [:IDENT, 'p'],
-                        [:NOT, ':not('],
-                        ['.', '.'],
-                        [:IDENT, 'a'],
-                        [:RPAREN, ')'],
-        ], @scanner)
-      end
-
       def test_function
         @scanner.scan("script comment()")
         assert_tokens([ [:IDENT, 'script'],
@@ -273,41 +263,6 @@ module CSSPool
         ], @scanner)
       end
 
-      def test_scan_an_plus_b
-        @scanner.scan('x:nth-child(5n+3)')
-        assert_tokens([ [:IDENT, 'x'],
-                        [':', ':'],
-                        [:FUNCTION, 'nth-child('],
-                        [:NUMBER, '5'],
-                        [:IDENT, 'n'],
-                        [:PLUS, '+'],
-                        [:NUMBER, '3'],
-                        [:RPAREN, ')'],
-        ], @scanner)
-
-        @scanner.scan('x:nth-child(-1n+3)')
-        assert_tokens([ [:IDENT, 'x'],
-                        [':', ':'],
-                        [:FUNCTION, 'nth-child('],
-                        [:MINUS, '-'],
-                        [:NUMBER, '1'],
-                        [:IDENT, 'n'],
-                        [:PLUS, '+'],
-                        [:NUMBER, '3'],
-                        [:RPAREN, ')'],
-        ], @scanner)
-
-        @scanner.scan('x:nth-child(-n+3)')
-        assert_tokens([ [:IDENT, 'x'],
-                        [':', ':'],
-                        [:FUNCTION, 'nth-child('],
-                        [:IDENT, '-n'],
-                        [:PLUS, '+'],
-                        [:NUMBER, '3'],
-                        [:RPAREN, ')'],
-        ], @scanner)
-      end
-
       def assert_tokens(tokens, scanner)
         toks = []
         while tok = @scanner.next_token

data/test/helper.rb

@@ -11,7 +11,7 @@ module CSSPool
 
     class MyDoc < CSSPool::CSS::DocumentHandler
       attr_accessor :start_documents, :end_documents
-      attr_accessor :charsets, :import_styles, :comments, :start_selectors
+      attr_accessor :charsets, :import_styles, :document_queries, :comments, :start_selectors
       attr_accessor :end_selectors, :properties
 
       def initialize
@@ -19,6 +19,7 @@ module CSSPool
         @end_documents    = []
         @charsets         = []
         @import_styles    = []
+        @document_queries = []
         @comments         = []
         @start_selectors  = []
         @end_selectors    = []
@@ -45,6 +46,10 @@ module CSSPool
         @import_styles << [media_list, uri, default_ns, location]
       end
 
+      def document_query string
+        @document_queries << string
+      end
+
       def namespace_declaration prefix, uri, location
         @import_styles << [prefix, uri, location]
       end

data/test/sac/test_parser.rb

@@ -12,6 +12,7 @@ module CSSPool
           /* This is a comment */
           div a.foo, #bar, * { background: red; }
           div#a, a.foo, a:hover, a[href][int="10"]{ background: red; }
+          ::selection, q:before { background: red; }
         eocss
         @parser = CSSPool::SAC::Parser.new(@doc)
         @parser.parse(@css)
@@ -74,7 +75,6 @@ module CSSPool
         assert_equal 'foo', foo_class.name
       end
 
-      # div#a, a.foo, a:hover, a[href='watever'] { background: red; }
       def test_id_additional_selector
         selectors_for_rule = @doc.start_selectors[1]
         selector = selectors_for_rule.first # => div#a
@@ -82,7 +82,6 @@ module CSSPool
         assert_equal 'a', simple_selector.additional_selectors.first.name
       end
 
-      # div#a, a.foo, a:hover, a[href][int="10"]{ background: red; }
       def test_pseudo_additional_selector
         selectors_for_rule = @doc.start_selectors[1]
         selector = selectors_for_rule[2] # => 'a:hover'
@@ -91,7 +90,6 @@ module CSSPool
         assert_nil simple_selector.additional_selectors.first.extra
       end
 
-      # div#a, a.foo, a:hover, a[href][int="10"]{ background: red; }
       def test_attribute_selector
         selectors_for_rule = @doc.start_selectors[1]
         selector = selectors_for_rule[3] # => a[href][int="10"]
@@ -105,6 +103,21 @@ module CSSPool
         assert_equal '10', simple_selector.additional_selectors[1].value
         assert_equal 2, simple_selector.additional_selectors[1].match_way
       end
+
+      def test_pseudo_element_additional_selector
+        selectors_for_rule = @doc.start_selectors[2]
+        selector = selectors_for_rule[0]
+
+        simple_selector = selector.simple_selectors[0] # ::selection
+        assert_equal 'selection', simple_selector.additional_selectors.first.name
+        assert_nil simple_selector.additional_selectors.first.css2
+
+        selector = selectors_for_rule[1]
+        simple_selector = selector.simple_selectors[0] # q.before
+        assert_equal 'before', simple_selector.additional_selectors.first.name
+        assert_equal true, simple_selector.additional_selectors.first.css2
+      end
+
     end
   end
 end