local-fastimage 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 576d4b3064f11a71c592f96929d6f58cb13af056
-  data.tar.gz: c221b3a5ed155f1f543f9d9de10ac103bd5338b3
+SHA256:
+  metadata.gz: 547d7024c4428e2314dd4ae8fe701d6baf57a4d0e735ab3b7d522e65b518be0e
+  data.tar.gz: b49ddf7062d328e10a91effc60e8965973d651371de7a3e1e63fd9dba983f37d
 SHA512:
-  metadata.gz: cced0adefb5b8523de34918baa5ded500e46cb72ec0208e0f5914e3074ef0a877f60b66083c9a52c7edfa0af7e637f9ff2dda0de7e255bb52dfa1d2b18ef2661
-  data.tar.gz: 3430d92ceb8e480625f2e506b7ed487ecff9944906e4d387d6240b2cf7adcf022d650a5a90d2e80002846cea841f1c1df0493ebb9de824910fb8a816f2104df8
+  metadata.gz: 3b055c6d724144c030c40bfa41fd2dcec29d527abbc71ac7538b481793986799d789790d9c4dc87591b3e7c625af822aca7c82423ad467f9db0041bcb92320d5
+  data.tar.gz: dc32631985b2332164e0cdac9bbc9d2fec7d8605f54cafc1444c2ef16a42aba4b7c324b9d5501ac202b361502fd73f28046ac0e4ae718a8afbc1f24ac4a07bdf

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 
 before_install:
   - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.1.0 - 2018-04-24
+
+Updates code to match fastimage v2.1.1
+
+* improved SVG support
+
 # 3.0.2 - 2016-10-17
 
 Fixes a bug,

data/README.textile

@@ -22,29 +22,27 @@ You only need supply the uri, and FastImage will do the rest.
 
 h2. Features
 
-Fastimage can also read local (and other) files - anything that is not parseable as a URI will be
-interpreted as a filename, and FastImage will attempt to open it with File#open.
+FastImage can also read local (and other) files - anything that is not parseable as a URI will be interpreted as a filename, and FastImage will attempt to open it with @File#open@.
 
-FastImage will also automatically read from any object that responds to :read - for
-instance an IO object if that is passed instead of a URI.
+FastImage will also automatically read from any object that responds to @:read@ - for 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. You can also pass a :proxy argument if you want to specify the proxy address in the call.
+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.
+You can add a timeout to the request which will limit the request time by passing @:timeout => number_of_seconds@.
 
-FastImage normally replies will nil if it encounters an error, but you can pass :raise_on_failure => true to get an exception.
+FastImage normally replies with @nil@ if it encounters an error, but you can pass @:raise_on_failure => true@ to get an exception.
 
 FastImage also provides a reader for the content length header provided in HTTP. This may be useful to assess the file size of an image, but do not rely on it exclusively - it will not be present in chunked responses for instance.
 
-FastImage accepts additional HTTP headers. This can be used to set a user agent or referrer which some servers require. Pass an :http_header argument to specify headers, e.g., :http_header => {'User-Agent' => 'Fake Browser'}.
+FastImage accepts additional HTTP headers. This can be used to set a user agent or referrer which some servers require. Pass an @:http_header@ argument to specify headers, e.g., @:http_header => {'User-Agent' => 'Fake Browser'}@.
 
 FastImage can give you information about the parsed display orientation of an image with Exif data (jpeg or tiff).
 
 h2. Security
 
-As of v1.6.7 FastImage no longer uses openuri to open files, but directly calls File.open. But take care to sanitise the strings passed to FastImage; it will try to read from whatever is passed.
+As of v1.6.7 FastImage no longer uses @openuri@ to open files, but directly calls @File.open@. Take care to sanitise the strings passed to FastImage; it will try to read from whatever is passed.
 
 h2. Examples
 
@@ -93,6 +91,10 @@ h2. Documentation
 
 "http://sdsykes.github.io/fastimage/rdoc/FastImage.html":http://sdsykes.github.io/fastimage/rdoc/FastImage.html
 
+h2. Maintainer
+
+FastImage is maintained by Stephen Sykes (@sdsykes). Support this project by using "LibPixel":https://libpixel.com cloud based image resizing and processing service.
+
 h2. Benchmark
 
 It's way faster than conventional methods (for example the image_size gem) for most types of file when fetching over the wire.
@@ -152,6 +154,7 @@ h2. FastImage in other languages
 * "PHP by tommoor":https://github.com/tommoor/fastimage
 * "Node.js by ShogunPanda":https://github.com/ShogunPanda/fastimage
 * "Objective C by kylehickinson":https://github.com/kylehickinson/FastImage
+* "Android by qstumn":https://github.com/qstumn/FastImageSize
 
 h2. Licence
 

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "fastimage"
+
+require "irb"
+IRB.start

data/lib/fastimage.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: ASCII-8BIT
 
 # FastImage finds the size or type of an image given its path. FastImage knows
@@ -139,6 +140,8 @@ class FastImage
 
     @property = @options[:type_only] ? :type : :size
 
+    @type, @state = nil
+
     if @source.respond_to?(:read)
       @path = @source.path if @source.respond_to? :path
       fetch_using_read
@@ -254,6 +257,7 @@ class FastImage
       @str = ''
     end
 
+    # Peeking beyond the end of the input will raise
     def peek(n)
       while @strpos + n - 1 >= @str.size
         unused_str = @str[@strpos..-1]
@@ -322,11 +326,17 @@ class FastImage
       end
     when "RI"
       :webp if @stream.peek(12)[8..11] == "WEBP"
-    when "<s", "<?"
-      # Does not handle UTF-16 or other multi-byte encodings
-      :svg if @stream.peek(64).include?("<svg")
+    when '<s', /<[?!]/
+      # Peek 10 more chars each time, and if end of file is reached just raise
+      # unknown. We assume the <svg tag cannot be within 10 chars of the end of
+      # the file, and is within the first 250 chars.
+      begin
+        :svg if (1..25).detect {|n| @stream.peek(10 * n).include?("<svg")}
+      rescue FiberError, CannotParseImage
+        nil
+      end
     end
-        
+
     parsed_type or raise UnknownImageType
   end
 
@@ -346,6 +356,7 @@ class FastImage
   end
 
   def parse_size_for_jpeg
+    exif = nil
     loop do
       @state = case @state
       when nil
@@ -361,7 +372,7 @@ class FastImage
           io = StringIO.new(data)
           if io.read(4) == "Exif"
             io.read(2)
-            @exif = Exif.new(IOStream.new(io)) rescue nil
+            exif = Exif.new(IOStream.new(io)) rescue nil
           end
           :started
         when 0xe0..0xef
@@ -381,8 +392,8 @@ class FastImage
         @stream.skip(3)
         height = @stream.read_int
         width = @stream.read_int
-        width, height = height, width if @exif && @exif.rotated?
-        return [width, height, @exif ? @exif.orientation : 1]
+        width, height = height, width if exif && exif.rotated?
+        return [width, height, exif ? exif.orientation : 1]
       end
     end
   end
@@ -445,6 +456,7 @@ class FastImage
 
     def initialize(stream)
       @stream = stream
+      @width, @height, @orientation = nil
       parse_exif
     end
 
@@ -524,6 +536,7 @@ class FastImage
   class Svg # :nodoc:
     def initialize(stream)
       @stream = stream
+      @width, @height, @ratio, @viewbox_width, @viewbox_height = nil
       parse_svg
     end
 
@@ -534,6 +547,10 @@ class FastImage
         [@width, @width / @ratio]
       elsif @height && @ratio
         [@height * @ratio, @height]
+      elsif @viewbox_width && @viewbox_height
+        [@viewbox_width, @viewbox_height]
+      else
+        nil
       end
     end
 
@@ -556,14 +573,20 @@ class FastImage
             return if @width
           elsif attr_name.join =~ /viewbox/i
             values = attr_value.split(/\s/)
-            @ratio = values[2].to_f / values[3].to_f
+            if values[2].to_f > 0 && values[3].to_f > 0
+              @ratio = values[2].to_f / values[3].to_f
+              @viewbox_width = values[2].to_i
+              @viewbox_height = values[3].to_i
+            end
           end
         when /\w/
           attr_name << char
+        when "<"
+          attr_name = [char]
         when ">"
           state = :stop if state == :started
         else
-          state = :started if attr_name.join == "svg"
+          state = :started if attr_name.join == "<svg"
           attr_name.clear
         end
       end

data/lib/fastimage/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FastImage
-  VERSION = "3.0.2"
+  VERSION = "3.1.0"
 end

data/local-fastimage.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["sdsykes@gmail.com", "gregor@plan.io", "support@plan.io"]
 
   s.summary = "Local FastImage - Image info fast"
-  s.description = "Local FastImage finds the size or type of an image given its uri by fetching as little as needed."
+  s.description = "Local FastImage finds the size or type of an image reading as little bytes as needed."
   s.homepage = "https://github.com/planio-gmbh/local-fastimage"
 
   s.license = "MIT"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "bundler", "~> 1.12"
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "minitest", "~> 5.0"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "minitest"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local-fastimage
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Stephen Sykes
@@ -9,52 +9,52 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-description: Local FastImage finds the size or type of an image given its uri by fetching
-  as little as needed.
+        version: '0'
+description: Local FastImage finds the size or type of an image reading as little
+  bytes as needed.
 email:
 - sdsykes@gmail.com
 - gregor@plan.io
@@ -71,6 +71,7 @@ files:
 - README.md
 - README.textile
 - Rakefile
+- bin/console
 - lib/fastimage.rb
 - lib/fastimage/version.rb
 - local-fastimage.gemspec
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Local FastImage - Image info fast