image_info 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 335b5d988c8fec52bf9d34596062dd56ff9d4db2
-  data.tar.gz: 4547675b414cd13d918d5abe0349b3db7516f5cb
+  metadata.gz: 0e64be805d1d84727d771133650ff254e7b8cb66
+  data.tar.gz: 330145b1fb6c7fe6c5916de26dcac0a284240e31
 SHA512:
-  metadata.gz: e8b7a26d43a838cb5291837e26a96c7c1bc7748c6ec86dd64a04ca00ee0f93c28c9856ea057b6e8c0ab5d8fd4b85da4c74d483b9d68425f4732df69b230e5f1a
-  data.tar.gz: a4385f974bffe74fd345ca38f0dd39536dde0a21db75d5426d52ecb0040246b68d03fb4f606a54aed20615cb4d2b4ed06df8f2a59a2680a83b6898065b8b6212
+  metadata.gz: 4025152ff395c4a4abb50c1f8715fe80b9ac81ed0e02a8b987c010349241d9da2879927eaf29bc1b4b9efae0cceed58acab6a63754fffe4314b77687c451dc5c
+  data.tar.gz: 1576e24fa6630e7168be36b915e74b93575155a54a50dcc1d99cc33d7fd9cb8ef295d1e39e05e421e0da6477831e7944ff5021719b984fbd68bc4313341fdfcb

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+* 1.1.1
+
+Now only fetch partial image data to compute its size and type.
+
+Thanks to [vdaubry](https://github.com/vdaubry) the gem now uses typhoeus
+stream capability to fetch images and get its size and type, aborting the
+request if necessary. Make sure to use typhoeus `v0.7.3` in order to benefit
+from this update since there was an issue with previous typhoeus version when
+aborting ongoing requests.
+
+Fixes [#1](https://github.com/gottfrois/image_info/issues/1)
+
+Also fix URL encoding issues.
+
 * 1.1.0
 
 - Introduces `width` and `height` method. Fixes [https://github.com/gottfrois/image_info/issues/2](https://github.com/gottfrois/image_info/issues/2)

data/README.md

@@ -5,13 +5,14 @@
 [![Dependency Status](https://gemnasium.com/gottfrois/image_info.svg)](https://gemnasium.com/gottfrois/image_info)
 [![Gem Version](https://badge.fury.io/rb/image_info.svg)](http://badge.fury.io/rb/image_info)
 
-ImageInfo finds the size and type of a single or multiple images from the web by fetching as little as needed in batches.
+ImageInfo finds the size and type of a single or multiple images from the web by fetching as little data as needed (partial image) in batches.
 
 ## Why
 
 In [LinkThumbnailer](https://github.com/gottfrois/link_thumbnailer) I needed to find images sizes not only for one image.
 A well known gem like FastImage was not enough so I decided to build my own.
-The gem use [typhoeus](https://github.com/typhoeus/typhoeus) under the hood to perform http requests in parallel.
+The gem use [typhoeus](https://github.com/typhoeus/typhoeus)'s parallel requests and stream capability under the hood to
+get images.
 
 ## Installation
 

data/lib/image_info/image.rb

@@ -7,7 +7,7 @@ module ImageInfo
     attr_accessor :width, :height, :type
 
     def initialize(uri)
-      @uri = ::URI.parse(uri.to_s)
+      @uri = ::URI.parse(::URI.encode(uri.to_s))
     end
 
     def size

data/lib/image_info/null_parser.rb

@@ -0,0 +1,12 @@
+module ImageInfo
+  class NullParser
+    def width
+    end
+
+    def height
+    end
+
+    def format
+    end
+  end
+end

data/lib/image_info/parser.rb

@@ -3,12 +3,11 @@ require 'image_size'
 module ImageInfo
   class Parser
 
-    attr_reader :image, :bytes, :parser
+    attr_reader :image, :data
 
     def initialize(image, data)
-      @image  = image
-      @bytes  = data.bytes
-      @parser = ::ImageSize.new(data)
+      @image = image
+      @data = data
     end
 
     def call
@@ -26,6 +25,13 @@ module ImageInfo
     def set_image_type
       image.type = parser.format
     end
-
+    
+    private
+    
+    def parser
+      @parser ||= ::ImageSize.new(data)
+    rescue ImageSize::FormatError
+      @parser ||= ::ImageInfo::NullParser.new
+    end
   end
 end

data/lib/image_info/processor.rb

@@ -2,6 +2,7 @@ require 'typhoeus'
 
 require 'image_info/image'
 require 'image_info/parser'
+require 'image_info/null_parser'
 require 'image_info/request_handler'
 
 module ImageInfo

data/lib/image_info/request_handler.rb

@@ -1,23 +1,26 @@
 module ImageInfo
   class RequestHandler
 
-    attr_reader :image
+    attr_reader :image, :buffer
 
     def initialize(image)
       @image = image
+      @buffer = StringIO.new
     end
 
     def build
       ::Typhoeus::Request.new(image.uri.to_s, followlocation: true, accept_encoding: :gzip).tap do |request|
-        request.on_complete { |response| on_complete(response) }
+        request.on_body do |chunk|
+          buffer.write(chunk)
+          :abort if found_image_info?(buffer)
+        end
       end
     end
 
     private
 
-    def on_complete(response)
-      ::ImageInfo::Parser.new(image, response.body).call if response.success?
+    def found_image_info?(chunk)
+      ::ImageInfo::Parser.new(image, chunk).call
     end
-
   end
 end

data/lib/image_info/version.rb

@@ -1,3 +1,3 @@
 module ImageInfo
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_info
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -117,6 +117,7 @@ files:
 - lib/image_info/configurable.rb
 - lib/image_info/configuration.rb
 - lib/image_info/image.rb
+- lib/image_info/null_parser.rb
 - lib/image_info/parser.rb
 - lib/image_info/processor.rb
 - lib/image_info/request_handler.rb