csspool 2.0.0 → 3.0.0

data/lib/csspool/node.rb

@@ -1,5 +1,33 @@
 module CSSPool
   class Node
-    include CSSPool::Visitable
+    include Enumerable
+
+    def accept target
+      target.accept self
+    end
+
+    def to_css
+      accept Visitors::ToCSS.new
+    end
+    alias :to_s :to_css
+
+    def == other
+      return false unless self.class == other.class
+
+      accept Visitors::Comparable.new other
+    end
+    alias :eql? :==
+
+    def each &block
+      Visitors::Iterator.new(block).accept self
+    end
+
+    def children
+      accept Visitors::Children.new
+    end
+
+    def hash
+      @hash ||= children.map { |child| child.hash }.hash
+    end
   end
 end

data/lib/csspool/sac/document.rb

@@ -10,7 +10,7 @@ module CSSPool
       def charset name, location
       end
 
-      def import_style media_list, uri, default_ns, location
+      def import_style media_list, uri, default_ns = nil, location = {}
       end
 
       def start_selector selector_list
@@ -25,10 +25,10 @@ module CSSPool
       def comment comment
       end
 
-      def start_media media_list, parse_location
+      def start_media media_list, parse_location = {}
       end
 
-      def end_media media_list, parse_location
+      def end_media media_list, parse_location = {}
       end
     end
   end

data/lib/csspool/sac/parser.rb

@@ -1,121 +1,15 @@
 module CSSPool
   module SAC
-    class Parser
-      attr_accessor :document
+    class Parser < CSSPool::CSS::Tokenizer
+      attr_accessor :handler
 
-      def initialize document = CSSPool::SAC::Document.new
-        @document = document
-        @selector_stack = []
+      def initialize handler = CSSPool::CSS::DocumentHandler.new
+        @handler = handler
       end
 
       def parse string
-        parse_memory(string, 5)
-      end
-
-      private
-      def push selectors
-        @selector_stack << selectors
-      end
-
-      def pop
-        @selector_stack.pop
-      end
-
-      def parse_memory string, encoding
-        parser = LibCroco::CRParser.new(
-          LibCroco.cr_parser_new_from_buf(
-            string,
-            string.length,
-            5,
-            0
-          )
-        )
-        sac_handler =
-          LibCroco::CRDocHandler.new(LibCroco.cr_doc_handler_new)
-
-        selector_stack = []
-        media_stack = []
-
-        sac_handler[:start_document] = lambda { |parser|
-          @document.start_document
-        }
-        sac_handler[:end_document] = lambda { |parser|
-          @document.end_document
-        }
-        sac_handler[:charset] = lambda { |dh, name, location|
-          @document.charset(
-            LibCroco.cr_string_peek_raw_str(name).read_string,
-            LibCroco::CRParsingLocation.new(location).to_h
-          )
-        }
-
-        sac_handler[:import_style] = lambda { |dh, media_list, uri, ns, loc|
-          media_list = media_list.null? ? [] : LibCroco::GList.new(media_list)
-          media_list = media_list.to_a.map { |data|
-            LibCroco.cr_string_peek_raw_str(data).read_string
-          }
-          uri = uri.null? ? nil :
-            LibCroco.cr_string_peek_raw_str(uri).read_string
-
-          ns = ns.null? ? nil : LibCroco.cr_string_peek_raw_str(ns).read_string
-
-          @document.import_style(
-            media_list,
-            uri,
-            ns,
-            LibCroco::CRParsingLocation.new(loc).to_h
-          )
-        }
-
-        sac_handler[:start_selector] = lambda { |dh, list|
-          list    = [LibCroco::CRSelector.new(list)]
-          pointer = list.last[:next]
-          until pointer.null?
-            list << LibCroco::CRSelector.new(pointer)
-            pointer = list.last[:next]
-          end
-          selector_stack.push list.map { |l| l.to_selector }
-          @document.start_selector selector_stack.last
-        }
-
-        sac_handler[:end_selector] = lambda { |dh, list|
-          @document.end_selector selector_stack.pop
-        }
-
-        sac_handler[:property] = lambda { |dh, name, expr, important|
-          expr_list = []
-          until expr.null?
-            expr_list << LibCroco::CRTerm.new(expr)
-            expr = expr_list.last[:next]
-          end
-          @document.property(
-            LibCroco.cr_string_peek_raw_str(name).read_string,
-            expr_list.map { |ex| ex.to_term },
-            important == 1
-          )
-        }
-
-        sac_handler[:comment] = lambda { |dh, comment|
-          @document.comment(
-            LibCroco.cr_string_peek_raw_str(comment).read_string
-          )
-        }
-
-        sac_handler[:start_media] = lambda { |dh,media_list,location|
-          media_list = LibCroco::GList.new(media_list)
-          media_stack << [media_list.to_a.map { |data|
-            LibCroco.cr_string_peek_raw_str(data).read_string
-          }, LibCroco::CRParsingLocation.new(location).to_h]
-          @document.start_media(*media_stack.last)
-        }
-
-        sac_handler[:end_media] = lambda { |dh,media_list|
-          @document.end_media(*media_stack.pop)
-        }
-
-        LibCroco.cr_parser_set_sac_handler(parser, sac_handler)
-        LibCroco.cr_parser_parse(parser)
-        LibCroco.cr_doc_handler_destroy(sac_handler)
+        scan_str string
+        @handler.document
       end
     end
   end

data/lib/csspool/terms/function.rb

@@ -6,7 +6,7 @@ module CSSPool
       attr_accessor :parse_location
       attr_accessor :operator
 
-      def initialize name, params, operator, parse_location
+      def initialize name, params, operator = nil, parse_location = nil
         @name   = name
         @params = params
         @operator = operator

data/lib/csspool/terms/ident.rb

@@ -5,7 +5,7 @@ module CSSPool
       attr_accessor :operator
       attr_accessor :parse_location
 
-      def initialize value, operator, parse_location
+      def initialize value, operator = nil, parse_location = {}
         @value = value
         @operator = operator
         @parse_location = parse_location

data/lib/csspool/terms/number.rb

@@ -4,7 +4,7 @@ module CSSPool
       attr_accessor :type
       attr_accessor :unary_operator
 
-      def initialize type, unary_operator, value, operator, parse_location
+      def initialize value, unary_operator = nil, type = nil, operator = nil, parse_location = {}
         @type     = type
         @unary_operator = unary_operator
         super(value, operator, parse_location)

data/lib/csspool/terms/rgb.rb

@@ -4,17 +4,14 @@ module CSSPool
       attr_accessor :red
       attr_accessor :green
       attr_accessor :blue
-      attr_accessor :percentage
       attr_accessor :parse_location
       attr_accessor :operator
-      alias :percentage? :percentage
 
-      def initialize red, green, blue, percentage, operator, parse_location
+      def initialize red, green, blue, operator = nil, parse_location = {}
         super()
         @red    = red
         @green  = green
         @blue   = blue
-        @percentage = percentage
         @operator = operator
         @parse_location = parse_location
       end

data/lib/csspool/terms/string.rb

@@ -1,6 +1,6 @@
 module CSSPool
   module Terms
-    class String < Ident
+    class String < CSSPool::Terms::Ident
     end
   end
 end

data/lib/csspool/visitors/children.rb

@@ -0,0 +1,50 @@
+module CSSPool
+  module Visitors
+    class Children < Visitor
+      visitor_for CSS::Document do |target|
+        children = []
+        [:charsets, :import_rules, :rule_sets].each do |member|
+          children += target.send(member)
+        end
+        children
+      end
+
+      visitor_for CSS::ImportRule do |target|
+        target.media
+      end
+
+      visitor_for CSS::Media,
+        CSS::Charset,
+        Selectors::Id,
+        Selectors::Class,
+        Selectors::PseudoClass,
+        Selectors::Attribute,
+        Terms::Ident,
+        Terms::String,
+        Terms::URI,
+        Terms::Number,
+        Terms::Hash,
+        Terms::Function,
+        Terms::Rgb do |target|
+        []
+      end
+
+      visitor_for CSS::Declaration do |target|
+        target.expressions
+      end
+
+      visitor_for CSS::RuleSet do |target|
+        target.selectors + target.declarations
+      end
+
+      visitor_for Selector do |target|
+        target.simple_selectors
+      end
+
+      visitor_for Selectors::Type, Selectors::Universal, Selectors::Simple do |target|
+        target.additional_selectors
+      end
+    end
+  end
+end
+

data/lib/csspool/visitors/comparable.rb

@@ -32,11 +32,18 @@ module CSSPool
         }
       end
 
-      visitor_for CSS::Media do |target|
+      visitor_for Selectors::PseudoClass do |target|
+        [:name, :extra].all? { |m|
+          target.send(m) == @other.send(m)
+        }
+      end
+
+      visitor_for CSS::Media, Selectors::Id, Selectors::Class do |target|
         target.name == @other.name
       end
 
-      visitor_for Selectors::Type do |target|
+      visitor_for Selectors::Type, Selectors::Universal,
+        Selectors::Simple do |target|
         [:name, :combinator, :additional_selectors].all? { |m|
           target.send(m) == @other.send(m)
         }
@@ -69,7 +76,6 @@ module CSSPool
           :red,
           :green,
           :blue,
-          :percentage,
           :operator
         ].all? { |m| target.send(m) == @other.send(m) }
       end

data/lib/csspool/visitors/iterator.rb

@@ -0,0 +1,80 @@
+module CSSPool
+  module Visitors
+    class Iterator < Visitor
+      def initialize block
+        @block = block
+      end
+
+      visitor_for CSS::Document do |target|
+        [:charsets, :import_rules, :rule_sets].each do |member|
+          target.send(member).each do |node|
+            node.accept self
+          end
+        end
+        @block.call target
+      end
+
+      visitor_for Selectors::Universal, Selectors::Simple do |target|
+        target.children.each do |node|
+          node.accept self
+        end
+        @block.call target
+      end
+
+      visitor_for CSS::Charset do |target|
+        @block.call target
+      end
+
+      visitor_for CSS::ImportRule do |target|
+        target.media.each do |node|
+          node.accept self
+        end
+        @block.call target
+      end
+
+      visitor_for CSS::Media,
+        Selectors::Id,
+        Selectors::Class,
+        Selectors::PseudoClass,
+        Selectors::Attribute,
+        Terms::Ident,
+        Terms::String,
+        Terms::URI,
+        Terms::Number,
+        Terms::Hash,
+        Terms::Function,
+        Terms::Rgb do |target|
+        @block.call target
+      end
+
+      visitor_for CSS::Declaration do |target|
+        target.expressions.each do |node|
+          node.accept self
+        end
+        @block.call target
+      end
+
+      visitor_for CSS::RuleSet do |target|
+        target.selectors.each do |node|
+          node.accept self
+        end
+        target.declarations.each do |node|
+          node.accept self
+        end
+        @block.call target
+      end
+
+      visitor_for Selector do |target|
+        target.simple_selectors.each { |ss| ss.accept self }
+        @block.call target
+      end
+
+      visitor_for Selectors::Type do |target|
+        target.additional_selectors.each do |node|
+          node.accept self
+        end
+        @block.call target
+      end
+    end
+  end
+end

data/lib/csspool/visitors/to_css.rb

@@ -1,14 +1,23 @@
 module CSSPool
   module Visitors
     class ToCSS < Visitor
+
+      CSS_IDENTIFIER_ILLEGAL_CHARACTERS =
+        (0..255).to_a.pack('U*').gsub(/[a-zA-Z0-9_-]/, '')
+      CSS_STRING_ESCAPE_MAP = {
+        "\\" => "\\\\",
+        "\"" => "\\\"",
+        "\n" => "\\a ", # CSS2 4.1.3 p3.2
+        "\r" => "\\\r",
+        "\f" => "\\\f"
+      }
+
       def initialize
         @indent_level = 0
         @indent_space = '  '
       end
 
       visitor_for CSS::Document do |target|
-        media_hash = {}
-
         # Default media list is []
         current_media_type = []
 
@@ -24,7 +33,10 @@ module CSSPool
 
         target.rule_sets.each { |rs|
           if rs.media != current_media_type
-            tokens << "#{indent}@media #{rs.media.map { |x| x.name }.join(", ")} {"
+            media = " " + rs.media.map do |medium|
+              escape_css_identifier medium.name.value
+            end.join(', ')
+            tokens << "#{indent}@media#{media} {"
             @indent_level += 1
           end
 
@@ -40,16 +52,16 @@ module CSSPool
       end
 
       visitor_for CSS::Charset do |target|
-        "@charset \"#{target.name}\";"
+        "@charset \"#{escape_css_string target.name}\";"
       end
 
       visitor_for CSS::ImportRule do |target|
         media = ''
-        media = " " + target.media.map { |x|
-          x.name
-        }.join(', ') if target.media.length > 0
+        media = " " + target.media.map do |medium|
+          escape_css_identifier medium.name.value
+        end.join(', ') if target.media.length > 0
 
-        "#{indent}@import url(\"#{target.uri}\")#{media};"
+        "#{indent}@import #{target.uri.accept(self)}#{media};"
       end
 
       visitor_for CSS::RuleSet do |target|
@@ -63,7 +75,7 @@ module CSSPool
         important = target.important? ? ' !important' : ''
 
         indent {
-          "#{indent}#{target.property}: " + target.expressions.map { |exp|
+          "#{indent}#{escape_css_identifier target.property}: " + target.expressions.map { |exp|
 
             op = '/' == exp.operator ? ' /' : exp.operator
 
@@ -76,7 +88,7 @@ module CSSPool
       end
 
       visitor_for Terms::Ident do |target|
-        target.value
+        escape_css_identifier target.value
       end
 
       visitor_for Terms::Hash do |target|
@@ -90,11 +102,11 @@ module CSSPool
       end
 
       visitor_for Terms::URI do |target|
-        "url(#{target.value})"
+        "url(\"#{escape_css_string target.value}\")"
       end
 
       visitor_for Terms::Function do |target|
-        "#{target.name}(" +
+        "#{escape_css_identifier target.name}(" +
           target.params.map { |x|
             [
               x.operator,
@@ -108,13 +120,15 @@ module CSSPool
           target.red,
           target.green,
           target.blue
-        ].map { |c| target.percentage? ? "#{c}%" : c }.join(',')
+        ].map { |c|
+          c.accept(self)
+        }.join ', '
 
         %{rgb(#{params})}
       end
 
       visitor_for Terms::String do |target|
-        "\"#{target.value}\""
+        "\"#{escape_css_string target.value}\""
       end
 
       visitor_for Selector do |target|
@@ -123,64 +137,50 @@ module CSSPool
 
       visitor_for Selectors::Type do |target|
         combo = {
-          0 => nil,
-          1 => ' ',
-          2 => ' + ',
-          3 => ' > '
+          :s => ' ',
+          :+ => ' + ',
+          :> => ' > '
         }[target.combinator]
 
-        [combo, target.name].compact.join +
+        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|
-        units = {
-          2   => 'em',
-          3   => 'ex',
-          4   => 'px',
-          5   => 'in',
-          6   => 'cm',
-          7   => 'mm',
-          8   => 'pt',
-          9   => 'pc',
-          10  => 'deg',
-          11  => 'rad',
-          12  => 'grad',
-          13  => 'ms',
-          14  => 's',
-          15  => 'Hz',
-          16  => 'kHz',
-          17  => '%',
-        }[target.type]
         [
           target.unary_operator == :minus ? '-' : nil,
           target.value,
-          units
+          target.type
         ].compact.join
       end
 
       visitor_for Selectors::Id do |target|
-        "##{target.name}"
+        "##{escape_css_identifier target.name}"
       end
 
       visitor_for Selectors::Class do |target|
-        ".#{target.name}"
+        ".#{escape_css_identifier target.name}"
       end
 
       visitor_for Selectors::PseudoClass do |target|
-        ":#{target.name}"
+        if target.extra.nil?
+          ":#{escape_css_identifier target.name}"
+        else
+          ":#{escape_css_identifier target.name}(#{escape_css_identifier target.extra})"
+        end
       end
 
       visitor_for Selectors::Attribute do |target|
         case target.match_way
         when Selectors::Attribute::SET
-          "[#{target.name}]"
+          "[#{escape_css_identifier target.name}]"
         when Selectors::Attribute::EQUALS
-          "[#{target.name}=\"#{target.value}\"]"
+          "[#{escape_css_identifier target.name}=\"#{escape_css_string target.value}\"]"
         when Selectors::Attribute::INCLUDES
-          "[#{target.name} ~= \"#{target.value}\"]"
+          "[#{escape_css_identifier target.name} ~= \"#{escape_css_string target.value}\"]"
         when Selectors::Attribute::DASHMATCH
-          "[#{target.name} |= \"#{target.value}\"]"
+          "[#{escape_css_identifier target.name} |= \"#{escape_css_string target.value}\"]"
         else
           raise "no matching matchway"
         end
@@ -196,6 +196,22 @@ module CSSPool
         end
         "#{@indent_space * @indent_level}"
       end
+
+      def escape_css_identifier text
+        # CSS2 4.1.3 p2
+        unsafe_chars = /[#{Regexp.escape CSS_IDENTIFIER_ILLEGAL_CHARACTERS}]/
+        text.gsub(/^\d|^\-(?=\-|\d)|#{unsafe_chars}/um) do |char|
+          if ':()-\\ ='.include? char
+            "\\#{char}"
+          else # I don't trust others to handle space termination well.
+            "\\#{char.unpack('U').first.to_s(16).rjust(6, '0')}"
+          end
+        end
+      end
+
+      def escape_css_string text
+        text.gsub(/[\\"\n\r\f]/) {CSS_STRING_ESCAPE_MAP[$&]}
+      end
     end
   end
 end

data/lib/csspool/visitors.rb

@@ -1,3 +1,5 @@
 require 'csspool/visitors/visitor'
 require 'csspool/visitors/to_css'
 require 'csspool/visitors/comparable'
+require 'csspool/visitors/iterator'
+require 'csspool/visitors/children'

data/lib/csspool.rb

@@ -1,16 +1,19 @@
-require 'csspool/visitable'
 require 'csspool/node'
 require 'csspool/selectors'
 require 'csspool/terms'
 require 'csspool/selector'
+old = $-w
+$-w = false
+require 'csspool/css/parser'
+$-w = old
+require 'csspool/css/tokenizer'
 require 'csspool/sac'
-require 'csspool/lib_croco'
 require 'csspool/css'
 require 'csspool/visitors'
 require 'csspool/collection'
 
 module CSSPool
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 
   def self.CSS doc
     CSSPool::CSS::Document.parse doc