fastimage 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e91d72ee9017341028e1a4e39335bcbe38fd430
-  data.tar.gz: 1967da0aa3c2814d4cf8451df75dff1c50bc2d98
+  metadata.gz: 8bdd1b1858b1101956c8d27e85509ad1c68a436b
+  data.tar.gz: 54021e4718ed2bf2480dd7972b59a8b6b711061c
 SHA512:
-  metadata.gz: 272713d7824e59ef0f049f503ecbb57cbb2f65bb1e3a756aed3830ffd5131fcb2943d06d090d9bfb82f3f99ca64f385d76debf5f3b121b3974b16be6b7aa1676
-  data.tar.gz: 390252f65f7d4770c00431de27f353835ec6d39ca2ed32be99337210daabc769e28d9823a24905b86f8f557c63edc0502cff5a1c34aaee25e004316bc3efda2c
+  metadata.gz: cf0bfcba525fbacbb09919754faf51e3702bdfba09430601db181485e5626949a0f6ed8797a34e37e1f13d19100fe4bf020e6f3ef7c77aad40efe544f7f3007d
+  data.tar.gz: bc307c6eda1000ad5a60be2bcfd98b18fa7bb33faf4bbf4db20c5fa4db3cb3653b55f39dba1653e83d0a8a8d3ec33ffe3a20da434d539993ae3b3447e8f3dea4

data/README.textile

@@ -37,6 +37,8 @@ FastImage accepts additional HTTP headers. This can be used to set a user agent
 
 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@. Take care to sanitise the strings passed to FastImage; it will try to read from whatever is passed.
@@ -62,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
@@ -97,7 +101,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)
@@ -114,7 +118,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)
@@ -124,8 +128,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:
 

data/lib/fastimage.rb

@@ -28,7 +28,7 @@
 # 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 
+# FastImage can give you information about the parsed display orientation of an image with Exif
 # data (jpeg or tiff).
 #
 # === Examples
@@ -55,10 +55,18 @@
 #
 
 require 'net/https'
-require 'addressable/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
@@ -184,10 +192,12 @@ class FastImage
 
     if uri.respond_to?(:read)
       fetch_using_read(uri)
+    elsif uri.start_with?('data:')
+      fetch_using_base64(uri)
     else
       begin
-        @parsed_uri = Addressable::URI.parse(uri)
-      rescue Addressable::URI::InvalidURIError
+        @parsed_uri = URI.parse(uri)
+      rescue URI::InvalidURIError
         fetch_using_file_open
       else
         if @parsed_uri.scheme == "http" || @parsed_uri.scheme == "https"
@@ -237,14 +247,16 @@ class FastImage
       if res.is_a?(Net::HTTPRedirection) && @redirect_count < 4
         @redirect_count += 1
         begin
-          newly_parsed_uri = Addressable::URI.parse(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
           end
-        rescue Addressable::URI::InvalidURIError
+        rescue URI::InvalidURIError
         else
           fetch_using_http_from_parsed_uri
           break
@@ -282,14 +294,18 @@ class FastImage
     end
   end
 
+  def protocol_relative_url?(url)
+    url.start_with?("//")
+  end
+
   def proxy_uri
     begin
       if @options[:proxy]
-        proxy = Addressable::URI.parse(@options[:proxy])
+        proxy = URI.parse(@options[:proxy])
       else
-        proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? Addressable::URI.parse(ENV['http_proxy']) : nil
+        proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? URI.parse(ENV['http_proxy']) : nil
       end
-    rescue Addressable::URI::InvalidURIError
+    rescue URI::InvalidURIError
       proxy = nil
     end
     proxy
@@ -299,9 +315,9 @@ class FastImage
     proxy = proxy_uri
 
     if proxy
-      @http = Net::HTTP::Proxy(proxy.host, proxy.port).new(@parsed_uri.host, @parsed_uri.inferred_port)
+      @http = Net::HTTP::Proxy(proxy.host, proxy.port).new(@parsed_uri.host, @parsed_uri.port)
     else
-      @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.inferred_port)
+      @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
     end
     @http.use_ssl = (@parsed_uri.scheme == "https")
     @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -334,6 +350,7 @@ class FastImage
   end
 
   def fetch_using_file_open
+    @content_length = File.size?(@uri)
     File.open(@uri) do |s|
       fetch_using_read(s)
     end
@@ -351,7 +368,7 @@ class FastImage
         else
           @orientation = 1
         end
-        
+
         instance_variable_set("@#{@property}", result)
       else
         raise CannotParseImage
@@ -366,6 +383,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
@@ -395,6 +417,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]
@@ -466,9 +489,16 @@ class FastImage
     when "<s"
       :svg
     when "<?"
-      :svg if @stream.peek(100).include?("<svg")
+      # 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
     end
-    
+
     parsed_type or raise UnknownImageType
   end
 
@@ -644,7 +674,7 @@ class FastImage
       end
 
       parse_exif_ifd
-      
+
       @orientation ||= 1
     end
 
@@ -676,6 +706,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
 
@@ -698,14 +732,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

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rdoc
   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: test-unit
   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: FastImage finds the size or type of an image given its uri by fetching
@@ -97,22 +83,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: FastImage - Image info fast