httpthumbnailer 1.0.0 → 1.1.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 ruby "1.9.3"
 
-gem "unicorn-cuba-base", "~> 1.0"
+gem "unicorn-cuba-base", "~> 1.1"
 gem "rmagick", "~> 2"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -33,7 +33,7 @@ GEM
       rake
       rdoc
     json (1.7.7)
-    kgio (2.8.0)
+    kgio (2.8.1)
     mime-types (1.23)
     multi_json (1.7.3)
     multipart-parser (0.1.1)
@@ -41,7 +41,7 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    raindrops (0.11.0)
+    raindrops (0.12.0)
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -65,7 +65,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-cuba-base (1.0.0)
+    unicorn-cuba-base (1.1.0)
       cli (~> 1.1.0)
       cuba (~> 3.0)
       facter (~> 1.6.11)
@@ -90,4 +90,4 @@ DEPENDENCIES
   rmagick (~> 2)
   rspec (~> 2.13)
   rspec-mocks (~> 2.13)
-  unicorn-cuba-base (~> 1.0)
+  unicorn-cuba-base (~> 1.1)

data/README.md

@@ -7,6 +7,7 @@ It is using [ImageMagick](http://www.imagemagick.org) or [GraphicsMagick](http:/
 ## Features
 
 * thumbnailing images with different aspect ratio keeping methods
+* identification of image foramt and size
 * support of many input and output formats
 * efficient API for generating multiple thumbnails from single input image with just one request
 * many image scaling and loading performance optimizations
@@ -14,6 +15,16 @@ It is using [ImageMagick](http://www.imagemagick.org) or [GraphicsMagick](http:/
 * memory limits and disk memory offloading support
 * based on [Unicorn HTTP server](http://unicorn.bogomips.org) with UNIX socket communication support
 
+## Changelog
+
+### 1.1.0
+
+* added identification API for image mime type and size identification
+* stripping user meta data from input image further reducing output image size
+* providing image size headers for input image and all generated thumbnails
+* X-Input-Image-Content-Type header is now deprecated in favour of X-Input-Image-Content-Type
+* not using [ImageMagick](http://www.imagemagick.org) for input image mime type resolution since it is accessing disk and behaves very inefficiently
+
 ## Installing
 
 You will need the following system packages installed: `imagemagick`, `pkg-config` and `make`.
@@ -140,6 +151,18 @@ HTTP Thumbnailer will generate 3 thumbnails:
 
 For detailed information about the API see [cucumber features](http://github.com/jpastuszek/httpthumbnailer/blob/master/features/thumbnails.feature).
 
+#### Identification API
+
+You can identify image mime type, width and height with **PUT** request to URI in format:
+
+    /identify
+
+Server will respond with **JSON** containing **contentType**, **width** and **height** fields:
+
+    {"mimeType":"image/jpeg","width":1239,"height":1750}
+
+For detailed information about the API see [cucumber features](http://github.com/jpastuszek/httpthumbnailer/blob/master/features/identify.feature).
+
 ### Ruby API client
 
 To make it easier to use this server [httpthumbnailer-client](http://github.com/jpastuszek/httpthumbnailer-client) gem provides useful class.
@@ -197,7 +220,8 @@ total_errors: 1
 calling: 1
 writing: 0
 total_images_loaded: 115
-total_images_prescaled: 30
+total_images_reloaded: 30
+total_images_downscaled: 30
 total_thumbnails_created: 147
 images_loaded: 0
 max_images_loaded: 3
@@ -223,6 +247,11 @@ $ curl 127.0.0.1:3100/stats/total_write_multipart
 
 [HTTP Image Store](https://github.com/jpastuszek/httpimagestore) service is configurable image storage and processing HTTP API server that uses this service as thumbnailing backend. 
 
+## Known Issues
+
+* When 413 error is reported due to memory limit exhaustion the disk offloading won't work any more and only requests that can fit in the memory can be processed without getting 413 - this is due to a bug in ImageMagick v6.8.6-8 (2013-08-06 6.8.6-8) or less
+* Mime type generated for images may not be the official mime type assigned for given format; please let me know of any inconsistencies or send a patch to get better output in efficient way
+
 ## Contributing to HTTP Thumbnailer
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/features/identify.feature

@@ -0,0 +1,31 @@
+Feature: Identify API endpoint
+	Identify API allows for image identification.
+
+	Background:
+		Given httpthumbnailer server is running at http://localhost:3100/
+
+	@identify
+	Scenario: Identifying of image mime type
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3100/identify
+		Then response status should be 200
+		And response content type should be application/json
+		And response body should be JSON encoded
+		And response JSON should contain key mimeType of value image/jpeg
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3100/identify
+		Then response status should be 200
+		And response content type should be application/json
+		And response body should be JSON encoded
+		And response JSON should contain key mimeType of value image/png
+
+	@identify
+	Scenario: Identifying of image width and height
+		Given test-large.jpg file content as request body
+		When I do PUT request http://localhost:3100/identify
+		Then response status should be 200
+		And response content type should be application/json
+		And response body should be JSON encoded
+		And response JSON should contain key width of integer value 9911
+		And response JSON should contain key height of integer value 14000
+

data/features/step_definitions/httpthumbnailer_steps.rb

@@ -16,7 +16,7 @@ When /I save response body/ do
 	@saved_response_body = @response.body
 end
 
-Then /(.*) header should be (.*)/ do |header, value|
+Then /^([^ ]+) header should be (.*)/ do |header, value|
 	@response.header[header].should_not be_empty
 	@response.header[header].first.should == value
 end
@@ -69,23 +69,15 @@ Then /response mime type should be (.*)/ do |mime_type|
 	step "response content type should be #{mime_type}"
 end
 
-Then /(.*) part mime type should be (.*)/ do |part, mime|
-	@response_multipart[part_no(part)].headers['content-type'].should == mime
+Then /^([^ ]+) part (.*) header should be (.*)/ do |part, header, value|
+	@response_multipart[part_no(part)].headers[header.downcase].should == value
 end
 
-Then /(.*) part content type should be (.*)/ do |part, content_type|
-	@response_multipart[part_no(part)].headers['content-type'].should == content_type
-end
-
-Then /(.*) part status should be (.*)/ do |part, status|
-	@response_multipart[part_no(part)].headers['status'].should == status
-end
-
-Then /(.*) part body should be CRLF endend lines$/ do |part, body|	
+Then /^([^ ]+) part body should be CRLF endend lines$/ do |part, body|	
 	@response_multipart[part_no(part)].body.should == body.gsub("\n", "\r\n")
 end
 
-Then /(.*) part body should be CRLF endend lines like$/ do |part, body|	
+Then /^([^ ]+) part body should be CRLF endend lines like$/ do |part, body|	
 	pbody = @response_multipart[part_no(part)].body
 	pbody.should match(body)
 end
@@ -141,7 +133,6 @@ And /that image should be (.*) bit image/ do |bits|
 	@image.depth.should == bits.to_i
 end
 
-
 And /there should be no leaked images/ do
 	Integer(http_client.get_content("http://localhost:3100/stats/images_loaded").strip).should == 0
 end
@@ -150,3 +141,15 @@ And /there should be maximum (.*) images loaded during single request/ do |max|
 	Integer(http_client.get_content("http://localhost:3100/stats/max_images_loaded").strip).should <= max.to_i
 end
 
+And /response body should be JSON encoded/ do
+	@json = JSON.load(@response.body)
+end
+
+And /response JSON should contain key (.*) of value (.*)/ do |key, value|
+	@json[key].should == value
+end
+
+And /response JSON should contain key (.*) of integer value (.*)/ do |key, value|
+	@json[key].should == value.to_i
+end
+

data/features/support/env.rb

@@ -16,6 +16,7 @@ require 'httpclient'
 require "open3"
 require "thread"
 require 'RMagick'
+require 'json'
 
 def gem_dir
 		Pathname.new(__FILE__).dirname + '..' + '..'

data/features/thumbnail.feature

@@ -9,11 +9,20 @@ Feature: Generating single thumbnail with PUT request
 	@test
 	Scenario: Single thumbnail
 		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,png
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,24,png
 		Then response status should be 200
-		Then response should contain PNG image of size 16x16
+		Then response should contain PNG image of size 16x24
 		And that image should be 8 bit image
-		And response mime type should be image/png
+		And Content-Type header should be image/png
+		And X-Image-Width header should be 16
+		And X-Image-Height header should be 24
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,24,jpeg
+		Then response status should be 200
+		Then response should contain JPEG image of size 16x24
+		And that image should be 8 bit image
+		And Content-Type header should be image/jpeg
+		And X-Image-Width header should be 16
+		And X-Image-Height header should be 24
 
 	@transparent
 	Scenario: Transparent image to JPEG handling - default background color white
@@ -228,14 +237,22 @@ Feature: Generating single thumbnail with PUT request
 		Then saved response body will be smaller than response body
 		Then response mime type should be image/png
 
-	@hint
+	@hint @input
 	Scenario: Hint on input image mime type
 		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3100/thumbnails/crop,16,16,png
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,png
 		Then response status should be 200
-		And X-Input-Image-Content-Type header should be image/jpeg
+		And X-Input-Image-Mime-Type header should be image/jpeg
 		Given test.png file content as request body
-		When I do PUT request http://localhost:3100/thumbnails/crop,16,16,png
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,png
+		Then response status should be 200
+		And X-Input-Image-Mime-Type header should be image/png
+
+	@hint @input
+	Scenario: Hint on input image size
+		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 should be 200
-		And X-Input-Image-Content-Type header should be image/png
+		And X-Input-Image-Width header should be 9911
+		And X-Input-Image-Height header should be 14000
 

data/features/thumbnails.feature

@@ -9,12 +9,14 @@ Feature: Generating set of thumbnails with single PUT request
 	@multipart
 	Scenario: Single thumbnail
 		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3100/thumbnails/crop,16,16,png
+		When I do PUT request http://localhost:3100/thumbnails/crop,16,24,png
 		Then response status should be 200
 		And I should get multipart response
-		Then first part should contain PNG image of size 16x16
+		Then first part should contain PNG image of size 16x24
 		And that image should be 8 bit image
-		And first part mime type should be image/png
+		And first part Content-Type header should be image/png
+		And first part X-Image-Width header should be 16
+		And first part X-Image-Height header should be 24
 
 	@multipart
 	Scenario: Multiple thumbnails
@@ -23,11 +25,17 @@ Feature: Generating set of thumbnails with single PUT request
 		Then response status should be 200
 		And I should get multipart response
 		Then first part should contain PNG image of size 16x16
-		And first part mime type should be image/png
+		And first part Content-Type header should be image/png
+		And first part X-Image-Width header should be 16
+		And first part X-Image-Height header should be 16
 		Then second part should contain JPEG image of size 4x8
-		And second part mime type should be image/jpeg
+		And second part Content-Type header should be image/jpeg
+		And second part X-Image-Width header should be 4
+		And second part X-Image-Height header should be 8
 		Then third part should contain JPEG image of size 16x32
-		And third part mime type should be image/jpeg
+		And third part Content-Type header should be image/jpeg
+		And third part X-Image-Width header should be 16
+		And third part X-Image-Height header should be 32
 
 	@input_size
 	Scenario: Thumbnails of width or height input should have input image width or height
@@ -45,9 +53,9 @@ Feature: Generating set of thumbnails with single PUT request
 		When I do PUT request http://localhost:3100/thumbnails/crop,0,0,png/fit,0,0,jpeg/pad,0,0,jpeg
 		Then response status should be 200
 		And I should get multipart response
-		And first part content type should be text/plain
-		And second part content type should be text/plain
-		And third part content type should be text/plain
+		And first part Content-Type header should be text/plain
+		And second part Content-Type header should be text/plain
+		And third part Content-Type header should be text/plain
 
 	@error_handling
 	Scenario: Reporitng of bad thumbanil spec format - bad dimension value
@@ -88,12 +96,12 @@ Feature: Generating set of thumbnails with single PUT request
 		When I do PUT request http://localhost:3100/thumbnails/crop,4,4,png/blah,128,128,png
 		Then response status should be 200
 		And I should get multipart response
-		And second part content type should be text/plain
+		And second part Content-Type header should be text/plain
 		And second part body should be CRLF endend lines
 		"""
 		thumbnail method 'blah' is not supported
 		"""
-		And second part status should be 400
+		And second part Status header should be 400
 
 	@error_handling
 	Scenario: Reporitng of image thumbnailing errors
@@ -102,15 +110,15 @@ Feature: Generating set of thumbnails with single PUT request
 		Then response status should be 200
 		And I should get multipart response
 		Then first part should contain PNG image of size 16x16
-		And first part mime type should be image/png
-		And second part content type should be text/plain
+		And first part Content-Type header should be image/png
+		And second part Content-Type header should be text/plain
 		And second part body should be CRLF endend lines
 		"""
 		at least one image dimension is zero: 0x0
 		"""
-		And second part status should be 400
+		And second part Status header should be 400
 		Then third part should contain JPEG image of size 16x32
-		And third part mime type should be image/jpeg
+		And third part Content-Type header should be image/jpeg
 
 	@resources
 	Scenario: Memory limits exhausted while thumbnailing
@@ -119,24 +127,32 @@ Feature: Generating set of thumbnails with single PUT request
 		Then response status should be 200
 		And I should get multipart response
 		Then first part should contain PNG image of size 16x16
-		And first part mime type should be image/png
-		And second part content type should be text/plain
+		And first part Content-Type header should be image/png
+		And second part Content-Type header should be text/plain
 		And second part body should be CRLF endend lines like
 		"""
 		image too large: cache resources exhausted
 		"""
-		And second part status should be 413
+		And second part Status header should be 413
 		Then third part should contain JPEG image of size 16x32
-		And third part mime type should be image/jpeg
+		And third part Content-Type header should be image/jpeg
 
-	@hint
+	@hint @input
 	Scenario: Hint on input image mime type
 		Given test.jpg file content as request body
 		When I do PUT request http://localhost:3100/thumbnails/crop,16,16,png
 		Then response status should be 200
-		And X-Input-Image-Content-Type header should be image/jpeg
+		And X-Input-Image-Mime-Type header should be image/jpeg
 		Given test.png file content as request body
 		When I do PUT request http://localhost:3100/thumbnails/crop,16,16,png
 		Then response status should be 200
-		And X-Input-Image-Content-Type header should be image/png
+		And X-Input-Image-Mime-Type header should be image/png
+
+	@hint @input
+	Scenario: Hint on input image size
+		Given test-large.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnails/crop,16,16,png
+		Then response status should be 200
+		And X-Input-Image-Width header should be 9911
+		And X-Input-Image-Height header should be 14000
 

data/httpthumbnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2013-07-16"
+  s.date = "2013-09-11"
   s.description = "Provides HTTP API for thumbnailing images"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpthumbnailer"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/httpthumbnailer",
     "features/httpthumbnailer.feature",
+    "features/identify.feature",
     "features/step_definitions/httpthumbnailer_steps.rb",
     "features/support/env.rb",
     "features/support/test-large.jpg",
@@ -45,6 +46,8 @@ Gem::Specification.new do |s|
     "load_test/extralarge.jpg",
     "load_test/large.jpg",
     "load_test/large.png",
+    "load_test/load_test-374846090-1.1.0-rc1-identify-only.csv",
+    "load_test/load_test-374846090-1.1.0-rc1.csv",
     "load_test/load_test-cd9679c.csv",
     "load_test/load_test-v0.3.1.csv",
     "load_test/load_test.jmx",
@@ -73,7 +76,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<unicorn-cuba-base>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<unicorn-cuba-base>, ["~> 1.1"])
       s.add_runtime_dependency(%q<rmagick>, ["~> 2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.13"])
       s.add_development_dependency(%q<rspec-mocks>, ["~> 2.13"])
@@ -85,7 +88,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<multipart-parser>, ["~> 0.1.1"])
       s.add_development_dependency(%q<daemon>, ["~> 1.1"])
     else
-      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.0"])
+      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.1"])
       s.add_dependency(%q<rmagick>, ["~> 2"])
       s.add_dependency(%q<rspec>, ["~> 2.13"])
       s.add_dependency(%q<rspec-mocks>, ["~> 2.13"])
@@ -98,7 +101,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<daemon>, ["~> 1.1"])
     end
   else
-    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.0"])
+    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.1"])
     s.add_dependency(%q<rmagick>, ["~> 2"])
     s.add_dependency(%q<rspec>, ["~> 2.13"])
     s.add_dependency(%q<rspec-mocks>, ["~> 2.13"])

data/lib/httpthumbnailer/error_reporter.rb

@@ -1,9 +1,5 @@
 class ErrorReporter < Controler
 	self.define do
-		on error Rack::UnhandledRequest::UnhandledRequestError do |error|
-			write_error 404, error
-		end
-
 		on error Plugin::Thumbnailer::UnsupportedMediaTypeError do |error|
 			write_error 415, error
 		end
@@ -23,16 +19,7 @@ class ErrorReporter < Controler
 			write_error 400, error
 		end
 
-		on error StandardError do |error|
-			log.error "unhandled error while processing request: #{env['REQUEST_METHOD']} #{env['SCRIPT_NAME']}[#{env["PATH_INFO"]}]", error
-			log.debug {
-				out = StringIO.new
-				PP::pp(env, out, 200)
-				"Request: \n" + out.string
-			}
-
-			write_error 500, error
-		end
+		run DefaultErrorReporter
 	end
 end
 

data/lib/httpthumbnailer/plugin/thumbnailer.rb

@@ -1,6 +1,29 @@
 require 'RMagick'
 require 'forwardable'
 
+# ImageMagick Image.mime_type is absolutely bunkers! It goes over file system to look for some strange files WTF?!
+# Also it cannot be used for thumbnails since they are not yet rendered to desired format
+# Here is stupid implementaiton
+module MetaData
+	def width
+		@image.columns
+	end
+
+	def height
+		@image.rows
+	end
+
+	def mime_type
+		#TODO: how do I do it better?
+		format = @format || @image.format
+		mime = case format
+			when 'JPG' then 'jpeg'
+			else format.downcase
+		end
+		"image/#{mime}"
+	end
+end
+
 module Plugin
 	module Thumbnailer
 		class UnsupportedMethodError < ArgumentError
@@ -105,7 +128,18 @@ module Plugin
 				end
 			end
 
-			def_delegators :@image, :destroy!, :destroyed?, :mime_type
+			def_delegators :@image, :destroy!, :destroyed?
+
+			include MetaData
+
+			# We use base values since it might have been loaded with size hint and prescaled
+			def width
+				@image.base_columns
+			end
+
+			def height
+				@image.base_rows
+			end
 
 			# needs to be seen as @image when returned in replace block
 			def equal?(image)
@@ -124,24 +158,16 @@ module Plugin
 			end
 
 			def data
-					format = @format
-					quality = @quality
-					@image.to_blob do
-						self.format = format
-						self.quality = quality if quality
-					end
-			end
-
-			def mime_type
-				#@image.mime_type cannot be used since it is raw crated image
-				#TODO: how do I do it better?
-				mime = case @format
-					when 'JPG' then 'jpeg'
-					else @format.downcase
+				format = @format
+				quality = @quality
+				@image.to_blob do
+					self.format = format
+					self.quality = quality if quality
 				end
-				"image/#{mime}"
 			end
 
+			include MetaData
+
 			private
 
 			def default_quality(format)
@@ -162,7 +188,8 @@ module Plugin
 			extend Stats
 			def_stats(
 				:total_images_loaded, 
-				:total_images_prescaled, 
+				:total_images_reloaded, 
+				:total_images_downscaled, 
 				:total_thumbnails_created, 
 				:images_loaded, 
 				:max_images_loaded, 
@@ -244,8 +271,8 @@ module Plugin
 			end
 
 			def load(io, options = {})
-				mw = options['max-width']
-				mh = options['max-height']
+				mw = options[:max_width]
+				mh = options[:max_height]
 				if mw and mh
 					mw = mw.to_i
 					mh = mh.to_i
@@ -258,7 +285,7 @@ module Plugin
 					old_memory_limit = nil
 					borrowed_memory_limit = nil
 					if options.member?(:limit_memory)
-						borrowed_memory_limit = options[:limit_memory].borrow(options[:limit_memory].limit)
+						borrowed_memory_limit = options[:limit_memory].borrow(options[:limit_memory].limit, 'image magick')
 						old_memory_limit = set_limit(:memory, borrowed_memory_limit)
 					end
 
@@ -270,12 +297,13 @@ module Plugin
 					end
 
 					image = images.first
-					if image.columns > image.base_columns or image.rows > image.base_rows
+					if image.columns > image.base_columns or image.rows > image.base_rows and not options[:no_reload]
 						log.warn "input image got upscaled from: #{image.base_columns}x#{image.base_rows} to #{image.columns}x#{image.rows}: reloading without max size hint!"
 						images.each do |other|
 							other.destroy!
 						end
 						images = Magick::Image.from_blob(blob)
+						Service.stats.incr_total_images_reloaded
 					end
 					blob = nil
 
@@ -285,14 +313,22 @@ module Plugin
 						end
 						log.info "loaded image: #{image.inspect}"
 						Service.stats.incr_total_images_loaded
+
+						# clean up the image
 						image.strip!
+						image.properties do |key, value|
+							log.debug "deleting user propertie '#{key}'"
+							image[key] = nil
+						end
+
+						image
 					end.replace do |image|
-						if mw and mh
-							f = image.find_prescale_factor(mw, mh)
+						if mw and mh and not options[:no_downscale]
+							f = image.find_downscale_factor(mw, mh)
 							if f > 1
-								image = image.prescale(f)
-								log.info "prescaled image by factor of #{f}: #{image.inspect}"
-								Service.stats.incr_total_images_prescaled
+								image = image.downscale(f)
+								log.info "downscaled image by factor of #{f}: #{image.inspect}"
+								Service.stats.incr_total_images_downscaled
 							end
 						end
 						InputImage.new(image, @processing_methods)
@@ -303,7 +339,7 @@ module Plugin
 				ensure
 					if old_memory_limit
 						set_limit(:memory, old_memory_limit)
-						options[:limit_memory].return(borrowed_memory_limit)
+						options[:limit_memory].return(borrowed_memory_limit, 'image magick')
 					end
 				end
 			end
@@ -380,14 +416,14 @@ class Magick::Image
 		end
 	end
 
-	def prescale(f)
+	def downscale(f)
 		sample(columns / f, rows / f)
 	end
 
-	def find_prescale_factor(max_width, max_height, factor = 1)
+	def find_downscale_factor(max_width, max_height, factor = 1)
 		new_factor = factor * 2
 		if columns / new_factor > max_width * 2 and rows / new_factor > max_height * 2
-			find_prescale_factor(max_width, max_height, factor * 2)
+			find_downscale_factor(max_width, max_height, factor * 2)
 		else
 			factor
 		end

data/lib/httpthumbnailer/thumbnailer.rb

@@ -5,24 +5,29 @@ class Thumbnailer < Controler
 	self.plugin Plugin::Thumbnailer
 
 	self.define do
+		opts = {}
+		opts[:limit_memory] = memory_limit
+
 		on put, 'thumbnail', /(.*)/ do |spec|
 			spec = ThumbnailSpec.from_uri(spec)
 			log.info "thumbnailing image to single spec: #{spec}"
 
-			opts = {}
 			if settings[:optimization]
-				opts['max-width'] = spec.width if spec.width.is_a? Integer
-				opts['max-height'] = spec.height if spec.height.is_a? Integer
+				opts[:max_width] = spec.width if spec.width.is_a? Integer
+				opts[:max_height] = spec.height if spec.height.is_a? Integer
 			end
-			opts[:limit_memory] = memory_limit
 
 			thumbnailer.load(req.body, opts).use do |input_image|
 				log.info "original image loaded: #{input_image.mime_type}"
-				res["X-Input-Image-Content-Type"] = input_image.mime_type
 
 				log.info "generating thumbnail: #{spec}"
 				input_image.thumbnail(spec) do |image|
-					write 200, image.mime_type, image.data
+					write 200, image.mime_type, image.data, 
+						"X-Image-Width" => image.width,
+						"X-Image-Height" => image.height,
+						"X-Input-Image-Mime-Type" => input_image.mime_type,
+						"X-Input-Image-Width" => input_image.width,
+						"X-Input-Image-Height" => input_image.height
 				end
 			end
 		end
@@ -31,22 +36,25 @@ class Thumbnailer < Controler
 			thumbnail_specs = ThumbnailSpecs.from_uri(specs)
 			log.info "thumbnailing image to multiple specs: #{thumbnail_specs.join(', ')}"
 
-			opts = {}
 			if settings[:optimization]
-					opts['max-width'] = thumbnail_specs.max_width
-					opts['max-height'] = thumbnail_specs.max_height
+					opts[:max_width] = thumbnail_specs.max_width
+					opts[:max_height] = thumbnail_specs.max_height
 			end
-			opts[:limit_memory] = memory_limit
 
 			thumbnailer.load(req.body, opts).use do |input_image|
 				log.info "original image loaded: #{input_image.mime_type}"
-				write_preamble 200, "X-Input-Image-Content-Type" => input_image.mime_type
+				write_preamble 200, 
+					"X-Input-Image-Mime-Type" => input_image.mime_type,
+					"X-Input-Image-Width" => input_image.width,
+					"X-Input-Image-Height" => input_image.height
 
 				thumbnail_specs.each do |spec|
 					log.info "generating thumbnail: #{spec}"
 					begin
 						input_image.thumbnail(spec) do |image|
-							write_part image.mime_type, image.data
+							write_part image.mime_type, image.data,
+								"X-Image-Width" => image.width,
+								"X-Image-Height" => image.height
 						end
 					rescue => error
 						case error
@@ -65,6 +73,30 @@ class Thumbnailer < Controler
 				write_epilogue
 			end
 		end
+
+		on put, 'identify' do
+			log.info "identifying image"
+			# load as little of image as possible
+			if settings[:optimization]
+					opts[:max_width] = 2
+					opts[:max_height] = 2
+			end
+
+			# disable preprocessing since we don't need them here
+			opts[:no_reload] = true
+			opts[:no_downscale] = true
+
+			# RMagick of v2.13.2 does not use ImageMagick's PingBlob so we have to actually load the image
+			thumbnailer.load(req.body, opts).use do |input_image|
+				mime_type = input_image.mime_type
+				log.info "image loaded and identified as: #{mime_type}"
+				write_json 200, {
+					'mimeType' => mime_type,
+					'width' => input_image.width,
+					'height' => input_image.height
+				}
+			end
+		end
 	end
 end
 

data/load_test/load_test-374846090-1.1.0-rc1-identify-only.csv

@@ -0,0 +1,3 @@
+sampler_label,aggregate_report_count,average,aggregate_report_median,aggregate_report_90%_line,aggregate_report_min,aggregate_report_max,aggregate_report_error%,aggregate_report_rate,aggregate_report_bandwidth
+identify,9434,98,41,317,2,2041,1.0599957600169599E-4,86.93889211430889,16.460990345050824
+TOTAL,9434,98,41,317,2,2041,1.0599957600169599E-4,86.93889211430889,16.460990345050824

data/load_test/load_test-374846090-1.1.0-rc1.csv

@@ -0,0 +1,11 @@
+sampler_label,aggregate_report_count,average,aggregate_report_median,aggregate_report_90%_line,aggregate_report_min,aggregate_report_max,aggregate_report_error%,aggregate_report_rate,aggregate_report_bandwidth
+crop 100x100 JPEG,9434,97,67,168,10,6023,1.0599957600169599E-4,2.034068600763908,8.133324288364369
+crop 800x600 JPEG,9434,437,364,877,11,3589,1.0599957600169599E-4,2.033919060628639,158.9437935773869
+crop 300x400 PNG,9434,427,388,649,9,1524,1.0599957600169599E-4,2.0337520051341786,231.20404558388668
+pad 100x100 JPEG,9434,57,43,102,4,940,1.0599957600169599E-4,2.0338642493706423,6.362563138196591
+fit 100x100 JPEG,9434,55,41,102,3,876,1.0599957600169599E-4,2.033791464586396,6.162153297530174
+limit 100x100 JPEG,9434,56,43,103,3,572,1.0599957600169599E-4,2.0337879570175277,6.160442445959317
+limit 500x500 JPEG,9434,335,294,610,3,1638,1.0599957600169599E-4,2.0336318824503,74.19337637719873
+limit 1500x1500 JPEG,9434,537,158,1366,3,9732,1.0599957600169599E-4,2.033324187613275,330.89337206349103
+multipart,9434,2402,1201,4951,178,54452,1.0599957600169599E-4,2.0319087644103666,819.6699318973896
+TOTAL,84906,489,139,992,3,54452,1.0599957600169599E-4,18.28246151103233,1640.6136821422608

data/load_test/soak_test.jmx

@@ -30,12 +30,12 @@
         <collectionProp name="Arguments.arguments">
           <elementProp name="media_dir" elementType="Argument">
             <stringProp name="Argument.name">media_dir</stringProp>
-            <stringProp name="Argument.value">/home/kazuya/Documents/Test Data/Tatoos</stringProp>
+            <stringProp name="Argument.value">/home/kazuya/Documents/Test Data</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="list_file" elementType="Argument">
             <stringProp name="Argument.name">list_file</stringProp>
-            <stringProp name="Argument.value">/home/kazuya/Documents/Test Data/Tatoos/list.csv</stringProp>
+            <stringProp name="Argument.value">/home/kazuya/Documents/Test Data/tatoos.csv</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -75,13 +75,70 @@
           <stringProp name="delimiter">,</stringProp>
           <stringProp name="fileEncoding"></stringProp>
           <stringProp name="filename">${list_file}</stringProp>
-          <boolProp name="quotedData">false</boolProp>
+          <boolProp name="quotedData">true</boolProp>
           <boolProp name="recycle">false</boolProp>
           <stringProp name="shareMode">All threads</stringProp>
           <boolProp name="stopThread">true</boolProp>
           <stringProp name="variableNames">file</stringProp>
         </CSVDataSet>
         <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="identify" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/identify</stringProp>
+          <stringProp name="HTTPSampler.method">PUT</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
+            <collectionProp name="HTTPFileArgs.files">
+              <elementProp name="${media_dir}/${file}" elementType="HTTPFileArg">
+                <stringProp name="File.path">${media_dir}/${file}</stringProp>
+                <stringProp name="File.paramname"></stringProp>
+                <stringProp name="File.mimetype"></stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="200" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="49586">200</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Content-Type: image/jpeg" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="2066544187">Content-Type: application/json</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_headers</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="identify JSON" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="-1132805170">&quot;mimeType&quot;:&quot;image/</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="crop 100x100 JPEG" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpthumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn-cuba-base
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,7 @@ files:
 - VERSION
 - bin/httpthumbnailer
 - features/httpthumbnailer.feature
+- features/identify.feature
 - features/step_definitions/httpthumbnailer_steps.rb
 - features/support/env.rb
 - features/support/test-large.jpg
@@ -223,6 +224,8 @@ files:
 - load_test/extralarge.jpg
 - load_test/large.jpg
 - load_test/large.png
+- load_test/load_test-374846090-1.1.0-rc1-identify-only.csv
+- load_test/load_test-374846090-1.1.0-rc1.csv
 - load_test/load_test-cd9679c.csv
 - load_test/load_test-v0.3.1.csv
 - load_test/load_test.jmx
@@ -255,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1707312696099202820
+      hash: -1021234509576024506
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: