fastimage 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72e83c6f6d442c29071e060cca8a8b0a0a17024a7871cd19a64b83f77e0c0ced
-  data.tar.gz: 56d0f5f86e11f1a8922cdf5bbe292fef2753f5637df402fd7532ef21d8393537
+  metadata.gz: 6e4c8a8fb1f0bf8db7dff5aef7fd640d56e0938bd0c0e8bd2f5f0a659009429d
+  data.tar.gz: f827ef53ce46af99612e2628f72ed5bfa2c82b4729ea3a5dccd76dc67079b6c3
 SHA512:
-  metadata.gz: 002eb40a04b2ce79f8cdc34ee2fdc0d70fe35ff964d380096302682756a17e4b22f8275e335822f5229080aada2ca8d5d17603607cb0cf6479b61ac6d4dd64ef
-  data.tar.gz: 17c8efefdc90fae00178d045bb0670e2914f9f19eabdb0be983c49ffb573b752672f02678e38b1395129d7f55ffc42905fa1cbeb9017445ffa295db6cc4fe119
+  metadata.gz: 599ffa78f1020ece118a5f1bc47533ad98085ac6f71ede9ad4b2b0c1d8748c81e4fb060f6a1b9f5001f7df2661d70d9a16972bd118863461d39d491d0e3b2988
+  data.tar.gz: d761639e39eae059e2f810c7d6a124515d3c6db1470236044db376b424e78effaf48c51f4197c3a565c1aae3d1f742e1899e221f566a828c4f1f209d4e91d588

data/README.textile

@@ -132,7 +132,7 @@ 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
+bc.. $ ruby test/test.rb
 Run options:
 
 # Running tests:

data/lib/fastimage.rb

@@ -251,10 +251,8 @@ class FastImage
     Errno::ENETUNREACH, ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT,
     OpenSSL::SSL::SSLError
     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]
+    raise if @options[:raise_on_failure]
   rescue CannotParseImage
     if @options[:raise_on_failure]
       if @property == :size
@@ -434,8 +432,11 @@ class FastImage
   end
 
   def fetch_using_base64(uri)
-    data = uri.split(',')[1]
-    decoded = Base64.decode64(data)
+    decoded = begin
+      Base64.decode64(uri.split(',')[1])
+    rescue
+      raise CannotParseImage
+    end
     @content_length = decoded.size
     fetch_using_read StringIO.new(decoded)
   end
@@ -471,19 +472,20 @@ class FastImage
 
     # Peeking beyond the end of the input will raise
     def peek(n)
-      while @strpos + n - 1 >= @str.size
+      while @strpos + n > @str.size
         unused_str = @str[@strpos..-1]
+
         new_string = @read_fiber.resume
+        new_string = @read_fiber.resume if new_string.is_a? Net::ReadAdapter
         raise CannotParseImage if !new_string
-
         # we are dealing with bytes here, so force the encoding
-        new_string.force_encoding("ASCII-8BIT") if String.method_defined? :force_encoding
+        new_string.force_encoding("ASCII-8BIT") if new_string.respond_to? :force_encoding
 
         @str = unused_str + new_string
         @strpos = 0
       end
 
-      @str[@strpos..(@strpos + n - 1)]
+      @str[@strpos, n]
     end
 
     def read(n)
@@ -501,7 +503,7 @@ class FastImage
         new_string = @read_fiber.resume
         raise CannotParseImage if !new_string
 
-        new_string.force_encoding("ASCII-8BIT") if String.method_defined? :force_encoding
+        new_string.force_encoding("ASCII-8BIT") if new_string.respond_to? :force_encoding
 
         fetched += new_string.size
         @str = new_string
@@ -585,7 +587,7 @@ class FastImage
 
       # fields (1) + bg color (1) + pixel ratio (1)
       fields = @stream.read(3).unpack("CCC")[0]
-      if fields & 0x80 # Global Color Table
+      if fields & 0x80 != 0 # Global Color Table
         # 2 * (depth + 1) colors, each occupying 3 bytes (RGB)
         @stream.skip(3 * 2 ** ((fields & 0x7) + 1))
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Stephen Sykes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2021-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb-fi
@@ -81,7 +81,7 @@ homepage: http://github.com/sdsykes/fastimage
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -97,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: FastImage - Image info fast
 test_files: []