antisamy 0.2.1 → 0.3.0

data/lib/antisamy/csspool/rsac/sac/parse_exception.rb

@@ -1,4 +1,4 @@
-module RSAC
-  class ParseException < RuntimeError
-  end
-end
+module RSAC
+  class ParseException < RuntimeError
+  end
+end

data/lib/antisamy/csspool/rsac/sac/parser.rb

@@ -1,109 +1,109 @@
-require "antisamy/csspool/rsac/sac/document_handler"
-require "antisamy/csspool/rsac/sac/error_handler"
-require "antisamy/csspool/rsac/sac/generated_parser"
-require "antisamy/csspool/rsac/sac/lexical_unit"
-require "antisamy/csspool/rsac/sac/parse_exception"
-require "antisamy/csspool/rsac/sac/tokenizer"
-require "antisamy/csspool/rsac/sac/property_parser"
-
-module RSAC
-  class Parser < RSAC::GeneratedParser
-    # The version of CSSPool you're using
-    VERSION = '0.2.7'
-
-    TOKENIZER = Tokenizer.new
-
-    attr_accessor :document_handler, :error_handler, :logger
-
-    def initialize(document_handler = StyleSheet.new(self))
-      @error_handler = ErrorHandler.new
-      @document_handler = document_handler
-      @property_parser = PropertyParser.new()
-      @tokenizer = TOKENIZER
-      @logger = nil
-    end
-
-    def parse_style_sheet(string)
-      @yydebug = true
-      @tokens = TOKENIZER.tokenize(string)
-      @position = 0
-
-      self.document_handler.start_document(string)
-      do_parse
-      self.document_handler.end_document(string)
-      self.document_handler
-    end
-
-    alias :parse :parse_style_sheet
-
-    def parse_rule(rule)
-      returner = Class.new(DocumentHandler) {
-        attr_accessor :selector
-        alias :start_selector :selector=
-      }.new
-      old_document_handler = self.document_handler
-      self.document_handler = returner
-      self.parse("#{rule} { }")
-      self.document_handler = old_document_handler
-      returner.selector
-    end
-
-    # Returns the parser version.  We return CSS2, but its actually
-    # CSS2.1.  No font-face tags.  Sorry.
-    def parser_version
-      "http://www.w3.org/TR/REC-CSS2"
-    end
-
-    attr_reader :property_parser
-    attr_reader :tokenizer
-
-    private # Bro.
-
-    # We have to eliminate matching pairs.
-    # http://www.w3.org/TR/CSS21/syndata.html#parsing-errors
-    # See the malformed declarations section
-    def eliminate_pair_matches(error_value) 
-      pairs = {}
-      pairs['"'] = '"'
-      pairs["'"] = "'"
-        pairs['{'] = '}'
-        pairs['['] = ']'
-        pairs['('] = ')'
-
-        error_value.to_s.strip!
-        if pairs[error_value]
-          logger.warn("Eliminating pair for: #{error_value}") if logger
-          loop {
-            token = next_token
-            eliminate_pair_matches(token[1])
-            logger.warn("Eliminated token: #{token.join(' ')}") if logger
-            if token[1] == pairs[error_value]
-              @position -= 1
-              @tokens[@position] = Token.new(:S, ' ', nil) # super hack
-              break
-            end
-          }
-        end
-      end
-
-      def on_error(error_token_id, error_value, value_stack)
-        if logger
-          logger.error(token_to_str(error_token_id))
-          logger.error("error value: #{error_value}")
-        end
-        eliminate_pair_matches(error_value)
-      end
-
-      def next_token
-        return [false, false] if @position >= @tokens.length
-
-        n_token = @tokens[@position]
-        @position += 1
-        if n_token.name == :COMMENT
-          self.document_handler.comment(n_token.value)
-          return next_token
-        end
-        n_token.to_racc_token
-      end
-    end
-  end
+require "antisamy/csspool/rsac/sac/document_handler"
+require "antisamy/csspool/rsac/sac/error_handler"
+require "antisamy/csspool/rsac/sac/generated_parser"
+require "antisamy/csspool/rsac/sac/lexical_unit"
+require "antisamy/csspool/rsac/sac/parse_exception"
+require "antisamy/csspool/rsac/sac/tokenizer"
+require "antisamy/csspool/rsac/sac/property_parser"
+
+module RSAC
+  class Parser < RSAC::GeneratedParser
+    # The version of CSSPool you're using
+    VERSION = '0.2.7'
+
+    TOKENIZER = Tokenizer.new
+
+    attr_accessor :document_handler, :error_handler, :logger
+
+    def initialize(document_handler = StyleSheet.new(self))
+      @error_handler = ErrorHandler.new
+      @document_handler = document_handler
+      @property_parser = PropertyParser.new()
+      @tokenizer = TOKENIZER
+      @logger = nil
+    end
+
+    def parse_style_sheet(string)
+      @yydebug = true
+      @tokens = TOKENIZER.tokenize(string)
+      @position = 0
+
+      self.document_handler.start_document(string)
+      do_parse
+      self.document_handler.end_document(string)
+      self.document_handler
+    end
+
+    alias :parse :parse_style_sheet
+
+    def parse_rule(rule)
+      returner = Class.new(DocumentHandler) {
+        attr_accessor :selector
+        alias :start_selector :selector=
+      }.new
+      old_document_handler = self.document_handler
+      self.document_handler = returner
+      self.parse("#{rule} { }")
+      self.document_handler = old_document_handler
+      returner.selector
+    end
+
+    # Returns the parser version.  We return CSS2, but its actually
+    # CSS2.1.  No font-face tags.  Sorry.
+    def parser_version
+      "http://www.w3.org/TR/REC-CSS2"
+    end
+
+    attr_reader :property_parser
+    attr_reader :tokenizer
+
+    private # Bro.
+
+    # We have to eliminate matching pairs.
+    # http://www.w3.org/TR/CSS21/syndata.html#parsing-errors
+    # See the malformed declarations section
+    def eliminate_pair_matches(error_value) 
+      pairs = {}
+      pairs['"'] = '"'
+      pairs["'"] = "'"
+        pairs['{'] = '}'
+        pairs['['] = ']'
+        pairs['('] = ')'
+
+        error_value.to_s.strip!
+        if pairs[error_value]
+          logger.warn("Eliminating pair for: #{error_value}") if logger
+          loop {
+            token = next_token
+            eliminate_pair_matches(token[1])
+            logger.warn("Eliminated token: #{token.join(' ')}") if logger
+            if token[1] == pairs[error_value]
+              @position -= 1
+              @tokens[@position] = Token.new(:S, ' ', nil) # super hack
+              break
+            end
+          }
+        end
+      end
+
+      def on_error(error_token_id, error_value, value_stack)
+        if logger
+          logger.error(token_to_str(error_token_id))
+          logger.error("error value: #{error_value}")
+        end
+        eliminate_pair_matches(error_value)
+      end
+
+      def next_token
+        return [false, false] if @position >= @tokens.length
+
+        n_token = @tokens[@position]
+        @position += 1
+        if n_token.name == :COMMENT
+          self.document_handler.comment(n_token.value)
+          return next_token
+        end
+        n_token.to_racc_token
+      end
+    end
+  end

data/lib/antisamy/csspool/rsac/sac/property_parser.rb

@@ -1,44 +1,44 @@
-require "antisamy/csspool/rsac/sac/generated_property_parser"
-
-module RSAC
-  class PropertyParser < RSAC::GeneratedPropertyParser
-    def initialize
-      @tokens = []
-      @token_table = Racc_arg[10]
-    end
-
-    def parse_tokens(tokens)
-      negate = false # Nasty hack for unary minus
-      @tokens = tokens.find_all { |x| x.name != :S }.map { |token|
-        tok = if @token_table.has_key?(token.value)
-        [token.value, token.value]
-      else
-        if token.name == :delim && !@token_table.has_key?(token.value)
-          negate = true if token.value == '-'
-          nil
-        else
-          token.to_racc_token
-        end
-      end
-
-      if negate && tok
-        tok[1] = "-#{tok[1]}"
-        negate = false
-      end
-      tok
-    }.compact
-
-    begin
-      return do_parse
-    rescue ParseError => e
-      return nil
-    end
-  end
-
-  private
-  def next_token
-    return [false, false] if @tokens.empty?
-    @tokens.shift
-  end
-end
-end
+require "antisamy/csspool/rsac/sac/generated_property_parser"
+
+module RSAC
+  class PropertyParser < RSAC::GeneratedPropertyParser
+    def initialize
+      @tokens = []
+      @token_table = Racc_arg[10]
+    end
+
+    def parse_tokens(tokens)
+      negate = false # Nasty hack for unary minus
+      @tokens = tokens.find_all { |x| x.name != :S }.map { |token|
+        tok = if @token_table.has_key?(token.value)
+        [token.value, token.value]
+      else
+        if token.name == :delim && !@token_table.has_key?(token.value)
+          negate = true if token.value == '-'
+          nil
+        else
+          token.to_racc_token
+        end
+      end
+
+      if negate && tok
+        tok[1] = "-#{tok[1]}"
+        negate = false
+      end
+      tok
+    }.compact
+
+    begin
+      return do_parse
+    rescue ParseError => e
+      return nil
+    end
+  end
+
+  private
+  def next_token
+    return [false, false] if @tokens.empty?
+    @tokens.shift
+  end
+end
+end

data/lib/antisamy/csspool/rsac/sac/selectors.rb

@@ -1,5 +1,5 @@
-require "antisamy/csspool/rsac/sac/selectors/selector"
-
-%w(simple child conditional descendant element sibling).each do |type|
-  require "antisamy/csspool/rsac/sac/selectors/#{type}_selector"
-end
+require "antisamy/csspool/rsac/sac/selectors/selector"
+
+%w(simple child conditional descendant element sibling).each do |type|
+  require "antisamy/csspool/rsac/sac/selectors/#{type}_selector"
+end

data/lib/antisamy/csspool/rsac/sac/selectors/child_selector.rb

@@ -1,36 +1,36 @@
-module RSAC
-  module Selectors
-    class ChildSelector < SimpleSelector
-      attr_accessor :ancestor_selector, :simple_selector
-      alias :parent :ancestor_selector
-      alias :selector :simple_selector
-
-      def initialize(parent, selector)
-        super(:SAC_CHILD_SELECTOR)
-
-        @ancestor_selector = parent
-        @simple_selector = selector
-      end
-
-      def to_css
-        "#{parent.to_css} > #{selector.to_css}"
-      end
-
-      def to_xpath(prefix=true)
-        "#{parent.to_xpath(prefix)}/#{selector.to_xpath(false)}"
-      end
-
-      def specificity
-        parent.specificity.zip(selector.specificity).map { |x,y| x + y }
-      end
-
-      def ==(other)
-        super && parent == other.parent && selector == other.selector
-      end
-
-      def hash
-        [parent, selector].hash
-      end
-    end
-  end
-end
+module RSAC
+  module Selectors
+    class ChildSelector < SimpleSelector
+      attr_accessor :ancestor_selector, :simple_selector
+      alias :parent :ancestor_selector
+      alias :selector :simple_selector
+
+      def initialize(parent, selector)
+        super(:SAC_CHILD_SELECTOR)
+
+        @ancestor_selector = parent
+        @simple_selector = selector
+      end
+
+      def to_css
+        "#{parent.to_css} > #{selector.to_css}"
+      end
+
+      def to_xpath(prefix=true)
+        "#{parent.to_xpath(prefix)}/#{selector.to_xpath(false)}"
+      end
+
+      def specificity
+        parent.specificity.zip(selector.specificity).map { |x,y| x + y }
+      end
+
+      def ==(other)
+        super && parent == other.parent && selector == other.selector
+      end
+
+      def hash
+        [parent, selector].hash
+      end
+    end
+  end
+end

data/lib/antisamy/csspool/rsac/sac/selectors/conditional_selector.rb

@@ -1,45 +1,45 @@
-module RSAC
-  module Selectors
-    class ConditionalSelector < SimpleSelector
-      attr_accessor :condition, :simple_selector
-      alias :selector :simple_selector
-
-      def initialize(selector, condition)
-        super(:SAC_CONDITIONAL_SELECTOR)
-
-        @condition = condition
-        @simple_selector = selector
-      end
-
-      def to_css
-        [selector, condition].map { |x|
-          x ? x.to_css : ''
-        }.join('')
-      end
-
-      def to_xpath(prefix=true)
-        atoms = []
-        atoms << "//" if prefix
-        atoms << (selector ? selector.to_xpath(false) : "*")
-        atoms << condition.to_xpath
-
-        atoms.join("")
-      end
-
-      def specificity
-        (selector ? selector.specificity : ([0] * 4)).zip(
-        (condition ? condition.specificity : ([0] * 4))).map { |x,y|
-          x + y
-        }
-      end
-
-      def ==(other)
-        super && condition == other.condition && selector == other.selector
-      end
-
-      def hash
-        [condition, selector].hash
-      end
-    end
-  end
-end
+module RSAC
+  module Selectors
+    class ConditionalSelector < SimpleSelector
+      attr_accessor :condition, :simple_selector
+      alias :selector :simple_selector
+
+      def initialize(selector, condition)
+        super(:SAC_CONDITIONAL_SELECTOR)
+
+        @condition = condition
+        @simple_selector = selector
+      end
+
+      def to_css
+        [selector, condition].map { |x|
+          x ? x.to_css : ''
+        }.join('')
+      end
+
+      def to_xpath(prefix=true)
+        atoms = []
+        atoms << "//" if prefix
+        atoms << (selector ? selector.to_xpath(false) : "*")
+        atoms << condition.to_xpath
+
+        atoms.join("")
+      end
+
+      def specificity
+        (selector ? selector.specificity : ([0] * 4)).zip(
+        (condition ? condition.specificity : ([0] * 4))).map { |x,y|
+          x + y
+        }
+      end
+
+      def ==(other)
+        super && condition == other.condition && selector == other.selector
+      end
+
+      def hash
+        [condition, selector].hash
+      end
+    end
+  end
+end