imageproxy 0.4.1 → 0.4.3

data/README.mdown

@@ -16,7 +16,7 @@ See http://imageproxy.heroku.com/selftest for some examples (it's running on Her
 Status
 ------
 
-This project is pretty new. There are definitely some improvements that can be/need to be made. Suggestions and pull requests are welcome.
+imageproxy is being used in production on at least one commercial website, keeping two big EC2 servers busy. There are definitely some feature and performance improvements that can be/need to be made. Suggestions and pull requests are welcome.
 
 ### Current Features
 
@@ -47,7 +47,16 @@ PERFORMANCE
 
 imageproxy doesn't do any sort of caching. That kind of thing is better left up to CDNs (like Amazon CloudFront or VoxCast CDN) or to caching proxies such as Varnish.
 
-Also, imageproxy itself isn't nearly as fast as it could be. It's written in an interpreted language, and it shells out to curl and ImageMagick to do its work. Presumably, it would be way faster written in C as an Apache module, but this implementation was quite a bit easier :)
+Also, imageproxy itself isn't nearly as fast as it could be. It's written in an interpreted language, and it shells out to curl and ImageMagick to do its work. Presumably, it would be way faster written in C as an Apache module or something.
+
+
+REQUIREMENTS
+------------
+
+  * [Ruby](http://www.ruby-lang.org/)
+  * [Rack](http://rack.github.com)
+  * [Imagemagick](http://www.imagemagick.org/)
+  * [Curl](http://curl.haxx.se)
 
 
 INSTALLING
@@ -83,7 +92,7 @@ There are two major functions: `identify` and `convert`, plus a helpful `selftes
 
 `thumbnail` The new size of the image, in "WxH" format (e.g., `20x30`). Thumbnailing assumes the resulting image will be pretty small and makes some optimizations.
 
-`shape` The shape of the image, when `resize`ing or `thumbnail`ing to a different aspect ratio. The value can be `preserve` which will preserve the original aspect ratio, `pad` which will add padding to keep the proper aspect ratio (you can supply a `background` parameter to choose the background color to pad with, or leave blank to pad with transparent color if the image format allows it), and `cut` which will cut the image to fit the new size.
+`shape` The shape of the image, when `resize`ing or `thumbnail`ing to a different aspect ratio. The value can be `preserve` which will preserve the original aspect ratio, `pad` which will add padding to keep the proper aspect ratio (you can supply a `background` parameter to choose the background color to pad with, or leave blank to pad with transparent color if the image format allows it), and `cut` which will cut the image to fit the new size. The default is `preserve`.
 
 `flip` Flip the image. The value can be `horizontal` or `vertical`.
 
@@ -91,9 +100,9 @@ There are two major functions: `identify` and `convert`, plus a helpful `selftes
 
 `format` Change the format. Possible formats include `gif`, `jpg`, `png`, `png8`, etc.
 
-`quality` Choose the compression quality for formats that support lossy compression. The value can be any number from 0 to 100.
+`quality` Choose the compression quality for formats that support lossy compression. The value can be any number from 0 to 100. The default is to use [Imagemagick's default quality settings](http://www.imagemagick.org/script/command-line-options.php#quality).
 
-`progressive` Choose whether a JPEG image should be a progressive JPEG or not. Possible values are `true` and `false`.
+`progressive` Choose whether a JPEG image should be a progressive JPEG or not. Possible values are `true` and `false`. The default is `false`.
 
 `background` Some operations allow for a background color to be provided. The format is hex (e.g., `#ff00ff`) or rgba (e.g., `rgba(20,30,19,0.4)`)
 
@@ -111,6 +120,8 @@ Or, the parameters can be Amazon CloudFront-compatible URLs, like this:
 
     http://example.com/convert/resize/100x100/shape/cut
 
+(Note that CloudFront now optionally support query parameters.)
+
 You can also mix the parameters if you like. This doesn't make much sense except for the case of the `signature` parameter which must be a query param:
 
     http://example.com/convert/resize/100x100?signature=szFGj470w%2ByhJYJfTRryFLF9msA%3D
@@ -280,6 +291,9 @@ Clone the imageproxy code:
 
 Set up Heroku:
 
+As of Aug 2012 cedar does not work out of the box but bamboo does (specify bamboo as
+an option to the heroku create command).
+
     http://devcenter.heroku.com/articles/quickstart
 
 Deploy:
@@ -305,9 +319,14 @@ To run the specs
 Thanks
 ------
 
-Thanks to [David Hall](https://github.com/moonhouse) for code contributions.
+Thanks to the following for code contributions:
+
+  * [David Hall](https://github.com/moonhouse)
+  * [Andy Blyler](https://github.com/ablyler)
+  * [NeedFeed](https://github.com/needfeed)
+  * [Daniel Szmulewicz](https://github.com/danielsz)
 
 License
 -------
 
-Licensed under the MIT license. See LICENSE.txt.
+Licensed under the MIT license. See LICENSE.txt.

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/imageproxy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "imageproxy"
-  s.version = "0.4.1"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Hanson"]
-  s.date = "2012-07-24"
+  s.date = "2012-11-26"
   s.description = "A image processing proxy server, written in Ruby as a Rack application. Requires ImageMagick."
   s.email = "erik@eahanson.com"
   s.extra_rdoc_files = [

data/lib/imageproxy/command.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module Imageproxy
   class Command
     protected
@@ -15,7 +17,7 @@ module Imageproxy
       user_agent = options[:user_agent] || "imageproxy"
       timeout = options[:timeout] ? "-m #{options[:timeout]} " : ""
       output = options[:output]
-      %|curl #{timeout}-L -s -A "#{user_agent}" #{output ? "-o #{output} ": ""}"#{url}"|
+      %|curl #{timeout}-L -f -s -S -A "#{user_agent}" #{output ? "-o #{output} ": ""}"#{url}"|
     end
 
     def to_path(obj)
@@ -26,4 +28,4 @@ module Imageproxy
       output.readlines.join("").chomp
     end
   end
-end
+end

data/lib/imageproxy/convert.rb

@@ -15,16 +15,23 @@ module Imageproxy
     def execute(user_agent=nil, timeout=nil)
       if options.overlay
         @overlay_file ||= Tempfile.new("imageproxy").tap(&:close)
-        execute_command(curl options.overlay, :user_agent => user_agent, :timeout => timeout, :output => @overlay_file.path)
-        execute_command curl(options.source, :user_agent => user_agent, :timeout => timeout) +
+        try_command_with_timeout(curl options.overlay, :user_agent => user_agent, :timeout => timeout, :output => @overlay_file.path)
+        try_command_with_timeout curl(options.source, :user_agent => user_agent, :timeout => timeout) +
                           "| composite #{@overlay_file.path} - - | convert - #{convert_options} #{new_format}#{file.path}"
         file
       else
-        execute_command %'#{curl options.source, :user_agent => user_agent, :timeout => timeout} | convert - #{convert_options} #{new_format}#{file.path}'
+        try_command_with_timeout %'#{curl options.source, :user_agent => user_agent, :timeout => timeout} | convert - #{convert_options} #{new_format}#{file.path}'
         file
       end
     end
 
+    def try_command_with_timeout cmd
+      Timeout::timeout(10) { execute_command cmd }
+    rescue Timeout::Error => e
+      puts "Command timed out after 10 seconds, retrying >#{cmd}<"
+      execute_command cmd
+      puts "SUCCESS " * 20
+    end
 
     def convert_options
       convert_options = []

data/spec/command_spec.rb

@@ -5,24 +5,29 @@ describe Imageproxy::Command do
     context "when a user agent is supplied" do
       it "should send that user agent" do
         Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg", :user_agent => "some user agent").should ==
-          %|curl -L -s -A "some user agent" "http://example.com/dog.jpg"|
+          %|curl -L -f -s -S -A "some user agent" "http://example.com/dog.jpg"|
       end
     end
 
     context "when no user agent is supplied" do
       it "should send a default user agent" do
         Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg").should ==
-          %|curl -L -s -A "imageproxy" "http://example.com/dog.jpg"|
+          %|curl -L -f -s -S -A "imageproxy" "http://example.com/dog.jpg"|
       end
     end
 
     context "when a timeout is supplied" do
       it "should set the timeout" do
         Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg", :timeout => "2").should ==
-          %|curl -m 2 -L -s -A "imageproxy" "http://example.com/dog.jpg"|
+          %|curl -m 2 -L -f -s -S -A "imageproxy" "http://example.com/dog.jpg"|
       end
     end
 
+    it "should have curl report errors on stderr" do
+      curl_command = Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg")
+      curl_command.should match(/curl .*-f -s -S .*/)
+    end
+
     context "when the command exits with a non-zero status" do
       it "should raise an exception" do
         ruby_19 = RUBY_VERSION.split(".").map(&:to_i)[1] == 9

data/spec/convert_spec.rb

@@ -21,7 +21,8 @@ describe Imageproxy::Convert do
     end
 
     it "should generate the proper command-line" do
-      @command.should_receive(:execute_command).with(%'curl -L -s -A "imageproxy" "http://example.com/dog.jpg" | convert - -resize 10x20 png:/mock/file/path')
+      @command.should_receive(:execute_command).with(
+          %'curl -L -f -s -S -A "imageproxy" "http://example.com/dog.jpg" | convert - -resize 10x20 png:/mock/file/path')
       @command.execute
     end
 
@@ -157,9 +158,9 @@ describe Imageproxy::Convert do
     end
 
     it "should fetch both the overlay and the source, and call the composite command to composit the overlay on top of the source" do
-      @command.should_receive(:execute_command).with(%r|curl -L -s -A "imageproxy" -o [^ ]+ "http://example.com/frame.jpg"|)
+      @command.should_receive(:execute_command).with(%r|curl -L -f -s -S -A "imageproxy" -o [^ ]+ "http://example.com/frame.jpg"|)
       @command.should_receive(:execute_command).with(
-        %r{curl -L -s -A "imageproxy" "http://example.com/dog.jpg" | composite [^ ]+ - - | convert - png:/mock/file/path})
+        %r{curl -L -f -s -S -A "imageproxy" "http://example.com/dog.jpg" | composite [^ ]+ - - | convert - png:/mock/file/path})
       @command.execute
     end
 

data/spec/server_spec.rb

@@ -121,6 +121,16 @@ describe "Server" do
 
   end
 
+  context "error handling on errors from curl" do
+    it "should fail if curl can't load from that URL" do
+      get("/convert/flip/vertical/source/#{escaped_test_broken_image_url}").should fail
+    end
+
+    it "should succeed if curl can load from that URL" do
+      get("/convert/flip/vertical/source/#{escaped_test_image_url}").should succeed
+    end
+  end
+
   describe "#content_type" do
     before do
       @options = Imageproxy::Options.new("/", {})

data/spec/spec_helper.rb

@@ -21,3 +21,15 @@ end
 def escaped_test_image_url
   CGI.escape test_image_url
 end
+
+def test_broken_image_path
+  File.expand_path(File.dirname(__FILE__) + "/../public/does-not-exist.png")
+end
+
+def test_broken_image_url
+  "file://#{test_broken_image_path}"
+end
+
+def escaped_test_broken_image_url
+  CGI.escape test_broken_image_url
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imageproxy
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3458948603279650035
+      hash: 1087416563410215419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: