csspool 4.0.0.pre → 4.0.0

data/lib/csspool/css/tokenizer.rex

@@ -7,10 +7,8 @@ macro
   w         [\s]*
   nonascii  [^\0-\177]
   num       ([0-9]*\.[0-9]+|[0-9]+)
-  length    {num}(px|cm|mm|in|pt|pc)
+  length    {num}(px|cm|mm|in|pt|pc|mozmm|em|ex|ch|rem|vh|vw|vmin|vmax)
   percentage {num}%
-  ems       {num}em
-  exs       {num}ex
   unicode   \\[0-9A-Fa-f]{1,6}(\r\n|[\s])?
   nth       ([\+\-]?[0-9]*n({w}[\+\-]{w}[0-9]+)?|[\+\-]?[0-9]+|odd|even)
   vendorprefix \-[A-Za-z]+\-
@@ -18,8 +16,7 @@ macro
   escape    {unicode}|\\[^\n\r\f0-9A-Fa-f]
   nmchar    [_A-Za-z0-9-]|{nonascii}|{escape}
   nmstart   [_A-Za-z]|{nonascii}|{escape}
-  ident     [-@]?({nmstart})({nmchar})*
-  func      [-@]?({nmstart})({nmchar}|[.])*
+  ident     \-?({nmstart})({nmchar})*
   name      ({nmchar})+
   string1   "([^\n\r\f\\"]|\\{nl}|{nonascii}|{escape})*"
   string2   '([^\n\r\f\\']|\\{nl}|{nonascii}|{escape})*'
@@ -28,24 +25,43 @@ macro
   invalid2  '([^\n\r\f\\']|\\{nl}|{nonascii}|{escape})*
   invalid   ({invalid1}|{invalid2})
   comment   \/\*(.|{w})*?\*\/
-
-  unit      ({num}|{length}|{percentage}|{ems}|{exs})
-  product   {unit}({w}(\*{w}{unit}|\/{w}{num}))*
-  sum       {product}([\s]+[\+\-][\s]+{product})*
-  calc      ({vendorprefix})?calc\({w}{sum}{w}\)
-  math      {calc}{w}
+  variablename \-\-{name}
 
 rule
 
 # [:state]  pattern  [actions]
 
+# "Logical queries", such as those used by @supports and @media, include keywords that match our IDENT pattern.
+# Including these as lexical words makes their use anywhere else (even inside other words!) not possible.
+# So we define a new state, and list the things that can occur.
+:LOGICQUERY url\({w}{string}{w}\) { [:URI, st(text)] }
+:LOGICQUERY url\({w}([!#\$%&*-~]|{nonascii}|{escape})*{w}\) { [:URI, st(text)] }
+:LOGICQUERY {ident}\(\s*      { [:FUNCTION, st(text)] }
+:LOGICQUERY {w}(and|only|not|or)[\s]+ { [text.upcase.strip.intern, st(text)] }
+:LOGICQUERY {w}{num}(dpi|dpcm)     { [:RESOLUTION, st(text)]}
+:LOGICQUERY {w}{length}{w}   { [:LENGTH, st(text)] }
+:LOGICQUERY {w}{num}(deg|rad|grad){w} { [:ANGLE, st(text)] }
+:LOGICQUERY {w}{num}(ms|s){w} { [:TIME, st(text)] }
+:LOGICQUERY {w}{num}[k]?hz{w} { [:FREQ, st(text)] }
+:LOGICQUERY {w}{percentage}{w} { [:PERCENTAGE, st(text)] }
+:LOGICQUERY {w}{num}{w}      { [:NUMBER, st(text)] }
+:LOGICQUERY {ident}          { [:IDENT, st(text)] }
+:LOGICQUERY {w},{w}          { [:COMMA, st(',')] }
+:LOGICQUERY {w}\)            { [:RPAREN, st(text)] }
+:LOGICQUERY {w}\(            { [:LPAREN, st(text)] }
+:LOGICQUERY \:               { [:COLON, st(text)] }
+:LOGICQUERY {w}!({w}|{w}{comment}{w})important{w}  { [:IMPORTANT_SYM, st(text)] }
+# this marks the end of our logical query
+:LOGICQUERY {w}\{{w}         { @state = nil; [:LBRACE, st(text)] }
+:LOGICQUERY [\s]+            { [:S, st(text)] }
+
             url\({w}{string}{w}\) { [:URI, st(text)] }
             url\({w}([!#\$%&*-~]|{nonascii}|{escape})*{w}\) { [:URI, st(text)] }
             U\+[0-9a-fA-F?]{1,6}(-[0-9a-fA-F]{1,6})?  {[:UNICODE_RANGE, st(text)] }
             {w}{comment}{w}  { next_token }
 
             # this one takes a selector as a parameter
-            not\(\s*         { [:NOT_PSEUDO_CLASS, st(text)] }
+            not\({w}            { [:NOT_PSEUDO_CLASS, st(text)] }
 
             # this one takes an "nth" value
             (nth\-child|nth\-last\-child|nth\-of\-type|nth\-last\-of\-type)\({w}{nth}{w}\) { [:NTH_PSEUDO_CLASS, st(text)] }
@@ -57,17 +73,24 @@ rule
             (domain|url\-prefix)\({w}{string}{w}\) { [:FUNCTION_NO_QUOTE, st(text)] }
             (domain|url\-prefix)\({w}([!#\$%&*-~]|{nonascii}|{escape})*{w}\) { [:FUNCTION_NO_QUOTE, st(text)] }
 
-            {w}{math}{w}     { [:MATH, st(text)] }
+            # mozilla-specific pseudo-elements that can be used with one or two colons and can have multiple parameters
+            (\-moz\-non\-element|\-moz\-anonymous\-block|\-moz\-anonymous\-positioned\-block|\-moz\-mathml\-anonymous\-block|\-moz\-xul\-anonymous\-block|\-moz\-hframeset\-border|\-moz\-vframeset\-border|\-moz\-line\-frame|\-moz\-button\-content|\-moz\-buttonlabel|\-moz\-cell\-content|\-moz\-dropdown\-list|\-moz\-fieldset\-content|\-moz\-frameset\-blank|\-moz\-display\-comboboxcontrol\-frame|\-moz\-html\-canvas\-content|\-moz\-inline\-table|\-moz\-table|\-moz\-table\-cell|\-moz\-table\-column\-group|\-moz\-table\-column|\-moz\-table\-outer|\-moz\-table\-row\-group|\-moz\-table\-row|\-moz\-canvas|\-moz\-pagebreak|\-moz\-page|\-moz\-pagecontent|\-moz\-page\-sequence|\-moz\-scrolled\-content|\-moz\-scrolled\-canvas|\-moz\-scrolled\-page\-sequence|\-moz\-column\-content|\-moz\-viewport|\-moz\-viewport\-scroll|\-moz\-anonymous\-flex\-item|\-moz\-tree\-column|\-moz\-tree\-row|\-moz\-tree\-separator|\-moz\-tree\-cell|\-moz\-tree\-indentation|\-moz\-tree\-line|\-moz\-tree\-twisty|\-moz\-tree\-image|\-moz\-tree\-cell\-text|\-moz\-tree\-checkbox|\-moz\-tree\-progressmeter|\-moz\-tree\-drop\-feedback|\-moz\-svg\-outer\-svg\-anon\-child|\-moz\-svg\-foreign\-content|\-moz\-svg\-text)\( { [:MOZ_PSEUDO_ELEMENT, st(text)] }
+
+            {w}@media{w}     { @state = :LOGICQUERY; [:MEDIA_SYM, st(text)] }
+            {w}@supports{w}  { @state = :LOGICQUERY; [:SUPPORTS_SYM, st(text)] }
+
+            calc\(\s*        { [:CALC_SYM, st(text)] }
+            {ident}\(\s*      { [:FUNCTION, st(text)] }
 
-            {func}\(\s*      { [:FUNCTION, st(text)] }
             {w}@import{w}    { [:IMPORT_SYM, st(text)] }
             {w}@page{w}      { [:PAGE_SYM, st(text)] }
             {w}@charset{w}   { [:CHARSET_SYM, st(text)] }
-            {w}@media{w}     { [:MEDIA_SYM, st(text)] }
             {w}@({vendorprefix})?document{w} { [:DOCUMENT_QUERY_SYM, st(text)] }
             {w}@namespace{w} { [:NAMESPACE_SYM, st(text)] }
+            {w}@font\-face{w} { [:FONTFACE_SYM, st(text)] }
             {w}@({vendorprefix})?keyframes{w} { [:KEYFRAMES_SYM, st(text)] }
             {w}!({w}|{w}{comment}{w})important{w}  { [:IMPORTANT_SYM, st(text)] }
+            {variablename}   { [:VARIABLE_NAME, st(text)] }
             {ident}          { [:IDENT, st(text)] }
             \#{name}         { [:HASH, st(text)] }
             {w}~={w}         { [:INCLUDES, st(text)] }
@@ -78,6 +101,7 @@ rule
             {w}!={w}         { [:NOT_EQUAL, st(text)] }
             {w}={w}          { [:EQUAL, st(text)] }
             {w}\)            { [:RPAREN, st(text)] }
+            {w}\(            { [:LPAREN, st(text)] }
             \[{w}            { [:LSQUARE, st(text)] }
             {w}\]            { [:RSQUARE, st(text)] }
             {w}\+{w}         { [:PLUS, st(text)] }
@@ -86,10 +110,9 @@ rule
             {w}>{w}          { [:GREATER, st(text)] }
             {w},{w}          { [:COMMA, st(',')] }
             {w};{w}          { [:SEMI, st(';')] }
+            \:               { [:COLON, st(text)] }
             \*               { [:STAR, st(text)] }
             {w}~{w}          { [:TILDE, st(text)] }
-            {w}{ems}{w}      { [:EMS, st(text)] }
-            {w}{exs}{w}      { [:EXS, st(text)] }
 
             {w}{length}{w}   { [:LENGTH, st(text)] }
             {w}{num}(deg|rad|grad){w} { [:ANGLE, st(text)] }
@@ -104,8 +127,8 @@ rule
             -->              { [:CDC, st(text)] }
             {w}\-(?!{ident}){w}   { [:MINUS, st(text)] }
             {w}\+{w}         { [:PLUS, st(text)] }
-            
-            
+
+
             [\s]+            { [:S, st(text)] }
             {string}         { [:STRING, st(text)] }
             {invalid}        { [:INVALID, st(text)] }

data/lib/csspool/css.rb

@@ -1,12 +1,17 @@
 require 'csspool/css/tokenizer'
 require 'csspool/css/charset'
+require 'csspool/css/fontface_rule'
 require 'csspool/css/import_rule'
-require 'csspool/css/media'
+require 'csspool/css/media_query'
+require 'csspool/css/media_query_list'
+require 'csspool/css/media_feature'
+require 'csspool/css/media_type'
 require 'csspool/css/rule_set'
 require 'csspool/css/declaration'
 require 'csspool/css/document'
 require 'csspool/css/document_handler'
 require 'csspool/css/document_query'
+require 'csspool/css/supports_rule'
 require 'csspool/css/namespace_rule'
 require 'csspool/css/keyframes_rule'
 require 'csspool/css/keyframes_block'

data/lib/csspool/node.rb

@@ -1,6 +1,28 @@
 module CSSPool
   class Node
     include Enumerable
+    
+    # These give the position of this node in the source CSS. Not all
+    # node types are supported. "Outer" represents the start/end of
+    # this node, "inner" represents the start/end of this node's
+    # children. Outer will not contain leading or trailing comments or
+    # whitespace, while inner will. For example, in this code:
+    #
+    # ---
+    # 1 /* test1 */
+    # 2 @document domain('example.com') {
+    # 3 	/* test2 */
+    # 4 	* { color: blue; }
+    # 5 	/* test3 */
+    # 6 } /* test4 */
+    # ---
+    # 
+    # The index will represent the position:
+    # outer_start_pos: 2:0
+    # inner_start_pos: 2:33
+    # inner_end_pos: 6:0
+    # outer_end_pos: 6:1
+    attr_accessor :outer_start_pos, :inner_start_pos, :inner_end_pos, :outer_end_pos
 
     def accept target
       target.accept self

data/lib/csspool/selector.rb

@@ -17,15 +17,16 @@ module CSSPool
     def specificity
       a = b = c = 0
       simple_selectors.each do |s|
-        if !s.name.nil?
+        if s.is_a?(Selectors::Type) && s.name && s.name != ''
           c += 1
         end
         s.additional_selectors.each do |additional_selector|
-          if Selectors::Id === additional_selector
+          case additional_selector
+          when Selectors::Id
             a += 1
-          elsif Selectors::PseudoElement === additional_selector
+          when Selectors::PseudoElement
             c += 1
-          else
+          when Selectors::Class, Selectors::PseudoClass, Selectors::Attribute
             b += 1
           end
         end

data/lib/csspool/selectors/pseudo.rb

@@ -3,10 +3,10 @@ require 'csspool/selectors/pseudo_element'
 
 module CSSPool
   module Selectors
-    def Selectors.pseudo name
+    def self.pseudo name
       # FIXME: This is a bit of an ugly solution. Should be able to handle it
       # more elegantly, and without calling out css2
-      css2_pseudo_elements = 
+      css2_pseudo_elements =
       if %w{after before first-letter first-line}.include? name
         PseudoElement.new name, true
       else

data/lib/csspool/terms/function.rb

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

data/lib/csspool/terms/resolution.rb

@@ -0,0 +1,13 @@
+module CSSPool
+  module Terms
+    class Resolution < CSSPool::Node
+      attr_accessor :number, :unit, :parse_location
+
+      def initialize(number, unit, parse_location = {})
+        @number = number
+        @unit = unit
+        @parse_location = parse_location
+      end
+    end
+  end
+end

data/lib/csspool/terms.rb

@@ -6,3 +6,4 @@ require 'csspool/terms/uri'
 require 'csspool/terms/rgb'
 require 'csspool/terms/hash'
 require 'csspool/terms/math'
+require 'csspool/terms/resolution'

data/lib/csspool/visitors/children.rb

@@ -13,7 +13,7 @@ module CSSPool
         target.media_list
       end
 
-      visitor_for CSS::Media,
+      visitor_for CSS::MediaType,
         CSS::Charset,
         Selectors::Id,
         Selectors::Class,
@@ -25,7 +25,8 @@ module CSSPool
         Terms::Number,
         Terms::Hash,
         Terms::Function,
-        Terms::Rgb do |target|
+        Terms::Rgb,
+        Terms::Resolution do |target|
         []
       end
 
@@ -37,6 +38,10 @@ module CSSPool
         target.selectors + target.declarations
       end
 
+      visitor_for CSS::FontfaceRule do |target|
+        target.declarations
+      end
+
       visitor_for Selector do |target|
         target.simple_selectors
       end
@@ -44,6 +49,15 @@ module CSSPool
       visitor_for Selectors::Type, Selectors::Universal, Selectors::Simple do |target|
         target.additional_selectors
       end
+
+      visitor_for CSS::MediaQuery do |target|
+        [target.media_expr].concat(target.and_exprs).compact
+      end
+
+      visitor_for CSS::MediaQueryList do |target|
+        target.media_queries
+      end
+
     end
   end
 end

data/lib/csspool/visitors/comparable.rb

@@ -17,7 +17,7 @@ module CSSPool
       end
 
       visitor_for CSS::RuleSet do |target|
-        [:selectors, :declarations, :media].all? { |m|
+        [:selectors, :declarations, :parent_rule].all? { |m|
           target.send(m) == @other.send(m)
         }
       end
@@ -38,13 +38,7 @@ module CSSPool
         }
       end
 
-      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|
+      visitor_for CSS::MediaType, Selectors::Id, Selectors::Class do |target|
         target.name == @other.name
       end
 
@@ -61,6 +55,24 @@ module CSSPool
         }
       end
 
+      visitor_for CSS::MediaFeature do |target|
+        [:property, :value].all? { |m|
+          target.send(m) == @other.send(m)
+        }
+      end
+
+      visitor_for CSS::MediaQuery do |target|
+        [:only_or_not, :media_expr, :and_exprs].all? { |m|
+          target.send(m) == @other.send(m)
+        }
+      end
+
+      visitor_for CSS::MediaQueryList do |target|
+        [:media_queries].all? { |m|
+          target.send(m) == @other.send(m)
+        }
+      end
+
       visitor_for Terms::Function do |target|
         [:name, :params, :operator].all? { |m|
           target.send(m) == @other.send(m)
@@ -85,6 +97,13 @@ module CSSPool
           :operator
         ].all? { |m| target.send(m) == @other.send(m) }
       end
+
+      visitor_for Terms::Resolution do |target|
+        [
+          :number,
+          :unit
+        ].all? { |m| target.send(m) == @other.send(m) }
+      end
     end
   end
 end

data/lib/csspool/visitors/iterator.rb

@@ -14,7 +14,7 @@ module CSSPool
         @block.call target
       end
 
-      visitor_for Selectors::Universal, Selectors::Simple do |target|
+      visitor_for Selectors::Universal, Selectors::Simple, CSS::MediaQuery, CSS::MediaQueryList do |target|
         target.children.each do |node|
           node.accept self
         end
@@ -32,7 +32,7 @@ module CSSPool
         @block.call target
       end
 
-      visitor_for CSS::Media,
+      visitor_for CSS::MediaType,
         Selectors::Id,
         Selectors::Class,
         Selectors::PseudoClass,
@@ -43,7 +43,9 @@ module CSSPool
         Terms::Number,
         Terms::Hash,
         Terms::Function,
-        Terms::Rgb do |target|
+        Terms::Rgb,
+        Terms::Resolution,
+        CSS::MediaFeature do |target|
         @block.call target
       end
 

data/lib/csspool/visitors/to_css.rb

@@ -18,8 +18,13 @@ module CSSPool
       end
 
       visitor_for CSS::Document do |target|
-        # Default media list is []
-        current_media_type = []
+        # FIXME - this does not handle nested parent rules, like
+        # @document domain(example.com) {
+        #   @media screen {
+        #     a { color: blue; }
+        #   }
+        # }
+        current_parent_rule = []
 
         tokens = []
 
@@ -31,34 +36,72 @@ module CSSPool
           tokens << ir.accept(self)
         end
 
+        target.fontface_rules.each do |ffr|
+          tokens << ffr.accept(self)
+        end
+
         target.rule_sets.each { |rs|
-          if rs.media != current_media_type
-            media = " " + rs.media.media_list.map do |medium|
-              escape_css_identifier medium.value
-            end.join(', ')
-            tokens << "#{indent}@media#{media} {"
+          # FIXME - handle other kinds of parents
+          if !rs.parent_rule.nil? and rs.parent_rule != current_parent_rule
+            media = rs.parent_rule
+            tokens << "#{indent}@media #{media} {"
             @indent_level += 1
           end
 
           tokens << rs.accept(self)
 
-          if rs.media != current_media_type
-            current_media_type = rs.media
-            @indent_level -= 1
-            tokens << "#{indent}}"
+          if rs.parent_rule != current_parent_rule
+            current_parent_rule = rs.parent_rule
+            if !rs.parent_rule.nil?
+              @indent_level -= 1
+              tokens << "#{indent}}"
+            end
           end
         }
         tokens.join(line_break)
       end
 
+      visitor_for CSS::MediaType do |target|
+        escape_css_identifier(target.name)
+      end
+
+      visitor_for CSS::MediaFeature do |target|
+        "(#{escape_css_identifier(target.property)}:#{target.value})"
+      end
+
+      visitor_for CSS::MediaQuery do |target|
+        ret = ''
+        if target.only_or_not
+          ret << target.only_or_not.to_s + ' '
+        end
+        ret << target.media_expr.accept(self)
+        if target.and_exprs.any?
+          ret << ' and '
+        end
+        ret << target.and_exprs.map { |expr| expr.accept(self) }.join(' and ')
+      end
+
+      visitor_for CSS::MediaQueryList do |target|
+        target.media_queries.map do |m|
+          m.accept(self)
+        end.join(', ')
+      end
+
       visitor_for CSS::Charset do |target|
         "@charset \"#{escape_css_string target.name}\";"
       end
 
+      visitor_for CSS::FontfaceRule do |target|
+        "@font-face {#{line_break}" +
+        "#{indent}" +
+          target.declarations.map { |decl| decl.accept self }.join(line_break) +
+          "#{line_break}#{indent}}"
+      end
+
       visitor_for CSS::ImportRule do |target|
         media = ''
         media = " " + target.media_list.map do |medium|
-          escape_css_identifier medium.value
+          escape_css_identifier medium.name
         end.join(', ') if target.media_list.length > 0
 
         "#{indent}@import #{target.uri.accept(self)}#{media};"
@@ -77,17 +120,22 @@ module CSSPool
       end
 
       visitor_for CSS::RuleSet do |target|
-        "#{indent}" +
-          target.selectors.map { |sel| sel.accept self }.join(", ") + " {#{line_break}" +
-          target.declarations.map { |decl| decl.accept self }.join(line_break) +
-          "#{line_break}#{indent}}"
+        if target.selectors.any?
+          "#{indent}" +
+            target.selectors.map { |sel| sel.accept self }.join(", ") + " {#{line_break}" +
+            target.declarations.map { |decl| decl.accept self }.join(line_break) +
+            "#{line_break}#{indent}}"
+        else
+          ''
+        end
       end
 
       visitor_for CSS::Declaration do |target|
         important = target.important? ? ' !important' : ''
 
+        # only output indents and semicolons if this is in a ruleset
         indent {
-          "#{indent}#{escape_css_identifier target.property}: " + target.expressions.map { |exp|
+          "#{target.rule_set.nil? ? '' : indent}#{escape_css_identifier target.property}: " + target.expressions.map { |exp|
 
             op = '/' == exp.operator ? ' /' : exp.operator
 
@@ -95,7 +143,7 @@ module CSSPool
               op,
               exp.accept(self),
             ].join ' '
-          }.join.strip + "#{important};"
+          }.join.strip + important + (target.rule_set.nil? ? '' : ';')
         }
       end
 
@@ -114,7 +162,7 @@ module CSSPool
       visitor_for Terms::Function do |target|
         "#{escape_css_identifier target.name}(" +
           target.params.map { |x|
-            [
+            x.is_a?(String) ? x : [
               x.operator,
               x.accept(self)
             ].compact.join(' ')
@@ -145,6 +193,10 @@ module CSSPool
         ].compact.join
       end
 
+      visitor_for Terms::Resolution do |target|
+        "#{target.number}#{target.unit}"
+      end
+
       visitor_for Selector do |target|
         target.simple_selectors.map { |ss| ss.accept self }.join
       end
@@ -153,7 +205,8 @@ module CSSPool
         combo = {
           :s => ' ',
           :+ => ' + ',
-          :> => ' > '
+          :> => ' > ',
+          :~ => ' ~ '
         }[target.combinator]
 
         name = [nil, '*'].include?(target.name) ? target.name : escape_css_identifier(target.name)

data/test/css/test_document_query.rb

@@ -6,71 +6,70 @@ module CSSPool
 
       def test_function
         doc = CSSPool.CSS <<-eocss
-					@document domain("example.com") {
-						* { color: blue; }
-					}
+          @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
+        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; }
-					}
+          @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
+        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; }
-					}
+          @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
+        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; }
-					}
+          @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
+        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") {
-					}
+          @document url("http://www.example.com") {
+          }
         eocss
         assert_equal 1, doc.document_queries.size
-				assert_equal true, doc.document_queries[0].rule_sets.empty?
+        assert_equal true, doc.document_queries[0].rule_sets.empty?
       end
-
     end
   end
 end

data/test/css/test_font_face.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+module CSSPool
+  module CSS
+    class TestFontFace < CSSPool::TestCase
+
+      def test_basic
+        doc = CSSPool.CSS <<-eocss
+          @font-face { font-weight: normal; }
+        eocss
+        assert_equal "@font-face {\n  font-weight: normal;\n}", doc.to_css
+      end
+
+    end
+  end
+end