css_parser 1.3.4 → 1.3.5

data/lib/css_parser.rb

@@ -1,7 +1,6 @@
 require 'addressable/uri'
 require 'uri'
 require 'net/https'
-require 'open-uri'
 require 'digest/md5'
 require 'zlib'
 require 'stringio'

data/lib/css_parser/parser.rb

@@ -24,7 +24,7 @@ module CssParser
 
      # Array of CSS files that have been loaded.
     attr_reader   :loaded_uris
-    
+
     #--
     # Class variable? see http://www.oreillynet.com/ruby/blog/2007/01/nubygems_dont_use_class_variab_1.html
     #++
@@ -38,10 +38,10 @@ module CssParser
 
       # array of RuleSets
       @rules = []
-    
-      
+
+
       @loaded_uris = []
-    
+
       # unprocessed blocks of CSS
       @blocks = []
       reset!
@@ -77,7 +77,7 @@ module CssParser
       rule_sets = []
 
       selectors.each do |selector|
-        each_rule_set(media_types) do |rule_set|
+        each_rule_set(media_types) do |rule_set, media_type|
           if !rule_sets.member?(rule_set) && rule_set.selectors.member?(selector)
             rule_sets << rule_set
           end
@@ -117,7 +117,7 @@ module CssParser
       if options[:base_uri] and @options[:absolute_paths]
         block = CssParser.convert_uris(block, options[:base_uri])
       end
-      
+
       # Load @imported CSS
       block.scan(RE_AT_IMPORT_RULE).each do |import_rule|
         media_types = []
@@ -128,22 +128,22 @@ module CssParser
         else
           media_types = [:all]
         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 = Addressable::URI.parse(options[:base_uri].to_s) + Addressable::URI.parse(import_path)
           load_uri!(import_uri, options[:base_uri], media_types)
         elsif options[:base_dir]
           load_file!(import_path, options[:base_dir], media_types)
-        end     
+        end
       end
 
       # Remove @import declarations
       block.gsub!(RE_AT_IMPORT_RULE, '')
-      
+
       parse_block_into_rule_sets!(block, options)
     end
 
@@ -169,13 +169,13 @@ module CssParser
     # Iterate through RuleSet objects.
     #
     # +media_types+ can be a symbol or an array of symbols.
-    def each_rule_set(media_types = :all) # :yields: rule_set
+    def each_rule_set(media_types = :all) # :yields: rule_set, media_types
       media_types = [:all] if media_types.nil?
       media_types = [media_types].flatten.collect { |mt| CssParser.sanitize_media_query(mt)}
 
       @rules.each do |block|
         if media_types.include?(:all) or block[:media_types].any? { |mt| media_types.include?(mt) }
-          yield block[:rules]
+          yield(block[:rules], block[:media_types])
         end
       end
     end
@@ -184,10 +184,10 @@ module CssParser
     #
     # +media_types+ can be a symbol or an array of symbols.
     # See RuleSet#each_selector for +options+.
-    def each_selector(media_types = :all, options = {}) # :yields: selectors, declarations, specificity
-      each_rule_set(media_types) do |rule_set|
+    def each_selector(media_types = :all, options = {}) # :yields: selectors, declarations, specificity, media_types
+      each_rule_set(media_types) do |rule_set, media_types|
         rule_set.each_selector(options) do |selectors, declarations, specificity|
-          yield selectors, declarations, specificity
+          yield selectors, declarations, specificity, media_types
         end
       end
     end
@@ -195,12 +195,32 @@ module CssParser
     # Output all CSS rules as a single stylesheet.
     def to_s(media_types = :all)
       out = ''
-      each_selector(media_types) do |selectors, declarations, specificity|
-        out << "#{selectors} {\n#{declarations}\n}\n"
+      styles_by_media_types = {}
+      each_selector(media_types) do |selectors, declarations, specificity, media_types|
+        media_types.each do |media_type|
+          styles_by_media_types[media_type] ||= []
+          styles_by_media_types[media_type] << [selectors, declarations]
+        end
+      end
+
+      styles_by_media_types.each_pair do |media_type, media_styles|
+        media_block = (media_type != :all)
+        out += "@media #{media_type} {\n" if media_block
+
+        media_styles.each do |media_style|
+          if media_block
+            out += "  #{media_style[0]} {\n    #{media_style[1]}\n  }\n"
+          else
+            out += "#{media_style[0]} {\n#{media_style[1]}\n}\n"
+          end
+        end
+
+        out += "}\n" if media_block
       end
+
       out
     end
-    
+
     # A hash of { :media_query => rule_sets }
     def rules_by_media_query
       rules_by_media = {}
@@ -212,7 +232,7 @@ module CssParser
           rules_by_media[mt] << block[:rules]
         end
       end
-      
+
       rules_by_media
     end
 
@@ -246,7 +266,7 @@ module CssParser
 
         if token =~ /\A"/ # found un-escaped double quote
           in_string = !in_string
-        end       
+        end
 
         if in_declarations > 0
           # too deep, malformed declaration block
@@ -254,17 +274,17 @@ module CssParser
             in_declarations -= 1 if token =~ /\}/
             next
           end
-          
+
           if token =~ /\{/
             in_declarations += 1
             next
           end
-        
+
           current_declarations += token
 
           if token =~ /\}/ and not in_string
             current_declarations.gsub!(/\}[\s]*$/, '')
-            
+
             in_declarations -= 1
 
             unless current_declarations.strip.empty?
@@ -318,7 +338,7 @@ module CssParser
         end
       end
 
-      # check for unclosed braces          
+      # check for unclosed braces
       if in_declarations > 0
         add_rule!(current_selectors, current_declarations, current_media_queries)
       end
@@ -343,7 +363,7 @@ module CssParser
         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'
@@ -356,7 +376,7 @@ module CssParser
         add_block!(src, opts)
       end
     end
-    
+
     # Load a local CSS file.
     def load_file!(file_name, base_dir = nil, media_types = :all)
       file_name = File.expand_path(file_name, base_dir)
@@ -368,18 +388,18 @@ module CssParser
 
       add_block!(src, {:media_types => media_types, :base_dir => base_dir})
     end
-    
+
     # Load a local CSS string.
     def load_string!(src, base_dir = nil, media_types = :all)
       add_block!(src, {:media_types => media_types, :base_dir => base_dir})
     end
-    
-    
+
+
 
   protected
     # Check that a path hasn't been loaded already
     #
-    # Raises a CircularReferenceError exception if io_exceptions are on, 
+    # Raises a CircularReferenceError exception if io_exceptions are on,
     # otherwise returns true/false.
     def circular_reference_check(path)
       path = path.to_s
@@ -391,7 +411,7 @@ module CssParser
         return true
       end
     end
-  
+
     # Strip comments and clean up blank lines from a block of CSS.
     #
     # Returns a string.
@@ -399,7 +419,7 @@ module CssParser
       # Strip CSS comments
       block.gsub!(STRIP_CSS_COMMENTS_RX, '')
 
-      # Strip HTML comments - they shouldn't really be in here but 
+      # Strip HTML comments - they shouldn't really be in here but
       # some people are just crazy...
       block.gsub!(STRIP_HTML_COMMENTS_RX, '')
 
@@ -416,12 +436,12 @@ module CssParser
     # TODO: add option to fail silently or throw and exception on a 404
     #++
     def read_remote_file(uri) # :nodoc:
-      return nil, nil unless circular_reference_check(uri.to_s)    
+      return nil, nil unless circular_reference_check(uri.to_s)
 
       src = '', charset = nil
 
       begin
-        uri = Addressable::URI.parse(uri.to_s)          
+        uri = Addressable::URI.parse(uri.to_s)
 
         if uri.scheme == 'file'
           # local file
@@ -433,13 +453,13 @@ module CssParser
           if uri.scheme == 'https'
             uri.port = 443 unless uri.port
             http = Net::HTTP.new(uri.host, uri.port)
-            http.use_ssl = true 
+            http.use_ssl = true
             http.verify_mode = OpenSSL::SSL::VERIFY_NONE
           else
             http = Net::HTTP.new(uri.host, uri.port)
           end
 
-          res = http.get(uri.path, {'User-Agent' => USER_AGENT, 'Accept-Encoding' => 'gzip'})
+          res = http.get(uri.request_uri, {'User-Agent' => USER_AGENT, 'Accept-Encoding' => 'gzip'})
           src = res.body
           charset = fh.respond_to?(:charset) ? fh.charset : 'utf-8'
 
@@ -471,7 +491,7 @@ module CssParser
         return nil, nil
       end
 
-      return src, charset  
+      return src, charset
     end
 
   private

data/lib/css_parser/rule_set.rb

@@ -366,8 +366,9 @@ module CssParser
        'border-style' => 'border-%s-style', 
        'border-width' => 'border-%s-width'}.each do |property, expanded|
 
-        foldable = @declarations.select do |dim, val| 
-          dim == expanded % 'top' or dim == expanded % 'right' or dim == expanded % 'bottom' or dim == expanded % 'left'
+        top, right, bottom, left = ['top', 'right', 'bottom', 'left'].map { |side| expanded % side }
+        foldable = @declarations.select do |dim, val|
+          dim == top or dim == right or dim == bottom or dim == left
         end
         # All four dimensions must be present
         if foldable.length == 4

data/lib/css_parser/version.rb

@@ -1,3 +1,3 @@
 module CssParser
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -53,7 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4252446732262852289
+      hash: 4192577183181421877
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4252446732262852289
+      hash: 4192577183181421877
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25