httpthumbnailer 0.0.14 → 0.1.0

data/Gemfile

@@ -5,10 +5,7 @@ gem "mongrel", ">= 1.1.5"
 gem "rmagick", "~> 2"
 gem "haml", "~> 3"
 gem "ruby-ip", "~> 0.9"
-gem "cli", "~> 0.0.3"
-
-# testing
-gem "fcgi", "~> 0.8.8"
+gem "cli", "~> 1.1.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     builder (3.0.0)
     cgi_multipart_eof_fix (2.5.0)
-    cli (0.0.3)
+    cli (1.1.0)
     cucumber (1.1.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -14,7 +14,6 @@ GEM
     daemons (1.1.4)
     diff-lcs (1.1.3)
     fastthread (1.0.7)
-    fcgi (0.8.8)
     gem_plugin (0.2.3)
     gherkin (2.6.5)
       json (>= 1.4.6)
@@ -59,10 +58,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  cli (~> 0.0.3)
+  cli (~> 1.1.0)
   cucumber
   daemon (~> 1)
-  fcgi (~> 0.8.8)
   haml (~> 3)
   httpclient (~> 2.2)
   jeweler (~> 1.6.4)

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.1.0

data/bin/httpthumbnailer

@@ -99,21 +99,23 @@ sinatra.put %r{^/thumbnail/(.*)} do |specs|
 		opts.merge!({'max-width' => biggest_spec.width, 'max-height' => biggest_spec.height})
 	end
 
-	$thumbnailer.load(request.body, opts) do |original_image_handler|
+	input_image_handler = $thumbnailer.load(request.body, opts)
+	input_image_handler.get do |input_image|
 		status 200
 		headers "Content-Type" => "multipart/mixed; boundary=\"#{settings.boundary}\""
+		headers "X-Input-Image-Content-Type" => input_image.mime_type
 
 		stream do |out| # this is non blocking
-			original_image_handler.use do |original_image|
+			input_image_handler.use do |input_image|
 				thumbnail_specs.each do |spec|
 					logger.info "Thumbnailing: #{spec}"
 					out << "--#{settings.boundary}\r\n"
 
 					begin
-						thumbnail_data = original_image.thumbnail(spec)
-
-						out << "Content-Type: #{spec.mime}\r\n\r\n"
-						out << thumbnail_data
+						input_image.thumbnail(spec) do |thumbnail|
+							out << "Content-Type: #{thumbnail.mime_type}\r\n\r\n"
+							out << thumbnail.data
+						end
 					rescue => e
 						logger.error "Thumbnailing error: #{e.class.name}: #{e}: \n#{e.backtrace.join("\n")}"
 						out << "Content-Type: text/plain\r\n\r\n"

data/features/httpthumbnailer.feature

@@ -1,6 +1,6 @@
 Feature: Generating set of thumbnails with single PUT request
 	In order to generate a set of image thumbnails
-	A user must PUT original image to URL in format
+	A user must PUT an image to URL in format
 	/thumbnail[/<thumbnail type>,<width>,<height>,<format>[,<option key>:<option value>]+]+
 
 	Background:
@@ -213,3 +213,15 @@ Feature: Generating set of thumbnails with single PUT request
 		Then second part will contain body smaller than third part
 		And there will be no leaked images
 
+	Scenario: Hint on input image mime type - JPEG
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,PNG
+		Then response status will be 200
+		And X-Input-Image-Content-Type header will be image/jpeg
+
+	Scenario: Hint on input image mime type - PNG
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/crop,16,16,PNG
+		Then response status will be 200
+		And X-Input-Image-Content-Type header will be image/png
+

data/features/step_definitions/httpthumbnailer_steps.rb

@@ -19,6 +19,11 @@ When /I do (.*) request (.*)/ do |method, url|
 	@response = HTTPClient.new.request(method, url, nil, @request_body)
 end
 
+Then /(.*) header will be (.*)/ do |header, value|
+	@response.header[header].should_not be_empty
+	@response.header[header].first.should == value
+end
+
 Then /I will get multipart response/ do
 	@response.header['Content-Type'].first.should match /^multipart/
 	@response_multipart = MultipartResponse.new(@response.header['Content-Type'].last, @response.body)

data/httpthumbnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer"
-  s.version = "0.0.14"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-12-02"
+  s.date = "2012-01-04"
   s.description = "Provides HTTP API for thumbnailing images"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpthumbnailer"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "features/support/test-large.jpg",
     "features/support/test-transparent.png",
     "features/support/test.jpg",
+    "features/support/test.png",
     "features/support/test.txt",
     "httpthumbnailer.gemspec",
     "lib/httpthumbnailer/multipart_response.rb",
@@ -69,8 +70,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rmagick>, ["~> 2"])
       s.add_runtime_dependency(%q<haml>, ["~> 3"])
       s.add_runtime_dependency(%q<ruby-ip>, ["~> 0.9"])
-      s.add_runtime_dependency(%q<cli>, ["~> 0.0.3"])
-      s.add_runtime_dependency(%q<fcgi>, ["~> 0.8.8"])
+      s.add_runtime_dependency(%q<cli>, ["~> 1.1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -85,8 +85,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rmagick>, ["~> 2"])
       s.add_dependency(%q<haml>, ["~> 3"])
       s.add_dependency(%q<ruby-ip>, ["~> 0.9"])
-      s.add_dependency(%q<cli>, ["~> 0.0.3"])
-      s.add_dependency(%q<fcgi>, ["~> 0.8.8"])
+      s.add_dependency(%q<cli>, ["~> 1.1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -102,8 +101,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rmagick>, ["~> 2"])
     s.add_dependency(%q<haml>, ["~> 3"])
     s.add_dependency(%q<ruby-ip>, ["~> 0.9"])
-    s.add_dependency(%q<cli>, ["~> 0.0.3"])
-    s.add_dependency(%q<fcgi>, ["~> 0.8.8"])
+    s.add_dependency(%q<cli>, ["~> 1.1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/httpthumbnailer/thumbnailer.rb

@@ -22,18 +22,10 @@ class ThumbnailSpec
 		@options = options
 	end
 
-	def mime
-		mime = case format
-			when 'JPG' then 'jpeg'
-			else format.downcase
-		end
-		"image/#{mime}"
-	end
-
 	attr_reader :method, :width, :height, :format, :options
 
 	def to_s
-		"#{method} #{width}x#{height} #{mime} (#{format}) #{options.inspect}"
+		"#{method} #{width}x#{height} (#{format}) #{options.inspect}"
 	end
 end
 
@@ -67,6 +59,17 @@ class Thumbnailer
 			@image = yield
 		end
 
+		def get
+			raise ImageDestroyedError unless @image
+			begin
+				yield @image
+			rescue
+				@image.destroy!
+				@image = nil
+				raise
+			end
+		end
+
 		def use
 			raise ImageDestroyedError unless @image
 			begin
@@ -84,7 +87,7 @@ class Thumbnailer
 		end
 	end
 
-	class OriginalImage
+	class InputImage
 		def initialize(io, methods, options = {})
 			@options = options
 			@logger = (options[:logger] or Logger.new('/dev/null'))
@@ -128,16 +131,10 @@ class Thumbnailer
 
 		def thumbnail(spec)
 			begin
-				quality = (spec.options['quality'] or default_quality(spec.format))
-				quality = quality.to_i if quality
-
 				ImageHandler.new do
 					process_image(@image, spec).render_on_background!((spec.options['background-color'] or 'white').sub(/^0x/, '#'))
-				end.use do |thumb|
-					thumb.to_blob do
-						self.format = spec.format
-						self.quality = quality if quality
-					end
+				end.use do |image|
+					yield Thumbnail.new(image, spec)
 				end
 			rescue Magick::ImageMagickError => e
 				raise ImageTooLargeError, e if e.message =~ /cache resources exhausted/
@@ -145,23 +142,16 @@ class Thumbnailer
 			end
 		end
 
+		def mime_type
+			@image.mime_type
+		end
+
 		def destroy!
 			@image.destroy!
 		end
 
 		private
 
-		def default_quality(format)
-			case format
-			when /png/i
-				95 # max zlib compression, adaptive filtering (photo)
-			when /jpeg|jpg/i
-				85
-			else
-				nil
-			end
-		end
-
 		def find_prescale_factor(max_width, max_height, factor = 1)
 			new_factor = factor * 2
 			if @image.columns / new_factor > max_width * 2 and @image.rows / new_factor > max_height * 2
@@ -183,6 +173,47 @@ class Thumbnailer
 		end
 	end
 
+	class Thumbnail
+		def initialize(image, spec)
+			@image = image
+			@spec = spec
+		end
+
+		def data
+				quality = (@spec.options['quality'] or default_quality(@spec.format))
+				quality = quality.to_i if quality
+
+				spec = @spec
+				@image.to_blob do
+					self.format = spec.format
+					self.quality = quality if quality
+				end
+		end
+
+		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
+				when 'JPG' then 'jpeg'
+				else @spec.format.downcase
+			end
+			"image/#{mime}"
+		end
+
+		private
+
+		def default_quality(format)
+			case format
+			when /png/i
+				95 # max zlib compression, adaptive filtering (photo)
+			when /jpeg|jpg/i
+				85
+			else
+				nil
+			end
+		end
+	end
+
 	def initialize(options = {})
 		@methods = {}
 		@options = options
@@ -208,16 +239,8 @@ class Thumbnailer
 	end
 
 	def load(io, options = {})
-		h = ImageHandler.new do
-			OriginalImage.new(io, @methods, @options.merge(options))
-		end
-
-		begin
-			yield h
-		rescue
-			# make sure that we destroy original image if there was an error before it could be used
-			h.destroy!
-			raise
+		ImageHandler.new do
+			InputImage.new(io, @methods, @options.merge(options))
 		end
 	end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpthumbnailer
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 14
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -99,34 +99,18 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        - 0
-        - 3
-        version: 0.0.3
+        version: 1.1.0
   prerelease: false
   name: cli
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 8
-        - 8
-        version: 0.8.8
-  prerelease: false
-  name: fcgi
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -139,10 +123,10 @@ dependencies:
         version: 2.3.0
   prerelease: false
   name: rspec
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -153,10 +137,10 @@ dependencies:
         version: "0"
   prerelease: false
   name: cucumber
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -169,10 +153,10 @@ dependencies:
         version: 1.0.0
   prerelease: false
   name: bundler
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -185,10 +169,10 @@ dependencies:
         version: 1.6.4
   prerelease: false
   name: jeweler
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -199,10 +183,10 @@ dependencies:
         version: "0"
   prerelease: false
   name: rcov
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -213,10 +197,10 @@ dependencies:
         version: "1"
   prerelease: false
   name: daemon
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -228,10 +212,10 @@ dependencies:
         version: "2.2"
   prerelease: false
   name: httpclient
-  version_requirements: *id014
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -243,7 +227,7 @@ dependencies:
         version: "3.9"
   prerelease: false
   name: rdoc
-  version_requirements: *id015
+  version_requirements: *id014
 description: Provides HTTP API for thumbnailing images
 email: jpastuszek@gmail.com
 executables: 
@@ -269,6 +253,7 @@ files:
 - features/support/test-large.jpg
 - features/support/test-transparent.png
 - features/support/test.jpg
+- features/support/test.png
 - features/support/test.txt
 - httpthumbnailer.gemspec
 - lib/httpthumbnailer/multipart_response.rb