httpthumbnailer 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/httpthumbnailer

@@ -24,6 +24,16 @@ sinatra.before do
 		@thumbnailer.method('crop') do |image, spec|
 			image.resize_to_fill(spec.width, spec.height)
 		end
+
+		@thumbnailer.method('fit') do |image, spec|
+			image.resize_to_fit(spec.width, spec.height)
+		end
+
+		@thumbnailer.method('pad') do |image, spec|
+			Magick::Image.new(spec.width, spec.height) {
+				self.background_color = Magick::Pixel.new(Magick::MaxRGB, Magick::MaxRGB, Magick::MaxRGB, Magick::MaxRGB) # transparent
+			}.composite!(image.resize_to_fit(spec.width, spec.height), Magick::CenterGravity, Magick::OverCompositeOp)
+		end
 	end
 end
 
@@ -51,17 +61,17 @@ sinatra.put %r{/thumbnail/(.*)} do |specs|
 	status 200
 	headers "Content-Type" => "multipart/mixed; boundary=\"#{settings.boundary}\""
 	stream do |out|
-		thumbnail_specs.each do |ts|
-			logger.info "Thumbnailing: #{ts}"
+		thumbnail_specs.each do |spec|
+			logger.info "Thumbnailing: #{spec}"
 			out << "--#{settings.boundary}\r\n"
 
 			begin
-				thumbnail = @thumbnailer.thumbnail('current', ts)
+				thumbnail = @thumbnailer.thumbnail('current', spec)
 				thumbnail_data = thumbnail.to_blob do |inf|
-					inf.format = ts.format
+					inf.format = spec.format
 				end
 
-				out << "Content-Type: #{ts.mime}\r\n\r\n"
+				out << "Content-Type: #{spec.mime}\r\n\r\n"
 				out << thumbnail_data
 
 				thumbnail_data = nil

data/features/httpthumbnailer.feature

@@ -3,16 +3,19 @@ Feature: Generating set of thumbnails with single PUT request
 	A user must PUT original image to URL in format
 	/thumbnail[/<thumbnail type>,<width>,<height>,<format>[,<option key>:<option value>]+]+
 
+	Background:
+		Given httpthumbnailer server is running at http://localhost:3100/
+
 	Scenario: Single thumbnail
 		Given test.jpg file content as request body
-		When I do PUT request /thumbnail/crop,16,16,PNG
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,PNG
 		Then I will get multipart response
 		Then first part mime type will be image/png
 		And first part will contain PNG image of size 16x16
 
 	Scenario: Multiple thumbnails
 		Given test.jpg file content as request body
-		When I do PUT request /thumbnail/crop,16,16,PNG/crop,4,8,JPG/crop,16,32,JPEG
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,PNG/crop,4,8,JPG/crop,16,32,JPEG
 		Then I will get multipart response
 		Then first part mime type will be image/png
 		And first part will contain PNG image of size 16x16
@@ -21,3 +24,33 @@ Feature: Generating set of thumbnails with single PUT request
 		Then third part mime type will be image/jpeg
 		And third part will contain JPEG image of size 16x32
 
+	Scenario: Transparent image to JPEG handling - default background color white
+		Given test-transparent.png file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/fit,128,128,JPEG
+		Then I will get multipart response
+		And first part body will be saved as test-transparent-default.png for human inspection
+		And first part will contain JPEG image of size 128x128
+		And that image pixel at 32x32 will be of color white
+
+	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
+		Then I will get multipart response
+		And first part will contain PNG image of size 91x128
+
+	Scenario: Pad thumbnailing method - default background color white
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/pad,128,128,PNG
+		Then I will get multipart response
+		And first part body will be saved as test-pad.png for human inspection
+		And first part will contain PNG image of size 128x128
+		And that image pixel at 2x2 will be of color white
+
+	Scenario: Pad thumbnailing method with specified background color
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/pad,128,128,PNG,background-color:green
+		Then I will get multipart response
+		And first part body will be saved as test-pad-background-color.png for human inspection
+		And first part will contain PNG image of size 128x128
+		And that image pixel at 2x2 will be of color green
+

data/features/step_definitions/httpthumbnailer_steps.rb

@@ -1,20 +1,18 @@
-Before do
-	server_start
-	@request_body = nil
-	@response = nil
-	@response_multipart = nil
-end
-
-After do
-	server_stop
+Given /httpthumbnailer server is running at (.*)/ do |url|
+	start_server(
+		"bundle exec #{script('httpthumbnailer')}",
+		'/tmp/httpthumbnailer.pid',
+		support_dir + 'server.log',
+		url
+	)
 end
 
 Given /(.*) file content as request body/ do |file|
 	@request_body = File.open(support_dir + file){|f| f.read }
 end
 
-When /I do (.*) request (.*)/ do |method, uri|
-	@response = server_request(method, uri, nil, @request_body)
+When /I do (.*) request (.*)/ do |method, url|
+	@response = HTTPClient.new.request(method, url, nil, @request_body)
 end
 
 Then /I will get multipart response/ do
@@ -26,16 +24,25 @@ Then /(.*) part mime type will be (.*)/ do |part, mime|
 	@response_multipart.part[part_no(part)].header['Content-Type'].should == mime
 end
 
-Then /(.*) part will contain (.*) image of size (.*)/ do |part, image_type, image_size|
+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
+	fail("expecte image got #{mime}: #{data}") unless mime =~ /^image\//
 
-	Open3.popen3('identify -') do |stdin, stdout, stderr| 
-		stdin.write data
-		stdin.close
-		path, type, size, *rest = *stdout.read.split(' ')
-		type.should == image_type
-		size.should == image_size
-	end
+	@image.destroy! if @image
+	@image = Magick::Image.from_blob(data).first
+
+	@image.format.should == format
+	@image.columns.should == width.to_i
+	@image.rows.should == height.to_i
 end
 
+And /(.*) part body will be saved as (.*) for human inspection/ do |part, file|
+	data = @response_multipart.part[part_no(part)].body
+	(support_dir + file).open('w'){|f| f.write(data)}
+end
+
+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
 

data/features/support/env.rb

@@ -16,6 +16,7 @@ require 'httpclient'
 require 'httpthumbnailer/multipart_response'
 require "open3"
 require "thread"
+require 'RMagick'
 
 def gem_dir
 		Pathname.new(__FILE__).dirname + '..' + '..'
@@ -33,24 +34,37 @@ def script(file)
 		gem_dir + 'bin' + file
 end
 
-def server_get(uri)
-	HTTPClient.new.get_content("http://localhost:3100#{uri}")
+def part_no(part)
+	case part
+		when 'first' then 0
+		when 'second' then 1
+		when 'third' then 2
+		else fail "add more parts?"
+	end
 end
 
-def server_request(method, uri, query = nil, body = nil)
-	HTTPClient.new.request(method, "http://localhost:3100#{uri}", query, body)
+
+def get(url)
+	HTTPClient.new.get_content(url)
 end
 
-def server_start
-	File.exist?("/tmp/httpthumbnailer.pid") and server_stop
+def start_server(cmd, pid_file, log_file, test_url)
+	stop_server(pid_file)
+
 	fork do
-		Daemon.daemonize("/tmp/httpthumbnailer.pid", support_dir + 'server.log')
-		exec("bundle exec #{script('httpthumbnailer')} -p 3100")
+		Daemon.daemonize(pid_file, log_file)
+		exec(cmd)
+	end
+	Process.wait
+
+	ppid = Process.pid
+	at_exit do
+		stop_server(pid_file) if Process.pid == ppid
 	end
 
 	Timeout.timeout(10) do
 		begin
-			server_get '/'
+			get test_url
 		rescue Errno::ECONNREFUSED
 			sleep 0.1
 			retry
@@ -58,28 +72,21 @@ def server_start
 	end
 end
 
-def server_stop
-	File.open("/tmp/httpthumbnailer.pid") do |pidf|
-		pid = pidf.read
-
-		Timeout.timeout(10) do
-			begin
-				loop do
-					ret = Process.kill("TERM", pid.strip.to_i)
-					sleep 0.1
-				end
-			rescue Errno::ESRCH
+def stop_server(pid_file)
+	pid_file = Pathname.new(pid_file)
+	return unless pid_file.exist?
+
+	pid = pid_file.read.strip.to_i
+
+	Timeout.timeout(20) do
+		begin
+			loop do
+				Process.kill("TERM", pid)
+				sleep 0.1
 			end
+		rescue Errno::ESRCH
+			pid_file.unlink
 		end
 	end
 end
 
-def part_no(part)
-	case part
-		when 'first' then 0
-		when 'second' then 1
-		when 'third' then 2
-		else fail "add more parts?"
-	end
-end
-

data/httpthumbnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-11-23"
+  s.date = "2011-11-28"
   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-transparent.png",
     "features/support/test.jpg",
     "httpthumbnailer.gemspec",
     "lib/httpthumbnailer/multipart_response.rb",

data/lib/httpthumbnailer/thumbnailer.rb

@@ -67,7 +67,14 @@ class Thumbnailer
 
 	def thumbnail(id, spec)
 		image = @images[id] or raise ImageNotFound.new(id)
-		process_image(image, spec)
+		thumb = process_image(image, spec)
+		replace_transparency(thumb, spec)
+	end
+
+	def replace_transparency(image, spec)
+		Magick::Image.new(image.columns, image.rows) {
+			self.background_color = (spec.options['background-color'] or 'white').sub(/^0x/, '#')
+		}.composite!(image, Magick::CenterGravity, Magick::OverCompositeOp)
 	end
 
 	def process_image(image, spec)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpthumbnailer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 Z
+date: 2011-11-28 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-transparent.png
 - features/support/test.jpg
 - httpthumbnailer.gemspec
 - lib/httpthumbnailer/multipart_response.rb