discourse_fastimage 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37620cc6b20562783bb7d7ac06cb535065a3e935
-  data.tar.gz: 07baa13fdec2f77276878545814d4ef32487bf41
+  metadata.gz: a75deaf2e304cde6b7109dc87c50d3fe2866633a
+  data.tar.gz: ad9f971c2769571d02c14e409482399e0ae7a714
 SHA512:
-  metadata.gz: e4084b661aa9e3f56af4bac6bf48630b3eedcbdb42f7a28e0fb6f7b64aecd8e42036ec4aeef46c0482439a0ce8be41743977c1d16b782804f85c2327195b1522
-  data.tar.gz: bde96e05a4e9826421cc6335e4d08a6dd838eae1c2a0e34c9f1040296e562f40b0ccef6e94b49a04a005ee434ccf0a2e8a00bb1efad567d5291125f63f010e1e
+  metadata.gz: 73efc6a4b04c496a7d834ef2a7d9071111ef801b94a03a92f40700d9ff790d551a9fa6d642e1537b3d730a532762604766b97c673db0de7b6c8b5db465bcd302
+  data.tar.gz: 808365bbfc92ce320ff314f814548cb71d44ece029035a4a2f8d7f4a3e382fdf9e47f452427c4db70e575c92405de7c80377a212508bd6e0ccd6069493d22ee0

data/README.textile

@@ -19,29 +19,29 @@ 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).
 
+FastImage also handles "Data URIs":https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs correctly.
+
 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
 
@@ -64,6 +64,8 @@ FastImage.size("http://stephensykes.com/images/ss.com_x.gif", :http_header => {'
 => [266, 56]
 FastImage.new("http://stephensykes.com/images/ExifOrientation3.jpg").orientation
 => 3
+FastImage.size("data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==")
+=> [1, 1]
 </code></pre>
 
 h2. Installation
@@ -90,6 +92,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.
@@ -99,7 +105,7 @@ irb> uri = "http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_1350660_13
 irb> puts Benchmark.measure {open(uri, 'rb') {|fh| p ImageSize.new(fh).size}}
 [9545, 6623]
   0.680000   0.250000   0.930000 (  7.571887)
-  
+
 irb> puts Benchmark.measure {p FastImage.size(uri)}
 [9545, 6623]
   0.010000   0.000000   0.010000 (  0.090640)
@@ -116,7 +122,7 @@ irb> uri = "http://upload.wikimedia.org/wikipedia/commons/1/11/Shinbutsureijoush
 irb> puts Benchmark.measure {open(uri, 'rb') {|fh| p ImageSize.new(fh).size}}
 [1120, 1559]
   1.080000   0.370000   1.450000 ( 13.766962)
-  
+
 irb> puts Benchmark.measure {p FastImage.size(uri)}
 [1120, 1559]
   3.490000   3.810000   7.300000 ( 11.754315)
@@ -126,8 +132,8 @@ h2. Tests
 
 You'll need to @gem install fakeweb@ and possibly also  @gem install test-unit@ to be able to run the tests.
 
-bc.. $ ruby test.rb 
-Run options: 
+bc.. $ ruby test.rb
+Run options:
 
 # Running tests:
 
@@ -149,6 +155,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/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 uri.
@@ -55,10 +56,18 @@
 #
 
 require 'net/https'
-require 'open-uri'
 require 'delegate'
 require 'pathname'
 require 'zlib'
+require 'base64'
+require 'uri'
+
+# see http://stackoverflow.com/questions/5208851/i/41048816#41048816
+if RUBY_VERSION < "2.2"
+  module URI
+    DEFAULT_PARSER = Parser.new(:HOSTNAME => "(?:(?:[a-zA-Z\\d](?:[-\\_a-zA-Z\\d]*[a-zA-Z\\d])?)\\.)*(?:[a-zA-Z](?:[-\\_a-zA-Z\\d]*[a-zA-Z\\d])?)\\.?")
+  end
+end
 
 class FastImage
   attr_reader :size, :type, :content_length, :orientation
@@ -80,28 +89,6 @@ class FastImage
 
   LocalFileChunkSize = 256 unless const_defined?(:LocalFileChunkSize)
 
-  # Parser object should respond to #parse
-  # and raise a URI::InvalidURIError if something goes wrong
-  def self.uri_parser=(parser)
-    @uri_parser = parser
-  end
-
-  # Helper that sets URI parsing to use the Addressable gem
-  def self.use_addressable_uri_parser
-    require 'addressable/uri'
-    self.uri_parser = Class.new do
-      def self.parse(location)
-        Addressable::URI.parse(location)
-      rescue Addressable::URI::InvalidURIError
-        raise URI::InvalidURIError
-      end
-    end
-  end
-
-  def self.parse_uri(location)
-    (@uri_parser || URI).parse(location)
-  end
-
   # 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.
   #
@@ -204,11 +191,15 @@ class FastImage
 
     @property = @options[:type_only] ? :type : :size
 
+    @type, @state = nil
+
     if uri.respond_to?(:read)
       fetch_using_read(uri)
+    elsif uri.start_with?('data:')
+      fetch_using_base64(uri)
     else
       begin
-        @parsed_uri = self.class.parse_uri(uri)
+        @parsed_uri = URI.parse(uri)
       rescue URI::InvalidURIError
         fetch_using_file_open
       else
@@ -222,11 +213,10 @@ class FastImage
 
     raise SizeNotFound if @options[:raise_on_failure] && @property == :size && !@size
 
-  rescue Timeout::Error,
-         Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET, Errno::ENOENT,
-         Net::HTTPBadResponse,
-         SocketError, EOFError, IOError, NoMethodError,
-         ImageFetchFailure
+  rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET,
+    ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT
+    raise ImageFetchFailure if @options[:raise_on_failure]
+  rescue NoMethodError  # 1.8.7p248 can raise this due to a net/http bug
     raise ImageFetchFailure if @options[:raise_on_failure]
   rescue UnknownImageType
     raise UnknownImageType if @options[:raise_on_failure]
@@ -241,6 +231,7 @@ class FastImage
 
   ensure
     uri.rewind if uri.respond_to?(:rewind)
+
   end
 
   private
@@ -259,9 +250,11 @@ class FastImage
       if res.is_a?(Net::HTTPRedirection) && @redirect_count < 4
         @redirect_count += 1
         begin
-          newly_parsed_uri = self.class.parse_uri(res['Location'])
+          newly_parsed_uri = URI.parse(res['Location'])
           # The new location may be relative - check for that
-          if newly_parsed_uri.scheme != "http" && newly_parsed_uri.scheme != "https"
+          if protocol_relative_url?(res['Location'])
+            @parsed_uri = URI.parse("#{@parsed_uri.scheme}:#{res['Location']}")
+          elsif newly_parsed_uri.scheme != "http" && newly_parsed_uri.scheme != "https"
             @parsed_uri.path = res['Location']
           else
             @parsed_uri = newly_parsed_uri
@@ -304,12 +297,16 @@ class FastImage
     end
   end
 
+  def protocol_relative_url?(url)
+    url.start_with?("//")
+  end
+
   def proxy_uri
     begin
       if @options[:proxy]
-        proxy = self.class.parse_uri(@options[:proxy])
+        proxy = URI.parse(@options[:proxy])
       else
-        proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? self.class.parse_uri(ENV['http_proxy']) : nil
+        proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? URI.parse(ENV['http_proxy']) : nil
       end
     rescue URI::InvalidURIError
       proxy = nil
@@ -319,16 +316,13 @@ class FastImage
 
   def setup_http
     proxy = proxy_uri
-    use_ssl = (@parsed_uri.scheme == "https")
-    port = @parsed_uri.port || (use_ssl ? 443 : 80)
 
     if proxy
-      @http = Net::HTTP::Proxy(proxy.host, proxy.port).new(@parsed_uri.host, port)
+      @http = Net::HTTP::Proxy(proxy.host, proxy.port).new(@parsed_uri.host, @parsed_uri.port)
     else
-      @http = Net::HTTP.new(@parsed_uri.host, port)
+      @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
     end
-
-    @http.use_ssl = use_ssl
+    @http.use_ssl = (@parsed_uri.scheme == "https")
     @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     @http.open_timeout = @options[:timeout]
     @http.read_timeout = @options[:timeout]
@@ -359,6 +353,7 @@ class FastImage
   end
 
   def fetch_using_file_open
+    @content_length = File.size?(@uri)
     File.open(@uri) do |s|
       fetch_using_read(s)
     end
@@ -391,6 +386,11 @@ class FastImage
     send("parse_size_for_#{@type}")
   end
 
+  def fetch_using_base64(uri)
+    data = uri.split(',')[1]
+    fetch_using_read StringIO.new(Base64.decode64(data))
+  end
+
   module StreamUtil # :nodoc:
     def read_byte
       read(1)[0].ord
@@ -420,6 +420,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]
@@ -442,6 +443,24 @@ class FastImage
       @pos += n
       result
     end
+
+    def skip(n)
+      discarded = 0
+      fetched = @str[@strpos..-1].size
+      while n > fetched
+        discarded += @str[@strpos..-1].size
+        new_string = @read_fiber.resume
+        raise CannotParseImage if !new_string
+
+        new_string.force_encoding("ASCII-8BIT") if String.method_defined? :force_encoding
+
+        fetched += new_string.size
+        @str = new_string
+        @strpos = 0
+      end
+      @strpos = @strpos + n - discarded
+      @pos += n
+    end
   end
 
   class IOStream < SimpleDelegator # :nodoc:
@@ -449,7 +468,7 @@ class FastImage
   end
 
   def parse_type
-    case @stream.peek(2)
+    parsed_type = case @stream.peek(2)
     when "BM"
       :bmp
     when "GI"
@@ -469,22 +488,21 @@ class FastImage
       when 2 then :cur
       end
     when "RI"
-      if @stream.peek(12)[8..11] == "WEBP"
-        :webp
-      else
-        raise UnknownImageType
-      end
+      :webp if @stream.peek(12)[8..11] == "WEBP"
     when "<s"
       :svg
-    when "<?"
-      (10..200).step(10).each do |length|
-        characters = @stream.peek(length) rescue nil
-        raise UnknownImageType if characters.nil?
-        return :svg if characters.include?("<svg")
+    when /<[?!]/
+      # 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
+        nil
       end
-    else
-      raise UnknownImageType
     end
+
+    parsed_type or raise UnknownImageType
   end
 
   def parse_size_for_ico
@@ -503,10 +521,11 @@ class FastImage
   end
 
   def parse_size_for_jpeg
+    exif = nil
     loop do
       @state = case @state
       when nil
-        @stream.read(2)
+        @stream.skip(2)
         :started
       when :started
         @stream.read_byte == 0xFF ? :sof : :started
@@ -518,7 +537,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
@@ -532,14 +551,14 @@ class FastImage
         end
       when :skipframe
         skip_chars = @stream.read_int - 2
-        @stream.read(skip_chars)
+        @stream.skip(skip_chars)
         :started
       when :readsize
-        _s = @stream.read(3)
+        @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
@@ -579,7 +598,7 @@ class FastImage
   end
 
   def parse_size_vp8l
-    @stream.read(1) # 0x2f
+    @stream.skip(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
@@ -602,6 +621,7 @@ class FastImage
 
     def initialize(stream)
       @stream = stream
+      @width, @height, @orientation = nil
       parse_exif
     end
 
@@ -652,7 +672,11 @@ class FastImage
       @stream.read(2) # 42
 
       offset = @stream.read(4).unpack(@long)[0]
-      @stream.read(offset - 8)
+      if @stream.respond_to?(:skip)
+        @stream.skip(offset - 8)
+      else
+        @stream.read(offset - 8)
+      end
 
       parse_exif_ifd
 
@@ -677,6 +701,7 @@ class FastImage
   class Svg # :nodoc:
     def initialize(stream)
       @stream = stream
+      @width, @height, @ratio, @viewbox_width, @viewbox_height = nil
       parse_svg
     end
 
@@ -687,6 +712,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
 
@@ -709,10 +738,16 @@ 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]/
+        when /\w/
           attr_name << char
+        when "<"
+          attr_name = [char]
         when ">"
           state = :stop if state == :started
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_fastimage
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
@@ -77,7 +77,7 @@ files:
 - MIT-LICENSE
 - README.textile
 - lib/fastimage.rb
-homepage: http://github.com/discourse/fastimage
+homepage: http://github.com/sdsykes/fastimage
 licenses:
 - MIT
 metadata: {}
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: FastImage - Image info fast