csspool 4.0.2 → 4.0.3

data/lib/csspool/css/parser.y

@@ -19,6 +19,7 @@ token OR
 token VARIABLE_NAME
 token CALC_SYM
 token FONTFACE_SYM
+token UNICODE_RANGE
 
 rule
   document
@@ -34,6 +35,7 @@ rule
     | import
     | namespace
     | body
+    |
     ;
   charset
     : CHARSET_SYM STRING SEMI { @handler.charset interpret_string(val[1]), {} }
@@ -558,6 +560,7 @@ rule
     | function
     | resolution
     | VARIABLE_NAME
+    | uranges
     ;
   function
     : function S { result = val.first }
@@ -582,6 +585,10 @@ rule
         result = Terms::Function.new(name, [Terms::String.new(interpret_string_no_quote(parts.last))])
       }
     ;
+  uranges
+    : UNICODE_RANGE COMMA uranges
+    | UNICODE_RANGE
+    ;
   calc
     : CALC_SYM calc_sum RPAREN optional_space {
        result = Terms::Math.new(val.first.split('(').first, val[1])
@@ -676,22 +683,16 @@ def interpret_string s
 end
 
 def interpret_escapes s
-  token_exp = /\\([0-9a-fA-F]{1,6}(?:\r\n|\s)?)|\\(.)|(.)/mu
-  characters = s.scan(token_exp).map do |u_escape, i_escape, ident|
-    if u_escape
-      code = u_escape.chomp.to_i 16
+  token_exp = /\\(?:([0-9a-fA-F]{1,6}(?:\r\n|\s)?)|(.))/mu
+  return s.gsub(token_exp) do |escape_sequence|
+    if !$1.nil?
+      code = $1.chomp.to_i 16
       code = 0xFFFD if code > 0x10FFFF
-      [code].pack('U')
-    elsif i_escape
-      if i_escape == "\n"
-        ''
-      else
-        i_escape
-      end
-    else
-      ident
+      next [code].pack('U')
     end
-  end.join ''
+    next '' if $2 == "\n"
+    next $2
+  end
 end
 
 # override racc's on_error so we can have context in our error messages

data/lib/csspool/css/tokenizer.rb

@@ -67,7 +67,7 @@ class Tokenizer < Parser
       when (text = @ss.scan(/U\+[0-9a-fA-F?]{1,6}(-[0-9a-fA-F]{1,6})?/i))
          action {[:UNICODE_RANGE, st(text)] }
 
-      when (text = @ss.scan(/[\s]*\/\*(.|[\s]*)*?\*\/[\s]*/i))
+      when (text = @ss.scan(/[\s]*\/\*(.|\s)*?\*\/[\s]*/i))
          action { next_token }
 
       when (text = @ss.scan(/not\([\s]*/i))
@@ -121,7 +121,7 @@ class Tokenizer < Parser
       when (text = @ss.scan(/[\s]*@(\-[A-Za-z]+\-)?keyframes[\s]*/i))
          action { [:KEYFRAMES_SYM, st(text)] }
 
-      when (text = @ss.scan(/[\s]*!([\s]*|[\s]*\/\*(.|[\s]*)*?\*\/[\s]*)important[\s]*/i))
+      when (text = @ss.scan(/[\s]*!([\s]*|[\s]*\/\*(.|\s)*?\*\/[\s]*)important[\s]*/i))
          action { [:IMPORTANT_SYM, st(text)] }
 
       when (text = @ss.scan(/\-\-([_A-Za-z0-9-]|[^\0-\177]|\\[0-9A-Fa-f]{1,6}(\r\n|[\s])?|\\[^\n\r\f0-9A-Fa-f])+/i))
@@ -296,7 +296,7 @@ class Tokenizer < Parser
       when (text = @ss.scan(/\:/i))
          action { [:COLON, st(text)] }
 
-      when (text = @ss.scan(/[\s]*!([\s]*|[\s]*\/\*(.|[\s]*)*?\*\/[\s]*)important[\s]*/i))
+      when (text = @ss.scan(/[\s]*!([\s]*|[\s]*\/\*(.|\s)*?\*\/[\s]*)important[\s]*/i))
          action { [:IMPORTANT_SYM, st(text)] }
 
       when (text = @ss.scan(/[\s]*\{[\s]*/i))

data/lib/csspool/css/tokenizer.rex

@@ -24,7 +24,7 @@ macro
   invalid1  "([^\n\r\f\\"]|\\{nl}|{nonascii}|{escape})*
   invalid2  '([^\n\r\f\\']|\\{nl}|{nonascii}|{escape})*
   invalid   ({invalid1}|{invalid2})
-  comment   \/\*(.|{w})*?\*\/
+  comment   \/\*(.|\s)*?\*\/
   variablename \-\-{name}
 
 rule

data/test/test_parser.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'benchmark'
 
 module CSSPool
   class TestParser < CSSPool::TestCase
@@ -133,5 +134,88 @@ module CSSPool
       end
     end
 
+    def test_only_comments
+      CSSPool.CSS <<-eocss
+        /* Comment */
+      eocss
+    end
+
+    def test_comments
+      CSSPool.CSS <<-eocss
+        /* Comment */
+        a { color: blue;}
+      eocss
+    end
+
+    def test_comments_linebreak
+      CSSPool.CSS <<-eocss
+        /* Multi
+        line
+        comment */
+        a { color: blue;}
+      eocss
+    end
+
+    def test_comments_with_asterisk
+      CSSPool.CSS <<-eocss
+        /* Don't get confused by the * in this comment */
+        a { color: blue;}
+      eocss
+    end
+
+    def test_broken_comment
+      time = Benchmark.measure {
+        begin
+          CSSPool.CSS <<-eocss
+            /*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          eocss
+        rescue
+        end
+      }
+      assert time.real < 1
+    end
+
+    def test_broken_comment_exclamation
+      time = Benchmark.measure {
+        begin
+          CSSPool.CSS <<-eocss
+!
+/**/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          eocss
+        rescue
+        end
+      }
+      assert time.real < 1
+    end
+
   end
 end

data/test/test_term.rb

@@ -68,5 +68,45 @@ module CSSPool
         a { -webkit-filter: invert() }
       eocss
     end
+
+    def test_unicode_range_single
+      CSSPool.CSS <<-eocss
+        @font-face {
+          font-family: 'Ampersand';
+          src: local('Times New Roman');
+          unicode-range: U+26;
+        }
+      eocss
+    end
+
+    def test_unicode_range_range
+      CSSPool.CSS <<-eocss
+        @font-face {
+          font-family: 'Ampersand';
+          src: local('Times New Roman');
+          unicode-range: U+0025-00FF;
+        }
+      eocss
+    end
+
+    def test_unicode_range_wildcard
+      CSSPool.CSS <<-eocss
+        @font-face {
+          font-family: 'Ampersand';
+          src: local('Times New Roman');
+          unicode-range: U+4??;
+        }
+      eocss
+    end
+
+    def test_unicode_range_wildcard_range
+      CSSPool.CSS <<-eocss
+        @font-face {
+          font-family: 'Ampersand';
+          src: local('Times New Roman');
+          unicode-range: U+0025-00FF, U+4??;
+        }
+      eocss
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csspool
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Aaron Patterson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: csspool
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: CSSPool is a CSS parser