httpthumbnailer 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/httpthumbnailer

@@ -18,11 +18,14 @@ sinatra.set :lock, true
 sinatra.set :boundary, "thumnail image data"
 sinatra.set :logging, true
 sinatra.set :debug, true
+sinatra.set :limit_memory, 128*10**6 # B (keep in mem)
+sinatra.set :limit_map, 256*10**6 # B (if not fit in mem, map to disk)
+sinatra.set :limit_disk, 0 # B (if not fit in map use standard IO)
 
 sinatra.before do
 	logger.level = Logger::DEBUG if settings.debug == true
 	if $thumbnailer.nil? 
-		$thumbnailer = Thumbnailer.new(:logger => logger)
+		$thumbnailer = Thumbnailer.new(:logger => logger, :limit_memory => settings.limit_memory, :limit_map => settings.limit_map, :limit_disk => settings.limit_disk)
 
 		$thumbnailer.method('crop') do |image, spec|
 			image.resize_to_fill!(spec.width, spec.height)
@@ -100,6 +103,11 @@ sinatra.error Thumbnailer::UnsupportedMediaTypeError do
 	halt 415
 end
 
+sinatra.error Thumbnailer::ImageTooLargeError do
+	plain_exception(env['sinatra.error'])
+	halt 413
+end
+
 sinatra.error 404 do
 	plain_response("Resource '#{request.path_info}' not found")
 end

data/features/httpthumbnailer.feature

@@ -141,3 +141,30 @@ Feature: Generating set of thumbnails with single PUT request
 		And third part mime type will be image/jpeg
 		And there will be no leaked images
 
+	Scenario: Memory limits exhausted while loading
+		Given test-large.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,PNG
+		Then response status will be 413
+		And response content type will be text/plain
+		And response body will be CRLF endend lines like
+		"""
+		Error: Thumbnailer::ImageTooLargeError: Magick::ImageMagickError: cache resources exhausted
+		"""
+		And there will be no leaked images
+
+	Scenario: Memory limits exhausted while thumbnailing
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,PNG/crop,16000,16000,JPG/crop,16,32,JPEG
+		Then response status will be 200
+		And I will get multipart response
+		Then first part will contain PNG image of size 16x16
+		And first part mime type will be image/png
+		And second part content type will be text/plain
+		And second part body will be CRLF endend lines like
+		"""
+		Error: Magick::ImageMagickError: cache resources exhausted
+		"""
+		Then third part will contain JPEG image of size 16x32
+		And third part mime type will be image/jpeg
+		And there will be no leaked images
+

data/features/step_definitions/httpthumbnailer_steps.rb

@@ -55,6 +55,14 @@ Then /(.*) part body will be CRLF endend lines$/ do |part, body|
 	@response_multipart.part[part_no(part)].body.should == body.gsub("\n", "\r\n") + "\r\n"
 end
 
+Then /(.*) part body will be CRLF endend lines like$/ do |part, body|	
+	pbody = @response_multipart.part[part_no(part)].body
+	pbody.should match(body)
+	pbody.each do |line|
+		line[-2,2].should == "\r\n"
+	end
+end
+
 Then /(.*) part will contain (.*) image of size (.*)x(.*)/ do |part, format, width, height|
 	mime = @response_multipart.part[part_no(part)].header['Content-Type']
 	data = @response_multipart.part[part_no(part)].body
@@ -77,7 +85,6 @@ And /that image pixel at (.*)x(.*) will be of color (.*)/ do |x, y, color|
 	@image.pixel_color(x.to_i, y.to_i).to_color.sub(/^#/, '0x').should == color
 end
 
-
 And /there will be no leaked images/ do
 	HTTPClient.new.get_content("http://localhost:3100/stats/images").to_i.should == 0
 end

data/httpthumbnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-11-29"
+  s.date = "2011-11-30"
   s.description = "Provides HTTP API for thumbnailing images"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpthumbnailer"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "features/httpthumbnailer.feature",
     "features/step_definitions/httpthumbnailer_steps.rb",
     "features/support/env.rb",
+    "features/support/test-large.jpg",
     "features/support/test-transparent.png",
     "features/support/test.jpg",
     "features/support/test.txt",

data/lib/httpthumbnailer/thumbnailer.rb

@@ -50,6 +50,12 @@ class Thumbnailer
 		end
 	end
 
+	class ImageTooLargeError < ArgumentError
+		def initialize(e)
+			super("#{e.class.name}: #{e}")
+		end
+	end
+
 	class ImageHandler
 		class ImageDestroyedError < RuntimeError
 			def initialize
@@ -86,6 +92,7 @@ class Thumbnailer
 			begin
 				@image = Magick::Image.from_blob(io.read).first.strip!
 			rescue Magick::ImageMagickError => e
+				raise ImageTooLargeError, e if e.message =~ /cache resources exhausted/
 				raise UnsupportedMediaTypeError, e
 			end
 			@methods = methods
@@ -126,6 +133,11 @@ class Thumbnailer
 
 		@logger.info "Initializing thumbniler"
 
+		set_limit(:area, options[:limit_area]) if options.member?(:limit_area)
+		set_limit(:memory, options[:limit_memory]) if options.member?(:limit_memory)
+		set_limit(:map, options[:limit_map]) if options.member?(:limit_map)
+		set_limit(:disk, options[:limit_disk]) if options.member?(:limit_disk)
+
 		@images = 0
 		Magick.trace_proc = lambda do |which, description, id, method|
 			case which
@@ -159,5 +171,10 @@ class Thumbnailer
 	def method(method, &impl)
 		@methods[method] = impl
 	end
+
+	def set_limit(limit, value)
+		old = Magick.limit_resource(limit, value)
+		@logger.info "Changed limit of #{limit} from #{old} to #{value}"
+	end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpthumbnailer
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -219,6 +219,7 @@ files:
 - features/httpthumbnailer.feature
 - features/step_definitions/httpthumbnailer_steps.rb
 - features/support/env.rb
+- features/support/test-large.jpg
 - features/support/test-transparent.png
 - features/support/test.jpg
 - features/support/test.txt