image_info 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc41310509a4e3d07a8e9a671875674e532f5e99
-  data.tar.gz: 8323109506dd885913623e9505dd5c51bddb0e51
+SHA256:
+  metadata.gz: c283f102f87200ff3e0e3fb823551aa689599576390bab279c63c305868b3ffd
+  data.tar.gz: 5b831b50c1977baeac9919d107d29dff41be41961a3a4ad77ecff7e7906e2b8b
 SHA512:
-  metadata.gz: 46b4ddbece7f0a43cda5731cfddc80479112faec2cf7e1cdcdfb83a27f43092cd45634d2581eff2816f2bc85f78db6490e900745edef5d2ed1ab51f1e77d2320
-  data.tar.gz: 1551bf0913c31c88830b387b10c603c3ef0858add6f0a213f1222cc1fb6185f14f05b7c0b79911e2d5e197801e4e5f903b83ea0130820adb51584f686357899c
+  metadata.gz: c1c8acb5dfd7c70902bac0af3a64d9647552318fa11f47ec8004814bea68f0aa89ab66ee7876177e161cf7153bde257cae5a9f8553b9d273b4d3e34f2642c6a6
+  data.tar.gz: 269f7d92862fc6b53c53741a9c756ccc622c47c7b04740fb37c2472474bc8cc369dacfdf409fe644f4d57809f6e265cc639ddf67d066bc029bd34f69faabf3b0

data/.ruby-version

@@ -0,0 +1 @@
+2.6.6

data/.travis.yml

@@ -1,7 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-before_install: gem install bundler -v 1.10.4
+  - 2.5
+  - 2.6

data/CHANGELOG.md

@@ -1,25 +1,56 @@
-* 1.1.2
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.2.0] - 2020-07-24
+### Added
+
+- Allows to set a maximum image size in bytes to fetch. The HTTP connection
+will be aborted as soon as the max size is reached. Setting a value to
+`zero` or a negative number will deactivate this feature. Default to `-1` not
+to break retro compatibility.
+
+### Fixed
+
+- Partial image loading was sometime yielding empty results. Image size and
+type was not set properly in this case.
+- `max_concurrency` option was not properly set by default.
+- Locks dependencies to their major version.
+  - `typhoeus` is now locked to `~> 1.0`
+  - `image_size` is now locked to `~> 2.0`
+
+## [1.1.2] - 2015-08-12
+### Fixed
 
 - Fix issues with schemaless uri (ex: `//foo.com`)
 
-* 1.1.1
+## [1.1.1] - 2015-08-11
+### Adds
 
-Now only fetch partial image data to compute its size and type.
+- Adds image partial loading and abort the connection as soon as image
+size and type has been found.
 
-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 `>= 0.7.3` in order to benefit
-from this update since there was an issue with previous typhoeus version when
-aborting ongoing requests.
+### Fixed
 
-Fixes [#1](https://github.com/gottfrois/image_info/issues/1)
+- Fixes URL encoding issues.
 
-Also fix URL encoding issues.
+## [1.1.0] - 2015-07-19
+### Adds
 
-* 1.1.0
+- Introduces `width` and `height` method.
 
-- Introduces `width` and `height` method. Fixes [https://github.com/gottfrois/image_info/issues/2](https://github.com/gottfrois/image_info/issues/2)
+## [1.0.0] - 2015-07-19
+### Adds
 
-* 1.0.0
+- First release 🎆
 
-- First release
+[Unreleased]: https://github.com/gottfrois/image_info/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/gottfrois/image_info/compare/v1.1.2...v1.2.0
+[1.1.2]: https://github.com/gottfrois/image_info/compare/v1.1.1...v1.1.2
+[1.1.1]: https://github.com/gottfrois/image_info/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/gottfrois/image_info/compare/v1.0.0...v1.1.0
+[1.0.0]: https://github.com/gottfrois/image_info/releases/tag/v1.0.0

data/README.md

@@ -60,6 +60,8 @@ images.map &:type
 
 ## Configuration
 
+### Concurrency
+
 You can configure the `max_concurrency` value (20 by default) used to fetch images in parallel:
 
 ```ruby
@@ -74,6 +76,26 @@ or at runtime:
 ImageInfo.from('http://foo.com/foo.png', max_concurrency: 10)
 ```
 
+### Image Size Limit
+
+You can set a `max_image_size` for which the connection will be aborted
+if reached.
+
+```ruby
+ImageInfo.configure do |config|
+  config.max_image_size = 5 * 1024 * 1024 # 5Mb
+end
+```
+
+or at runtime:
+
+```ruby
+ImageInfo.from('http://foo.com/foo.png', max_image_size: -1)
+```
+
+Setting the value to zero or a negative number simply disable the limit.
+By default it is set to `-1`.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -88,4 +110,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/gottfr
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/image_info.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "typhoeus"
-  spec.add_dependency "image_size"
+  spec.add_dependency "typhoeus", "~> 1.0"
+  spec.add_dependency "image_size", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/image_info/configuration.rb

@@ -1,10 +1,11 @@
 module ImageInfo
   class Configuration
 
-    attr_accessor :max_concurrency
+    attr_accessor :max_concurrency, :max_image_size
 
     def initialize
       @max_concurrency = 20
+      @max_image_size = -1
     end
 
   end

data/lib/image_info/parser.rb

@@ -1,4 +1,5 @@
 require 'image_size'
+require 'image_info/null_parser'
 
 module ImageInfo
   class Parser
@@ -25,13 +26,12 @@ module ImageInfo
     def set_image_type
       image.type = parser.format
     end
-    
-    private
-    
+
     def parser
       @parser ||= ::ImageSize.new(data)
-    rescue ImageSize::FormatError
+    rescue ::ImageSize::FormatError, NoMethodError
       @parser ||= ::ImageInfo::NullParser.new
     end
+
   end
 end

data/lib/image_info/processor.rb

@@ -2,7 +2,6 @@ require 'typhoeus'
 
 require 'image_info/image'
 require 'image_info/parser'
-require 'image_info/null_parser'
 require 'image_info/request_handler'
 
 module ImageInfo
@@ -10,7 +9,7 @@ module ImageInfo
 
     attr_reader :images, :options
 
-    def initialize(urls, options = {})
+    def initialize(urls, options = { max_concurrency: ::ImageInfo.config.max_concurrency })
       @images  = Array(urls).map { |uri| ::ImageInfo::Image.new(uri) }.keep_if(&:valid?)
       @options = options
     end
@@ -25,7 +24,7 @@ module ImageInfo
     private
 
     def hydra
-      @hydra ||= ::Typhoeus::Hydra.new(max_concurrency: options[:max_concurrency])
+      @hydra ||= ::Typhoeus::Hydra.new(max_concurrency: options[:max_concurrency].to_i)
     end
 
   end

data/lib/image_info/request_handler.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module ImageInfo
   class RequestHandler
 
@@ -12,15 +14,25 @@ module ImageInfo
       ::Typhoeus::Request.new(image.uri.to_s, followlocation: true, accept_encoding: :gzip).tap do |request|
         request.on_body do |chunk|
           buffer.write(chunk)
-          :abort if found_image_info?(buffer)
+          buffer.rewind
+          :abort if max_image_size_reached? || found_image_info?
         end
       end
     end
 
     private
 
-    def found_image_info?(chunk)
-      ::ImageInfo::Parser.new(image, chunk).call
+    def found_image_info?
+      ::ImageInfo::Parser.new(image, buffer).call
+    end
+
+    def max_image_size_reached?
+      return false if max_image_size <= 0
+      buffer.size > max_image_size
+    end
+
+    def max_image_size
+      ::ImageInfo.config.max_image_size
     end
   end
 end

data/lib/image_info/version.rb

@@ -1,3 +1,3 @@
 module ImageInfo
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: image_info
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: webmock
   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: ImageInfo finds the size and type of a single or multiple images from
@@ -102,9 +102,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -126,24 +127,23 @@ homepage: https://github.com/gottfrois/image_info
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: ImageInfo finds the size and type of a single or multiple images from the
   web by fetching as little as needed.