fastimage 1.3.0 → 1.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 41430d6372593b80ee08688d0d5ba73e6b75afe7
+  data.tar.gz: 6c087874cf7dc4fbc330bdc57b07d7e2a8adec2c
+SHA512:
+  metadata.gz: 8c8a4315619a334e8de54d5162a7a96a1de1aadb272b7ad1bdb530559a4f465d4f821680c2ff06e9650c1f5b7130a803c0549a45086b9f6ef4d468269493b558
+  data.tar.gz: ad654e975fd54b5f7d3fd583d4d03bbae3d3b143622f292aa859f43c18d3d89279274bce3a271e2339da43b42a66c775557b4a6b4b3278c1bdd6f5e36f31d128

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008-2011 Stephen Sykes
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.textile

@@ -14,17 +14,24 @@ FastImage does this minimal fetch for image types GIF, JPEG, PNG and BMP.  And i
 
 You only need supply the uri, and FastImage will do the rest.
 
+h2. Features
+
 Fastimage can also read local (and other) files, and uses the open-uri library to do so.
 
-And new in v1.2.9, FastImage will automatically read from any object that responds to :read - for 
+FastImage will automatically read from any object that responds to :read - for
 instance an IO object if that is passed instead of a URI.
 
-New in v1.2.10 FastImage will follow up to 4 HTTP redirects to get the image.
+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 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.
 
 h2. Examples
 
-<pre>
-<code>
+<pre lang="ruby"><code>
 require 'fastimage'
 
 FastImage.size("http://stephensykes.com/images/ss.com_x.gif")
@@ -33,62 +40,51 @@ FastImage.type("http://stephensykes.com/images/pngimage")
 => :png
 FastImage.type("/some/local/file.gif")
 => :gif
-</code>
-</pre>
+FastImage.size("http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_1350660_1350692_33_images.jpg", :raise_on_failure=>true, :timeout=>0.1)
+=> FastImage::ImageFetchFailure: FastImage::ImageFetchFailure
+FastImage.size("http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_1350660_1350692_33_images.jpg", :raise_on_failure=>true, :timeout=>2.0)
+=> [9545, 6623]
+</code></pre>
 
 h2. Installation
 
 h4. Gem
 
-<pre>
-<code>
-  gem install fastimage
-</code>
-</pre>
+bc. gem install fastimage
 
 h4. Rails
 
 Install the gem as above, and add it to your Gemfile if you are using bundler, or configure it in your environment.rb file as below:
-<pre>
-<code>
-...
+<pre lang="ruby"><code>
 Rails::Initializer.run do |config|
-  ...
   config.gem "fastimage"
-  ...
 end
-...
-</code>
-</pre>
-Then you're off - just use FastImage.size() and FastImage.type() in your code as in the examples.
+</code></pre>
+Then you're off - just use @FastImage.size()@ and @FastImage.type()@ in your code as in the examples.
 
 h2. Documentation
 
-"http://rdoc.info/projects/sdsykes/fastimage":http://rdoc.info/projects/sdsykes/fastimage
+"http://sdsykes.github.io/fastimage/rdoc/FastImage.html":http://sdsykes.github.io/fastimage/rdoc/FastImage.html
 
 h2. Tests
 
-You'll need to 'sudo gem install fakeweb' to be able to run the tests.
+You'll need to @gem install fakeweb@ to be able to run the tests.
 
-<pre>
-<code>
-ruby test/test.rb
+bc.. ruby ./test/test.rb
 Loaded suite test/test
 Started
 ...............
 Finished in 0.059392 seconds.
 
 15 tests, 27 assertions, 0 failures, 0 errors
-</code>
-</pre>
-
 
 h2. References
-* "http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima":http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima
-* "http://snippets.dzone.com/posts/show/805":http://snippets.dzone.com/posts/show/805
-* "http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/":http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
-* "http://imagesize.rubyforge.org/":http://imagesize.rubyforge.org/
+
+* "Pennysmalls - Find jpeg dimensions fast in pure Ruby, no image library needed":http://pennysmalls.wordpress.com/2008/08/19/find-jpeg-dimensions-fast-in-pure-ruby-no-ima/
+* "DZone - Determine Image Size":http://snippets.dzone.com/posts/show/805
+* "Antti Kupila - Getting JPG dimensions with AS3 without loading the entire file":http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
+* "imagesize gem documentation":http://imagesize.rubyforge.org/
 
 h2. Licence
 
-MIT, see file MIT_LICENCE
+MIT, see file "MIT-LICENSE":MIT-LICENSE

data/lib/fastimage.rb

@@ -35,7 +35,7 @@
 # === References
 # * http://snippets.dzone.com/posts/show/805
 # * http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
-# * http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima
+# * http://pennysmalls.wordpress.com/2008/08/19/find-jpeg-dimensions-fast-in-pure-ruby-no-ima/
 # * http://imagesize.rubyforge.org/
 #
 
@@ -184,7 +184,7 @@ class FastImage
   
   def fetch_using_http_from_parsed_uri
     setup_http
-    @http.request_get(@parsed_uri.request_uri) do |res|
+    @http.request_get(@parsed_uri.request_uri, 'Accept-Encoding' => 'identity') do |res|
       if res.is_a?(Net::HTTPRedirection) && @redirect_count < 4
         @redirect_count += 1
         begin
@@ -246,6 +246,7 @@ class FastImage
   #
   def parse_packet(str)
     @str = (@unused_str || "") + str
+    @str.force_encoding("ASCII-8BIT") if has_encoding?
     @strpos = 0
     begin
       result = send("parse_#{@property}")
@@ -325,12 +326,12 @@ class FastImage
       when :started
         get_byte == 0xFF ? :sof : :started
       when :sof
-        c = get_byte
-        if (0xe0..0xef).include?(c)
+        case get_byte
+        when 0xe0..0xef
           :skipframe
-        elsif [0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF].detect {|r| r.include? c}
+        when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF
           :readsize
-        elsif c == 0xFF
+        when 0xFF
           :sof
         else
           :skipframe

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 1.3.1
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies: []
 description: FastImage finds the size or type of an image given its uri by fetching
   as little as needed.
@@ -17,10 +16,9 @@ email: sdsykes@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README
 - README.textile
 files:
-- README
+- MIT-LICENSE
 - README.textile
 - lib/fastimage.rb
 - test/fixtures/faulty.jpg
@@ -35,28 +33,27 @@ files:
 - test/test.rb
 homepage: http://github.com/sdsykes/fastimage
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: FastImage - Image info fast
 test_files:
 - test/test.rb

data/README

@@ -1,79 +0,0 @@
-FastImage
-
-FastImage finds the size or type of an image given its uri by fetching as little as needed
-
-The problem
-
-Your app needs to find the size or type of an image.  This could be for adding width and height attributes to an image tag, for adjusting layouts or overlays to fit an image or any other of dozens of reasons.
-
-But the image is not locally stored - it's on another asset server, or in the cloud - at Amazon S3 for example.
-
-You don't want to download the entire image to your app server - it could be many tens of kilobytes, or even megabytes just to get this information.  For most image types, the size of the image is simply stored at the start of the file.  For JPEG files it's a little bit more complex, but even so you do not need to fetch most of the image to find the size.
-
-FastImage does this minimal fetch for image types GIF, JPEG, PNG and BMP.  And it doesn't rely on installing external libraries such as RMagick (which relies on ImageMagick or GraphicsMagick) or ImageScience (which relies on FreeImage).
-
-You only need supply the uri, and FastImage will do the rest.
-
-Fastimage can also read local (and other) files, and uses the open-uri library to do so.
-
-And new in v1.2.9, FastImage will automatically read from any object that responds to :read - for 
-instance an IO object if that is passed instead of a URI.
-
-New in v1.2.10 FastImage will follow up to 4 HTTP redirects to get the image.
-
-Examples
-
-  require 'fastimage'
-
-  FastImage.size("http://stephensykes.com/images/ss.com_x.gif")
-  => [266, 56]  # width, height
-  FastImage.type("http://stephensykes.com/images/pngimage")
-  => :png
-  FastImage.type("/some/local/file.gif")
-  => :gif
-
-Installation
-
-h4. Gem
-
-  gem install fastimage
-
-h4. Rails
-
-Install the gem as above, and configure it in your environment.rb file as below:
-
-  ...
-  Rails::Initializer.run do |config|
-    ...
-    config.gem "fastimage", :lib=>"fastimage"
-    ...
-  end
-  ...
-
-Then you're off - just use FastImage.size() and FastImage.type() in your code as in the examples.
-
-Documentation
-
-"http://rdoc.info/projects/sdsykes/fastimage":http://rdoc.info/projects/sdsykes/fastimage
-
-Tests
-
-You'll need to 'sudo gem install fakeweb' to be able to run the tests.
-
-  ruby test/test.rb
-  Loaded suite test/test
-  Started
-  ...............
-  Finished in 0.059392 seconds.
-
-  15 tests, 27 assertions, 0 failures, 0 errors
-
-
-References
-* "http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima":http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima
-* "http://snippets.dzone.com/posts/show/805":http://snippets.dzone.com/posts/show/805
-* "http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/":http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
-* "http://imagesize.rubyforge.org/":http://imagesize.rubyforge.org/
-
-
-(c) 2009 Stephen Sykes