csspool 3.0.2 → 4.0.0.pre

data/Gemfile.lock

@@ -1,16 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    hoe (3.1.0)
+    hoe (3.0.4)
       rake (~> 0.8)
-    hoe-bundler (1.2.0)
+    hoe-bundler (1.1.0)
       hoe (>= 2.2.0)
     hoe-gemspec (1.0.0)
       hoe (>= 2.2.0)
     hoe-git (1.5.0)
       hoe (>= 2.2.0)
-    json (1.7.5)
-    racc (1.4.9)
+    json (1.7.0)
+    racc (1.4.8)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

data/Manifest.txt

@@ -12,8 +12,12 @@ lib/csspool/css/charset.rb
 lib/csspool/css/declaration.rb
 lib/csspool/css/document.rb
 lib/csspool/css/document_handler.rb
+lib/csspool/css/document_query.rb
 lib/csspool/css/import_rule.rb
+lib/csspool/css/keyframes_block.rb
+lib/csspool/css/keyframes_rule.rb
 lib/csspool/css/media.rb
+lib/csspool/css/namespace_rule.rb
 lib/csspool/css/parser.rb
 lib/csspool/css/parser.y
 lib/csspool/css/rule_set.rb
@@ -29,7 +33,9 @@ lib/csspool/selectors/additional.rb
 lib/csspool/selectors/attribute.rb
 lib/csspool/selectors/class.rb
 lib/csspool/selectors/id.rb
+lib/csspool/selectors/pseudo.rb
 lib/csspool/selectors/pseudo_class.rb
+lib/csspool/selectors/pseudo_element.rb
 lib/csspool/selectors/simple.rb
 lib/csspool/selectors/type.rb
 lib/csspool/selectors/universal.rb
@@ -37,6 +43,7 @@ lib/csspool/terms.rb
 lib/csspool/terms/function.rb
 lib/csspool/terms/hash.rb
 lib/csspool/terms/ident.rb
+lib/csspool/terms/math.rb
 lib/csspool/terms/number.rb
 lib/csspool/terms/rgb.rb
 lib/csspool/terms/string.rb
@@ -47,8 +54,12 @@ lib/csspool/visitors/comparable.rb
 lib/csspool/visitors/iterator.rb
 lib/csspool/visitors/to_css.rb
 lib/csspool/visitors/visitor.rb
+test/_local_helper.rb
 test/css/test_document.rb
+test/css/test_document_query.rb
 test/css/test_import_rule.rb
+test/css/test_keyframes_rule.rb
+test/css/test_namespace_rule.rb
 test/css/test_parser.rb
 test/css/test_tokenizer.rb
 test/files/test.css
@@ -57,8 +68,10 @@ test/sac/test_parser.rb
 test/sac/test_properties.rb
 test/sac/test_terms.rb
 test/test_collection.rb
+test/test_declaration.rb
 test/test_parser.rb
 test/test_selector.rb
+test/test_term.rb
 test/visitors/test_children.rb
 test/visitors/test_comparable.rb
 test/visitors/test_each.rb

data/README.rdoc

@@ -40,7 +40,7 @@ $ sudo gem install rexical
 
 (The MIT License)
 
-Copyright (c) 2007-2012
+Copyright (c) 2007-2013
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {John Barnette}[http://www.jbarnette.com/]

data/lib/csspool/css/document.rb

@@ -21,15 +21,21 @@ module CSSPool
       attr_accessor :rule_sets
       attr_accessor :charsets
       attr_accessor :import_rules
+      attr_accessor :document_queries
+      attr_accessor :namespaces
       attr_accessor :parent
       attr_accessor :parent_import_rule
+      attr_accessor :keyframes_rules
 
       def initialize
         @rule_sets    = []
         @charsets     = []
         @import_rules = []
+        @document_queries = []
+        @namespaces   = []
         @parent       = nil
         @parent_import_rule = nil
+        @keyframes_rules = []
       end
 
       def [] selector

data/lib/csspool/css/document_handler.rb

@@ -5,7 +5,8 @@ module CSSPool
 
       def initialize
         @document     = nil
-        @media_stack  = []
+        @conditional_stack  = []
+        @active_keyframes_block = nil
       end
 
       def start_document
@@ -20,32 +21,65 @@ module CSSPool
         @document.import_rules << CSS::ImportRule.new(
           uri,
           ns,
-          media_list.map { |x| CSS::Media.new(x, loc) },
+          media_list,
           @document,
           loc
         )
       end
 
+      def namespace prefix, uri
+        @document.namespaces << CSS::NamespaceRule.new(
+          prefix,
+          uri
+        )
+      end
+
       def start_selector selector_list
-        @document.rule_sets << RuleSet.new(
+        rs = RuleSet.new(
           selector_list,
           [],
-          @media_stack.last || []
+          @conditional_stack.last || []
         )
+        @document.rule_sets << rs
+        @conditional_stack.last.rule_sets << rs unless @conditional_stack.empty?
       end
 
       def property name, exp, important
-        rs = @document.rule_sets.last
+        rs = @active_keyframes_block.nil? ? @document.rule_sets.last : @active_keyframes_block
         rs.declarations << Declaration.new(name, exp, important, rs)
       end
 
       def start_media media_list, parse_location = {}
-        @media_stack << media_list.map { |x| CSS::Media.new(x, parse_location) }
+        @conditional_stack << CSS::Media.new(media_list, parse_location)
       end
 
       def end_media media_list, parse_location = {}
-        @media_stack.pop
+        @conditional_stack.pop
+      end
+
+      def start_document_query url_functions
+        dq = CSS::DocumentQuery.new(url_functions)
+        @document.document_queries << dq
+        @conditional_stack << dq
+      end
+
+      def end_document_query
+        @conditional_stack.pop
       end
+
+      def start_keyframes_rule name
+        @document.keyframes_rules << CSS::KeyframesRule.new(name)
+      end
+
+      def start_keyframes_block keyText
+        @active_keyframes_block = CSS::KeyframesBlock.new(keyText)
+        @document.keyframes_rules.last.rule_sets << @active_keyframes_block
+      end
+
+      def end_keyframes_block
+        @active_keyframes_block = nil
+      end
+
     end
   end
 end

data/lib/csspool/css/document_query.rb

@@ -0,0 +1,14 @@
+# Represents an @document conditional rule
+module CSSPool
+  module CSS
+    class DocumentQuery < CSSPool::Node
+      attr_accessor :url_functions
+      attr_accessor :rule_sets
+
+      def initialize url_functions
+        @url_functions = url_functions
+        @rule_sets = []
+      end
+    end
+  end
+end

data/lib/csspool/css/import_rule.rb

@@ -3,14 +3,14 @@ module CSSPool
     class ImportRule < CSSPool::Node
       attr_accessor :uri
       attr_accessor :namespace
-      attr_accessor :media
+      attr_accessor :media_list
       attr_accessor :document
       attr_accessor :parse_location
 
-      def initialize uri, namespace, media, document, parse_location
+      def initialize uri, namespace, media_list, document, parse_location
         @uri = uri
         @namespace = namespace
-        @media = media
+        @media_list = media_list
         @document = document
         @parse_location = parse_location
       end
@@ -19,7 +19,11 @@ module CSSPool
         new_doc = CSSPool.CSS(yield uri.value)
         new_doc.parent_import_rule = self
         new_doc.parent = document
-        new_doc.rule_sets.each { |rs| rs.media = media }
+        # we'll make a "fake" media rule if this import specified media to apply to the rulesets
+        if !media_list.empty?
+            media = CSS::Media.new(media_list, parse_location)
+            new_doc.rule_sets.each { |rs| rs.media = media }
+        end
         new_doc
       end
     end

data/lib/csspool/css/keyframes_block.rb

@@ -0,0 +1,14 @@
+# Represents a block inside a @keyframes rule
+module CSSPool
+  module CSS
+    class KeyframesBlock < CSSPool::Node
+      attr_accessor :keyText
+      attr_accessor :declarations
+
+      def initialize keyText
+        @keyText = keyText
+        @declarations = []
+      end
+    end
+  end
+end

data/lib/csspool/css/keyframes_rule.rb

@@ -0,0 +1,14 @@
+# Represents an @keyframes rule
+module CSSPool
+  module CSS
+    class KeyframesRule < CSSPool::Node
+      attr_accessor :name
+      attr_accessor :rule_sets
+
+      def initialize name
+        @name = name
+        @rule_sets = []
+      end
+    end
+  end
+end

data/lib/csspool/css/media.rb

@@ -1,12 +1,14 @@
 module CSSPool
   module CSS
     class Media < CSSPool::Node
-      attr_accessor :name
+      attr_accessor :media_list
       attr_accessor :parse_location
+      attr_accessor :rule_sets
 
-      def initialize name, parse_location
-        @name = name
+      def initialize media_list, parse_location
+        @media_list = media_list
         @parse_location = parse_location
+        @rule_sets = []
       end
     end
   end

data/lib/csspool/css/namespace_rule.rb

@@ -0,0 +1,13 @@
+module CSSPool
+  module CSS
+    class NamespaceRule < CSSPool::Node
+      attr_accessor :prefix
+      attr_accessor :uri
+
+      def initialize prefix, uri
+        @prefix = prefix
+        @uri = uri
+      end
+    end
+  end
+end