css_parser 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d2edab93087cfbb4df3485a29e7da0f744b19b0
-  data.tar.gz: ea77067eaa3ef29d16f7f056791cc7b443a6e817
+  metadata.gz: c2235852355e4765608d07c7f501095cdf831e99
+  data.tar.gz: e10526e998c3791112043380ae0e90d170f0af0b
 SHA512:
-  metadata.gz: 20375f61b0bcc6acc2d38ab58ba845fe424e6dbabcd92624e833054377d433a9c3ad42022de503101a733d52583fbffa86cddf0da5c6349ae2afef288eb1afea
-  data.tar.gz: acbf629feb25276a2b77614600c2c4befc95a56784a9de031e4aed181a879747a8f10b577b09af5f12d4d9e3ca58024ddf200d2a7fb7e88ab18ea7c044baf509
+  metadata.gz: db43d815d770ac070f6d24a660566467e55ee80bcf88d0a7dd976b9e01c36fe5f22b10d749e28264101e26c4350b35f61b02ff2eab967334e9166d20fd92658a
+  data.tar.gz: af2feaacfd1770feb88fd301d8a994feb36735bb224d0a5004420e41b8e2d6e27d682680db64c90df3229f55e908b171f19dbda063a5702a87d213cc61d0246f

data/lib/css_parser/parser.rb

@@ -22,7 +22,9 @@ module CssParser
     # Initial parsing
     RE_AT_IMPORT_RULE = /\@import\s*(?:url\s*)?(?:\()?(?:\s*)["']?([^'"\s\)]*)["']?\)?([\w\s\,^\]\(\))]*)\)?[;\n]?/
 
-     # Array of CSS files that have been loaded.
+    MAX_REDIRECTS = 3
+
+    # Array of CSS files that have been loaded.
     attr_reader   :loaded_uris
 
     #--
@@ -438,7 +440,21 @@ 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)
+      if @redirect_count.nil?
+        @redirect_count = 0
+      else
+        @redirect_count += 1
+      end
+
+      unless circular_reference_check(uri.to_s)
+        @redirect_count = nil
+        return nil, nil
+      end
+
+      if @redirect_count > MAX_REDIRECTS
+        @redirect_count = nil
+        return nil, nil
+      end
 
       src = '', charset = nil
 
@@ -466,8 +482,13 @@ module CssParser
           charset = fh.respond_to?(:charset) ? fh.charset : 'utf-8'
 
           if res.code.to_i >= 400
+            @redirect_count = nil
             raise RemoteFileError if @options[:io_exceptions]
             return '', nil
+          elsif res.code.to_i == 301 or res.code.to_i == 302
+            if res.response['Location'] != nil
+              return read_remote_file Addressable::URI.parse(URI::encode(res.response['Location']))
+            end
           end
 
           case res['content-encoding']
@@ -489,10 +510,12 @@ module CssParser
           end
         end
       rescue
+        @redirect_count = nil
         raise RemoteFileError if @options[:io_exceptions]
         return nil, nil
       end
 
+      @redirect_count = nil
       return src, charset
     end
 

data/lib/css_parser/rule_set.rb

@@ -9,7 +9,7 @@ module CssParser
 
     # Array of selector strings.
     attr_reader   :selectors
-    
+
     # Integer with the specificity to use for this RuleSet.
     attr_accessor   :specificity
 
@@ -55,7 +55,7 @@ module CssParser
         @declarations.delete(property)
         return
       end
-      
+
       value.gsub!(/;\Z/, '')
       is_important = !value.gsub!(CssParser::IMPORTANT_IN_PROPERTY_RX, '').nil?
       property = property.downcase.strip
@@ -173,7 +173,7 @@ module CssParser
         split_declaration(k, "#{k}-color", value.slice!(CssParser::RE_COLOUR))
         split_declaration(k, "#{k}-style", value.slice!(CssParser::RE_BORDER_STYLE))
 
-        @declarations.delete(k)   
+        @declarations.delete(k)
       end
     end
 
@@ -182,20 +182,20 @@ module CssParser
     def expand_dimensions_shorthand! # :nodoc:
       {'margin'       => 'margin-%s',
        'padding'      => 'padding-%s',
-       'border-color' => 'border-%s-color', 
-       'border-style' => 'border-%s-style', 
+       'border-color' => 'border-%s-color',
+       'border-style' => 'border-%s-style',
        'border-width' => 'border-%s-width'}.each do |property, expanded|
 
         next unless @declarations.has_key?(property)
-        
+
         value = @declarations[property][:value]
 
         # RGB and HSL values in borders are the only units that can have spaces (within params).
-        # We cheat a bit here by stripping spaces after commas in RGB and HSL values so that we 
+        # We cheat a bit here by stripping spaces after commas in RGB and HSL values so that we
         # can split easily on spaces.
         #
         # TODO: rgba, hsl, hsla
-        value.gsub!(RE_COLOUR) { |c| c.gsub(/[\s]+/, '') }
+        value.gsub!(RE_COLOUR) { |c| c.gsub(/(\s?\,\s?)/, ',') }
 
         matches = value.strip.split(/[\s]+/)
 
@@ -348,14 +348,14 @@ module CssParser
 
       create_shorthand_properties! BACKGROUND_PROPERTIES, 'background'
     end
-    
+
     # Combine border-color, border-style and border-width into border
     # Should be run after create_dimensions_shorthand!
     #
     # TODO: this is extremely similar to create_background_shorthand! and should be combined
     def create_border_shorthand! # :nodoc:
       values = []
-      
+
       ['border-width', 'border-style', 'border-color'].each do |property|
         if @declarations.has_key?(property) and not @declarations[property][:is_important]
           # can't merge if any value contains a space (i.e. has multiple values)
@@ -373,16 +373,16 @@ module CssParser
         @declarations['border'] = {:value => values.join(' ')}
       end
     end
-    
-    # Looks for long format CSS dimensional properties (margin, padding, border-color, border-style and border-width) 
+
+    # Looks for long format CSS dimensional properties (margin, padding, border-color, border-style and border-width)
     # and converts them into shorthand CSS properties.
     def create_dimensions_shorthand! # :nodoc:
       directions = ['top', 'right', 'bottom', 'left']
 
       {'margin'       => 'margin-%s',
        'padding'      => 'padding-%s',
-       'border-color' => 'border-%s-color', 
-       'border-style' => 'border-%s-style', 
+       'border-color' => 'border-%s-color',
+       'border-style' => 'border-%s-style',
        'border-width' => 'border-%s-width'}.each do |property, expanded|
 
         top, right, bottom, left = ['top', 'right', 'bottom', 'left'].map { |side| expanded % side }
@@ -396,7 +396,7 @@ module CssParser
           directions.each { |d| values[d.to_sym] = @declarations[expanded % d][:value].downcase.strip }
 
           if values[:left] == values[:right]
-            if values[:top] == values[:bottom] 
+            if values[:top] == values[:bottom]
               if values[:top] == values[:left] # All four sides are equal
                 new_value = values[:top]
               else # Top and bottom are equal, left and right are equal
@@ -419,8 +419,8 @@ module CssParser
     end
 
 
-    # Looks for long format CSS font properties (e.g. <tt>font-weight</tt>) and 
-    # tries to convert them into a shorthand CSS <tt>font</tt> property.  All 
+    # Looks for long format CSS font properties (e.g. <tt>font-weight</tt>) and
+    # tries to convert them into a shorthand CSS <tt>font</tt> property.  All
     # font properties must be present in order to create a shorthand declaration.
     def create_font_shorthand! # :nodoc:
       ['font-style', 'font-variant', 'font-weight', 'font-size',
@@ -468,17 +468,17 @@ module CssParser
 
       if @declarations.has_key?(dest)
         #puts "dest #{dest} already exists"
-      
+
         if @declarations[dest][:order] > @declarations[src][:order]
-          #puts "skipping #{dest}:#{v} due to order "        
+          #puts "skipping #{dest}:#{v} due to order "
           return
         else
-          @declarations[dest] = {}    
+          @declarations[dest] = {}
         end
       end
-      @declarations[dest] = @declarations[src].merge({:value => v.to_s.strip})    
+      @declarations[dest] = @declarations[src].merge({:value => v.to_s.strip})
     end
-  
+
     def parse_declarations!(block) # :nodoc:
       @declarations = {}
 

data/lib/css_parser/version.rb

@@ -1,3 +1,3 @@
 module CssParser
-  VERSION = "1.4.2".freeze
+  VERSION = "1.4.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby CSS parser.