css_parser 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f0a57b79a2c3074f6e8a4f83f9c33c86af5f8d
-  data.tar.gz: 70c358a8a37da0b69c7a752fdf845f5b57decaa4
+  metadata.gz: e52722a5c36a9f9c005952eec5a578dea6b0bcab
+  data.tar.gz: 7402ed19b5d47e7eaee3de93fd40b5f0919d040c
 SHA512:
-  metadata.gz: c3cb1b5bff4cf81a54a3f2ed091b8119c6c47ec3e3278e110ac2ead3da8685d7504f2affeb62d8956128c165fe1273b3c89ed25c23e18722215f0e66293d9b5a
-  data.tar.gz: 179f6d26055efe2340cbebc9bb551000cbe466dadae3c16ceb00708b8f3f7283f364d89d164e3509ae70d65c3c4e17d431a95627acc250411d5ab89685f44f95
+  metadata.gz: 3bb6fe5419e7eed4020270f70450fad376f21d950974b0bdc24625f0073221a304fa01ca73f628504d7cfa4fbbbf6eb683fe9855e46c362e337ed2db701fb265
+  data.tar.gz: 659b96cce569d009fe41c00073f05c214afb278c8e4fc2834c8b05cd5af8f1fd1477f52e065b8de96e8148931f8fd4b5f44f5c53dc376bf27db5608cb690bd25

data/lib/css_parser/parser.rb

@@ -20,7 +20,7 @@ module CssParser
     STRIP_HTML_COMMENTS_RX = /\<\!\-\-|\-\-\>/m
 
     # Initial parsing
-    RE_AT_IMPORT_RULE = /\@import\s*(?:url\s*)?(?:\()?(?:\s*)["']?([^'"\s\)]*)["']?\)?([\w\s\,^\]\(\))]*)\)?[;\n]?/
+    RE_AT_IMPORT_RULE = /\@import\s*(?:url\s*)?(?:\()?(?:\s*)["']?([^'"\s\)]*)["']?\)?([\w\s\,^\]\(\)]*)\)?[;\n]?/
 
     MAX_REDIRECTS = 3
 
@@ -188,10 +188,10 @@ module CssParser
     end
 
     # Output all CSS rules as a Hash
-    def to_h(media_types = :all)
+    def to_h(which_media = :all)
       out = {}
       styles_by_media_types = {}
-      each_selector(media_types) do |selectors, declarations, specificity, media_types|
+      each_selector(which_media) 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]
@@ -221,10 +221,10 @@ module CssParser
     end
 
     # Output all CSS rules as a single stylesheet.
-    def to_s(media_types = :all)
+    def to_s(which_media = :all)
       out = ''
       styles_by_media_types = {}
-      each_selector(media_types) do |selectors, declarations, specificity, media_types|
+      each_selector(which_media) 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]
@@ -511,8 +511,8 @@ module CssParser
             raise RemoteFileError if @options[:io_exceptions]
             return '', nil
           elsif res.code.to_i >= 300 and res.code.to_i < 400
-            if res.response['Location'] != nil
-              return read_remote_file Addressable::URI.parse(URI.escape(res.response['Location']))
+            if res['Location'] != nil
+              return read_remote_file Addressable::URI.parse(Addressable::URI.escape(res['Location']))
             end
           end
 

data/lib/css_parser/regexps.rb

@@ -23,7 +23,7 @@ module CssParser
   RE_GRADIENT = /[-a-z]*gradient\([-a-z0-9 .,#%()]*\)/im
 
   # Initial parsing
-  RE_AT_IMPORT_RULE = /\@import[\s]+(url\()?["''"]?(.[^'"\s"']*)["''"]?\)?([\w\s\,^\])]*)\)?;?/
+  RE_AT_IMPORT_RULE = /\@import\s+(url\()?["']?(.[^'"\s]*)["']?\)?([\w\s\,^\])]*)\)?;?/
 
   #--
   #RE_AT_MEDIA_RULE = Regexp.new('(\"(.[^\n\r\f\\"]*|\\\\' + RE_NL.to_s + '|' + RE_ESCAPE.to_s + ')*\")')
@@ -44,7 +44,7 @@ module CssParser
   STRIP_HTML_COMMENTS_RX = /\<\!\-\-|\-\-\>/m
 
   # Special units
-  BOX_MODEL_UNITS_RX = /(auto|inherit|0|([\-]*([0-9]+|[0-9]*\.[0-9]+)(e[mx]+|px|[cm]+m|p[tc+]|in|\%)))([\s;]|\Z)/imx
+  BOX_MODEL_UNITS_RX = /(auto|inherit|0|([\-]*([0-9]+|[0-9]*\.[0-9]+)(rem|vw|vh|vm|vmin|vmax|e[mx]+|px|[cm]+m|p[tc+]|in|\%)))([\s;]|\Z)/imx
   RE_LENGTH_OR_PERCENTAGE = Regexp.new('([\-]*(([0-9]*\.[0-9]+)|[0-9]+)(e[mx]+|px|[cm]+m|p[tc+]|in|\%))', Regexp::IGNORECASE)
   RE_BACKGROUND_POSITION = Regexp.new("((((#{RE_LENGTH_OR_PERCENTAGE})|left|center|right|top|bottom)[\s]*){1,2})", Regexp::IGNORECASE | Regexp::EXTENDED)
   RE_BACKGROUND_SIZE = Regexp.new("\\s*/\\s*((((#{RE_LENGTH_OR_PERCENTAGE})|auto|cover|contain|initial|inherit)[\\s]*){1,2})", Regexp::IGNORECASE | Regexp::EXTENDED)

data/lib/css_parser/version.rb

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

metadata

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