css_parser 1.1.2 → 1.1.3

data/lib/css_parser/parser.rb

@@ -81,6 +81,10 @@ module CssParser
     # In order to follow +@import+ rules you must supply either a
     # +:base_dir+ or +:base_uri+ option.
     #
+    # Use the +:media_types+ option to set the media type(s) for this block.  Takes an array of symbols.
+    #
+    # Use the +:only_media_types+ option to selectively follow +@import+ rules.  Takes an array of symbols.
+    #
     # ==== Example
     #   css = <<-EOT
     #     body { font-size: 10pt }
@@ -92,12 +96,11 @@ module CssParser
     #
     #   parser = CssParser::Parser.new
     #   parser.add_block!(css)
-    #--
-    # TODO: add media_type
-    #++
     def add_block!(block, options = {})
-      options = {:base_uri => nil, :base_dir => nil, :charset => nil, :media_types => :all}.merge(options)
-      
+      options = {:base_uri => nil, :base_dir => nil, :charset => nil, :media_types => :all, :only_media_types => :all}.merge(options)
+      options[:media_types] = [options[:media_types]].flatten
+      options[:only_media_types] = [options[:only_media_types]].flatten
+
       block = cleanup_block(block)
 
       if options[:base_uri] and @options[:absolute_paths]
@@ -105,16 +108,18 @@ module CssParser
       end
 
       # Load @imported CSS
-      block.scan(RE_AT_IMPORT_RULE).each do |import_rule|        
+      block.scan(RE_AT_IMPORT_RULE).each do |import_rule|    
         media_types = []
         if media_string = import_rule[-1]
           media_string.split(/\s|\,/).each do |t|
             media_types << t.to_sym unless t.empty?
           end
         end
+              
+        next unless options[:only_media_types].include?(:all) or media_types.length < 1 or (media_types & options[:only_media_types]).length > 0
 
         import_path = import_rule[0].to_s.gsub(/['"]*/, '').strip
-        
+
         if options[:base_uri]
           import_uri = URI.parse(options[:base_uri].to_s).merge(import_path)
           load_uri!(import_uri, options[:base_uri], media_types)

data/test/test_css_parser_media_types.rb

@@ -28,7 +28,7 @@ class CssParserMediaTypesTests < Test::Unit::TestCase
     assert_equal 'font-size: 13px; line-height: 1.2;', @cp.find_by_selector('body', :screen).join(' ')
   end
 
-  def atest_finding_by_multiple_media_types
+  def test_finding_by_multiple_media_types
     css = <<-EOT
       @media print {
         body { font-size: 10pt }
@@ -55,14 +55,49 @@ class CssParserMediaTypesTests < Test::Unit::TestCase
     assert_equal 'font-size: 10pt;', @cp.find_by_selector('body', :screen).join(' ')
     assert @cp.find_by_selector('body', :handheld).empty?
   end
+  
+  def test_adding_block_and_limiting_media_types1
+    css = <<-EOT
+      @import "import1.css", print
+    EOT
+    
+    base_dir = File.dirname(__FILE__)  + '/fixtures/'
+
+    @cp.add_block!(css, :only_media_types => :screen, :base_dir => base_dir)
+    assert @cp.find_by_selector('div').empty?
+
+  end
+  
+  def test_adding_block_and_limiting_media_types2
+    css = <<-EOT
+      @import "import1.css", print
+    EOT
+    
+    base_dir = File.dirname(__FILE__)  + '/fixtures/'
+
+    @cp.add_block!(css, :only_media_types => :print, :base_dir => base_dir)
+    assert_match 'color: lime', @cp.find_by_selector('div').join(' ')
+  end  
+
+  def test_adding_block_and_limiting_media_types
+    css = <<-EOT
+      @import "import1.css"
+    EOT
+    
+    base_dir = File.dirname(__FILE__)  + '/fixtures/'
+
+    @cp.add_block!(css, :only_media_types => :print, :base_dir => base_dir)
+    assert_match 'color: lime', @cp.find_by_selector('div').join(' ')
+  end  
+
 
-  def atest_adding_rule_set_with_media_type
+  def test_adding_rule_set_with_media_type
     @cp.add_rule!('body', 'color: black;', [:handheld,:tty])
     @cp.add_rule!('body', 'color: blue;', :screen)
     assert_equal 'color: black;', @cp.find_by_selector('body', :handheld).join(' ')
   end
 
-  def atest_selecting_with_all_meda_type
+  def test_selecting_with_all_meda_type
     @cp.add_rule!('body', 'color: black;', [:handheld,:tty])
     assert_equal 'color: black;', @cp.find_by_selector('body', :all).join(' ')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: css_parser
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Alex Dunae
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -07:00
+date: 2010-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: []