httpimagestore 1.2.0 → 1.3.0

data/lib/httpimagestore/configuration/thumbnailer.rb

@@ -1,4 +1,3 @@
-require 'unicorn-cuba-base'
 require 'httpthumbnailer-client'
 require 'httpimagestore/ruby_string_template'
 require 'httpimagestore/configuration/handler'
@@ -126,7 +125,7 @@ module Configuration
 					operation || 'fit',
 					width || 'input',
 					height || 'input',
-					format || 'jpeg',
+					format || 'input',
 					remaining || {},
 					matcher
 				)
@@ -134,7 +133,7 @@ module Configuration
 
 			matcher = InclusionMatcher.new(source_image_name, node.grab_attributes('if-image-name-on').first) if use_multipart_api
 
-			configuration.image_sources << self.new(
+			configuration.processors << self.new(
 				configuration.global, 
 				source_image_name, 
 				specs, 
@@ -158,12 +157,14 @@ module Configuration
 			@specs.select do |spec|
 				spec.included?(request_state)
 			end.each do |spec|
-				rendered_specs.merge! spec.render(request_state.locals)
+				rendered_specs.merge! spec.render(request_state)
 			end
 			source_image = request_state.images[@source_image_name]
 
 			thumbnails = {}
 			input_mime_type = nil
+			input_width = nil
+			input_height = nil
 
 			Thumbnail.stats.incr_total_thumbnail_requests
 			Thumbnail.stats.incr_total_thumbnail_requests_bytes source_image.data.bytesize
@@ -192,6 +193,8 @@ module Configuration
 				end
 
 				input_mime_type = thumbnails.input_mime_type
+				input_width = thumbnails.input_width
+				input_height = thumbnails.input_height
 
 				# check each thumbnail for errors
 				thumbnails = Hash[rendered_specs.keys.zip(thumbnails)]
@@ -205,7 +208,7 @@ module Configuration
 
 				# borrow from memory limit - note that we might have already used too much memory
 				thumbnails.each do |name, thumbnail|
-					request_state.memory_limit.borrow thumbnail.data.bytesize
+					request_state.memory_limit.borrow(thumbnail.data.bytesize, "thumbnail '#{name}'")
 				end
 			else
 				name, rendered_spec = *rendered_specs.first
@@ -213,8 +216,12 @@ module Configuration
 
 				begin
 					thumbnail = client.thumbnail(source_image.data, *rendered_spec)
-					request_state.memory_limit.borrow thumbnail.data.bytesize
+					request_state.memory_limit.borrow(thumbnail.data.bytesize, "thumbnail '#{name}'")
+
 					input_mime_type = thumbnail.input_mime_type
+					input_width = thumbnail.input_width
+					input_height = thumbnail.input_height
+
 					thumbnails[name] = thumbnail
 				rescue HTTPThumbnailerClient::HTTPThumbnailerClientError => error
 					log.warn 'got thumbnailer error', error
@@ -232,8 +239,10 @@ module Configuration
 				Thumbnail.stats.incr_total_thumbnail_thumbnails_bytes thumbnail.data.bytesize
 			end
 
-			# update input image mime type from httpthumbnailer provided information
-			source_image.mime_type = input_mime_type unless source_image.mime_type
+			# use httpthumbnailer provided information on input image mime type and size
+			source_image.mime_type = input_mime_type if input_mime_type
+			source_image.width = input_width if input_width
+			source_image.height = input_height if input_height
 
 			request_state.images.merge! thumbnails
 		end

data/lib/httpimagestore/error_reporter.rb

@@ -1,7 +1,6 @@
 class ErrorReporter < Controler
 	self.define do
 		on error(
-			Rack::UnhandledRequest::UnhandledRequestError,
 			Configuration::S3NoSuchKeyError,
 			Configuration::NoSuchFileError
 		)	do |error|
@@ -21,16 +20,7 @@ class ErrorReporter < Controler
 			write_error 400, error
 		end
 
-		on error StandardError do |error|
-			log.error "unhandled error while processing request: #{env['REQUEST_METHOD']} #{env['SCRIPT_NAME']}[#{env["PATH_INFO"]}]", error
-			log.debug {
-				out = StringIO.new
-				PP::pp(env, out, 200)
-				"Request: \n" + out.string
-			}
-
-			write_error 500, error
-		end
+		run DefaultErrorReporter
 	end
 end
 

data/load_test/load_test.jmx

@@ -42,7 +42,7 @@
         <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
       </ConfigTestElement>
       <hashTree/>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Compatibility API" enabled="true">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Compatibility API" enabled="false">
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
@@ -78,7 +78,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/thumbnail/original,search,search_thumb,brochure,brochure_thumb,admin,dmin_thumb,treatment_thumb,staff_member_thumb,consultation,clinic_google_map_thumb</stringProp>
+          <stringProp name="HTTPSampler.path">/thumbnail/original,search,search_thumb,brochure,brochure_thumb,admin,dmin_thumb,treatment_thumb,staff_member_thumb,consultation,clinic_google_map_thumb/randwick.jpg</stringProp>
           <stringProp name="HTTPSampler.method">PUT</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -108,7 +108,7 @@
           <hashTree/>
         </hashTree>
       </hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="API v1" enabled="false">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Flexi API" enabled="true">
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
@@ -144,8 +144,8 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/v1/original</stringProp>
-          <stringProp name="HTTPSampler.method">PUT</stringProp>
+          <stringProp name="HTTPSampler.path">/iss/v2/pictures</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
@@ -172,9 +172,9 @@
             <stringProp name="RegexExtractor.match_number">1</stringProp>
           </RegexExtractor>
           <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="contains path" enabled="true">
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="contains .jpg file path" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="1768443330">dev/httpimagestore/v1</stringProp>
+              <stringProp name="1475827">.jpg</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
@@ -195,7 +195,7 @@
             <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="thumbnail specs" enabled="true">
               <stringProp name="filename">thumbnail_specs.csv</stringProp>
               <stringProp name="fileEncoding"></stringProp>
-              <stringProp name="variableNames">method,width,height,options</stringProp>
+              <stringProp name="variableNames">type,method,width,height,options</stringProp>
               <stringProp name="delimiter">,</stringProp>
               <boolProp name="quotedData">true</boolProp>
               <boolProp name="recycle">true</boolProp>
@@ -213,7 +213,7 @@
               <stringProp name="HTTPSampler.response_timeout"></stringProp>
               <stringProp name="HTTPSampler.protocol"></stringProp>
               <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-              <stringProp name="HTTPSampler.path">/v1/thumbnail/${__BeanShell(vars.get(&quot;store_path&quot;).replace(&quot;/&quot;\, &quot;%2f&quot;))}/${method}/${width}/${height}/${options}</stringProp>
+              <stringProp name="HTTPSampler.path">/iss/v2/pictures/${__BeanShell(vars.get(&quot;store_path&quot;).replace(&quot;/:&quot;\, &quot;%2f&quot;))}?type=${type}</stringProp>
               <stringProp name="HTTPSampler.method">GET</stringProp>
               <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
               <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -238,13 +238,13 @@
         <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="false">
           <boolProp name="displayJMeterProperties">false</boolProp>
           <boolProp name="displayJMeterVariables">true</boolProp>
-          <boolProp name="displaySamplerProperties">false</boolProp>
+          <boolProp name="displaySamplerProperties">true</boolProp>
           <boolProp name="displaySystemProperties">false</boolProp>
         </DebugPostProcessor>
         <hashTree/>
       </hashTree>
       <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
-        <boolProp name="ResultCollector.error_logging">true</boolProp>
+        <boolProp name="ResultCollector.error_logging">false</boolProp>
         <objProp>
           <name>saveConfig</name>
           <value class="SampleSaveConfiguration">

data/load_test/thumbnail_specs.csv

@@ -1,11 +1,11 @@
-"crop","input","input","background-color:0xF0F0F0"
-"pad","162","162","background-color:0xF0F0F0"
-"pad","28","28","background-color:0xF0F0F0"
-"pad","264","264","background-color:0xF0F0F0"
-"pad","40","40","background-color:0xF0F0F0"
-"pad","160","160","background-color:0xF0F0F0"
-"pad","65","65","background-color:0xF0F0F0"
-"pad","80","60","background-color:0xF0F0F0"
-"pad","50","50","background-color:0xF0F0F0"
-"pad","126","126","background-color:0xF0F0F0"
-"pad","74","74","background-color:0xF0F0F0"
+"original","crop","input","input","background-color:0xF0F0F0"
+"search","pad","162","162","background-color:0xF0F0F0"
+"search_thumb","pad","28","28","background-color:0xF0F0F0"
+"brochure","pad","264","264","background-color:0xF0F0F0"
+"brochure_thumb","pad","40","40","background-color:0xF0F0F0"
+"admin","pad","160","160","background-color:0xF0F0F0"
+"admin_thumb","pad","65","65","background-color:0xF0F0F0"
+"treatment_thumb","pad","80","60","background-color:0xF0F0F0"
+"staff_member_thumb","pad","50","50","background-color:0xF0F0F0"
+"consultation","pad","126","126","background-color:0xF0F0F0"
+"clinic_google_map_thumb","pad","74","74","background-color:0xF0F0F0"

data/spec/configuration_file_spec.rb

@@ -36,21 +36,21 @@ describe Configuration do
 		end
 
 		it 'should source image from file using path spec' do
-			subject.handlers[0].image_sources[0].should be_a Configuration::FileSource
-			subject.handlers[0].image_sources[0].realize(state)
+			subject.handlers[0].sources[0].should be_a Configuration::FileSource
+			subject.handlers[0].sources[0].realize(state)
 
 			state.images["original"].should_not be_nil
 			state.images["original"].data.should == 'abc'
 		end
 
 		it 'should have nil mime type' do
-			subject.handlers[0].image_sources[0].realize(state)
+			subject.handlers[0].sources[0].realize(state)
 
 			state.images["original"].mime_type.should be_nil
 		end
 
 		it 'should have source path and url' do
-			subject.handlers[0].image_sources[0].realize(state)
+			subject.handlers[0].sources[0].realize(state)
 
 			state.images['original'].source_path.should == "test.in"
 			state.images['original'].source_url.should == "file://test.in"
@@ -65,16 +65,16 @@ describe Configuration do
 			
 			subject do
 				Configuration.read(<<-EOF)
-				path "imagename" "\#{imagename}.jpg"
+				path "image_name" "\#{image_name}.jpg"
 
 				get "small" {
-					source_file "test-image-name" root="/tmp" path="imagename"
+					source_file "test-image-name" root="/tmp" path="image_name"
 				}
 				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
@@ -93,7 +93,7 @@ describe Configuration do
 				EOF
 
 				expect {
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].realize(state)
 				}.to raise_error Configuration::FileStorageOutsideOfRootDirError, %{error while processing image 'original': file storage path '../test.in' outside of root direcotry}
 			end
 
@@ -109,7 +109,7 @@ describe Configuration do
 				EOF
 
 				expect {
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].realize(state)
 				}.to raise_error Configuration::NoSuchFileError, %{error while processing image 'original': file 'blah' not found}
 			end
 
@@ -151,7 +151,7 @@ describe Configuration do
 
 			it 'should rais MemoryLimit::MemoryLimitedExceededError error if limit exceeded runing file sourcing' do
 				expect {
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].realize(state)
 				}.to raise_error MemoryLimit::MemoryLimitedExceededError, 'memory limit exceeded'
 			end
 		end
@@ -176,7 +176,7 @@ describe Configuration do
 
 		before :each do
 			out_file.unlink if out_file.exist?
-			subject.handlers[0].image_sources[0].realize(state)
+			subject.handlers[0].sources[0].realize(state)
 		end
 
 		after :each do
@@ -227,33 +227,33 @@ describe Configuration do
 		describe 'context locals' do
 			subject do
 				Configuration.read(<<-'EOF')
-				path "imagename" "#{imagename}.jpg"
-				path "mimeextension" "test-store-file.#{mimeextension}"
+				path "image_name" "#{image_name}.jpg"
+				path "image_mime_extension" "test-store-file.#{image_mime_extension}"
 
 				post "small" {
-					store_file "input" root="/tmp" path="imagename"
-					store_file "input" root="/tmp" path="mimeextension"
+					store_file "input" root="/tmp" path="image_name"
+					store_file "input" root="/tmp" 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.jpg'
 			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[1].realize(state)
 
 				state.images['input'].store_path.should == 'test-store-file.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[1].realize(state)
-				}.to raise_error Configuration::NoValueForPathTemplatePlaceholerError, %q{cannot generate path 'mimeextension' from template 'test-store-file.#{mimeextension}': no value for '#{mimeextension}'}
+				}.to raise_error Configuration::PathRenderingError, %q{cannot generate path 'image_mime_extension' from template 'test-store-file.#{image_mime_extension}': image 'input' does not have data for variable 'image_mime_extension'}
 			end
 		end
 

data/spec/configuration_handler_spec.rb

@@ -39,6 +39,156 @@ describe Configuration do
 		end
 
 		describe Configuration::RequestState do
+			subject do
+				Configuration::RequestState.new(
+					'test',
+					{operation: 'pad'},
+					'/hello/world.jpg',
+					{width: '123', height: '321'}
+				)
+			end
+
+			it 'should behave like hash' do
+				subject['a'] = 'b'
+				subject['a'].should == 'b'
+			end
+
+			it 'should provide body' do
+				subject.body.should == 'test'
+			end
+
+			describe 'variables' do
+				it 'should provide path' do
+					subject[:path].should == '/hello/world.jpg'
+				end
+
+				it 'should provide query string params' do
+					subject[:width].should == '123'
+					subject[:height].should == '321'
+				end
+
+				it 'should provide matches' do
+					subject[:operation].should == 'pad'
+				end
+
+				it 'should provide query_string_options' do
+					subject[:query_string_options].should == 'height:321,width:123'
+				end
+
+				it 'should provide request body digest' do
+					subject[:digest].should == '9f86d081884c7d65' # deprecated
+					subject[:input_digest].should == '9f86d081884c7d65'
+				end
+
+				it 'should provide request body full sha256 checsum' do
+					subject[:input_sha256].should == '9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08'
+				end
+
+				it 'should provide input image mime extension' do
+					subject.images['input'] = Struct.new(:data, :mime_type).new('image body', 'image/jpeg')
+					subject.images['input'].extend Configuration::ImageMetaData
+					subject[:input_image_mime_extension].should == 'jpg'
+				end
+
+				it 'should provide input image width and height' do
+					subject.images['input'] = Struct.new(:data, :width, :height).new('image body', 128, 256)
+					subject[:input_image_width].should == 128
+					subject[:input_image_height].should == 256
+				end
+
+				it 'should provide image body digest' do
+					subject.images['abc'] = Struct.new(:data).new('image body')
+					subject.with_locals(image_name: 'abc')[:image_digest].should == 'f5288dd892bb007b'
+				end
+
+				it 'should provide image body full sha256 checsum' do
+					subject.images['abc'] = Struct.new(:data).new('image body')
+					subject.with_locals(image_name: 'abc')[:image_sha256].should == 'f5288dd892bb007b607304a8fb20c91ea769dcd04d82cc8ddf3239602867eb4d'
+				end
+
+				it 'should provide uuid' do
+					subject[:uuid].should_not be_empty
+					subject[:uuid].should == subject[:uuid]
+				end
+
+				it 'should provide extension' do
+					subject[:extension].should == 'jpg'
+				end
+
+				it 'should provide dirname' do
+					subject[:dirname].should == '/hello'
+				end
+
+				it 'should provide basename' do
+					subject[:basename].should == 'world'
+				end
+
+				it 'should provide image mime extension' do
+					subject.images['abc'] = Struct.new(:data, :mime_type).new('image body', 'image/jpeg')
+					subject.images['abc'].extend Configuration::ImageMetaData
+					subject.with_locals(image_name: 'abc')[:mimeextension].should == 'jpg' # deprecated
+					subject.with_locals(image_name: 'abc')[:image_mime_extension].should == 'jpg'
+				end
+
+				it 'should provide image width and height' do
+					subject.images['abc'] = Struct.new(:data, :width, :height).new('image body', 128, 256)
+					subject.with_locals(image_name: 'abc')[:image_width].should == 128
+					subject.with_locals(image_name: 'abc')[:image_height].should == 256
+				end
+
+				describe "error handling" do
+					it 'should raise NoRequestBodyToGenerateMetaVariableError when empty body was provided and body needed for variable calculation' do
+						subject = Configuration::RequestState.new(
+							'',
+							{operation: 'pad'},
+							'/hello/world.jpg',
+							{width: '123', height: '321'}
+						)
+
+						expect {
+							subject[:input_digest]
+						}.to raise_error Configuration::NoRequestBodyToGenerateMetaVariableError, %q{need not empty request body to generate value for 'input_digest'}
+					end
+					
+					it 'should raise ImageNotLoadedError when asking for image related variable of not loaded image' do
+						expect {
+							subject.with_locals(image_name: 'abc')[:image_mime_extension]
+						}.to raise_error Configuration::ImageNotLoadedError, %q{image 'abc' not loaded}
+					end
+
+					it 'should raise NoVariableToGenerateMetaVariableError when no image_name was defined' do
+						expect {
+							subject.with_locals({})[:image_mime_extension]
+						}.to raise_error Configuration::NoVariableToGenerateMetaVariableError, %q{need 'image_name' variable to generate value for 'image_mime_extension'}
+					end
+
+					it 'should raise NoVariableToGenerateMetaVariableError when no path was defined' do
+						expect {
+							subject.delete(:path)
+							subject[:basename]
+						}.to raise_error Configuration::NoVariableToGenerateMetaVariableError, %q{need 'path' variable to generate value for 'basename'}
+					end
+
+					it 'should raise NoImageDataForVariableError when image has no mime type' do
+						subject.images['abc'] = Struct.new(:data, :mime_type).new('image body', nil)
+						subject.images['abc'].extend Configuration::ImageMetaData
+						expect {
+							subject.with_locals(image_name: 'abc')[:image_mime_extension]
+						}.to raise_error Configuration::NoImageDataForVariableError, %q{image 'abc' does not have data for variable 'image_mime_extension'}
+					end
+
+					it 'should raise NoImageDataForVariableError when image has no known width or height' do
+						subject.images['abc'] = Struct.new(:data, :width, :height).new('image body', nil, nil)
+						expect {
+							subject.with_locals(image_name: 'abc')[:image_width]
+						}.to raise_error Configuration::NoImageDataForVariableError, %q{image 'abc' does not have data for variable 'image_width'}
+						expect {
+							subject.with_locals(image_name: 'abc')[:image_height]
+						}.to raise_error Configuration::NoImageDataForVariableError, %q{image 'abc' does not have data for variable 'image_height'}
+					end
+				end
+			end
+
 			it 'should raise ImageNotLoadedError if image lookup fails' do
 				expect {
 					Configuration::RequestState.new.images['test']
@@ -72,27 +222,27 @@ describe Configuration do
 
 		describe 'sources' do
 			it 'should have implicit InputSource on non get handlers' do
-				subject.handlers[0].image_sources.first.should_not be_a Configuration::InputSource
-				subject.handlers[1].image_sources.first.should be_a Configuration::InputSource
-				subject.handlers[2].image_sources.first.should be_a Configuration::InputSource
+				subject.handlers[0].sources.first.should_not be_a Configuration::InputSource
+				subject.handlers[1].sources.first.should be_a Configuration::InputSource
+				subject.handlers[2].sources.first.should be_a Configuration::InputSource
 			end
 
 			describe Configuration::InputSource do
 				it 'should copy input data to "input" image when realized' do
 					state = Configuration::RequestState.new('abc')
-					input_source = subject.handlers[1].image_sources[0].realize(state)
+					input_source = subject.handlers[1].sources[0].realize(state)
 					state.images['input'].data.should == 'abc'
 				end
 
 				it 'should have nil mime type' do
 					state = Configuration::RequestState.new('abc')
-					input_source = subject.handlers[1].image_sources[0].realize(state)
+					input_source = subject.handlers[1].sources[0].realize(state)
 					state.images['input'].mime_type.should be_nil
 				end
 
 				it 'should have nil source path and url' do
 					state = Configuration::RequestState.new('abc')
-					input_source = subject.handlers[1].image_sources[0].realize(state)
+					input_source = subject.handlers[1].sources[0].realize(state)
 					state.images['input'].source_path.should be_nil
 					state.images['input'].source_url.should be_nil
 				end

data/spec/configuration_identify_spec.rb

@@ -0,0 +1,45 @@
+require_relative 'spec_helper'
+require 'httpimagestore/configuration'
+Configuration::Scope.logger = Logger.new('/dev/null')
+
+require 'httpimagestore/configuration/thumbnailer'
+require 'httpimagestore/configuration/identify'
+MemoryLimit.logger = Logger.new('/dev/null')
+
+describe Configuration do
+	describe 'thumbnailer' do
+		before :all do
+			log = support_dir + 'server.log'
+			start_server(
+				"httpthumbnailer -f -d -l #{log}",
+				'/tmp/httpthumbnailer.pid',
+				log,
+				'http://localhost:3100/'
+			)
+		end
+
+		let :state do
+			Configuration::RequestState.new(
+				(support_dir + 'compute.jpg').read
+			)
+		end
+
+		subject do
+			Configuration.read(<<-'EOF')
+			put {
+				identify "input"
+			}
+			EOF
+		end
+
+		it 'should provide input image mime type' do
+			subject.handlers[0].sources[0].realize(state)
+			state.images['input'].mime_type.should be_nil
+
+			subject.handlers[0].processors[0].realize(state)
+			state.images['input'].mime_type.should == 'image/jpeg'
+		end
+	end
+end
+
+

data/spec/configuration_output_spec.rb

@@ -27,7 +27,7 @@ describe Configuration do
 		end
 
 		before :each do
-			subject.handlers[0].image_sources[0].realize(state)
+			subject.handlers[0].sources[0].realize(state)
 		end
 
 		it 'should provide given image' do
@@ -112,7 +112,7 @@ describe Configuration do
 				}
 				EOF
 
-				subject.handlers[0].image_sources[0].realize(state)
+				subject.handlers[0].sources[0].realize(state)
 				subject.handlers[0].stores[0].realize(state)
 				subject.handlers[0].output.realize(state)
 
@@ -142,8 +142,8 @@ describe Configuration do
 				}
 				EOF
 
-				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].sources[1].realize(state)
 				subject.handlers[0].stores[0].realize(state)
 				subject.handlers[0].stores[1].realize(state)
 				subject.handlers[0].output.realize(state)
@@ -185,9 +185,9 @@ describe Configuration do
 				end
 
 				it 'should output store path only for images that names match if-image-name-on list' do
-					subject.handlers[0].image_sources[0].realize(state)
-					subject.handlers[0].image_sources[1].realize(state)
-					subject.handlers[0].image_sources[2].realize(state)
+					subject.handlers[0].sources[0].realize(state)
+					subject.handlers[0].sources[1].realize(state)
+					subject.handlers[0].sources[2].realize(state)
 					subject.handlers[0].stores[0].realize(state)
 					subject.handlers[0].stores[1].realize(state)
 					subject.handlers[0].stores[2].realize(state)
@@ -207,7 +207,7 @@ describe Configuration do
 					}
 					EOF
 
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].realize(state)
 
 					expect {
 						subject.handlers[0].output.realize(state)
@@ -230,7 +230,7 @@ describe Configuration do
 				}
 				EOF
 
-				subject.handlers[0].image_sources[0].realize(state)
+				subject.handlers[0].sources[0].realize(state)
 				subject.handlers[0].stores[0].realize(state)
 				subject.handlers[0].output.realize(state)
 
@@ -260,8 +260,8 @@ describe Configuration do
 				}
 				EOF
 
-				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].sources[1].realize(state)
 				subject.handlers[0].stores[0].realize(state)
 				subject.handlers[0].stores[1].realize(state)
 				subject.handlers[0].output.realize(state)
@@ -303,9 +303,9 @@ describe Configuration do
 				end
 
 				it 'should output store url only for images that names match if-image-name-on list' do
-					subject.handlers[0].image_sources[0].realize(state)
-					subject.handlers[0].image_sources[1].realize(state)
-					subject.handlers[0].image_sources[2].realize(state)
+					subject.handlers[0].sources[0].realize(state)
+					subject.handlers[0].sources[1].realize(state)
+					subject.handlers[0].sources[2].realize(state)
 					subject.handlers[0].stores[0].realize(state)
 					subject.handlers[0].stores[1].realize(state)
 					subject.handlers[0].stores[2].realize(state)
@@ -325,7 +325,7 @@ describe Configuration do
 					}
 					EOF
 
-					subject.handlers[0].image_sources[0].realize(state)
+					subject.handlers[0].sources[0].realize(state)
 
 					expect {
 						subject.handlers[0].output.realize(state)