fastimage 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d922750baf3944066ebd6d111e43f93c53c6295
-  data.tar.gz: 475ce77b823d27771f51930695bc4a90dcada5f7
+  metadata.gz: d53b20cff044a6f154f24155070dc9146cd70ff7
+  data.tar.gz: c3e80b5e1bb01f18f73149a19c6772244f7fead1
 SHA512:
-  metadata.gz: a16be654c6c2e6d6199ac75f71403b56124b21a65d530e71f8b5f4732122b73cf2a29bf800df2b2e6dc210791754ac3ecfe736a317a4b0763565929ae2920a5f
-  data.tar.gz: ca50e122cfbec08af5d9f090e1aeefaa56890787168a9c8859b4707d2a5ebae9796a58392ac117b9782d13369c89c28fa2e3e268825042b1d70c04fdce90a50a
+  metadata.gz: 1d99e7827d87d3cc564d67130e54c5a7716259796ea1c5bd3513023824e8251af2d80426294577ddd8d58691908e5679d032ec19559f922f86d7890a8a85a104
+  data.tar.gz: 758414866ee9b5e278e997afb4954641d27961fbfe4876f96ec6b25db6cb5021f57fd0ab10b68d5be4beb108cbd3fe3491a85a8e25e8138b2e294e06323d957e

data/lib/fastimage.rb

@@ -44,6 +44,7 @@ require 'net/https'
 require 'addressable/uri'
 require 'fastimage/fbr.rb'
 require 'delegate'
+require 'pathname'
 
 class FastImage
   attr_reader :size, :type
@@ -264,9 +265,23 @@ class FastImage
   end
 
   def fetch_using_read(readable)
-    read_fiber = Fiber.new do
-      while str = readable.read(LocalFileChunkSize)
-        Fiber.yield str
+    # Pathnames respond to read, but always return the first
+    # chunk of the file unlike an IO (even though the
+    # docuementation for it refers to IO). Need to supply
+    # an offset in this case.
+    if readable.is_a?(Pathname)
+      read_fiber = Fiber.new do
+        offset = 0
+        while str = readable.read(LocalFileChunkSize, offset)
+          Fiber.yield str
+          offset += LocalFileChunkSize
+        end
+      end
+    else
+      read_fiber = Fiber.new do
+        while str = readable.read(LocalFileChunkSize)
+          Fiber.yield str
+        end
       end
     end
 

data/test/test.rb

@@ -25,7 +25,7 @@ GoodFixtures = {
   "exif_orientation.jpg"=>[:jpeg, [600, 450]],
   "infinite.jpg"=>[:jpeg, [160,240]],
   "orient_2.jpg"=>[:jpeg, [230,408]]
-  }
+}
 
 BadFixtures = [
   "faulty.jpg",
@@ -234,4 +234,13 @@ class FastImageTest < Test::Unit::TestCase
     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
+    # so this tests if we are able to read past that using a
+    # Pathname (which has a different API from an IO).
+    path = Pathname.new(File.join(FixturePath, "bad.jpg"))
+    assert_equal([500,500], FastImage.size(path))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -84,6 +84,7 @@ files:
 - README.textile
 - lib/fastimage.rb
 - lib/fastimage/fbr.rb
+- test/fixtures/bad.jpg
 - test/fixtures/exif_orientation.jpg
 - test/fixtures/faulty.jpg
 - test/fixtures/folder with spaces/test.bmp