httpthumbnailer 1.1.2 → 1.2.0

data/Gemfile

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

data/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     cli (1.3.1)
-    cuba (3.1.0)
+    cuba (3.1.1)
       rack
     cucumber (1.3.1)
       builder (>= 2.1.2)
@@ -52,7 +52,7 @@ GEM
     json (1.7.7)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    kgio (2.8.1)
+    kgio (2.9.2)
     mime-types (1.23)
     multi_json (1.7.3)
     multi_xml (0.5.5)
@@ -69,7 +69,7 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    raindrops (0.12.0)
+    raindrops (0.13.0)
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -89,11 +89,11 @@ GEM
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    unicorn (4.6.3)
+    unicorn (4.8.2)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-cuba-base (1.1.1)
+    unicorn-cuba-base (1.2.0)
       cli (~> 1.3)
       cuba (~> 3.0)
       facter (~> 1.6.11)
@@ -118,4 +118,4 @@ DEPENDENCIES
   rmagick (~> 2)
   rspec (~> 2.13)
   rspec-mocks (~> 2.13)
-  unicorn-cuba-base (~> 1.1.1)
+  unicorn-cuba-base (~> 1.2.0)

data/README.md

@@ -17,6 +17,12 @@ It is using [ImageMagick](http://www.imagemagick.org) or [GraphicsMagick](http:/
 
 ## Changelog
 
+### 1.2.0
+* added `float-x` and `float-y` option support
+* added `interlace` option support
+* syslog logging
+* transaction ID tracking
+
 ### 1.1.0
 
 * added identification API for image mime type and size identification
@@ -92,13 +98,18 @@ If running as root you can use `--user` option to specify user with whose privil
 
 Additionally `httpthumbnailer` will log requests in [common NCSA format](http://en.wikipedia.org/wiki/Common_Log_Format) to `httpthumbnailer_access.log` file. Use `--access-log-file` option to change location of access log.
 
+Syslog logging can be enabled with `--syslog-facility` option followed by name of syslog facility to use. When enabled log files are not created and both application logs and access logs are sent to syslog. 
+Access logs will gain meta information that will include `type="http-access"` that can be used to filter access log entries out from application log entries.
+
+With `--xid-header` option name of HTTP request header can be specified. Value of this header will be logged in meta information tag `xid` along side all request related log entries.
+
 ### Supported operations
 
 As operation type you can select one of the following options:
-* fit - fit image within given dimensions keeping aspect ratio
-* crop - cut image to fit within given dimensions keeping aspect ratio
-* pad - fit scale image and pad image with background colour to given dimensions keeping aspect ratio
-* limit - fit scale image to given dimensions if it is larger than that dimensions
+* `fit` - fit image within given dimensions keeping aspect ratio
+* `crop` - cut image to fit within given dimensions keeping aspect ratio
+* `pad` - fit scale image and pad image with background colour to given dimensions keeping aspect ratio
+* `limit` - fit scale image to given dimensions if it is larger than that dimensions
 
 ### Supported formats
 
@@ -113,8 +124,10 @@ Width and height values are interpreted depending on operation.
 ### Thumbnail options
 
 Following options can be used with thumbnail specification:
-* quality - set output image quality; this is format specific: for JPEG 0 is maximum compression and 100 is maximum quality, for PNG first digit is zlib compression level and second one is filter level
-* background-color - color in HTML notation or textual description ('red', 'green' etc.) used for background when processing transparent images or padding; by default white background is used
+* `quality` - set output image quality; this is format specific: for JPEG 0 is maximum compression and 100 is maximum quality, for PNG first digit is zlib compression level and second one is filter level
+* `background-color` - color in HTML notation or textual description ('red', 'green' etc.) used for background when processing transparent images or padding; by default white background is used
+* `float-x` and `float-y` - value between 0.0 and 1.0; can be used with `crop` and `pad` operations to move cropping view or image over background left to right or top to bottom (0.0 to 1.0); both default to 0.5 centering the view or image
+* `interlace` - one of `UndefinedInterlace`, `NoInterlace`, `LineInterlace`, `PlaneInterlace`, `PartitionInterlace`, `GIFInterlace`, `JPEGInterlace`, `PNGInterlace`; some formats support interlaced output format; use `JPEGInterlace` or `LineInterlace` or `PlaneInterlace` with `jpeg` format to produce progressive JPEG; defaults to `NoInterlace`
 
 ### API
 
@@ -252,6 +265,11 @@ $ curl 127.0.0.1:3100/stats/total_write_multipart
 * 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
 
+## TODO
+
+* Save input image data for images that has failed processing to allow further investigation
+* Allow for specifying different quality values for different image types, e.g.: quality[jpeg]:97,quality[png]:85
+
 ## 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.1.2
+1.2.0

data/bin/httpthumbnailer

@@ -30,25 +30,28 @@ Application.new('httpthumbnailer', port: 3100) do
 			puts
 			puts "Output formats:"
 			puts "\t#{Plugin::Thumbnailer::Service.output_formats.join(' ')}"
+			puts
+			puts "Supported Interlace:"
+			puts "\t#{Magick::InterlaceType.values.map(&:to_s).join(' ')}"
 			exit 0
 		end
 
-		Controler.settings[:optimization] = (not settings.no_optimization)
-		Controler.settings[:limit_memory] = settings.limit_memory * 1024**2
-		Controler.settings[:limit_map] = settings.limit_disk * 1024**2
-		Controler.settings[:limit_disk] = settings.limit_disk * 1024**2
+		Controller.settings[:optimization] = (not settings.no_optimization)
+		Controller.settings[:limit_memory] = settings.limit_memory * 1024**2
+		Controller.settings[:limit_map] = settings.limit_disk * 1024**2
+		Controller.settings[:limit_disk] = settings.limit_disk * 1024**2
 	end
 
 	main do |settings|
 		require 'httpthumbnailer/error_reporter'
 		require 'httpthumbnailer/thumbnailer'
 
-		class HTTPThumbniler < Controler
+		class HTTPThumbniler < Controller
 			extend Stats
 			def_stats(
 				:workers,
-				:total_requests, 
-				:total_errors 
+				:total_requests,
+				:total_errors
 			)
 
 			raindrops_stats = Raindrops::Middleware::Stats.new
@@ -65,7 +68,7 @@ Application.new('httpthumbnailer', port: 3100) do
 					HTTPThumbniler.stats.incr_total_errors
 					run ErrorReporter
 				end
-				
+
 				on 'stats' do
 					run StatsReporter
 				end

data/httpthumbnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2013-11-04"
+  s.date = "2014-07-28"
   s.description = "Provides HTTP API for thumbnailing images"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpthumbnailer"]
@@ -19,12 +19,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".idea/encodings.xml",
-    ".idea/httpthumbnailer.iml",
-    ".idea/misc.xml",
-    ".idea/modules.xml",
-    ".idea/scopes/scope_settings.xml",
-    ".idea/vcs.xml",
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
@@ -69,20 +63,24 @@ Gem::Specification.new do |s|
     "load_test/v0.0.14-no-optimization.csv",
     "load_test/v0.0.14.csv",
     "spec/image_processing_spec.rb",
+    "spec/plugin_thumbnailer_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/square_even.png",
+    "spec/support/square_odd.png",
+    "spec/support/test_image.rb",
     "spec/thumbnail_specs_spec.rb"
   ]
   s.homepage = "http://github.com/jpastuszek/httpthumbnailer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.23"
   s.summary = "HTTP thumbnailing server"
 
   if s.respond_to? :specification_version then
     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.1.1"])
+      s.add_runtime_dependency(%q<unicorn-cuba-base>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<rmagick>, ["~> 2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.13"])
       s.add_development_dependency(%q<rspec-mocks>, ["~> 2.13"])
@@ -94,7 +92,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.1.1"])
+      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.2.0"])
       s.add_dependency(%q<rmagick>, ["~> 2"])
       s.add_dependency(%q<rspec>, ["~> 2.13"])
       s.add_dependency(%q<rspec-mocks>, ["~> 2.13"])
@@ -107,7 +105,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<daemon>, ["~> 1.1"])
     end
   else
-    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.1.1"])
+    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.2.0"])
     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,4 +1,4 @@
-class ErrorReporter < Controler
+class ErrorReporter < Controller
 	self.define do
 		on error Plugin::Thumbnailer::UnsupportedMediaTypeError do |error|
 			write_error 415, error

data/lib/httpthumbnailer/plugin/thumbnailer.rb

@@ -1,9 +1,6 @@
 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
@@ -13,6 +10,9 @@ module MetaData
 		@image.rows
 	end
 
+	# 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 implementation
 	def mime_type
 		#TODO: how do I do it better?
 		format = @format || @image.format
@@ -94,7 +94,7 @@ module Plugin
 
 			def thumbnail(spec)
 				spec = spec.dup
-				# default backgraud is white
+				# default background is white
 				spec.options['background-color'] = spec.options.fetch('background-color', 'white').sub(/^0x/, '#')
 
 				width = spec.width == :input ? @image.columns : spec.width
@@ -134,7 +134,7 @@ module Plugin
 				end
 			end
 
-			def_delegators :@image, :destroy!, :destroyed?
+			def_delegators :@image, :destroy!, :destroyed?, :format
 
 			include MetaData
 
@@ -155,20 +155,32 @@ module Plugin
 
 		class Thumbnail
 			include ClassLogging
+			extend Forwardable
 
 			def initialize(image, format, options = {})
 				@image = image
 				@format = format
+
 				@quality = (options['quality'] or default_quality(format))
 				@quality &&= @quality.to_i
+
+				@interlace = (options['interlace'] or 'NoInterlace')
+				fail "unsupported interlace: #{@interlace}" unless Magick::InterlaceType.values.map(&:to_s).include? @interlace
+				@interlace = Magick.const_get @interlace.to_sym
 			end
 
+			def_delegators :@image, :format
+
 			def data
+				# export class variables to local scope
 				format = @format
 				quality = @quality
+				interlace = @interlace
+
 				@image.to_blob do
 					self.format = format
 					self.quality = quality if quality
+					self.interlace = interlace
 				end
 			end
 
@@ -359,6 +371,26 @@ module Plugin
 				log.info "changed #{limit} limit from #{old} to #{value} bytes"
 				old
 			end
+
+			def setup_default_methods
+				processing_method('crop') do |image, width, height, options|
+					image.resize_to_fill(width, height, (Float(options['float-x']) rescue 0.5), (Float(options['float-y']) rescue 0.5)) if image.columns != width or image.rows != height
+				end
+
+				processing_method('fit') do |image, width, height, options|
+					image.resize_to_fit(width, height) if image.columns != width or image.rows != height
+				end
+
+				processing_method('pad') do |image, width, height, options|
+					image.resize_to_fit(width, height).replace do |resize|
+						resize.render_on_background(options['background-color'], width, height, (Float(options['float-x']) rescue 0.5), (Float(options['float-y']) rescue 0.5))
+					end if image.columns != width or image.rows != height
+				end
+
+				processing_method('limit') do |image, width, height, options|
+					image.resize_to_fit(width, height) if image.columns > width or image.rows > height
+				end
+			end
 		end
 
 		def self.setup(app)
@@ -372,23 +404,7 @@ module Plugin
 				limit_disk: app.settings[:limit_disk]
 			)
 
-			@@service.processing_method('crop') do |image, width, height, options|
-				image.resize_to_fill(width, height) if image.columns != width or image.rows != height
-			end
-
-			@@service.processing_method('fit') do |image, width, height, options|
-				image.resize_to_fit(width, height) if image.columns != width or image.rows != height
-			end
-
-			@@service.processing_method('pad') do |image, width, height, options|
-				image.resize_to_fit(width, height).replace do |resize|
-					resize.render_on_background(options['background-color'], width, height)
-				end if image.columns != width or image.rows != height
-			end
-
-			@@service.processing_method('limit') do |image, width, height, options|
-				image.resize_to_fit(width, height) if image.columns > width or image.rows > height
-			end
+			@@service.setup_default_methods
 		end
 
 		def thumbnailer
@@ -400,8 +416,16 @@ end
 class Magick::Image
 	include Plugin::Thumbnailer::ImageProcessing
 
-	def render_on_background(background_color, width = nil, height = nil)
-		Magick::Image.new(width || self.columns, height || self.rows) {
+	def render_on_background(background_color, width = nil, height = nil, float_x = 0.5, float_y = 0.5)
+		# default to image size
+		width ||= self.columns
+		height ||= self.rows
+
+		# make sure we have enough background to fit image on top of it
+		width = self.columns if width < self.columns
+		height = self.rows if height < self.rows
+
+		Magick::Image.new(width, height) {
 			begin
 				self.background_color = background_color
 			rescue ArgumentError
@@ -409,20 +433,22 @@ class Magick::Image
 			end
 			self.depth = 8
 		}.replace do |background|
-			background.composite!(self, Magick::CenterGravity, Magick::OverCompositeOp)
+			background.composite!(self, *background.float_to_offset(self.columns, self.rows, float_x, float_y), Magick::OverCompositeOp)
 		end
 	end
 
 	# non coping version
-	def resize_to_fill(ncols, nrows = nil, gravity = Magick::CenterGravity)
-		nrows ||= ncols
-		if ncols != columns or nrows != rows
-			scale = [ncols / columns.to_f, nrows / rows.to_f].max
-			resize(scale * columns + 0.5, scale * rows + 0.5).replace do |image|
-				image.crop(gravity, ncols, nrows, true) if ncols != columns or nrows != rows
-			end
-		else
-			crop(gravity, ncols, nrows, true) if ncols != columns or nrows != rows
+	def resize_to_fill(width, height = nil, float_x = 0.5, float_y = 0.5)
+		# default to square
+		height ||= width
+
+		return if width == columns and height == rows
+
+		scale = [width / columns.to_f, height / rows.to_f].max
+
+		resize((scale * columns).ceil, (scale * rows).ceil).replace do |image|
+			next if width == image.columns and height == image.rows
+			image.crop(*image.float_to_offset(width, height, float_x, float_y), width, height, true)
 		end
 	end
 
@@ -438,5 +464,21 @@ class Magick::Image
 			factor
 		end
 	end
+
+	def float_to_offset(float_width, float_height, float_x = 0.5, float_y = 0.5)
+		base_width = self.columns
+		base_height = self.rows
+
+		x = ((base_width - float_width) * float_x).ceil
+		y = ((base_height - float_height) * float_y).ceil
+
+		x = 0 if x < 0
+		x = (base_width - float_width) if x > (base_width - float_width)
+
+		y = 0 if y < 0
+		y = (base_height - float_height) if y > (base_height - float_height)
+
+		[x, y]
+	end
 end
 

data/lib/httpthumbnailer/thumbnailer.rb

@@ -1,7 +1,7 @@
 require 'httpthumbnailer/plugin/thumbnailer'
 require 'httpthumbnailer/thumbnail_specs'
 
-class Thumbnailer < Controler
+class Thumbnailer < Controller
 	self.plugin Plugin::Thumbnailer
 
 	self.define do
@@ -22,7 +22,7 @@ class Thumbnailer < Controler
 
 				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,
@@ -43,7 +43,7 @@ class Thumbnailer < Controler
 
 			thumbnailer.load(req.body, opts).use do |input_image|
 				log.info "original image loaded: #{input_image.mime_type}"
-				write_preamble 200, 
+				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

data/spec/image_processing_spec.rb

@@ -2,7 +2,7 @@ require_relative 'spec_helper'
 require 'unicorn-cuba-base'
 require 'httpthumbnailer/plugin/thumbnailer'
 
-class TestImage
+class StubImage
 	include Plugin::Thumbnailer::ImageProcessing
 
 	@@created = 0
@@ -26,7 +26,7 @@ class TestImage
 	end
 
 	def copy
-		TestImage.new
+		StubImage.new
 	end
 
 	def destroyed?
@@ -45,7 +45,7 @@ end
 
 describe 'image processing module' do
 	it '#replace will return new or original image makng sure that all other images are destroyed' do
-		image = TestImage.new.replace do |image|
+		image = StubImage.new.replace do |image|
 			image.copy.replace do |image|
 				image.final!
 			end
@@ -53,10 +53,10 @@ describe 'image processing module' do
 		image.should be_final
 		image.should_not be_destroyed
 
-		TestImage.alive.should == 1
+		StubImage.alive.should == 1
 		image.destroy!
 
-		image = TestImage.new.replace do |image|
+		image = StubImage.new.replace do |image|
 			image.copy.replace do |image|
 				image.copy.replace do |image|
 					image.copy
@@ -68,10 +68,10 @@ describe 'image processing module' do
 		image.should be_final
 		image.should_not be_destroyed
 
-		TestImage.alive.should == 1
+		StubImage.alive.should == 1
 		image.destroy!
 
-		image = TestImage.new.replace do |image|
+		image = StubImage.new.replace do |image|
 			image.copy.replace do |image|
 				image = image.copy.replace do |image|
 					image.copy
@@ -86,13 +86,13 @@ describe 'image processing module' do
 		image.should be_final
 		image.should_not be_destroyed
 
-		TestImage.alive.should == 1
+		StubImage.alive.should == 1
 		image.destroy!
 	end
 
 	it '#replace will destroy created images on exception' do
 		lambda {
-			image = TestImage.new.replace do |image|
+			image = StubImage.new.replace do |image|
 				image.copy.replace do |image|
 					image.copy.replace do |image|
 						image.copy.replace do |image|
@@ -103,10 +103,10 @@ describe 'image processing module' do
 			end
 		}.should raise_error(RuntimeError, 'test')
 
-		TestImage.alive.should == 0
+		StubImage.alive.should == 0
 
 		lambda {
-			image = TestImage.new.replace do |image|
+			image = StubImage.new.replace do |image|
 				image.copy.replace do |image|
 					image.copy.replace do |image|
 						image.copy
@@ -118,11 +118,11 @@ describe 'image processing module' do
 			end
 		}.should raise_error(RuntimeError, 'test')
 
-		TestImage.alive.should == 0
+		StubImage.alive.should == 0
 	end
 
 	it '#use should return image to be used for multiple processing and destroy it at the end' do
-		image = TestImage.new.use do |image|
+		image = StubImage.new.use do |image|
 			i1 = image.replace do |image|
 				image.copy.final!
 			end
@@ -142,7 +142,7 @@ describe 'image processing module' do
 		end
 		image.should be_destroyed
 
-		TestImage.alive.should == 0
+		StubImage.alive.should == 0
 	end
 end
 

data/spec/plugin_thumbnailer_spec.rb

@@ -0,0 +1,318 @@
+require_relative 'spec_helper'
+require 'unicorn-cuba-base'
+require 'httpthumbnailer/plugin/thumbnailer'
+require 'httpthumbnailer/thumbnail_specs'
+
+describe Plugin::Thumbnailer::Service do
+	subject do
+		service = Plugin::Thumbnailer::Service.new
+		service.setup_default_methods
+		service
+	end
+
+	def square_odd
+		subject.load(TestImage.io('square_odd.png'))
+	end
+
+	def square_even
+		subject.load(TestImage.io('square_even.png'))
+	end
+
+	before :each do
+		@before_stats = Plugin::Thumbnailer::Service.stats.to_hash
+	end
+
+	def diff_stat(name)
+		Plugin::Thumbnailer::Service.stats.to_hash[name] - @before_stats[name]
+	end
+
+	it "should load images from provided blob" do
+		image = subject.load(TestImage.io('square_odd.png'))
+		image.format.should == 'PNG'
+		image.width.should == 99
+		image.height.should == 99
+	end
+
+	describe 'encoding' do
+		describe 'interlace' do
+			it 'should fail if unknown interlace is specified' do
+				expect {
+					square_odd.thumbnail(ThumbnailSpec.from_uri('crop,99,99,jpeg,interlace:Blah')) do |thumbnail|
+					end
+				}.to raise_error RuntimeError, 'unsupported interlace: Blah'
+			end
+
+			it 'should allow to construct progressive JPEG with interlace JPEGInterlace or LineInterlace or PlaneInerlace' do
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,99,99,jpeg')) do |thumbnail|
+					image = Magick::Image.from_blob(thumbnail.data).first
+					image.columns.should == 99
+					image.rows.should == 99
+					image.interlace.to_s.should == 'NoInterlace'
+					image.destroy!
+				end
+
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,99,99,jpeg,interlace:JPEGInterlace')) do |thumbnail|
+					image = Magick::Image.from_blob(thumbnail.data).first
+					image.columns.should == 99
+					image.rows.should == 99
+					image.interlace.to_s.should == 'JPEGInterlace'
+					image.destroy!
+				end
+
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,99,99,jpeg,interlace:LineInterlace')) do |thumbnail|
+					image = Magick::Image.from_blob(thumbnail.data).first
+					image.columns.should == 99
+					image.rows.should == 99
+					image.interlace.to_s.should == 'JPEGInterlace'
+					image.destroy!
+				end
+
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,99,99,jpeg,interlace:PlaneInterlace')) do |thumbnail|
+					image = Magick::Image.from_blob(thumbnail.data).first
+					image.columns.should == 99
+					image.rows.should == 99
+					image.interlace.to_s.should == 'JPEGInterlace'
+					image.destroy!
+				end
+			end
+		end
+	end
+
+	describe 'thumbnailing' do
+		describe 'cropping' do
+			it 'should be a noop if same width and height are used as original image' do
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,99,99,png')) do |thumbnail|
+					thumbnail.width.should == 99
+					thumbnail.height.should == 99
+				end
+				diff_stat(:total_images_created_resize).should == 0
+				diff_stat(:total_images_created_crop).should == 0
+			end
+
+			it 'should be a resize operation if same proportions are used as original image' do
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,50,50,png')) do |thumbnail|
+					thumbnail.width.should == 50
+					thumbnail.height.should == 50
+				end
+				diff_stat(:total_images_created_resize).should == 1
+				diff_stat(:total_images_created_crop).should == 0
+			end
+
+			it 'should be a resize and crop operation if different proportions are used as original image' do
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,50,60,png')) do |thumbnail|
+					thumbnail.width.should == 50
+					thumbnail.height.should == 60
+				end
+				diff_stat(:total_images_created_resize).should == 1
+				diff_stat(:total_images_created_crop).should == 1
+			end
+
+			it 'should crop to even and odd proportions' do
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,33,33,png')) do |thumbnail|
+					thumbnail.width.should == 33
+					thumbnail.height.should == 33
+				end
+
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,91,91,png')) do |thumbnail|
+					thumbnail.width.should == 91
+					thumbnail.height.should == 91
+				end
+
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,33,50,png')) do |thumbnail|
+					thumbnail.width.should == 33
+					thumbnail.height.should == 50
+				end
+			end
+
+			it 'should crop with upwards scaling' do
+				square_odd.thumbnail(ThumbnailSpec.from_uri('crop,198,99,png')) do |thumbnail|
+					thumbnail.width.should == 198
+					thumbnail.height.should == 99
+					#show_blob thumbnail.data
+				end
+			end
+
+			describe 'floating' do
+				it 'should crop with floating horizontally' do
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,100,200,png')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,100,200,png,float-x:1.0')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,100,200,png,float-x:0.0')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,100,200,png,float-x:0.8')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,100,200,png,float-x:-9.8')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,100,200,png,float-x:3')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+				end
+
+				it 'should crop with floating vertically' do
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,200,100,png')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,200,100,png,float-y:1.0')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,200,100,png,float-y:0.0')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,200,100,png,float-y:0.8')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,200,100,png,float-y:-9.8')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,200,100,png,float-y:3')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+				end
+
+				it 'should crop with floating horizontally and vertically' do
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,100,200,png,float-x:0.25,float-y:0.25')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('crop,200,100,png,float-x:0.25,float-y:0.25')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+				end
+
+				it 'should pad with floating horizontaly' do
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,200,100,png')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,200,100,png,float-x:1.0')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,200,100,png,float-x:0.0')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,200,100,png,float-x:0.8')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,200,100,png,float-x:-9.8')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,200,100,png,float-x:3')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+				end
+
+				it 'should pad with floating verticaly' do
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,100,200,png')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,100,200,png,float-y:1.0')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,100,200,png,float-y:0.0')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,100,200,png,float-y:0.8')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,100,200,png,float-y:-9.8')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,100,200,png,float-y:3')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+				end
+
+				it 'should pad with floating horizontally and vertically' do
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,100,200,png,float-x:0.25,float-y:0.25')) do |thumbnail|
+						thumbnail.width.should == 100
+						thumbnail.height.should == 200
+						#show_blob thumbnail.data
+					end
+
+					square_even.thumbnail(ThumbnailSpec.from_uri('pad,200,100,png,float-x:0.25,float-y:0.25')) do |thumbnail|
+						thumbnail.width.should == 200
+						thumbnail.height.should == 100
+						#show_blob thumbnail.data
+					end
+				end
+			end
+		end
+	end
+end

data/spec/support/test_image.rb

@@ -0,0 +1,16 @@
+require 'pathname'
+
+module TestImage
+	def self.io(name)
+		File.open(Pathname.new(__FILE__).dirname + name)
+	end
+end
+
+def show_blob(blob)
+	t = Tempfile.new('blob')
+	t.write(blob)
+	t.close
+	`display '#{t.path}'`
+	#pid = Process.spawn "display '#{t.path}'"
+	#Process.detach pid
+end

data/spec/thumbnail_specs_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require_relative 'spec_helper'
 require 'httpthumbnailer/thumbnail_specs'
 
 describe ThumbnailSpecs do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpthumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-07-28 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.1.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -197,12 +197,6 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
-- .idea/encodings.xml
-- .idea/httpthumbnailer.iml
-- .idea/misc.xml
-- .idea/modules.xml
-- .idea/scopes/scope_settings.xml
-- .idea/vcs.xml
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -247,7 +241,11 @@ files:
 - load_test/v0.0.14-no-optimization.csv
 - load_test/v0.0.14.csv
 - spec/image_processing_spec.rb
+- spec/plugin_thumbnailer_spec.rb
 - spec/spec_helper.rb
+- spec/support/square_even.png
+- spec/support/square_odd.png
+- spec/support/test_image.rb
 - spec/thumbnail_specs_spec.rb
 homepage: http://github.com/jpastuszek/httpthumbnailer
 licenses:
@@ -264,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 626389733843602187
+      hash: -2315585188832359526
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -273,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: HTTP thumbnailing server

data/.idea/encodings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-

data/.idea/httpthumbnailer.iml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="gem" name="Gem">
-      <configuration>
-        <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />
-        <option name="GEM_APP_TEST_PATH" value="" />
-        <option name="GEM_APP_LIB_PATH" value="$MODULE_DIR$/lib" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="capybara (v1.1.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.3.9, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cli (v1.3.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cuba (v3.1.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cucumber (v1.3.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="daemon (v1.1.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="facter (v1.6.18, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.8.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gherkin (v2.12.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="git (v1.2.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.3.3, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jeweler (v1.8.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v1.7.7, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="kgio (v2.8.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mime-types (v1.23, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.7.3, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multipart-parser (v0.1.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.5.9, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="raindrops (v0.12.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rdoc (v3.12.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rmagick (v2.13.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.13.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.13.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.13.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.13.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-ip (v0.9.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v0.9.9, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v2.32.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicorn (v4.6.3, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicorn-cuba-base (v1.1.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="websocket (v1.0.7, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="xpath (v0.1.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
-  </component>
-</module>
-

data/.idea/misc.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.3-p429" project-jdk-type="RUBY_SDK" />
-</project>
-

data/.idea/modules.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/httpthumbnailer.iml" filepath="$PROJECT_DIR$/.idea/httpthumbnailer.iml" />
-    </modules>
-  </component>
-</project>
-

data/.idea/scopes/scope_settings.xml

@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>

data/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
-