httpthumbnailer 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/httpthumbnailer

@@ -50,18 +50,18 @@ sinatra.before do
 	if $thumbnailer.nil? 
 		$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)
+		$thumbnailer.method('crop') do |image, width, height, options|
+			image.resize_to_fill!(width, height)
 		end
 
-		$thumbnailer.method('fit') do |image, spec|
-			image.resize_to_fit!(spec.width, spec.height)
+		$thumbnailer.method('fit') do |image, width, height, options|
+			image.resize_to_fit!(width, height)
 		end
 
-		$thumbnailer.method('pad') do |image, spec|
-			image.resize_to_fit!(spec.width, spec.height)
+		$thumbnailer.method('pad') do |image, width, height, options|
+			image.resize_to_fit!(width, height)
 
-			out = Magick::Image.new(spec.width, spec.height) {
+			out = Magick::Image.new(width, height) {
 				self.background_color = Magick::Pixel.new(Magick::MaxRGB, Magick::MaxRGB, Magick::MaxRGB, Magick::MaxRGB) # transparent
 			}.composite!(image, Magick::CenterGravity, Magick::OverCompositeOp)
 

data/features/httpthumbnailer.feature

@@ -63,6 +63,18 @@ Feature: Generating set of thumbnails with single PUT request
 		Then third part will contain PNG image of size 16x32
 		And third part mime type will be image/png
 
+	Scenario: Thumbnails of width or height INPUT will have input image width or height
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/crop,INPUT,16,JPEG/crop,4,INPUT,PNG/crop,INPUT,INPUT,PNG
+		Then response status will be 200
+		And I will get multipart response
+		Then first part will contain JPEG image of size 509x16
+		And first part mime type will be image/jpeg
+		Then second part will contain PNG image of size 4x719
+		And second part mime type will be image/png
+		Then third part will contain PNG image of size 509x719
+		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
@@ -129,6 +141,16 @@ Feature: Generating set of thumbnails with single PUT request
 		Error: Thumbnailer::UnsupportedMediaTypeError: Magick::ImageMagickError:
 		"""
 
+	Scenario: Reporitng of bad thumbanil spec format - bad dimmension value
+		Given test.txt file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/crop,128,bogous,PNG
+		Then response status will be 500
+		And response content type will be text/plain
+		And response body will be CRLF endend lines
+		"""
+		Error: ThumbnailSpecs::BadThubnailSpecError::BadDimmensionValueError: bad dimmension value: bogous
+		"""
+
 	Scenario: Reporitng of bad thumbanil spec format - missing param
 		Given test.txt file content as request body
 		When I do PUT request http://localhost:3100/thumbnail/crop,128,PNG
@@ -136,7 +158,7 @@ Feature: Generating set of thumbnails with single PUT request
 		And response content type will be text/plain
 		And response body will be CRLF endend lines
 		"""
-		Error: ThumbnailSpecs::BadThubnailSpecFormat: missing argument in: crop,128,PNG
+		Error: ThumbnailSpecs::BadThubnailSpecError::MissingArgumentError: missing argument in: crop,128,PNG
 		"""
 
 	Scenario: Reporitng of bad thumbanil spec format - bad options format
@@ -146,7 +168,7 @@ Feature: Generating set of thumbnails with single PUT request
 		And response content type will be text/plain
 		And response body will be CRLF endend lines
 		"""
-		Error: ThumbnailSpecs::BadThubnailSpecFormat: missing option key or value in: fas-fda
+		Error: ThumbnailSpecs::BadThubnailSpecError::MissingOptionKeyOrValueError: missing option key or value in: fas-fda
 		"""
 
 	Scenario: Reporitng of image thumbnailing errors

data/httpthumbnailer.gemspec

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

data/lib/httpthumbnailer/thumbnail_specs.rb

@@ -1,22 +1,60 @@
 require 'httpthumbnailer/thumbnailer'
 
 class ThumbnailSpecs < Array
-	class BadThubnailSpecFormat < ArgumentError
+	class BadThubnailSpecError < ArgumentError
+		class MissingArgumentError < BadThubnailSpecError
+			def initialize(spec)
+				super "missing argument in: #{spec}"
+			end
+		end
+
+		class MissingOptionKeyOrValueError < BadThubnailSpecError
+			def initialize(option)
+				super "missing option key or value in: #{option}"
+			end
+		end
+
+		class BadDimmensionValueError < BadThubnailSpecError
+			def initialize(value)
+				super "bad dimmension value: #{value}"
+			end
+		end
+	end
+
+	class ThumbnailSpec
+		def initialize(method, width, height, format, options = {})
+			@method = method
+			@width = cast_dimmension(width)
+			@height = cast_dimmension(height)
+			@format = (format == 'INPUT' ? :input : format.upcase)
+			@options = options
+		end
+
+		attr_reader :method, :width, :height, :format, :options
+
+		def to_s
+			"#{method} #{width}x#{height} (#{format}) #{options.inspect}"
+		end
+
+		private
+
+		def cast_dimmension(string)
+			return :input if string == 'INPUT'
+			raise BadThubnailSpecError::BadDimmensionValueError.new(string) unless string =~ /^\d+$/
+			string.to_i
+		end
 	end
 
 	def self.from_uri(specs)
 		ts = ThumbnailSpecs.new
 		specs.split('/').each do |spec|
 			method, width, height, format, *options = *spec.split(',')
-			raise BadThubnailSpecFormat, "missing argument in: #{spec}" unless method and width and height and format
-
-			width = width.to_i
-			height = height.to_i
+			raise BadThubnailSpecError::MissingArgumentError.new(spec) unless method and width and height and format
 
 			opts = {}
 			options.each do |option|
 				key, value = option.split(':')
-				raise BadThubnailSpecFormat, "missing option key or value in: #{option}" unless key and value
+				raise BadThubnailSpecError::MissingOptionKeyOrValueError.new(option) unless key and value
 				opts[key] = value
 			end
 
@@ -26,25 +64,17 @@ class ThumbnailSpecs < Array
 	end
 
 	def max_width
-		map{|spec| spec.width}.max
+		map do |spec|
+			return nil unless spec.width.is_a? Integer
+			spec.width
+		end.max
 	end
 
 	def max_height
-		map{|spec| spec.height}.max
-	end
-
-	def biggest_spec
-		max_field = -1
-		max_spec = nil
-		each do |spec|
-			field = spec.width * spec.height
-			if max_field < field
-				max_field = field
-				max_spec = spec
-			end
-		end
-
-		max_spec
+		map do |spec|
+			return nil unless spec.height.is_a? Integer
+			spec.height
+		end.max
 	end
 end
 

data/lib/httpthumbnailer/thumbnailer.rb

@@ -12,23 +12,6 @@ class Magick::Image
 	end
 end
 
-
-class ThumbnailSpec
-	def initialize(method, width, height, format, options = {})
-		@method = method
-		@width = width
-		@height = height
-		@format = format.upcase
-		@options = options
-	end
-
-	attr_reader :method, :width, :height, :format, :options
-
-	def to_s
-		"#{method} #{width}x#{height} (#{format}) #{options.inspect}"
-	end
-end
-
 class Thumbnailer
 	class UnsupportedMethodError < ArgumentError
 		def initialize(method)
@@ -92,7 +75,6 @@ class Thumbnailer
 			@options = options
 			@logger = (options[:logger] or Logger.new('/dev/null'))
 
-
 			mw = options['max-width']
 			mh = options['max-height']
 			if mw and mh
@@ -132,9 +114,14 @@ class Thumbnailer
 		def thumbnail(spec)
 			begin
 				ImageHandler.new do
-					process_image(@image, spec).render_on_background!((spec.options['background-color'] or 'white').sub(/^0x/, '#'))
+					width = spec.width == :input ? @image.columns : spec.width
+					height = spec.height == :input ? @image.rows : spec.height
+
+					process_image(@image, spec.method, width, height, spec.options).render_on_background!((spec.options['background-color'] or 'white').sub(/^0x/, '#'))
 				end.use do |image|
-					yield Thumbnail.new(image, spec.format == 'INPUT' ? @image.format : spec.format, spec.options['quality'])
+					format = spec.format == :input ? @image.format : spec.format
+
+					yield Thumbnail.new(image, format, spec.options)
 				end
 			rescue Magick::ImageMagickError => e
 				raise ImageTooLargeError, e if e.message =~ /cache resources exhausted/
@@ -161,11 +148,11 @@ class Thumbnailer
 			end
 		end
 
-		def process_image(image, spec)
-			impl = @methods[spec.method] or raise UnsupportedMethodError.new(spec.method)
+		def process_image(image, method, width, height, options)
+			impl = @methods[method] or raise UnsupportedMethodError.new(method)
 			copy = image.copy
 			begin
-				impl.call(copy, spec)
+				impl.call(copy, width, height, options)
 			rescue
 				copy.destroy!
 				raise
@@ -174,10 +161,10 @@ class Thumbnailer
 	end
 
 	class Thumbnail
-		def initialize(image, format, quality = nil)
+		def initialize(image, format, options = {})
 			@image = image
 			@format = format
-			@quality = (quality or default_quality(format))
+			@quality = (options['quality'] or default_quality(format))
 			@quality &&= @quality.to_i
 		end
 

metadata

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