local-fastimage 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd9284c076b0188defe52e6b096895b4ee269777
-  data.tar.gz: 19aa7d5f249704b46e1dede9ba4de56b74c51882
+  metadata.gz: 576d4b3064f11a71c592f96929d6f58cb13af056
+  data.tar.gz: c221b3a5ed155f1f543f9d9de10ac103bd5338b3
 SHA512:
-  metadata.gz: d2d58e6c9668204823820a86d52797b99ed5e1a661cce1e2a4e54a95f8c25354f6b448213093d3cfe252f30e3355e9ec0745c6cd2ca033b2a5f0ffa2ececb16a
-  data.tar.gz: 62b2aa3589ed8b0bd931063f74886c3ad52394d3b6391457364a65bb56abe6ebd8b1997de4170dd269585aecacc13bab334aee227c46b9cd29864f73f9b4afef
+  metadata.gz: cced0adefb5b8523de34918baa5ded500e46cb72ec0208e0f5914e3074ef0a877f60b66083c9a52c7edfa0af7e637f9ff2dda0de7e255bb52dfa1d2b18ef2661
+  data.tar.gz: 3430d92ceb8e480625f2e506b7ed487ecff9944906e4d387d6240b2cf7adcf022d650a5a90d2e80002846cea841f1c1df0493ebb9de824910fb8a816f2104df8

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 
+before_install:
+  - gem install bundler
+
+cache: bundler
 sudo: false
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 3.0.2 - 2016-10-17
+
+Fixes a bug,
+
+* where local-fastimage would keep large amounts of data in memory
+* where unknown file type was not reported correctly (#1)
+
+Thanks @bertg and @sdsykes for contributing to this release
+
 # 3.0.1 - 2016-06-02
 
 Updating meta data in gemspec, no code changes.

data/README.md

@@ -7,6 +7,8 @@ It features the following differences:
 * Removal of all remote image handling code
 * Minor changes to code organization
 
+[![Build Status](https://travis-ci.org/planio-gmbh/local-fastimage.svg?branch=master)](https://travis-ci.org/planio-gmbh/local-fastimage)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/fastimage.rb

@@ -276,6 +276,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:
@@ -283,7 +301,7 @@ class FastImage
   end
 
   def parse_type
-    case @stream.peek(2)
+    parsed_type = case @stream.peek(2)
     when "BM"
       :bmp
     when "GI"
@@ -303,21 +321,13 @@ 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", "<?"
       # Does not handle UTF-16 or other multi-byte encodings
-      if @stream.peek(64).include?("<svg")
-        :svg
-      else
-        raise UnknownImageType
-      end
-    else
-      raise UnknownImageType
+      :svg if @stream.peek(64).include?("<svg")
     end
+        
+    parsed_type or raise UnknownImageType
   end
 
   def parse_size_for_ico
@@ -339,7 +349,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
@@ -365,10 +375,10 @@ class FastImage
         end
       when :skipframe
         skip_chars = @stream.read_int - 2
-        @stream.read(skip_chars)
+        @stream.skip(skip_chars)
         :started
       when :readsize
-        @stream.read(3)
+        @stream.skip(3)
         height = @stream.read_int
         width = @stream.read_int
         width, height = height, width if @exif && @exif.rotated?
@@ -412,7 +422,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
@@ -485,7 +495,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
 

data/lib/fastimage/version.rb

@@ -1,3 +1,3 @@
 class FastImage
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local-fastimage
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Stephen Sykes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Local FastImage - Image info fast