sanitize 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deeb3ae443c40c253cdb678466e2c45c06469287
-  data.tar.gz: f818071efddc24d9cc59e0d5c265fb82ead463bd
+  metadata.gz: 04116455cb1ededd3413abade63532f93664c741
+  data.tar.gz: 608d034be8d8b305407f87be7e439e00917a1e62
 SHA512:
-  metadata.gz: 8e7d3aea9a7c510e79882c67ed0c51096dbdeb7a492ba93ab632cfac876d06c0c93787e4048834da3520ad880193e29486344e8e510fd985e632cee7c46ef4cf
-  data.tar.gz: 3d3ce9d3c6585e35bb11d1a9b3b04c7d45602a5d968a704cb977df77ccd32c16b927b6d147c76e3807e50b8649e788ed1b1abe5ec623714dab10190fe1000735
+  metadata.gz: d79b43a450dbc1336a9e648f2f33c8675da87dea4068784bafe56b0a71b9b2f11810a660657336a5ace1b7d406bcf9f1a0b16894d9d5bfd000d2ad1ec4bb326c
+  data.tar.gz: 5f800eafba144631a99b94f71de49cbf323bf6548ef3b19c2c019718b1d127743007ef9c53c28b2447a4faf89fcfd95fdd996491d6f582aeb95d648d7ccfede1

data/HISTORY.md

@@ -1,6 +1,16 @@
 Sanitize History
 ================================================================================
 
+Version 3.0.3 (2014-10-29)
+--------------------------
+
+* Fixed: Some CSS selectors weren't parsed correctly inside the body of a
+  `@media` block, causing them to be removed even when whitelist rules should
+  have allowed them to remain. [#121][121]
+
+[121]:https://github.com/rgrove/sanitize/issues/121
+
+
 Version 3.0.2 (2014-09-02)
 --------------------------
 

data/lib/sanitize/css.rb

@@ -143,7 +143,10 @@ class Sanitize; class CSS
     return nil unless @config[:at_rules].include?(name)
 
     if AT_RULES_WITH_STYLES.include?(name)
-      styles = Crass::Parser.parse_rules(rule[:block][:value],
+      # Remove the { and } tokens surrounding the @media block.
+      tokens = rule[:block][:tokens][1...-1]
+
+      styles = Crass::Parser.parse_rules(tokens,
         :preserve_comments => @config[:allow_comments],
         :preserve_hacks    => @config[:allow_hacks])
 

data/lib/sanitize/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 class Sanitize
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/test/test_sanitize_css.rb

@@ -219,4 +219,31 @@ describe 'Sanitize::CSS' do
       end
     end
   end
+
+  describe 'bugs' do
+    before do
+      @default = Sanitize::CSS.new
+      @relaxed = Sanitize::CSS.new(Sanitize::Config::RELAXED[:css])
+    end
+
+    # https://github.com/rgrove/sanitize/issues/121
+    it 'should parse the contents of @media rules properly' do
+      css = '@media { p[class="center"] { text-align: center; }}'
+      @relaxed.stylesheet(css).must_equal css
+
+      css = %[
+        @media (max-width: 720px) {
+          p.foo > .bar { float: right; width: expression(body.scrollLeft + 50 + 'px'); }
+          #baz { color: green; }
+        }
+      ].strip
+
+      @relaxed.stylesheet(css).must_equal %[
+        @media (max-width: 720px) {
+          p.foo > .bar { float: right;  }
+          #baz { color: green; }
+        }
+      ].strip
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanitize
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Ryan Grove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crass