fastimage 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d875303daa1b28112147473975032f3f81208c96
-  data.tar.gz: 3d89ef08e50f8aa11792de19776cb86daa85a98d
+  metadata.gz: 8e91d72ee9017341028e1a4e39335bcbe38fd430
+  data.tar.gz: 1967da0aa3c2814d4cf8451df75dff1c50bc2d98
 SHA512:
-  metadata.gz: 8026c5b308cd35dee11005123318cd1d19ec73f9da625014cef529e0855d570d1ba67618ecf4d2433239f699f6d2e2dcd9fc639c7ca4effe9c10d330d4ce3cb4
-  data.tar.gz: 871b33aaa246cd85b80bac5376826e941385d73c1f90e5b084b0977df7d441de39c3fe6661c681715cdf67fe24629795dec95eebb0456cafb6cd8e1b591cbdea
+  metadata.gz: 272713d7824e59ef0f049f503ecbb57cbb2f65bb1e3a756aed3830ffd5131fcb2943d06d090d9bfb82f3f99ca64f385d76debf5f3b121b3974b16be6b7aa1676
+  data.tar.gz: 390252f65f7d4770c00431de27f353835ec6d39ca2ed32be99337210daabc769e28d9823a24905b86f8f557c63edc0502cff5a1c34aaee25e004316bc3efda2c

data/README.textile

@@ -19,29 +19,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
 

data/lib/fastimage.rb

@@ -417,6 +417,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:
@@ -424,7 +442,7 @@ class FastImage
   end
 
   def parse_type
-    case @stream.peek(2)
+    parsed_type = case @stream.peek(2)
     when "BM"
       :bmp
     when "GI"
@@ -444,26 +462,20 @@ 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 "<?"
-      if @stream.peek(100).include?("<svg")
-        :svg
-      else
-        raise UnknownImageType
-      end
-    else
-      raise UnknownImageType
+      :svg if @stream.peek(100).include?("<svg")
     end
+    
+    parsed_type or raise UnknownImageType
   end
 
   def parse_size_for_ico
-    @stream.read(8)[6..7].unpack('CC').map{|byte| byte == 0 ? 256 : byte }
+    icons = @stream.read(6)[4..5].unpack('v').first
+    sizes = icons.times.map { @stream.read(16).unpack('C2').map { |x| x == 0 ? 256 : x } }.sort_by { |w,h| w * h }
+    sizes.last
   end
   alias_method :parse_size_for_cur, :parse_size_for_ico
 
@@ -479,7 +491,7 @@ class FastImage
     loop do
       @state = case @state
       when nil
-        @stream.read(2)
+        @stream.skip(2)
         :started
       when :started
         @stream.read_byte == 0xFF ? :sof : :started
@@ -505,10 +517,10 @@ 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?
@@ -552,7 +564,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
@@ -625,7 +637,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
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable