html-pipeline 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a991b217bf4c9c658d1843fe35e6a9ba989b180
-  data.tar.gz: 24763a9cac62ba2047a64e2c42bfee4107e00ae3
+  metadata.gz: 18ebd2d23ad0e2b826d0f799544324f75efad1c4
+  data.tar.gz: c052603aa7e7dd3af1b9b75f55a52ad4be278fbf
 SHA512:
-  metadata.gz: 8433da8334030909b29622d615aa693117c89fdcb06ce581d2dfae7e1a14dee705e3c60fbfbebb8d1c1227ee80d279aded108a1d7491305279d0994195b03c2c
-  data.tar.gz: 34cd18428fdf6b408347ffc6d5e5eb95e6f6ee0dfff098b2a5114ecbb73bc4f78931baabaee145abf070cd2b2df6e1edfb6d28a9b6ad49d53c5ccb156db006d2
+  metadata.gz: f5177792a0de9b78ccdfeb86c2b335ed25dcc83a2e10db7c8fa34236ec61e6746fb358c593fc156739c338144332e7e6f193300a6399485e1ea5210af3424ff2
+  data.tar.gz: 905067a669f37813c52858536ebda8af639ba6b3b1929b361acd4f9460d06881f922db57f40033f2eb15b7eb061a31b365d497e0b19b6863ebbf42401bc7dc35

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.4.0
+
+  * Fix CamoFilter double entity encoding. #101 josh
+
 ## 1.3.0
 
 1.2.0 didn't actually include the following changes. Yanked that release.

data/lib/html/pipeline/camo_filter.rb

@@ -25,10 +25,11 @@ module HTML
         return unless asset_proxy_enabled?
 
         doc.search("img").each do |element|
-          next if element['src'].nil?
+          original_src = element['src']
+          next unless original_src
 
           begin
-            uri = URI.parse(element['src'])
+            uri = URI.parse(original_src)
           rescue Exception
             next
           end
@@ -36,8 +37,8 @@ module HTML
           next if uri.host.nil?
           next if asset_host_whitelisted?(uri.host)
 
-          element['src'] = asset_proxy_url(uri.to_s)
-          element['data-canonical-src'] = uri.to_s
+          element['src'] = asset_proxy_url(original_src)
+          element['data-canonical-src'] = original_src
         end
         doc
       end

data/lib/html/pipeline/version.rb

@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

data/test/html/pipeline/camo_filter_test.rb

@@ -15,51 +15,44 @@ class HTML::Pipeline::CamoFilterTest < Test::Unit::TestCase
 
   def test_camouflaging_http_image_urls
     orig = %(<p><img src="http://twitter.com/img.png"></p>)
-    assert_includes 'img src="' + @asset_proxy_url,
-      CamoFilter.call(orig, @options).to_s
-    assert_includes 'data-canonical-src="http://twitter.com/img.png"',
+    assert_equal %(<p><img src="https//assets.example.org/a5ad43494e343b20d745586282be61ff530e6fa0/687474703a2f2f747769747465722e636f6d2f696d672e706e67" data-canonical-src="http://twitter.com/img.png"></p>),
       CamoFilter.call(orig, @options).to_s
   end
 
   def test_doesnt_rewrite_dotcom_image_urls
     orig = %(<p><img src="https://github.com/img.png"></p>)
-    assert_equal "<p><img src=\"https://github.com/img.png\"></p>",
-      CamoFilter.call(orig, @options).to_s
+    assert_equal orig, CamoFilter.call(orig, @options).to_s
   end
 
   def test_doesnt_rewrite_dotcom_subdomain_image_urls
     orig = %(<p><img src="https://raw.github.com/img.png"></p>)
-    assert_equal "<p><img src=\"https://raw.github.com/img.png\"></p>",
-      CamoFilter.call(orig, @options).to_s
+    assert_equal orig, CamoFilter.call(orig, @options).to_s
   end
 
   def test_doesnt_rewrite_dotcom_subsubdomain_image_urls
     orig = %(<p><img src="https://f.assets.github.com/img.png"></p>)
-    assert_equal "<p><img src=\"https://f.assets.github.com/img.png\"></p>",
-      CamoFilter.call(orig, @options).to_s
+    assert_equal orig, CamoFilter.call(orig, @options).to_s
   end
 
   def test_camouflaging_github_prefixed_image_urls
     orig = %(<p><img src="https://notgithub.com/img.png"></p>)
-    assert_includes 'img src="' + @asset_proxy_url,
+    assert_equal %(<p><img src="https//assets.example.org/5d4a96c69713f850520538e04cb9661035cfb534/68747470733a2f2f6e6f746769746875622e636f6d2f696d672e706e67" data-canonical-src="https://notgithub.com/img.png"></p>),
       CamoFilter.call(orig, @options).to_s
   end
 
   def test_doesnt_rewrite_absolute_image_urls
     orig = %(<p><img src="/img.png"></p>)
-    assert_equal "<p><img src=\"/img.png\"></p>",
-      CamoFilter.call(orig, @options).to_s
+    assert_equal orig, CamoFilter.call(orig, @options).to_s
   end
 
   def test_doesnt_rewrite_relative_image_urls
     orig = %(<p><img src="img.png"></p>)
-    assert_equal "<p><img src=\"img.png\"></p>",
-      CamoFilter.call(orig, @options).to_s
+    assert_equal orig, CamoFilter.call(orig, @options).to_s
   end
 
   def test_camouflaging_https_image_urls
     orig = %(<p><img src="https://foo.com/img.png"></p>)
-    assert_includes 'img src="' + @asset_proxy_url,
+    assert_equal %(<p><img src="https//assets.example.org/3c5c6dc74fd6592d2596209dfcb8b7e5461383c8/68747470733a2f2f666f6f2e636f6d2f696d672e706e67" data-canonical-src="https://foo.com/img.png"></p>),
       CamoFilter.call(orig, @options).to_s
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri