fastimage 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bdd1b1858b1101956c8d27e85509ad1c68a436b
-  data.tar.gz: 54021e4718ed2bf2480dd7972b59a8b6b711061c
+  metadata.gz: 286c430f0c94ceafdbcbe884ae9bee4252e549c0
+  data.tar.gz: c006bb076bdefba5bfdea4f024c8f327189b0b83
 SHA512:
-  metadata.gz: cf0bfcba525fbacbb09919754faf51e3702bdfba09430601db181485e5626949a0f6ed8797a34e37e1f13d19100fe4bf020e6f3ef7c77aad40efe544f7f3007d
-  data.tar.gz: bc307c6eda1000ad5a60be2bcfd98b18fa7bb33faf4bbf4db20c5fa4db3cb3653b55f39dba1653e83d0a8a8d3ec33ffe3a20da434d539993ae3b3447e8f3dea4
+  metadata.gz: cb7f192a5d7c2909c9b5275305608ed3c2e9c97e6d7fc9d0bd1386b08e3ccc29621a8cff9ba3b83eae4651fdbf8c27b2aa0cd70c5dea50efcd0912c7d82fcdc2
+  data.tar.gz: 72a91dbf2da909e0ebadbbd902fb7ffbbd3d7718073726fed3b23044bbc67134892008d227607d0f27e4b89ba464a451526a95c3bb047ed353c9addb98485a63

data/README.textile

@@ -92,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.
@@ -151,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.
@@ -190,6 +191,8 @@ 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:')
@@ -385,7 +388,9 @@ class FastImage
 
   def fetch_using_base64(uri)
     data = uri.split(',')[1]
-    fetch_using_read StringIO.new(Base64.decode64(data))
+    decoded = Base64.decode64(data)
+    @content_length = decoded.size
+    fetch_using_read StringIO.new(decoded)
   end
 
   module StreamUtil # :nodoc:
@@ -431,7 +436,7 @@ class FastImage
         @strpos = 0
       end
 
-      result = @str[@strpos..(@strpos + n - 1)]
+      @str[@strpos..(@strpos + n - 1)]
     end
 
     def read(n)
@@ -488,7 +493,7 @@ class FastImage
       :webp if @stream.peek(12)[8..11] == "WEBP"
     when "<s"
       :svg
-    when "<?"
+    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.
@@ -518,6 +523,7 @@ class FastImage
   end
 
   def parse_size_for_jpeg
+    exif = nil
     loop do
       @state = case @state
       when nil
@@ -533,7 +539,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
@@ -553,8 +559,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
@@ -575,7 +581,7 @@ class FastImage
 
   def parse_size_for_webp
     vp8 = @stream.read(16)[12..15]
-    len = @stream.read(4).unpack("V")
+    _len = @stream.read(4).unpack("V")
     case vp8
     when "VP8 "
       parse_size_vp8
@@ -617,6 +623,7 @@ class FastImage
 
     def initialize(stream)
       @stream = stream
+      @width, @height, @orientation = nil
       parse_exif
     end
 
@@ -696,6 +703,7 @@ class FastImage
   class Svg # :nodoc:
     def initialize(stream)
       @stream = stream
+      @width, @height, @ratio, @viewbox_width, @viewbox_height = nil
       parse_svg
     end
 
@@ -732,7 +740,7 @@ class FastImage
             return if @width
           elsif attr_name.join =~ /viewbox/i
             values = attr_value.split(/\s/)
-            if values[2].to_f > 0 && values[3].to_f > 0 
+            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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb