csspool 4.0.0.pre → 4.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 78a85df3fe179c10647db55fdae56a52458d191c
+  data.tar.gz: 316c13064d6a93280dc4a2ab4b785ddc2e62607f
+SHA512:
+  metadata.gz: d472fdf6210e101fde9d8a1c21c5ec10229f8587f06e20878c08d337748e0a671eadeb66d82503739f54c3c32d62670d46824656987d7a3e05422e719d2120be
+  data.tar.gz: 1a96b768e988dc4330cefa5bb51dfe108771204c28e9b8c64be4983d7f4c925368b2c100331b6cca9991328e4b34ff3bfc46156be6d49b4bee2c052ea0d79fa4

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+== 4.0.0
+
+* New Features
+
+  * Support for parsing many new CSS features, including `:not`, `calc`, and `@supports`.
+  * Line number and context in parser error messages
+  * Some nodes types will remember their start and end positions, allowing developers to retrieve their original code.
+
+* Bugfixes
+
+  * Updated parsing for unusual syntax.
+
 == 3.0.2
 
 * New Features

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    hoe (3.0.4)
-      rake (~> 0.8)
-    hoe-bundler (1.1.0)
+    hoe (3.4.0)
+      rake (>= 0.8, < 11.0)
+    hoe-bundler (1.2.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.0)
-    racc (1.4.8)
-    rake (0.9.2.2)
+    json (1.7.7)
+    racc (1.4.9)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rexical (1.0.5)

data/Manifest.txt

@@ -13,14 +13,19 @@ 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/fontface_rule.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/media_feature.rb
+lib/csspool/css/media_query.rb
+lib/csspool/css/media_query_list.rb
+lib/csspool/css/media_type.rb
 lib/csspool/css/namespace_rule.rb
 lib/csspool/css/parser.rb
 lib/csspool/css/parser.y
 lib/csspool/css/rule_set.rb
+lib/csspool/css/supports_rule.rb
 lib/csspool/css/tokenizer.rb
 lib/csspool/css/tokenizer.rex
 lib/csspool/node.rb
@@ -45,6 +50,7 @@ lib/csspool/terms/hash.rb
 lib/csspool/terms/ident.rb
 lib/csspool/terms/math.rb
 lib/csspool/terms/number.rb
+lib/csspool/terms/resolution.rb
 lib/csspool/terms/rgb.rb
 lib/csspool/terms/string.rb
 lib/csspool/terms/uri.rb
@@ -54,13 +60,15 @@ 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_font_face.rb
 test/css/test_import_rule.rb
 test/css/test_keyframes_rule.rb
+test/css/test_media_rule.rb
 test/css/test_namespace_rule.rb
 test/css/test_parser.rb
+test/css/test_supports_rule.rb
 test/css/test_tokenizer.rb
 test/files/test.css
 test/helper.rb

data/Rakefile

@@ -16,6 +16,7 @@ Hoe.spec('csspool') do
   self.readme_file   = 'README.rdoc'
   self.history_file  = 'CHANGELOG.rdoc'
   self.extra_rdoc_files  = FileList['*.rdoc']
+  self.licenses      = ['MIT']
 
   %w{racc rexical hoe-git hoe-gemspec hoe-bundler}.each do |dep|
     self.extra_dev_deps << [dep, '>= 0']

data/lib/csspool/css/declaration.rb

@@ -8,7 +8,7 @@ module CSSPool
 
       alias :important? :important
 
-      def initialize property, expressions, important, rule_set
+      def initialize property, expressions, important, rule_set = nil
         @property = property
         @expressions = expressions
         @important = important

data/lib/csspool/css/document.rb

@@ -22,25 +22,29 @@ module CSSPool
       attr_accessor :charsets
       attr_accessor :import_rules
       attr_accessor :document_queries
+      attr_accessor :supports_rules
       attr_accessor :namespaces
       attr_accessor :parent
       attr_accessor :parent_import_rule
       attr_accessor :keyframes_rules
+      attr_accessor :fontface_rules
 
       def initialize
         @rule_sets    = []
         @charsets     = []
         @import_rules = []
         @document_queries = []
+        @supports_rules = []
         @namespaces   = []
         @parent       = nil
         @parent_import_rule = nil
         @keyframes_rules = []
+        @fontface_rules = []
       end
 
       def [] selector
         selectors = CSSPool.CSS("#{selector} {}").rule_sets.first.selectors
-        rule_sets.find_all { |rs| rs.selectors == selectors}
+        rule_sets.find_all { |rs| rs.selectors == selectors }
       end
     end
   end

data/lib/csspool/css/document_handler.rb

@@ -2,11 +2,13 @@ module CSSPool
   module CSS
     class DocumentHandler < CSSPool::SAC::Document
       attr_accessor :document
+      attr_accessor :node_start_pos
 
       def initialize
         @document     = nil
         @conditional_stack  = []
         @active_keyframes_block = nil
+        @active_fontface_rule = nil
       end
 
       def start_document
@@ -17,11 +19,11 @@ module CSSPool
         @document.charsets << CSS::Charset.new(name, location)
       end
 
-      def import_style media_list, uri, ns = nil, loc = {}
+      def import_style media, uri, ns = nil, loc = {}
         @document.import_rules << CSS::ImportRule.new(
           uri,
           ns,
-          media_list,
+          media,
           @document,
           loc
         )
@@ -38,32 +40,54 @@ module CSSPool
         rs = RuleSet.new(
           selector_list,
           [],
-          @conditional_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 = @active_keyframes_block.nil? ? @document.rule_sets.last : @active_keyframes_block
-        rs.declarations << Declaration.new(name, exp, important, rs)
+      def property declaration
+        if !@active_fontface_rule.nil?
+          rs = @active_fontface_rule
+        elsif !@active_keyframes_block.nil?
+          rs = @active_keyframes_block
+        else
+          rs = @document.rule_sets.last
+        end
+        declaration.rule_set = rs
+        rs.declarations << declaration
       end
 
-      def start_media media_list, parse_location = {}
-        @conditional_stack << CSS::Media.new(media_list, parse_location)
+      def start_media media_query_list
+        @conditional_stack << media_query_list
       end
 
-      def end_media media_list, parse_location = {}
+      def end_media media_query_list
         @conditional_stack.pop
       end
 
-      def start_document_query url_functions
+      def start_document_query url_functions, inner_start_pos = nil
         dq = CSS::DocumentQuery.new(url_functions)
+        dq.outer_start_pos = @node_start_pos
+        @node_start_pos = nil
+        dq.inner_start_pos = inner_start_pos
         @document.document_queries << dq
         @conditional_stack << dq
       end
 
-      def end_document_query
+      def end_document_query inner_end_pos = nil, outer_end_pos = nil
+        last = @conditional_stack.pop
+        last.inner_end_pos = inner_end_pos
+        last.outer_end_pos = outer_end_pos
+      end
+      
+      def start_supports conditions
+        sr = CSS::SupportsRule.new(conditions)
+        @document.supports_rules << sr
+        @conditional_stack << sr
+      end
+
+      def end_supports
         @conditional_stack.pop
       end
 
@@ -80,6 +104,14 @@ module CSSPool
         @active_keyframes_block = nil
       end
 
+      def start_fontface_rule
+        @active_fontface_rule = CSS::FontfaceRule.new
+        @document.fontface_rules << @active_fontface_rule
+      end
+
+      def end_fontface_rule
+        @active_fontface_rule = nil
+      end
     end
   end
 end

data/lib/csspool/css/fontface_rule.rb

@@ -0,0 +1,13 @@
+# Represents an @font-face rule
+module CSSPool
+  module CSS
+    class FontfaceRule < CSSPool::Node
+
+      attr_accessor :declarations
+
+      def initialize
+        @declarations = []
+      end
+    end
+  end
+end

data/lib/csspool/css/import_rule.rb

@@ -19,11 +19,6 @@ module CSSPool
         new_doc = CSSPool.CSS(yield uri.value)
         new_doc.parent_import_rule = self
         new_doc.parent = document
-        # 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/media_feature.rb

@@ -0,0 +1,14 @@
+module CSSPool
+  module CSS
+    class MediaFeature < CSSPool::Node
+      attr_accessor :property, :value
+      attr_accessor :parse_location
+
+      def initialize(property, value, parse_location = {})
+        @property = property
+        @value = value
+        @parse_location = parse_location
+      end
+    end
+  end
+end

data/lib/csspool/css/media_query.rb

@@ -0,0 +1,19 @@
+module CSSPool
+  module CSS
+    class MediaQuery < CSSPool::Node
+      attr_accessor :only_or_not, :media_expr, :and_exprs
+      attr_accessor :parse_location
+
+      def self.empty
+        new(nil, nil, [])
+      end
+
+      def initialize(only_or_not, media_expr, and_exprs, parse_location = {})
+        @only_or_not = only_or_not
+        @media_expr = media_expr
+        @and_exprs = and_exprs
+        @parse_location = parse_location
+      end
+    end
+  end
+end

data/lib/csspool/css/media_query_list.rb

@@ -0,0 +1,41 @@
+module CSSPool
+  module CSS
+    class MediaQueryList < CSSPool::Node
+      attr_accessor :media_queries, :parse_location, :rule_sets
+
+      def initialize(media_queries = [], parse_location = {})
+        @media_queries = media_queries
+        @parse_location = parse_location
+        @rule_sets = []
+      end
+
+      def <<(media_query)
+        media_queries << media_query
+        self
+      end
+      alias push <<
+
+      def length
+        media_queries.length
+      end
+      alias size length
+
+      def first
+        media_queries.first
+      end
+
+      def last
+        media_queries.last
+      end
+
+      def [](idx)
+        media_queries[idx]
+      end
+
+      def inspect
+        media_queries.inspect
+      end
+
+    end
+  end
+end

data/lib/csspool/css/{media.rb → media_type.rb}

@@ -1,15 +1,17 @@
 module CSSPool
   module CSS
-    class Media < CSSPool::Node
-      attr_accessor :media_list
+    class MediaType < CSSPool::Node
+      attr_accessor :name
       attr_accessor :parse_location
       attr_accessor :rule_sets
 
-      def initialize media_list, parse_location
-        @media_list = media_list
+      def initialize(name, parse_location = {})
+        @name = name
         @parse_location = parse_location
         @rule_sets = []
       end
+
+      alias value name
     end
   end
 end