css_parser 1.3.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ffcb3340dbf48f0ab35f5d27c63a16b6a1a948c
-  data.tar.gz: c33511de9fb08a3e34a59a24b72063eed4f54561
+  metadata.gz: 0b24b01cc09a9975b249b7f68331c44a4b2e6d00
+  data.tar.gz: 7dc6b7777312134d63abf3ba61154ec152f5ee40
 SHA512:
-  metadata.gz: 6972c831ca48c5c1b796ee4b7a3c85f855651d4fb954c26f822360d37f0d573d29d12f29dc2f26fccd2fa3ef57afd167a7928d5d9633f6ed45ddbd574cdfaa1c
-  data.tar.gz: 5fa36e3e019f67f9b3c594be09ebec77a1318a6f087b469392b71891948ab38c9d03cdffeb3bdc269d8b2bb704f12e17babc0a4f68648bdbd4c617050cef53d7
+  metadata.gz: bf202f430205ba83586fbc04ebe084ca12fe552303b70691ae69755ea8d8753cdc94cc1dc87ef4d22bff55b134880f2c23133764539d75b7a4080c67e834fccd
+  data.tar.gz: 9384222c4c92f027b0869a2941459ab5ad408b054b7180d4f2aef5e0e784b2a8601057065d1e03794e3710b8744c7f0b5ea280382e386ab3a31b1ac1fcf85785

data/lib/css_parser/regexps.rb

@@ -47,6 +47,7 @@ module CssParser
   BOX_MODEL_UNITS_RX = /(auto|inherit|0|([\-]*([0-9]+|[0-9]*\.[0-9]+)(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)
   FONT_UNITS_RX = /(([x]+\-)*small|medium|large[r]*|auto|inherit|([0-9]+|[0-9]*\.[0-9]+)(e[mx]+|px|[cm]+m|p[tc+]|in|\%)*)/i
   RE_BORDER_STYLE = /([\s]*^)?(none|hidden|dotted|dashed|solid|double|dot-dash|dot-dot-dash|wave|groove|ridge|inset|outset)([\s]*$)?/imx
   RE_BORDER_UNITS = Regexp.union(BOX_MODEL_UNITS_RX, /(thin|medium|thick)/i)

data/lib/css_parser/rule_set.rb

@@ -4,7 +4,7 @@ module CssParser
     RE_ELEMENTS_AND_PSEUDO_ELEMENTS = /((^|[\s\+\>]+)[\w]+|\:(first\-line|first\-letter|before|after))/i
     RE_NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES = /(\.[\w]+)|(\[[\w]+)|(\:(link|first\-child|lang))/i
 
-    BACKGROUND_PROPERTIES = ['background-color', 'background-image', 'background-repeat', 'background-position', 'background-attachment']
+    BACKGROUND_PROPERTIES = ['background-color', 'background-image', 'background-repeat', 'background-position', 'background-size', 'background-attachment']
     LIST_STYLE_PROPERTIES = ['list-style-type', 'list-style-position', 'list-style-image']
 
     # Array of selector strings.
@@ -149,11 +149,18 @@ module CssParser
       split_declaration('background', 'background-attachment', value.slice!(CssParser::RE_SCROLL_FIXED))
       split_declaration('background', 'background-repeat', value.slice!(CssParser::RE_REPEAT))
       split_declaration('background', 'background-color', value.slice!(CssParser::RE_COLOUR))
+      split_declaration('background', 'background-size', extract_background_size_from(value))
       split_declaration('background', 'background-position', value.slice(CssParser::RE_BACKGROUND_POSITION))
 
       @declarations.delete('background')
     end
 
+    def extract_background_size_from(value)
+      size = value.slice!(CssParser::RE_BACKGROUND_SIZE)
+
+      size.sub(/^\s*\/\s*/, '') if size
+    end
+
     # Split shorthand border declarations (e.g. <tt>border: 1px red;</tt>)
     # Additional splitting happens in expand_dimensions_shorthand!
     def expand_border_shorthand! # :nodoc:
@@ -327,6 +334,18 @@ module CssParser
     #
     # Leaves properties declared !important alone.
     def create_background_shorthand! # :nodoc:
+      # When we have a background-size property we must separate it and distinguish it from
+      # background-position by preceeding it with a backslash. In this case we also need to
+      # have a background-position property, so we set it if it's missing.
+      # http://www.w3schools.com/cssref/css3_pr_background.asp
+      if @declarations.has_key?('background-size') and not @declarations['background-size'][:is_important]
+        unless @declarations.has_key?('background-position')
+          @declarations['background-position'] = {value => 'initial'}
+        end
+
+        @declarations['background-size'][:value] = "/ #{@declarations['background-size'][:value]}"
+      end
+
       create_shorthand_properties! BACKGROUND_PROPERTIES, 'background'
     end
     

data/lib/css_parser/version.rb

@@ -1,3 +1,3 @@
 module CssParser
-  VERSION = "1.3.7".freeze
+  VERSION = "1.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby CSS parser.