httpthumbnailer 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/httpthumbnailer

@@ -95,8 +95,7 @@ sinatra.put %r{^/thumbnail/(.*)} do |specs|
 
 	opts = {}
 	if settings.optimization
-		biggest_spec = thumbnail_specs.biggest_spec
-		opts.merge!({'max-width' => biggest_spec.width, 'max-height' => biggest_spec.height})
+		opts.merge!({'max-width' => thumbnail_specs.max_width, 'max-height' => thumbnail_specs.max_height})
 	end
 
 	input_image_handler = $thumbnailer.load(request.body, opts)

data/features/httpthumbnailer.feature

@@ -39,6 +39,30 @@ Feature: Generating set of thumbnails with single PUT request
 		And that image pixel at 32x32 will be of color white
 		And there will be no leaked images
 
+	Scenario: Thumbnails of format INPUT should have same format as input image - for JPEG
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,PNG/crop,4,8,INPUT/crop,16,32,INPUT
+		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
+		Then second part will contain JPEG image of size 4x8
+		And second part mime type will be image/jpeg
+		Then third part will contain JPEG image of size 16x32
+		And third part mime type will be image/jpeg
+
+	Scenario: Thumbnails of format INPUT should have same format as input image - for PNG
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,JPEG/crop,4,8,INPUT/crop,16,32,INPUT
+		Then response status will be 200
+		And I will get multipart response
+		Then first part will contain JPEG image of size 16x16
+		And first part mime type will be image/jpeg
+		Then second part will contain PNG image of size 4x8
+		And second part mime type will be image/png
+		Then third part will contain PNG image of size 16x32
+		And third part mime type will be image/png
+
 	Scenario: Fit thumbnailing method
 		Given test.jpg file content as request body
 		When I do PUT request http://localhost:3100/thumbnail/fit,128,128,PNG

data/httpthumbnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2012-01-04"
+  s.date = "2012-01-12"
   s.description = "Provides HTTP API for thumbnailing images"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpthumbnailer"]

data/lib/httpthumbnailer/thumbnail_specs.rb

@@ -25,6 +25,14 @@ class ThumbnailSpecs < Array
 		ts
 	end
 
+	def max_width
+		map{|spec| spec.width}.max
+	end
+
+	def max_height
+		map{|spec| spec.height}.max
+	end
+
 	def biggest_spec
 		max_field = -1
 		max_spec = nil

data/lib/httpthumbnailer/thumbnailer.rb

@@ -134,7 +134,7 @@ class Thumbnailer
 				ImageHandler.new do
 					process_image(@image, spec).render_on_background!((spec.options['background-color'] or 'white').sub(/^0x/, '#'))
 				end.use do |image|
-					yield Thumbnail.new(image, spec)
+					yield Thumbnail.new(image, spec.format == 'INPUT' ? @image.format : spec.format, spec.options['quality'])
 				end
 			rescue Magick::ImageMagickError => e
 				raise ImageTooLargeError, e if e.message =~ /cache resources exhausted/
@@ -174,18 +174,18 @@ class Thumbnailer
 	end
 
 	class Thumbnail
-		def initialize(image, spec)
+		def initialize(image, format, quality = nil)
 			@image = image
-			@spec = spec
+			@format = format
+			@quality = (quality or default_quality(format))
+			@quality &&= @quality.to_i
 		end
 
 		def data
-				quality = (@spec.options['quality'] or default_quality(@spec.format))
-				quality = quality.to_i if quality
-
-				spec = @spec
+				format = @format
+				quality = @quality
 				@image.to_blob do
-					self.format = spec.format
+					self.format = format
 					self.quality = quality if quality
 				end
 		end
@@ -193,9 +193,9 @@ class Thumbnailer
 		def mime_type
 			#@image.mime_type cannot be used since it is raw loaded image
 			#TODO: how do I do it better?
-			mime = case @spec.format
+			mime = case @format
 				when 'JPG' then 'jpeg'
-				else @spec.format.downcase
+				else @format.downcase
 			end
 			"image/#{mime}"
 		end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpthumbnailer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 Z
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime