rcarvalho-image_scraper 0.1.8.2 → 0.1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6511033d9a509358084f1374353dccc616138228
-  data.tar.gz: 3579edc4039f4af49173e82ef497ab1a04c10468
+  metadata.gz: 0d5014335accdba31dc9b9b383f7421b7ae70575
+  data.tar.gz: 99ed329c5092b56c200456b3d9d9d75e4b18eada
 SHA512:
-  metadata.gz: 0ff28ea7c3301d297b7bb4e4a1cf131c61468cc8328480d218d5c339c397abc7cb18b65618bbf788c366e7391db5d1ac8724dfb7d0c2c403a8fbceb475ffe8cf
-  data.tar.gz: 5995dda2686702b3efa5f6b68bf99ec0e2c8416a628632e010db55f725705f3f2ca0d3e5322b380fa73208bd12e8270eae42feaa364de7f5aefd5330723da5f3
+  metadata.gz: 325570c10e64036e4e97ac08e1dab0913cc0be29a0d4600c18fbee6c0fa94310121390ee54f87be14dedaed017883699a576e1aa56e47a2364c5561b00098dcc
+  data.tar.gz: 0036a9afbf286177627085406c5e08a3b78f0d68f0f481e6c290de940a6f3f40af283d8a84f1f9a3b79add7e671e7c61b029c2dd5d8448f0a690c7977bb827bb

data/image_scraper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rcarvalho-image_scraper"
-  s.version = "0.1.8.2"
+  s.version = "0.1.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John McAliley"]

data/lib/image_scraper/client.rb

@@ -39,12 +39,11 @@ module ImageScraper
         css = file.string rescue IO.read(file) rescue next
 
         images += css.scan(/url\((.*?)\)/).collect do |image_url|
-          image_url = URI.escape image_url[0]
+          image_url = URI.escape ImageScraper::Util.cleanup_url(image_url[0])
           image_url = image_url.gsub(/([{}|\^\[\]\@`])/) {|s| CGI.escape(s)} # escape characters that URI.escape doesn't get
           if image_url.include?("data:image") and @include_css_data_images
             image_url
           else
-            image_url = ImageScraper::Util.strip_quotes(image_url)
             @convert_to_absolute_url ? ImageScraper::Util.absolute_url(stylesheet, image_url) : image_url
           end
         end
@@ -55,7 +54,7 @@ module ImageScraper
     def stylesheets
       return [] if doc.blank?
       doc.xpath('//link[@rel="stylesheet"]').collect do |stylesheet|
-        ImageScraper::Util.absolute_url url, URI.escape(stylesheet['href'])
+        ImageScraper::Util.absolute_url url, URI.escape(ImageScraper::Util.cleanup_url(stylesheet['href']))
       end
     end
   end

data/lib/image_scraper/util.rb

@@ -26,7 +26,15 @@ module ImageScraper
     end
     
     def self.strip_quotes(image_url)
-      image_url.sub(/^%22/,'').sub(/%22$/,'').sub(/^%20/,'').sub(/%20$/,'').gsub("'","").gsub('"','')
+      image_url.gsub("'","").gsub('"','')
+    end
+
+    def self.chomp(image_url)
+      image_url.gsub(/\s/,'')
+    end
+
+    def self.cleanup_url(image_url)
+      ImageScraper::Util.chomp(ImageScraper::Util.strip_quotes(image_url))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcarvalho-image_scraper
 version: !ruby/object:Gem::Version
-  version: 0.1.8.2
+  version: 0.1.8.3
 platform: ruby
 authors:
 - John McAliley