httpimagestore 1.6.0 → 1.7.0

data/load_test/load_test.jmx

@@ -9,12 +9,12 @@
         <collectionProp name="Arguments.arguments">
           <elementProp name="iss_server" elementType="Argument">
             <stringProp name="Argument.name">iss_server</stringProp>
-            <stringProp name="Argument.value">test.iss.whatclinic.com</stringProp>
+            <stringProp name="Argument.value">localhost</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="test_data_dir" elementType="Argument">
             <stringProp name="Argument.name">test_data_dir</stringProp>
-            <stringProp name="Argument.value">${__property(user.dir)}/Documents/test_data</stringProp>
+            <stringProp name="Argument.value">${__property(user.dir)}/test_data</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="test_data_list" elementType="Argument">
@@ -42,72 +42,6 @@
         <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
       </ConfigTestElement>
       <hashTree/>
-      <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>
-          <intProp name="LoopController.loops">-1</intProp>
-        </elementProp>
-        <stringProp name="ThreadGroup.num_threads">5</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
-        <longProp name="ThreadGroup.start_time">1373912751000</longProp>
-        <longProp name="ThreadGroup.end_time">1373912751000</longProp>
-        <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="ThreadGroup.duration"></stringProp>
-        <stringProp name="ThreadGroup.delay"></stringProp>
-      </ThreadGroup>
-      <hashTree>
-        <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="test files" enabled="true">
-          <stringProp name="delimiter">,</stringProp>
-          <stringProp name="fileEncoding"></stringProp>
-          <stringProp name="filename">${test_data_dir}/${test_data_list}</stringProp>
-          <boolProp name="quotedData">true</boolProp>
-          <boolProp name="recycle">false</boolProp>
-          <stringProp name="shareMode">All threads</stringProp>
-          <boolProp name="stopThread">true</boolProp>
-          <stringProp name="variableNames">test_file</stringProp>
-        </CSVDataSet>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="classes" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"></stringProp>
-          <stringProp name="HTTPSampler.port"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <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/randwick.jpg</stringProp>
-          <stringProp name="HTTPSampler.method">PUT</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-            <collectionProp name="HTTPFileArgs.files">
-              <elementProp name="${test_data_dir}/${test_file}" elementType="HTTPFileArg">
-                <stringProp name="File.path">${test_data_dir}/${test_file}</stringProp>
-                <stringProp name="File.paramname"></stringProp>
-                <stringProp name="File.mimetype">image/jpeg</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="contains path" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="-1604815031">dev/httpimagestore/compat</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">16</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-      </hashTree>
       <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">
@@ -144,7 +78,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/iss/v2/pictures</stringProp>
+          <stringProp name="HTTPSampler.path">/iss/v2/thumbnails/pictures</stringProp>
           <stringProp name="HTTPSampler.method">POST</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -184,18 +118,18 @@
         </hashTree>
         <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="iterations" enabled="true">
           <boolProp name="LoopController.continue_forever">true</boolProp>
-          <stringProp name="LoopController.loops">4</stringProp>
+          <stringProp name="LoopController.loops">1</stringProp>
         </LoopController>
         <hashTree>
           <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="specs counter" enabled="true">
             <boolProp name="LoopController.continue_forever">true</boolProp>
-            <stringProp name="LoopController.loops">11</stringProp>
+            <stringProp name="LoopController.loops">10</stringProp>
           </LoopController>
           <hashTree>
             <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="thumbnail specs" enabled="true">
-              <stringProp name="filename">thumbnail_specs.csv</stringProp>
+              <stringProp name="filename">thumbnail_specs_v2.csv</stringProp>
               <stringProp name="fileEncoding"></stringProp>
-              <stringProp name="variableNames">type,method,width,height,options</stringProp>
+              <stringProp name="variableNames">type,operation,width,height,options</stringProp>
               <stringProp name="delimiter">,</stringProp>
               <boolProp name="quotedData">true</boolProp>
               <boolProp name="recycle">true</boolProp>
@@ -203,7 +137,7 @@
               <stringProp name="shareMode">Current thread</stringProp>
             </CSVDataSet>
             <hashTree/>
-            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="thumbnail fit" enabled="true">
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="query string param thumbnail" enabled="true">
               <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
                 <collectionProp name="Arguments.arguments"/>
               </elementProp>
@@ -213,9 +147,9 @@
               <stringProp name="HTTPSampler.response_timeout"></stringProp>
               <stringProp name="HTTPSampler.protocol"></stringProp>
               <stringProp name="HTTPSampler.contentEncoding"></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.path">/iss/v2/thumbnails/${__BeanShell(vars.get(&quot;store_path&quot;).replace(&quot;/:&quot;\, &quot;%2f&quot;))}?operation=${operation}&amp;width=${width}&amp;height=${height}&amp;options=${options}</stringProp>
               <stringProp name="HTTPSampler.method">GET</stringProp>
-              <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+              <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
               <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
               <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
               <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
@@ -223,7 +157,7 @@
               <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
             </HTTPSamplerProxy>
             <hashTree>
-              <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+              <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="image type" enabled="true">
                 <collectionProp name="Asserion.test_strings">
                   <stringProp name="-722923736">Content-Type: image/</stringProp>
                 </collectionProp>
@@ -233,6 +167,45 @@
               </ResponseAssertion>
               <hashTree/>
             </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="query string param thumbnail - data URI output" enabled="true">
+              <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+                <collectionProp name="Arguments.arguments"/>
+              </elementProp>
+              <stringProp name="HTTPSampler.domain"></stringProp>
+              <stringProp name="HTTPSampler.port"></stringProp>
+              <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+              <stringProp name="HTTPSampler.response_timeout"></stringProp>
+              <stringProp name="HTTPSampler.protocol"></stringProp>
+              <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+              <stringProp name="HTTPSampler.path">/iss/v2/thumbnails/${__BeanShell(vars.get(&quot;store_path&quot;).replace(&quot;/:&quot;\, &quot;%2f&quot;))}?operation=${operation}&amp;width=${width}&amp;height=${height}&amp;options=${options}&amp;data-uri=true</stringProp>
+              <stringProp name="HTTPSampler.method">GET</stringProp>
+              <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+              <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+              <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+              <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+              <boolProp name="HTTPSampler.monitor">false</boolProp>
+              <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+            </HTTPSamplerProxy>
+            <hashTree>
+              <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="text/uri-list" enabled="true">
+                <collectionProp name="Asserion.test_strings">
+                  <stringProp name="530900877">Content-Type: text/uri-list</stringProp>
+                </collectionProp>
+                <stringProp name="Assertion.test_field">Assertion.response_headers</stringProp>
+                <boolProp name="Assertion.assume_success">false</boolProp>
+                <intProp name="Assertion.test_type">16</intProp>
+              </ResponseAssertion>
+              <hashTree/>
+              <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="base64 response" enabled="true">
+                <collectionProp name="Asserion.test_strings">
+                  <stringProp name="-586062814">;base64,</stringProp>
+                </collectionProp>
+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                <boolProp name="Assertion.assume_success">false</boolProp>
+                <intProp name="Assertion.test_type">16</intProp>
+              </ResponseAssertion>
+              <hashTree/>
+            </hashTree>
           </hashTree>
         </hashTree>
         <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="false">

data/load_test/thumbnail_specs_v2.csv

@@ -0,0 +1,10 @@
+"storage","limit","2160","2160","quality:95"
+"crop","pad","98","148",""
+"float-crop","crop","242","162","float-x:0.8,float-y:0.2"
+"pad","pad","220","220","background-color:0xeeede8"
+"pad2","pad","40","40","background-color:0xF0F0F0"
+"pad3","pad","65","65","background-color:0xF0F0F0"
+"fit","fit","65","65",""
+"limit","limit","80","60",""
+"float-pad","pad","50","50","float-x:0.8,float-y:0.2"
+"large","limit","1200","900","background-color:white,interlace:PlaneInterlace"

data/spec/configuration_file_spec.rb

@@ -3,6 +3,7 @@ require 'httpimagestore/configuration'
 Configuration::Scope.logger = Logger.new('/dev/null')
 
 require 'httpimagestore/configuration/file'
+require 'httpimagestore/configuration/output'
 MemoryLimit.logger = Logger.new('/dev/null')
 
 describe Configuration do
@@ -62,7 +63,7 @@ describe Configuration do
 					io.write('hello world')
 				end
 			end
-			
+
 			subject do
 				Configuration.read(<<-EOF)
 				path "image_name" "\#{image_name}.jpg"
@@ -155,6 +156,30 @@ describe Configuration do
 				}.to raise_error MemoryLimit::MemoryLimitedExceededError, 'memory limit exceeded'
 			end
 		end
+
+		context 'in failover context' do
+			subject do
+				Configuration.read(<<-EOF)
+				path "in" "test.in"
+
+				get "test" {
+					source_failover {
+						source_file "first_fail_1" root="/tmp/bogous" path="in"
+						source_file "first_fail_2" root="/tmp" path="in"
+					}
+				}
+				EOF
+			end
+
+			it 'should source second image' do
+				subject.handlers[0].sources[0].should be_a Configuration::SourceFailover
+				subject.handlers[0].sources[0].realize(state)
+
+				state.images.keys.should == ['first_fail_2']
+				state.images['first_fail_2'].should_not be_nil
+				state.images['first_fail_2'].data.should == 'abc'
+			end
+		end
 	end
 
 	describe Configuration::FileStore do
@@ -242,7 +267,7 @@ describe Configuration do
 
 				state.images['input'].store_path.should == 'input.jpg'
 			end
-			
+
 			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)

data/spec/configuration_identify_spec.rb

@@ -2,16 +2,17 @@ require_relative 'spec_helper'
 require 'httpimagestore/configuration'
 Configuration::Scope.logger = Logger.new('/dev/null')
 
+require 'httpimagestore/configuration/output'
 require 'httpimagestore/configuration/thumbnailer'
 require 'httpimagestore/configuration/identify'
 MemoryLimit.logger = Logger.new('/dev/null')
 
 describe Configuration do
-	describe 'thumbnailer' do
+	describe 'identify' do
 		before :all do
 			log = support_dir + 'server.log'
 			start_server(
-				"httpthumbnailer -f -d -l #{log}",
+				"httpthumbnailer -f -d -x XID -l #{log}",
 				'/tmp/httpthumbnailer.pid',
 				log,
 				'http://localhost:3100/'
@@ -39,6 +40,28 @@ describe Configuration do
 			subject.handlers[0].processors[0].realize(state)
 			state.images['input'].mime_type.should == 'image/jpeg'
 		end
+
+		describe 'passing HTTP headers to thumbnailer' do
+			let :xid do
+				rand(0..1000)
+			end
+
+			let :state do
+				Configuration::RequestState.new(
+					(support_dir + 'compute.jpg').read,
+					{}, '', {}, MemoryLimit.new,
+					{'XID' => xid}
+				)
+			end
+
+			it 'should pass headers provided with request state' do
+				subject.handlers[0].sources[0].realize(state)
+				subject.handlers[0].processors[0].realize(state)
+				state.images['input'].mime_type.should == 'image/jpeg'
+
+				(support_dir + 'server.log').read.should include "xid=\"#{xid}\""
+			end
+		end
 	end
 end
 

data/spec/configuration_s3_spec.rb

@@ -1,6 +1,7 @@
 require_relative 'spec_helper'
 require 'aws-sdk'
 require 'httpimagestore/configuration'
+require 'httpimagestore/configuration/output'
 Configuration::Scope.logger = Logger.new('/dev/null')
 
 require 'httpimagestore/configuration/s3'
@@ -286,7 +287,7 @@ else
 
 						# 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)
@@ -299,7 +300,7 @@ else
 						let :state do
 							Configuration::RequestState.new('abc', {test_image: 'test.jpg'})
 						end
-						
+
 						before :each do
 							@cache_file = Pathname.new('/tmp/af/a3/5eaf0a614693e2d1ed455ac1cedb')
 							@cache_file.dirname.mkpath
@@ -352,7 +353,7 @@ else
 							cache_file = Pathname.new('/tmp/a2/fd/4261e9a7586ed772d0c78bb51c9d')
 							cache_file.unlink if cache_file.exist?
 
-							state = Configuration::RequestState.new('abc', {test_image: 'bogous.jpg'})
+							state = Configuration::RequestState.new('abc', {test_image: 'bogus.jpg'})
 
 							expect {
 								subject.handlers[0].sources[0].realize(state)
@@ -551,6 +552,31 @@ else
 					}.to raise_error MemoryLimit::MemoryLimitedExceededError
 				end
 			end
+
+			context 'in failover context' do
+				subject do
+					Configuration.read(<<-EOF)
+					s3 key="#{ENV['AWS_ACCESS_KEY_ID']}" secret="#{ENV['AWS_SECRET_ACCESS_KEY']}"
+					path "hash" "\#{test_image}"
+					path "bogus" "bogus"
+					get {
+						source_failover {
+							source_s3 "first_fail_1" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="bogus"
+							source_s3 "first_fail_2" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="hash"
+						}
+					}
+					EOF
+				end
+
+				it 'should source second image' do
+					subject.handlers[0].sources[0].should be_a Configuration::SourceFailover
+					subject.handlers[0].sources[0].realize(state)
+
+					state.images.keys.should == ['first_fail_2']
+					state.images['first_fail_2'].should_not be_nil
+					state.images['first_fail_2'].data.should == @test_data
+				end
+			end
 		end
 
 		describe Configuration::S3Store do

data/spec/configuration_source_failover_spec.rb

@@ -0,0 +1,101 @@
+require_relative 'spec_helper'
+require 'httpimagestore/configuration'
+Configuration::Scope.logger = Logger.new('/dev/null')
+
+require 'httpimagestore/configuration/source_failover'
+require 'httpimagestore/configuration/file'
+require 'httpimagestore/configuration/output'
+MemoryLimit.logger = Logger.new('/dev/null')
+
+describe Configuration do
+	let :state do
+		Configuration::RequestState.new('abc')
+	end
+
+	describe Configuration::FileSource do
+		subject do
+			Configuration.read(<<-EOF)
+			path "in" "test.in"
+
+			get "test" {
+				source_failover {
+					source_file "no_fail_1" root="/tmp" path="in"
+					source_file "no_fail_2" root="/tmp" path="in"
+				}
+
+				source_failover {
+					source_file "first_fail_1" root="/tmp/bogous" path="in"
+					source_file "first_fail_2" root="/tmp" path="in"
+				}
+
+				source_failover {
+					source_file "all_fail" root="/tmp/bogous" path="in"
+					source_file "all_fail" root="/tmp/bogous2" path="in"
+				}
+
+				source_failover {
+					source_file "deep_fail_1" root="/tmp/bogous" path="in"
+					source_file "deep_fail_2" root="/tmp/bogous" path="in"
+					source_file "deep_fail_3" root="/tmp" path="in"
+					source_file "deep_fail_4" root="/tmp/bogous" path="in"
+				}
+			}
+			EOF
+		end
+
+		let :in_file do
+			Pathname.new("/tmp/test.in")
+		end
+
+		before :each do
+			in_file.open('w'){|io| io.write('abc')}
+		end
+
+		after :each do
+			in_file.unlink
+		end
+
+		context 'first source is OK' do
+			it 'should source first image' do
+				subject.handlers[0].sources[0].should be_a Configuration::SourceFailover
+				subject.handlers[0].sources[0].realize(state)
+
+				state.images.keys.should == ['no_fail_1']
+				state.images['no_fail_1'].should_not be_nil
+				state.images['no_fail_1'].data.should == 'abc'
+			end
+		end
+
+		context 'second source is OK' do
+			it 'should source second image' do
+				subject.handlers[0].sources[1].should be_a Configuration::SourceFailover
+				subject.handlers[0].sources[1].realize(state)
+
+				state.images.keys.should == ['first_fail_2']
+				state.images['first_fail_2'].should_not be_nil
+				state.images['first_fail_2'].data.should == 'abc'
+			end
+		end
+
+		context 'all sources fail' do
+			it 'should raise error Configuration::SourceFailoverAllFailedError' do
+				subject.handlers[0].sources[2].should be_a Configuration::SourceFailover
+
+				expect {
+					subject.handlers[0].sources[2].realize(state)
+				}.to raise_error Configuration::SourceFailoverAllFailedError, "all sources failed: FileSource[image_name: 'all_fail' root_dir: '/tmp/bogous' path_spec: 'in'](Configuration::NoSuchFileError: error while processing image 'all_fail': file 'test.in' not found), FileSource[image_name: 'all_fail' root_dir: '/tmp/bogous2' path_spec: 'in'](Configuration::NoSuchFileError: error while processing image 'all_fail': file 'test.in' not found)"
+			end
+		end
+
+		context 'tird source is OK' do
+			it 'should source second image' do
+				subject.handlers[0].sources[3].should be_a Configuration::SourceFailover
+				subject.handlers[0].sources[3].realize(state)
+
+				state.images.keys.should == ['deep_fail_3']
+				state.images['deep_fail_3'].should_not be_nil
+				state.images['deep_fail_3'].data.should == 'abc'
+			end
+		end
+	end
+end

data/spec/configuration_thumbnailer_spec.rb

@@ -1,5 +1,6 @@
 require_relative 'spec_helper'
 require 'httpimagestore/configuration'
+require 'httpimagestore/configuration/output'
 Configuration::Scope.logger = Logger.new('/dev/null')
 
 require 'httpimagestore/configuration/thumbnailer'
@@ -30,7 +31,7 @@ describe Configuration do
 			subject = Configuration.read(<<-EOF, thumbnailer_url: 'http://1.1.1.1:8080')
 			thumbnailer url="http://2.2.2.2:1000"
 			EOF
-			
+
 			subject.thumbnailer.server_url.should == 'http://2.2.2.2:1000'
 		end
 
@@ -58,7 +59,7 @@ describe Configuration do
 		describe 'should provide thumbnail spec array based on given locals' do
 			it 'where image name is hash key pointing to array where all values are string and options is hash' do
 				Configuration::Thumbnail::ThumbnailSpec.new('small', 'pad', 100, 100, 'jpeg', 'background-color' => 'red').render.should == {
-					'small' => 
+					'small' =>
 						['pad', '100', '100', 'jpeg', {'background-color' => 'red'}]
 				}
 			end
@@ -74,7 +75,7 @@ describe Configuration do
 					}
 
 					Configuration::Thumbnail::ThumbnailSpec.new('small', '#{operation}', '#{width}', '#{height}', '#{format}', 'background-color' => '#{bg}').render(locals).should == {
-						'small' => 
+						'small' =>
 							['fit', '99', '66', 'png', {'background-color' => 'white'}]
 					}
 				end
@@ -89,7 +90,7 @@ describe Configuration do
 					}
 
 					Configuration::Thumbnail::ThumbnailSpec.new('small', '#{operation}', '#{width}', '#{height}', '#{format}', 'options' => '#{opts}', 'background-color' => 'red').render(locals).should == {
-						'small' => 
+						'small' =>
 							['fit', '99', '66', 'png', {'background-color' => 'red', 'quality' => '100'}]
 					}
 				end
@@ -126,7 +127,7 @@ describe Configuration do
 			before :all do
 				log = support_dir + 'server.log'
 				start_server(
-					"httpthumbnailer -f -d -l #{log}",
+					"httpthumbnailer -f -d -x XID -l #{log}",
 					'/tmp/httpthumbnailer.pid',
 					log,
 					'http://localhost:3100/'
@@ -207,6 +208,32 @@ describe Configuration do
 					end
 				end
 
+				describe 'passing HTTP headers to thumbnailer' do
+					let :xid do
+						rand(0..1000)
+					end
+
+					let :state do
+						Configuration::RequestState.new(
+							(support_dir + 'compute.jpg').read,
+							{
+								operation: 'pad',
+								width: '10',
+								height: '10',
+								options: 'background-color:green'
+							},
+							'', {}, MemoryLimit.new,
+							{'XID' => xid}
+						)
+					end
+
+					it 'should pass headers provided with request state' do
+						subject.handlers[0].processors[0].realize(state)
+
+						(support_dir + 'server.log').read.should include "xid=\"#{xid}\""
+					end
+				end
+
 				describe 'error handling' do
 					it 'should raise Thumbnail::ThumbnailingError on realization of bad thumbnail sepc' do
 						state = Configuration::RequestState.new(
@@ -318,7 +345,7 @@ describe Configuration do
 				end
 
 				describe 'conditional inclusion support' do
-					subject do 
+					subject do
 						Configuration.read(<<-'EOF')
 						put {
 							thumbnail "input" {
@@ -351,6 +378,34 @@ describe Configuration do
 					end
 				end
 
+				describe 'passing HTTP headers to thumbnailer' do
+					let :xid do
+						rand(0..1000)
+					end
+
+					let :state do
+						Configuration::RequestState.new(
+							(support_dir + 'compute.jpg').read,
+							{
+								operation: 'pad',
+								width: '10',
+								height: '10',
+								options: 'background-color:green'
+							},
+							'', {}, MemoryLimit.new,
+							{'XID' => xid}
+						)
+					end
+
+					it 'should pass headers provided with request state' do
+						subject.handlers[0].processors[0].realize(state)
+						state.images.keys.should include 'original'
+						state.images.keys.should include 'small'
+
+						(support_dir + 'server.log').read.should include "xid=\"#{xid}\""
+					end
+				end
+
 				describe 'error handling' do
 					it 'should raise Thumbnail::ThumbnailingError on realization of bad thumbnail sepc' do
 						state = Configuration::RequestState.new(
@@ -400,10 +455,10 @@ describe Configuration do
 					thumbnail "input1" "thumbnail1" if-image-name-on="#{list}"
 					thumbnail "input2" "thumbnail2" if-image-name-on="#{list}"
 					thumbnail "input3" if-image-name-on="#{list}" {
-						"thumbnail3" 
+						"thumbnail3"
 					}
 					thumbnail "input4" if-image-name-on="#{list}" {
-						"thumbnail4" 
+						"thumbnail4"
 					}
 					thumbnail "input5" if-image-name-on="#{list}" {
 						"thumbnail5" if-image-name-on="#{list}"

data/spec/ruby_string_template_spec.rb

@@ -16,6 +16,10 @@ describe RubyStringTemplate do
 		}.to raise_error RubyStringTemplate::NoValueForTemplatePlaceholderError, %q{no value for '#{world}' in template '>#{hello}-#{world}#{test}<'}
 	end
 
+	it 'should not process nested placeholders' do
+		subject.render(hello: '#{nested}', world: 'world', test: 123, nested: 'xxx').should == '>#{nested}-world123<'
+	end
+
 	describe 'with custom resolver' do
 		subject do
 			RubyStringTemplate.new('>#{hello}-#{world}#{test}<') do |locals, name|