fastimage 1.2.14 → 1.3.0

data/lib/fastimage.rb

@@ -206,8 +206,24 @@ class FastImage
     end
   end
 
+  def proxy_uri
+    begin
+      proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? URI.parse(ENV['http_proxy']) : nil
+    rescue URI::InvalidURIError
+      proxy = nil
+    end
+    proxy
+  end
+
   def setup_http
-    @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
+    proxy = proxy_uri
+
+    if proxy
+      @http = Net::HTTP::Proxy(proxy.host, proxy.port).new(@parsed_uri.host, @parsed_uri.port)
+    else
+      @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
+    end
+    
     @http.use_ssl = (@parsed_uri.scheme == "https")
     @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     @http.open_timeout = @timeout

data/test/test.rb

@@ -191,4 +191,16 @@ class FastImageTest < Test::Unit::TestCase
     assert type_time - time < LargeImageFetchLimit
     assert_equal LargeImageInfo[0], type
   end
+  
+  # This test doesn't actually test the proxy function, but at least
+  # it excercises the code. You could put anything in the http_proxy and it would still pass.
+  # Any ideas on how to actually test this?
+  def test_should_fetch_via_proxy
+    file = "test.gif"
+    actual_size = GoodFixtures[file][1]
+    ENV['http_proxy'] = "http://my.proxy.host:8080"
+    size = FastImage.size(TestUrl + file)
+    ENV['http_proxy'] = nil
+    assert_equal actual_size, size
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.2.14
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies: []
 description: FastImage finds the size or type of an image given its uri by fetching
   as little as needed.