fastimage 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0cc039d623dc912c65fb475ac7fcf40e6908075
-  data.tar.gz: d0904edca54dbb88a60dcfc3e38405c7133efcdf
+  metadata.gz: 47e50479e458978b758e62aaeea44345c05a27ea
+  data.tar.gz: ee7b1918db731c9bee8c1f08bd0cc3515ec6c348
 SHA512:
-  metadata.gz: 70886f6c9b00ee5a47af1beb69fdccaa6d1611ee264eba196c5773e2b0f6959b7cec9dc60c1540851788190d2e64c763094be8cd9ff44d0ca0ab52ea7461f6d7
-  data.tar.gz: 14f89c0602a5d7602d28d1e2fad44c47009afb004f4635f44fc7131ad2b2a49df4c9062041799556e04297ac8c214afe15b3608284763d53282dd93294d4edcf
+  metadata.gz: 590b19d10a62e9c34cd7777f10999498e787acd5b09ce103578f9d777fdb73e670a78cebafc6ad61a80c1ac08947a5dbff96d4a8e1589982fa6abe065592f4a9
+  data.tar.gz: 41f069d44b395574c5c5c60b10bde728d5cae4d9d6e7fee195ebef5c541476efeb102830dea89a6b09c64ce87b349cd05758792166ee81b5a435d32890b831ef

data/README.textile

@@ -26,7 +26,7 @@ instance an IO object if that is passed instead of a URI.
 
 FastImage will follow up to 4 HTTP redirects to get the image.
 
-FastImage will obey the http_proxy setting in your environment to route requests via a proxy.
+FastImage will obey the http_proxy setting in your environment to route requests via a proxy. You can also pass a :proxy argument if you want to specify the proxy address in the call.
 
 You can add a timeout to the request which will limit the request time by passing :timeout => number_of_seconds.
 
@@ -142,4 +142,5 @@ Pull requests and suggestions are always welcome. Thanks to all the contributors
 * @muffinista
 * @marcandre
 * @apanzerj
+* @forresty
 

data/lib/fastimage.rb

@@ -63,9 +63,9 @@ class FastImage
   class CannotParseImage < FastImageException # :nodoc:
   end
 
-  DefaultTimeout = 2
+  DefaultTimeout = 2 unless const_defined?(:DefaultTimeout)
 
-  LocalFileChunkSize = 256
+  LocalFileChunkSize = 256 unless const_defined?(:LocalFileChunkSize)
 
   # Returns an array containing the width and height of the image.
   # It will return nil if the image could not be fetched, or if the image type was not recognised.
@@ -160,6 +160,7 @@ class FastImage
   def initialize(uri, options={})
     @property = options[:type_only] ? :type : :size
     @timeout = options[:timeout] || DefaultTimeout
+    @proxy_url = options[:proxy]
     @uri = uri
 
     if uri.respond_to?(:read)
@@ -250,7 +251,7 @@ class FastImage
           end
         end
       end
-      
+
       parse_packets FiberStream.new(read_fiber)
 
       break  # needed to actively quit out of the fetch
@@ -259,7 +260,11 @@ class FastImage
 
   def proxy_uri
     begin
-      proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? Addressable::URI.parse(ENV['http_proxy']) : nil
+      if @proxy_url
+        proxy = Addressable::URI.parse(@proxy_url)
+      else
+        proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? Addressable::URI.parse(ENV['http_proxy']) : nil
+      end
     rescue Addressable::URI::InvalidURIError
       proxy = nil
     end
@@ -404,7 +409,7 @@ class FastImage
         :webp
       else
         raise UnknownImageType
-      end        
+      end
     else
       raise UnknownImageType
     end
@@ -493,18 +498,18 @@ class FastImage
       nil
     end
   end
-  
+
   def parse_size_vp8
     w, h = @stream.read(10).unpack("@6vv")
     [w & 0x3fff, h & 0x3fff]
   end
-  
+
   def parse_size_vp8l
     @stream.read(1) # 0x2f
     b1, b2, b3, b4 = @stream.read(4).bytes.to_a
     [1 + (((b2 & 0x3f) << 8) | b1), 1 + (((b4 & 0xF) << 10) | (b3 << 2) | ((b2 & 0xC0) >> 6))]
   end
-  
+
   def parse_size_vp8x
     flags = @stream.read(4).unpack("C")[0]
     b1, b2, b3, b4, b5, b6 = @stream.read(6).unpack("CCCCCC")
@@ -514,7 +519,7 @@ class FastImage
       # parse exif for orientation
       # TODO: find or create test images for this
     end
-    
+
     return [width, height]
   end
 

data/lib/fastimage/fbr.rb

@@ -64,4 +64,3 @@ unless defined? Fiber
     end
   end
 end
-

data/test/test.rb

@@ -60,9 +60,9 @@ BadFixtures.each do |fn|
 end
 
 GzipTestImg = "gzipped.jpg"
-FakeWeb.register_uri(:get, "#{TestUrl}#{GzipTestImg}", :body => File.join(FixturePath, GzipTestImg), :content_encoding => "gzip") 
+FakeWeb.register_uri(:get, "#{TestUrl}#{GzipTestImg}", :body => File.join(FixturePath, GzipTestImg), :content_encoding => "gzip")
 GzipTestImgTruncated = "truncated_gzipped.jpg"
-FakeWeb.register_uri(:get, "#{TestUrl}#{GzipTestImgTruncated}", :body => File.join(FixturePath, GzipTestImgTruncated), :content_encoding => "gzip") 
+FakeWeb.register_uri(:get, "#{TestUrl}#{GzipTestImgTruncated}", :body => File.join(FixturePath, GzipTestImgTruncated), :content_encoding => "gzip")
 GzipTestImgSize = [970, 450]
 
 class FastImageTest < Test::Unit::TestCase
@@ -245,11 +245,18 @@ class FastImageTest < Test::Unit::TestCase
     assert_equal actual_size, size
   end
 
+  def test_should_fetch_via_proxy_option
+    file = "test.gif"
+    actual_size = GoodFixtures[file][1]
+    size = FastImage.size(TestUrl + file, :proxy => "http://my.proxy.host:8080")
+    assert_equal actual_size, size
+  end
+
   def test_should_handle_https_image
     size = FastImage.size(HTTPSImage)
     assert_equal HTTPSImageInfo[1], size
   end
-  
+
   require 'pathname'
   def test_should_handle_pathname
     # bad.jpg does not have the size info in the first 256 bytes
@@ -258,7 +265,7 @@ class FastImageTest < Test::Unit::TestCase
     path = Pathname.new(File.join(FixturePath, "bad.jpg"))
     assert_equal([500,500], FastImage.size(path))
   end
-  
+
   def test_should_report_type_and_size_correctly_for_stringios
     GoodFixtures.each do |fn, info|
       string = File.read(File.join(FixturePath, fn))
@@ -267,7 +274,7 @@ class FastImageTest < Test::Unit::TestCase
       assert_equal info[1], FastImage.size(stringio)
     end
   end
-  
+
   def test_gzipped_file
     url = "http://example.nowhere/#{GzipTestImg}"
     assert_equal([970, 450], FastImage.size(url))
@@ -279,7 +286,7 @@ class FastImageTest < Test::Unit::TestCase
       FastImage.size(url, :raise_on_failure => true)
     end
   end
-  
+
   def test_cant_access_shell
     url = "|echo>shell_test"
     %x{rm -f shell_test}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: FastImage finds the size or type of an image given its uri by fetching
   as little as needed.
 email: sdsykes@gmail.com
@@ -130,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: FastImage - Image info fast