httpimagestore 1.2.0 → 1.3.0

data/spec/configuration_path_spec.rb

@@ -2,26 +2,28 @@ require_relative 'spec_helper'
 require 'httpimagestore/configuration'
 Configuration::Scope.logger = Logger.new('/dev/null')
 
+require 'httpimagestore/configuration/handler'
 require 'httpimagestore/configuration/path'
+MemoryLimit.logger = Logger.new('/dev/null')
 
 describe Configuration do
 	describe 'path rendering' do
 		it 'should load paths form single line and multi line declarations and render spec templates' do
 			subject = Configuration.read(<<-'EOF')
 			path "uri"						"#{path}"
-			path "hash"						"#{digest}.#{extension}"
+			path "hash"						"#{input_digest}.#{extension}"
 			path {
-				"hash-name"					"#{digest}/#{imagename}.#{extension}"
-				"structured"				"#{dirname}/#{digest}/#{basename}.#{extension}"
-				"structured-name"		"#{dirname}/#{digest}/#{basename}-#{imagename}.#{extension}"
+				"hash-name"					"#{input_digest}/#{image_name}.#{extension}"
+				"structured"				"#{dirname}/#{input_digest}/#{basename}.#{extension}"
+				"structured-name"		"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{extension}"
 			}
 			EOF
 
 			subject.paths['uri'].render(path: 'test/abc.jpg').should == 'test/abc.jpg'
-			subject.paths['hash'].render(path: 'test/abc.jpg', _body: 'hello').should == '2cf24dba5fb0a30e.jpg'
-			subject.paths['hash-name'].render(path: 'test/abc.jpg', _body: 'hello', imagename: 'xbrna').should == '2cf24dba5fb0a30e/xbrna.jpg'
-			subject.paths['structured'].render(path: 'test/abc.jpg', _body: 'hello').should == 'test/2cf24dba5fb0a30e/abc.jpg'
-			subject.paths['structured-name'].render(path: 'test/abc.jpg', _body: 'hello', imagename: 'xbrna').should == 'test/2cf24dba5fb0a30e/abc-xbrna.jpg'
+			subject.paths['hash'].render(input_digest: '2cf24dba5fb0a30e', extension: 'jpg').should == '2cf24dba5fb0a30e.jpg'
+			subject.paths['hash-name'].render(input_digest: '2cf24dba5fb0a30e', image_name: 'xbrna', extension: 'jpg').should == '2cf24dba5fb0a30e/xbrna.jpg'
+			subject.paths['structured'].render(dirname: 'test', input_digest: '2cf24dba5fb0a30e', basename: 'abc', extension: 'jpg').should == 'test/2cf24dba5fb0a30e/abc.jpg'
+			subject.paths['structured-name'].render(dirname: 'test', input_digest: '2cf24dba5fb0a30e', basename: 'abc', extension: 'jpg', image_name: 'xbrna').should == 'test/2cf24dba5fb0a30e/abc-xbrna.jpg'
 		end
 
 		describe 'error handling' do
@@ -62,29 +64,74 @@ describe Configuration do
 					subject.paths['test'].render
 				}.to raise_error Configuration::NoValueForPathTemplatePlaceholerError, %q{cannot generate path 'test' from template '#{abc}#{xyz}': no value for '#{abc}'} 
 			end
+		end
 
-			it 'should raise NoValueForPathTemplatePlaceholerError if path value is not found' do
-				subject = Configuration.read(<<-'EOF')
+		describe 'rendering from RequestState' do
+			let :state do
+				Configuration::RequestState.new(
+					'test',
+					{operation: 'pad'},
+					'test/abc.jpg',
+					{width: '123', height: '321'}
+				)
+			end
+
+			subject do
+				Configuration.read(<<-'EOF')
+				path "uri"						"#{path}"
+				path "hash"						"#{input_digest}.#{extension}"
 				path {
-					"test"								"#{dirname}#{basename}"
+					"hash-name"					"#{input_digest}/#{image_name}.#{extension}"
+					"structured"				"#{dirname}/#{input_digest}/#{basename}.#{extension}"
+					"structured-name"		"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{extension}"
 				}
+				path "name"						"#{image_name}"
+				path "base"						"#{basename}"
 				EOF
+			end
 
-				expect {
-					subject.paths['test'].render
-				}.to raise_error Configuration::NoMetaValueForPathTemplatePlaceholerError, %q{cannot generate path 'test' from template '#{dirname}#{basename}': need 'path' to generate value for '#{dirname}'}
+			it 'should render path using meta variables and locals' do
+
+				subject.paths['uri'].render(state).should == 'test/abc.jpg'
+				subject.paths['hash'].render(state).should == '9f86d081884c7d65.jpg'
+				subject.paths['hash-name'].render(state.with_locals(image_name: 'xbrna')).should == '9f86d081884c7d65/xbrna.jpg'
+				subject.paths['structured'].render(state).should == 'test/9f86d081884c7d65/abc.jpg'
+				subject.paths['structured-name'].render(state.with_locals(image_name: 'xbrna')).should == 'test/9f86d081884c7d65/abc-xbrna.jpg'
 			end
 
-			it 'should raise NoValueForPathTemplatePlaceholerError if body value is not found' do
-				subject = Configuration.read(<<-'EOF')
-				path {
-					"test"								"#{digest}"
-				}
-				EOF
+			describe 'error handling' do
+				let :state do
+					Configuration::RequestState.new(
+						'',
+						{operation: 'pad'},
+						'test/abc.jpg',
+						{width: '123', height: '321'}
+					)
+				end
 
-				expect {
-					subject.paths['test'].render(path: '')
-				}.to raise_error Configuration::NoMetaValueForPathTemplatePlaceholerError, %q{cannot generate path 'test' from template '#{digest}': need 'body' to generate value for '#{digest}'}
+				it 'should raise PathRenderingError if body was expected but not provided' do
+					expect {
+						subject.paths['hash'].render(state)
+					}.to raise_error Configuration::PathRenderingError, %q{cannot generate path 'hash' from template '#{input_digest}.#{extension}': need not empty request body to generate value for 'input_digest'}
+				end
+
+				it 'should raise PathRenderingError if variable not defined' do
+					expect {
+						subject.paths['name'].render(state)
+					}.to raise_error Configuration::PathRenderingError, %q{cannot generate path 'name' from template '#{image_name}': variable 'image_name' not defined}
+				end
+
+				it 'should raise PathRenderingError if meta variable dependent variable not defined' do
+					state = Configuration::RequestState.new(
+						'',
+						{operation: 'pad'},
+						nil,
+						{width: '123', height: '321'}
+					)
+					expect {
+						subject.paths['base'].render(state)
+					}.to raise_error Configuration::PathRenderingError, %q{cannot generate path 'base' from template '#{basename}': need 'path' variable to generate value for 'basename'}
+				end
 			end
 		end
 	end

data/spec/configuration_s3_spec.rb

@@ -66,6 +66,39 @@ else
 			end
 		end
 
+		describe Configuration::S3SourceStoreBase::CacheRoot do
+			subject do
+				Configuration::S3SourceStoreBase::CacheRoot.new('/tmp')
+			end
+
+			before do
+				@cached_object = Pathname.new('/tmp/0d/bf/50c256d6b6efe55d11d0b6b50600')
+				@cached_object.dirname.mkpath
+				@cached_object.open('w') do |io|
+					io.write 'abc'
+				end
+
+				test2 = Pathname.new('/tmp/46/b9/7a454d831d7570abbb833330d9fb')
+				test2.unlink if test2.exist?
+			end
+
+			it 'should build cache file location for storage location from bucket and key' do
+				subject.cache_file('mybucket', 'hello/world.jpg').should == "0d/bf/50c256d6b6efe55d11d0b6b50600"
+			end
+
+			it 'should look up object stored on disk by bucket and key' do
+				subject.open('mybucket', 'hello/world.jpg') do |io|
+					io.read.should == 'abc'
+				end
+			end
+
+			it 'should create cache object for bucket and key if it does not exist' do
+				subject.open('mybucket', 'hello/world2.jpg') do |io|
+					io.read.should == ''
+				end
+			end
+		end
+
 		describe Configuration::S3Source do
 			let :state do
 				Configuration::RequestState.new('abc', {test_image: 'test.jpg'})
@@ -91,20 +124,20 @@ else
 			end
 
 			it 'should source image from S3 using path spec' do
-				subject.handlers[0].image_sources[0].should be_a Configuration::S3Source
-				subject.handlers[0].image_sources[0].realize(state)
+				subject.handlers[0].sources[0].should be_a Configuration::S3Source
+				subject.handlers[0].sources[0].realize(state)
 
 				state.images['original'].data.should == @test_data
 			end
 
 			it 'should use S3 object content type for mime type' do
-				subject.handlers[0].image_sources[0].realize(state)
+				subject.handlers[0].sources[0].realize(state)
 
 				state.images['original'].mime_type.should == 'image/jpeg'
 			end
 
 			it 'should provide source path and HTTPS url' do
-				subject.handlers[0].image_sources[0].realize(state)
+				subject.handlers[0].sources[0].realize(state)
 
 				state.images['original'].source_path.should == "test.jpg"
 				state.images['original'].source_url.should start_with "https://"
@@ -126,7 +159,7 @@ else
 				end
 
 				it 'should still provide valid HTTPS URL incliding prefix' do
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].realize(state)
 
 					state.images['original'].source_url.should start_with "https://"
 					state.images['original'].source_url.should include ENV['AWS_S3_TEST_BUCKET']
@@ -136,12 +169,138 @@ else
 				end
 
 				it 'should provide source path without prefix' do
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].realize(state)
 
 					state.images['original'].source_path.should == "test.jpg"
 				end
 			end
 
+			describe 'object cache' do
+				let :state do
+					Configuration::RequestState.new('abc', {test_image: 'test/ghost.jpg'})
+				end
+
+				subject do
+					Configuration.read(<<-EOF)
+					s3 key="#{ENV['AWS_ACCESS_KEY_ID']}" secret="#{ENV['AWS_SECRET_ACCESS_KEY']}"
+					path "hash" "\#{test_image}"
+					get {
+						source_s3 "original" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="hash" cache-root="/tmp"
+						source_s3 "original_cached" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="hash" cache-root="/tmp"
+						source_s3 "original_cached_public" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="hash" cache-root="/tmp" public="true"
+						source_s3 "original_cached_public2" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="hash" cache-root="/tmp" public="true"
+					}
+					EOF
+				end
+
+				before do
+					@cached_object = Pathname.new('/tmp/ce/26/b196585e28aa99f55b1260b629e2')
+					@cached_object.dirname.mkpath
+					@cached_object.open('w') do |io|
+						header = MessagePack.pack(
+							'private_url' => 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg?' + ENV['AWS_ACCESS_KEY_ID'],
+							'public_url' => 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg',
+							'content_type' => 'image/jpeg'
+						)
+						io.write [header.length].pack('L') # header length
+						io.write header
+						io.write 'abc'
+					end
+				end
+
+				it 'should use cache when configured' do
+					subject.handlers[0].sources[0].should be_a Configuration::S3Source
+					subject.handlers[0].sources[0].realize(state)
+
+					state.images['original'].data.should == 'abc'
+				end
+
+				it 'should keep mime type' do
+					subject.handlers[0].sources[0].realize(state)
+
+					state.images['original'].mime_type.should == 'image/jpeg'
+				end
+
+				it 'should keep private source URL' do
+					subject.handlers[0].sources[0].realize(state)
+
+					state.images['original'].source_url.should == 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg?' + ENV['AWS_ACCESS_KEY_ID']
+				end
+
+				it 'should keep public source URL' do
+					subject = Configuration.read(<<-EOF)
+					s3 key="#{ENV['AWS_ACCESS_KEY_ID']}" secret="#{ENV['AWS_SECRET_ACCESS_KEY']}"
+					path "hash" "\#{test_image}"
+					get {
+						source_s3 "original" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="hash" cache-root="/tmp" public=true
+					}
+					EOF
+					subject.handlers[0].sources[0].realize(state)
+
+					state.images['original'].source_url.should == 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg'
+				end
+
+				it 'shluld use object stored in S3 when not found in the cache' do
+					cache_file = Pathname.new('/tmp/af/a3/5eaf0a614693e2d1ed455ac1cedb')
+					cache_file.unlink if cache_file.exist?
+
+					state = Configuration::RequestState.new('abc', {test_image: 'test.jpg'})
+					subject.handlers[0].sources[0].realize(state)
+
+					cache_file.should exist
+				end
+
+				it 'should use cached object writen when it was initialy read' do
+					cache_file = Pathname.new('/tmp/af/a3/5eaf0a614693e2d1ed455ac1cedb')
+					cache_file.unlink if cache_file.exist?
+
+					state = Configuration::RequestState.new('abc', {test_image: 'test.jpg'})
+					subject.handlers[0].sources[0].realize(state)
+
+					cache_file.should exist
+
+					subject.handlers[0].sources[1].realize(state)
+
+					state.images['original'].data.should == @test_data
+					state.images['original'].mime_type.should == 'image/jpeg'
+
+					state.images['original_cached'].data.should == @test_data
+					state.images['original_cached'].mime_type.should == 'image/jpeg'
+				end
+
+				it 'should use update cached object when new properties are read from S3' do
+					cache_file = Pathname.new('/tmp/af/a3/5eaf0a614693e2d1ed455ac1cedb')
+					cache_file.unlink if cache_file.exist?
+
+					state = Configuration::RequestState.new('abc', {test_image: 'test.jpg'})
+
+					## cache with private URL
+					subject.handlers[0].sources[0].realize(state)
+
+					cache_file.should exist
+					sum = Digest::SHA2.new.update(cache_file.read).to_s
+
+					## read from cache with private URL
+					subject.handlers[0].sources[1].realize(state)
+
+					# no change
+					Digest::SHA2.new.update(cache_file.read).to_s.should == sum
+
+					## read from cache; add public URL
+					subject.handlers[0].sources[2].realize(state)
+
+					# should get updated
+					Digest::SHA2.new.update(cache_file.read).to_s.should_not == sum
+					
+					sum = Digest::SHA2.new.update(cache_file.read).to_s
+					## read from cahce
+					subject.handlers[0].sources[3].realize(state)
+
+					# no change
+					Digest::SHA2.new.update(cache_file.read).to_s.should == sum
+				end
+			end
+
 			describe 'non encrypted connection mode' do
 				subject do
 					Configuration.read(<<-EOF)
@@ -154,14 +313,14 @@ else
 				end
 
 				it 'should source image from S3 using path spec' do
-					subject.handlers[0].image_sources[0].should be_a Configuration::S3Source
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].should be_a Configuration::S3Source
+					subject.handlers[0].sources[0].realize(state)
 
 					state.images['original'].data.should == @test_data
 				end
 
 				it 'should provide source HTTP url' do
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].realize(state)
 					state.images['original'].source_url.should start_with "http://"
 					state.images['original'].source_url.should include ENV['AWS_S3_TEST_BUCKET']
 					state.images['original'].source_url.should include "/test.jpg"
@@ -181,23 +340,23 @@ else
 				subject do
 					Configuration.read(<<-EOF)
 					s3 key="#{ENV['AWS_ACCESS_KEY_ID']}" secret="#{ENV['AWS_SECRET_ACCESS_KEY']}" ssl=false
-					path "imagename" "\#{imagename}.jpg"
+					path "image_name" "\#{image_name}.jpg"
 					path "bucket" "\#{bucket}.jpg"
 					get {
-						source_s3 "test-image-name" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="imagename"
+						source_s3 "test-image-name" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="image_name"
 						source_s3 "bucket" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="bucket"
 					}
 					EOF
 				end
 
-				it 'should provide image name to be used as #{imagename}' do
-					subject.handlers[0].image_sources[0].realize(state)
+				it 'should provide image name to be used as #{image_name}' do
+					subject.handlers[0].sources[0].realize(state)
 					state.images['test-image-name'].source_path.should == 'test-image-name.jpg'
 					state.images['test-image-name'].data.should == 'hello world'
 				end
 
 				it 'should provide bucket to be used as #{bucket}' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].sources[1].realize(state)
 					state.images['bucket'].source_path.should == "#{ENV['AWS_S3_TEST_BUCKET']}.jpg"
 					state.images['bucket'].data.should == 'hello bucket'
 				end
@@ -242,7 +401,7 @@ else
 					}
 					EOF
 					expect {
-						subject.handlers[0].image_sources[0].realize(state)
+						subject.handlers[0].sources[0].realize(state)
 					}.to raise_error Configuration::S3NotConfiguredError, 'S3 client not configured'
 				end
 
@@ -255,7 +414,7 @@ else
 					}
 					EOF
 					expect {
-						subject.handlers[0].image_sources[0].realize(state)
+						subject.handlers[0].sources[0].realize(state)
 					}.to raise_error Configuration::S3NoSuchBucketError, %{S3 bucket '#{ENV['AWS_S3_TEST_BUCKET']}X' does not exist}
 				end
 
@@ -268,7 +427,7 @@ else
 					}
 					EOF
 					expect {
-						subject.handlers[0].image_sources[0].realize(state)
+						subject.handlers[0].sources[0].realize(state)
 					}.to raise_error Configuration::S3NoSuchKeyError, %{S3 bucket '#{ENV['AWS_S3_TEST_BUCKET']}' does not contain key 'blah'}
 				end
 
@@ -281,7 +440,7 @@ else
 					}
 					EOF
 					expect {
-						subject.handlers[0].image_sources[0].realize(state)
+						subject.handlers[0].sources[0].realize(state)
 					}.to raise_error Configuration::S3AccessDenied, %{access to S3 bucket 'blah' or key 'test.jpg' was denied}
 				end
 			end
@@ -293,7 +452,7 @@ else
 
 				it 'should raise MemoryLimit::MemoryLimitedExceededError when sourcing bigger image than limit' do
 					expect {
-						subject.handlers[0].image_sources[0].realize(state)
+						subject.handlers[0].sources[0].realize(state)
 					}.to raise_error MemoryLimit::MemoryLimitedExceededError
 				end
 			end
@@ -326,7 +485,7 @@ else
 			end
 
 			before :each do
-				subject.handlers[0].image_sources[0].realize(state)
+				subject.handlers[0].sources[0].realize(state)
 			end
 
 			it 'should source image from S3 using path spec' do
@@ -518,18 +677,18 @@ else
 				subject do
 					Configuration.read(<<-EOF)
 					s3 key="#{ENV['AWS_ACCESS_KEY_ID']}" secret="#{ENV['AWS_SECRET_ACCESS_KEY']}" ssl=false
-					path "imagename" "\#{imagename}"
+					path "image_name" "\#{image_name}"
 					path "bucket" "\#{bucket}"
-					path "mimeextension" "\#{mimeextension}"
+					path "image_mime_extension" "\#{image_mime_extension}"
 					post {
-						store_s3 "input" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="imagename"
+						store_s3 "input" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="image_name"
 						store_s3 "input" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="bucket"
-						store_s3 "input" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="mimeextension"
+						store_s3 "input" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="image_mime_extension"
 					}
 					EOF
 				end
 
-				it 'should provide image name to be used as #{imagename}' do
+				it 'should provide image name to be used as #{image_name}' do
 					subject.handlers[0].stores[0].realize(state)
 
 					state.images['input'].store_path.should == 'input'
@@ -541,17 +700,17 @@ else
 					state.images['input'].store_path.should == ENV['AWS_S3_TEST_BUCKET']
 				end
 
-				it 'should provide image mime type based file extension to be used as #{mimeextension}' do
+				it 'should provide image mime type based file extension to be used as #{image_mime_extension}' do
 					state.images['input'].mime_type = 'image/jpeg'
 					subject.handlers[0].stores[2].realize(state)
 
 					state.images['input'].store_path.should == 'jpg'
 				end
 
-				it 'should raise NoValueForPathTemplatePlaceholerError if there is on mime type for image defined and path contains #{mimeextension}' do
+				it 'should raise PathRenderingError if there is on mime type for image defined and path contains #{image_mime_extension}' do
 					expect {
 						subject.handlers[0].stores[2].realize(state)
-					}.to raise_error Configuration::NoValueForPathTemplatePlaceholerError, %q{cannot generate path 'mimeextension' from template '#{mimeextension}': no value for '#{mimeextension}'}
+					}.to raise_error Configuration::PathRenderingError, %q{cannot generate path 'image_mime_extension' from template '#{image_mime_extension}': image 'input' does not have data for variable 'image_mime_extension'}
 				end
 			end
 

data/spec/configuration_thumbnailer_spec.rb

@@ -146,7 +146,7 @@ describe Configuration do
 			end
 
 			before :each do
-				subject.handlers[0].image_sources[0].realize(state)
+				subject.handlers[0].sources[0].realize(state)
 			end
 
 			describe 'thumbnailing to single spec' do
@@ -164,23 +164,23 @@ describe Configuration do
 				end
 
 				it 'should provide thumbnail data' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].processors[0].realize(state)
 					state.images['original'].data.should_not be_nil
 				end
 
 				it 'should set thumbnail mime type' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].processors[0].realize(state)
 					state.images['original'].mime_type.should == 'image/jpeg'
 				end
 
 				it 'should use input image source path and url' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].processors[0].realize(state)
 					state.images['original'].source_path.should == 'test.in'
 					state.images['original'].source_url.should == 'file://test.in'
 				end
 
 				it 'should set input image mime type' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].processors[0].realize(state)
 					state.images['input'].mime_type.should == 'image/jpeg'
 				end
 
@@ -202,7 +202,7 @@ describe Configuration do
 
 					it 'should raise MemoryLimit::MemoryLimitedExceededError when limit is exceeded' do
 						expect {
-							subject.handlers[0].image_sources[1].realize(state)
+							subject.handlers[0].processors[0].realize(state)
 						}.to raise_error MemoryLimit::MemoryLimitedExceededError
 					end
 				end
@@ -220,8 +220,8 @@ describe Configuration do
 						)
 
 						expect {
-							subject.handlers[0].image_sources[0].realize(state)
-							subject.handlers[0].image_sources[1].realize(state)
+							subject.handlers[0].sources[0].realize(state)
+							subject.handlers[0].processors[0].realize(state)
 							}.to raise_error Configuration::Thumbnail::ThumbnailingError # WTF?, "thumbnailing of 'input' into 'original' failed: at least one image dimension is zero: 0x10"
 					end
 
@@ -266,26 +266,26 @@ describe Configuration do
 				end
 
 				it 'should provide thumbnail data' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].processors[0].realize(state)
 					state.images['original'].data.should_not be_nil
 					state.images['small'].data.should_not be_nil
 					state.images['padded'].data.should_not be_nil
 				end
 
 				it 'should set thumbnail mime type' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].processors[0].realize(state)
 					state.images['original'].mime_type.should == 'image/jpeg'
 					state.images['small'].mime_type.should == 'image/jpeg'
 					state.images['padded'].mime_type.should == 'image/png'
 				end
 
 				it 'should set input image mime type' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].processors[0].realize(state)
 					state.images['input'].mime_type.should == 'image/jpeg'
 				end
 
 				it 'should use input image source path and url' do
-					subject.handlers[0].image_sources[1].realize(state)
+					subject.handlers[0].processors[0].realize(state)
 					state.images['original'].source_path.should == 'test.in'
 					state.images['original'].source_url.should == 'file://test.in'
 					state.images['small'].source_path.should == 'test.in'
@@ -312,7 +312,7 @@ describe Configuration do
 
 					it 'should raise MemoryLimit::MemoryLimitedExceededError when limit is exceeded' do
 						expect {
-							subject.handlers[0].image_sources[1].realize(state)
+							subject.handlers[0].processors[0].realize(state)
 						}.to raise_error MemoryLimit::MemoryLimitedExceededError
 					end
 				end
@@ -344,7 +344,7 @@ describe Configuration do
 					end
 
 					it 'should provide thumbnails that name match if-image-name-on list' do
-						subject.handlers[0].image_sources[1].realize(state)
+						subject.handlers[0].processors[0].realize(state)
 						state.images.should_not include 'original'
 						state.images['small'].data.should_not be_nil
 						state.images['padded'].data.should_not be_nil
@@ -363,10 +363,10 @@ describe Configuration do
 							}
 						)
 
-						subject.handlers[0].image_sources[0].realize(state)
+						subject.handlers[0].sources[0].realize(state)
 
 						expect {
-							subject.handlers[0].image_sources[1].realize(state)
+							subject.handlers[0].processors[0].realize(state)
 						}.to raise_error Configuration::Thumbnail::ThumbnailingError, "thumbnailing of 'input' into 'original' failed: at least one image dimension is zero: 0x10"
 					end
 
@@ -416,12 +416,12 @@ describe Configuration do
 			end
 
 			it 'should mark source to be included when output image name in oneline and destination image name in multiline statement match if-image-name-on list' do
-				subject.handlers[0].image_sources[1].excluded?(state).should be_false
-				subject.handlers[0].image_sources[2].excluded?(state).should be_true
-				subject.handlers[0].image_sources[3].excluded?(state).should be_true
-				subject.handlers[0].image_sources[4].excluded?(state).should be_false
-				subject.handlers[0].image_sources[5].excluded?(state).should be_true
-				subject.handlers[0].image_sources[6].excluded?(state).should be_false
+				subject.handlers[0].processors[0].excluded?(state).should be_false
+				subject.handlers[0].processors[1].excluded?(state).should be_true
+				subject.handlers[0].processors[2].excluded?(state).should be_true
+				subject.handlers[0].processors[3].excluded?(state).should be_false
+				subject.handlers[0].processors[4].excluded?(state).should be_true
+				subject.handlers[0].processors[5].excluded?(state).should be_false
 			end
 		end
 	end

data/spec/spec_helper.rb

@@ -28,21 +28,28 @@ def headers(url)
 	HTTPClient.new.get(url).headers
 end
 
+@@running_cmd = {}
 def start_server(cmd, pid_file, log_file, test_url)
+	if @@running_cmd[pid_file]
+		return if @@running_cmd[pid_file] == cmd
+		stop_server(pid_file) 
+	end
+
 	fork do
 		Daemon.daemonize(pid_file, log_file)
 		log_file = Pathname.new(log_file)
 		log_file.truncate(0) if log_file.exist?
 		exec(cmd)
 	end
-	return unless Process.wait2.last.exitstatus == 0
+
+	@@running_cmd[pid_file] = cmd
 
 	ppid = Process.pid
 	at_exit do
 		stop_server(pid_file) if Process.pid == ppid
 	end
 
-	Timeout.timeout(6) do
+	Timeout.timeout(10) do
 		begin
 			get test_url
 		rescue Errno::ECONNREFUSED
@@ -56,6 +63,7 @@ def stop_server(pid_file)
 	pid_file = Pathname.new(pid_file)
 	return unless pid_file.exist?
 
+	STDERR.puts http_client.get_content("http://localhost:3000/stats") if pid_file.to_s.include? 'httpimagestore'
 	pid = pid_file.read.strip.to_i
 
 	Timeout.timeout(20) do
@@ -65,6 +73,7 @@ def stop_server(pid_file)
 				sleep 0.1
 			end
 		rescue Errno::ESRCH
+			@@running_cmd.delete pid_file.to_s
 			pid_file.unlink
 		end
 	end