css_parser 1.1.5 → 1.1.6

data/lib/css_parser/parser.rb

@@ -115,7 +115,7 @@ module CssParser
             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
@@ -282,18 +282,35 @@ module CssParser
     # Load a remote CSS file.
     #
     # You can also pass in file://test.css
-    def load_uri!(uri, base_uri = nil, media_types = :all)
+    #
+    # See add_block! for options.
+    #
+    # Deprecated: originally accepted three params: `uri`, `base_uri` and `media_types`
+    def load_uri!(uri, options = {}, deprecated = nil)
       uri = URI.parse(uri) unless uri.respond_to? :scheme
+      #base_uri = nil, media_types = :all, options = {}
+
+      opts = {:base_uri => nil, :media_types => :all}
+
+      if options.is_a? Hash
+        opts.merge!(options)
+      else
+        opts[:base_uri] = options if options.is_a? String
+        opts[:media_types] = deprecated if deprecated
+      end
+      
+      
       if uri.scheme == 'file' or uri.scheme.nil?
         uri.path = File.expand_path(uri.path)
         uri.scheme = 'file'
       end
-      base_uri = uri if base_uri.nil?
+
+      opts[:base_uri] = uri if opts[:base_uri].nil?
 
       src, charset = read_remote_file(uri)
 
       if src
-        add_block!(src, {:media_types => media_types, :base_uri => base_uri})
+        add_block!(src, opts)
       end
     end
     

data/lib/css_parser.rb

@@ -7,7 +7,7 @@ require 'stringio'
 require 'iconv'
 
 module CssParser
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 
   # Merge multiple CSS RuleSets by cascading according to the CSS 2.1 cascading rules 
   # (http://www.w3.org/TR/REC-CSS2/cascade.html#cascading-order).

data/test/test_css_parser_media_types.rb

@@ -97,7 +97,7 @@ class CssParserMediaTypesTests < Test::Unit::TestCase
     assert_equal 'color: black;', @cp.find_by_selector('body', :handheld).join(' ')
   end
 
-  def test_selecting_with_all_meda_type
+  def test_selecting_with_all_media_types
     @cp.add_rule!('body', 'color: black;', [:handheld,:tty])
     assert_equal 'color: black;', @cp.find_by_selector('body', :all).join(' ')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Alex Dunae
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -08:00
+date: 2011-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: []