css_parser 1.4.9 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e52722a5c36a9f9c005952eec5a578dea6b0bcab
-  data.tar.gz: 7402ed19b5d47e7eaee3de93fd40b5f0919d040c
+  metadata.gz: 1b445faf1396f058086f3ec3654d5ebb4a2d1157
+  data.tar.gz: 2c8b069bfff50b3e5072ba4912d52aff2ec813ee
 SHA512:
-  metadata.gz: 3bb6fe5419e7eed4020270f70450fad376f21d950974b0bdc24625f0073221a304fa01ca73f628504d7cfa4fbbbf6eb683fe9855e46c362e337ed2db701fb265
-  data.tar.gz: 659b96cce569d009fe41c00073f05c214afb278c8e4fc2834c8b05cd5af8f1fd1477f52e065b8de96e8148931f8fd4b5f44f5c53dc376bf27db5608cb690bd25
+  metadata.gz: 95c649943ddeb1d61395107986d97d594354654647d13453c41c7cee0d2bffeb6645320e2084a56609131f29721f3f7ddb538ed2c068af43770e48947b1fee40
+  data.tar.gz: ed26582b08c72abf29c10c8f6a45d28c5d8a12cadbaf9dd3096ff96f719251b0334d73ad68b1cb56fc3e489d184fbe53d3bc7cd24fd595d93e4f76f94b1b6250

data/lib/css_parser/parser.rb

@@ -399,7 +399,7 @@ module CssParser
 
       opts[:base_uri] = uri if opts[:base_uri].nil?
 
-      src, charset = read_remote_file(uri)
+      src, = read_remote_file(uri) # skip charset
       if src
         add_block!(src, opts)
       end
@@ -483,9 +483,8 @@ module CssParser
 
       src = '', charset = nil
 
+      uri = Addressable::URI.parse(uri.to_s)
       begin
-        uri = Addressable::URI.parse(uri.to_s)
-
         if uri.scheme == 'file'
           # local file
           fh = open(uri.path, 'rb')
@@ -508,7 +507,7 @@ module CssParser
 
           if res.code.to_i >= 400
             @redirect_count = nil
-            raise RemoteFileError if @options[:io_exceptions]
+            raise RemoteFileError.new(uri.to_s) if @options[:io_exceptions]
             return '', nil
           elsif res.code.to_i >= 300 and res.code.to_i < 400
             if res['Location'] != nil
@@ -536,7 +535,7 @@ module CssParser
         end
       rescue
         @redirect_count = nil
-        raise RemoteFileError if @options[:io_exceptions]
+        raise RemoteFileError.new(uri.to_s)if @options[:io_exceptions]
         return nil, nil
       end
 

data/lib/css_parser/rule_set.rb

@@ -317,14 +317,19 @@ module CssParser
     # Combine several properties into a shorthand one
     def create_shorthand_properties! properties, shorthand_property # :nodoc:
       values = []
+      properties_to_delete = []
       properties.each do |property|
-         if @declarations.has_key?(property) and not @declarations[property][:is_important]
+        if @declarations.has_key?(property) and not @declarations[property][:is_important]
           values << @declarations[property][:value]
-           @declarations.delete(property)
-         end
-       end
+          properties_to_delete << property
+        end
+      end
+
+      if values.length > 1
+        properties_to_delete.each do |property|
+          @declarations.delete(property)
+        end
 
-      unless values.empty?
         @declarations[shorthand_property] = {:value => values.join(' ')}
       end
     end
@@ -493,7 +498,7 @@ module CssParser
           continuation = decs + ';'
 
         elsif matches = decs.match(/(.[^:]*)\s*:\s*(.+)(;?\s*\Z)/i)
-          property, value, end_of_declaration = matches.captures
+          property, value, = matches.captures # skip end_of_declaration
 
           add_declaration!(property, value)
           continuation = ''

data/lib/css_parser/version.rb

@@ -1,3 +1,3 @@
 module CssParser
-  VERSION = "1.4.9".freeze
+  VERSION = "1.4.10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable