httpimagestore 1.7.0 → 1.8.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 ruby "1.9.3"
 
-gem "unicorn-cuba-base", "~> 1.2.0"
+gem "unicorn-cuba-base", "~> 1.2.2"
 #gem "unicorn-cuba-base", path: "../unicorn-cuba-base"
 gem "httpthumbnailer-client", "~> 1.2.0"
 #gem "httpthumbnailer-client", path: "../httpthumbnailer-client"
@@ -13,7 +13,7 @@ gem "msgpack", "~> 0.5"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "httpclient", ">= 2.3"
+  gem "faraday", ">= 0.8"
   gem "rspec", "~> 2.13"
   gem "cucumber", ">= 0"
   gem "jeweler", "~> 1.8.4"

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       uuidtools (~> 2.1)
     builder (3.2.2)
     cli (1.3.1)
-    cuba (3.1.1)
+    cuba (3.3.0)
       rack
     cucumber (1.3.8)
       builder (>= 2.1.2)
@@ -34,7 +34,7 @@ GEM
     hashie (2.0.5)
     highline (1.6.20)
     httpauth (0.2.0)
-    httpclient (2.3.4.1)
+    httpclient (2.4.0)
     httpthumbnailer (1.2.0)
       rmagick (~> 2)
       unicorn-cuba-base
@@ -91,13 +91,13 @@ GEM
     rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
-    ruby-ip (0.9.1)
+    ruby-ip (0.9.3)
     sdl4r (0.9.11)
-    unicorn (4.8.2)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-cuba-base (1.2.0)
+    unicorn-cuba-base (1.2.2)
       cli (~> 1.3)
       cuba (~> 3.0)
       facter (~> 1.6.11)
@@ -113,7 +113,7 @@ DEPENDENCIES
   aws-sdk (~> 1.10)
   cucumber
   daemon (~> 1)
-  httpclient (>= 2.3)
+  faraday (>= 0.8)
   httpthumbnailer (~> 1.2.0)
   httpthumbnailer-client (~> 1.2.0)
   jeweler (~> 1.8.4)
@@ -123,4 +123,4 @@ DEPENDENCIES
   rdoc (~> 3.9)
   rspec (~> 2.13)
   sdl4r (~> 0.9)
-  unicorn-cuba-base (~> 1.2.0)
+  unicorn-cuba-base (~> 1.2.2)

data/README.md

@@ -17,6 +17,13 @@ It is using [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) as
 
 ## Changelog
 
+### 1.8.0
+* `output_store_url` support additional arguments: `scheme`, `port` and `host`
+* `output_store_uri` support added
+* fixed `output_store_url` URL formatting for `file_store`
+* fixed parsing of POST body when query string matches are used
+* decoding UTF-8 characters encoded with JavaScript encode() (%uXXXX) to support legacy/broken clients
+
 ### 1.7.0
 * `output_data_uri_image` support
 * `source_failover` support
@@ -562,7 +569,7 @@ Putting image data to `/multi` URI will result with image `original` sourced fro
 
 #### output_store_url
 
-This is similar statement to `output_store_file` but it will output `file://` URL for file stored images and valid S3 access URL for S3 stored images.
+This is similar statement to `output_store_file` but it will output `file:` URL for file stored images and valid S3 access URL for S3 stored images.
 
 For S3 stored image if `ssl` is set to `true` on the S3 client statement (`s3 ssl="true"`) the URL will start with `https://`. If `public` is set to `true` when storing image in S3 (`store_s3 public="true"`) then the URL will not contain query string options, otherwise authentication tokens and expiration token (set to expire in 20 years) will be include in the query string.
 
@@ -575,7 +582,10 @@ Arguments:
 
 Options:
 
-* `path` - name of predefined path that will be used to generate output URL path part; `#{path}` variable and all derivative will be replaced with given image storage path; if not specified the original URL will be provided
+* `scheme` - rewrite URL scheme with provided one; variables can be used; `#{path}` variable and all derivative will be replaced with given image storage path; `#{url}` variable will contain full original URL
+* `host` - add/rewrite provided host to the URL; variables can be used; `#{path}` variable and all derivative will be replaced with given image storage path; `#{url}` variable will contain full original URL
+* `port` - add provided port to the URL; variables can be used; `#{path}` variable and all derivative will be replaced with given image storage path; `#{url}` variable will contain full original URL
+* `path` - name of predefined path that will be used to generate output URL path part; `#{path}` variable and all derivative will be replaced with given image storage path; if not specified the original URL will be provided; `#{url}` variable will contain full original URL
 
 Example:
 
@@ -611,9 +621,54 @@ http://mybucket.s3.amazonaws.com/4006450256177f4a/small.jpg
 http://mybucket.s3.amazonaws.com/4006450256177f4a/tiny_png.png
 ```
 
-#### output_source_file and output_source_url
+#### output_store_uri
+
+This is similar statement to `output_store_url` but it will output only path component of the URL for stored images.
+
+The `Content-Type` header of this response is `text/uri-list`.
+Each output URL is `\r\n` ended.
+
+Arguments:
+
+1. image names - names of images
+
+Options:
 
-This statements are similar to their storage variants. The difference is that they will output path and URL of the source locations.
+* `path` - name of predefined path that will be used to generate output URL path part; `#{path}` variable and all derivative will be replaced with given image storage path; if not specified the original URL will be provided; `#{url}` variable will contain full original URL
+
+Example:
+
+```sdl
+s3 key="AIAITCKMELYWQZPJP7HQ" secret="V37lCu0F48Tv9s7QVqIT/sLf/wwqhNSB4B0Em7Ei" ssl=false
+
+path "hash"			"#{input_digest}.#{image_mime_extension}"
+path "hash-name"	"#{input_digest}/#{image_name}.#{image_mime_extension}"
+
+put "thumbnail" {
+	thumbnail "input" {
+		"small"		operation="crop"	width=128	height=128	format="jpeg"
+		"tiny_png"	operation="crop"	width=32	height=32	format="png"
+	}
+
+	store_s3 "input"	bucket="mybucket"		path="hash"		 public=true
+	store_s3 "small"	bucket="mybucket"		path="hash-name" public=true
+	store_s3 "tiny_png"	bucket="mybucket"		path="hash-name" public=true
+
+	output_store_uri {
+		"input"
+		"small"
+		"tiny_png"
+	}
+}
+```
+
+Putting image data will result in storage of that image and two thumbnails generated from it. The output will contain `\r\n` ended lines like:
+
+```
+/4006450256177f4a.jpg
+/4006450256177f4a/small.jpg
+/4006450256177f4a/tiny_png.png
+```
 
 ### API endpoint meta options
 

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.0

data/features/compatibility.feature

@@ -130,7 +130,7 @@ Feature: Image list based thumbnailing and S3 storage
 		Given there is no test/图像/4006450256177f4a/测试.jpg file in S3 bucket
 		And there is no test/图像/4006450256177f4a/测试-small.jpg file in S3 bucket
 		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/small/test/图像/测试
+		When I do PUT request with encoded URL http://localhost:3000/thumbnail/small/test/图像/测试
 		Then response status will be 200
 		And response content type will be text/uri-list
 		And response body will be CRLF ended lines
@@ -138,8 +138,8 @@ Feature: Image list based thumbnailing and S3 storage
 		http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/test/%E5%9B%BE%E5%83%8F/4006450256177f4a/%E6%B5%8B%E8%AF%95.jpg
 		http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/test/%E5%9B%BE%E5%83%8F/4006450256177f4a/%E6%B5%8B%E8%AF%95-small.jpg
 		"""
-		And http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/test/图像/4006450256177f4a/测试.jpg will contain JPEG image of size 509x719
-		And http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/test/图像/4006450256177f4a/测试-small.jpg will contain JPEG image of size 128x128
+		And Encoded URL http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/test/图像/4006450256177f4a/测试.jpg will contain JPEG image of size 509x719
+		And Encoded URL http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/test/图像/4006450256177f4a/测试-small.jpg will contain JPEG image of size 128x128
 
 	@compatibility @forward @test
 	Scenario: Getting thumbanils requested with compatibility API from flexi bucket

data/features/encoding.feature

@@ -0,0 +1,35 @@
+Feature: Encoded UTF-8 URI support
+	HTTP Image Store should be able to decode UTF-8 characters form URI using URI decode and also support JavaScript encode() format.
+
+	Background:
+		Given httpthumbnailer server is running at http://localhost:3100/health_check
+		Given httpimagestore server is running at http://localhost:3000/health_check with the following configuration
+		"""
+		path "path"             "#{path}"
+
+		post "encoding" "encoded" {
+			store_file "input" root="/tmp" path="path"
+			output_store_uri "input" path="path"
+		}
+
+		post "encoding" "decoded" {
+			store_file "input" root="/tmp" path="path"
+			output_store_path "input" path="path"
+		}
+		"""
+
+	Scenario: JavaScript encode() + URL encoded variable decoding and URL encoding
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/encoding/encoded/triple%20kro%25u0301l.png
+		And response body will be CRLF ended lines
+		"""
+		/triple%20kro%CC%81l.png
+		"""
+
+	Scenario: URL encoded variable decoding
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/encoding/decoded/triple%20kr%C3%B3l.png
+		And response body will be CRLF ended lines
+		"""
+		triple król.png
+		"""

data/features/error-reporting.feature

@@ -217,6 +217,17 @@ Feature: Error handling
 		invalid UTF-8 encoding in URI: "hello\\xE9world"
 		"""
 
+	@error-reporting
+	Scenario: Bad URI encoding + JavaScript encode
+		Given test.jpg file content as request body
+		When I do POST request http://localhost:3000/filename/triple%20kro%25udfcfl.png
+		Then response status will be 400
+		And response content type will be text/plain
+		And response body will be CRLF ended lines like
+		"""
+		invalid UTF-8 encoding in URI: "triple kro\\xED\\xBF\\x8Fl"
+		"""
+
 	@error-reporting
 	Scenario: Zero body length
 		Given test.empty file content as request body

data/features/rewrite.feature

@@ -0,0 +1,122 @@
+Feature: Rewrite of the output path and URL
+	Output path or URL can be rewritten with variables to customise further the API output.
+
+	Background:
+		Given httpthumbnailer server is running at http://localhost:3100/health_check
+		Given httpimagestore server is running at http://localhost:3000/health_check with the following configuration
+		"""
+		path "input_digest"       "#{input_digest}"
+		path "rewritten"          "hello/#{prefix}/#{input_sha256}.jpg"
+		path "rewritten-absolute" "/hello/#{prefix}/#{input_sha256}.jpg"
+		path "demo"               "image/#{input_sha256}.jpg"
+
+		post "rewrite" "path" "&:prefix" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_path "input" path="rewritten"
+		}
+
+		post "rewrite" "uri" "path" "&:prefix" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_uri "input" path="rewritten"
+		}
+
+		post "rewrite" "uri" "path-absolute" "&:prefix" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_uri "input" path="rewritten-absolute"
+		}
+
+		post "rewrite" "url" "path" "&:prefix" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_url "input" path="rewritten"
+		}
+
+		post "rewrite" "url" "path-absolute" "&:prefix" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_url "input" path="rewritten-absolute"
+		}
+
+		post "rewrite" "url" "scheme" "&:proto" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_url "input" scheme="#{proto}"
+		}
+
+		post "rewrite" "url" "host" "&:target" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_url "input" host="www.#{target}"
+		}
+
+		post "rewrite" "url" "port" "&:number" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_url "input" port="#{number}"
+		}
+
+		post "rewrite" "demo" {
+			store_file "input" root="/tmp" path="input_digest"
+			output_store_url "input" scheme="ftp" host="example.com" port="21" path="demo"
+		}
+		"""
+
+	Scenario: Store path rewriting
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/rewrite/path?prefix=world
+		And response body will be CRLF ended lines
+		"""
+		hello/world/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e.jpg
+		"""
+
+	Scenario: Store URI path rewriting
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/rewrite/uri/path?prefix=world
+		And response body will be CRLF ended lines
+		"""
+		/hello/world/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e.jpg
+		"""
+
+	Scenario: Store URI path rewriting - absolute path
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/rewrite/uri/path-absolute?prefix=world
+		And response body will be CRLF ended lines
+		"""
+		/hello/world/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e.jpg
+		"""
+
+	Scenario: Store URL path rewriting
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/rewrite/url/path?prefix=world
+		And response body will be CRLF ended lines
+		"""
+		file:/hello/world/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e.jpg
+		"""
+
+	Scenario: Store URL path rewriting - absolute path
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/rewrite/url/path-absolute?prefix=world
+		And response body will be CRLF ended lines
+		"""
+		file:/hello/world/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e.jpg
+		"""
+
+	Scenario: Store URL scheme rewriting
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/rewrite/url/host?target=example.com
+		And response body will be CRLF ended lines
+		"""
+		file://www.example.com/b0fe25319ba5909a
+		"""
+
+	Scenario: Store URL port rewriting
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/rewrite/url/port?number=41
+		And response body will be CRLF ended lines
+		"""
+		file::41/b0fe25319ba5909a
+		"""
+
+	Scenario: Store URL rewriting demo
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/rewrite/demo
+		And response body will be CRLF ended lines
+		"""
+		ftp://example.com:21/image/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e.jpg
+		"""
+

data/features/s3-store-and-thumbnail.feature

@@ -16,7 +16,7 @@ Feature: Store limited original image in S3 and thumbnail based on request
 		put "original" {
 			thumbnail "input" "original" operation="limit" width=100 height=100 format="jpeg" quality=95
 			store_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="original-hash" cache-root="/tmp"
-			output_store_path "original"
+			output_store_uri "original"
 		}
 
 		get "thumbnail" "v1" ":path" ":operation" ":width" ":height" ":options?" {
@@ -38,10 +38,10 @@ Feature: Store limited original image in S3 and thumbnail based on request
 		Given test.jpg file content as request body
 		When I do PUT request http://localhost:3000/original
 		Then response status will be 200
-		And response content type will be text/plain
+		And response content type will be text/uri-list
 		And response body will be CRLF ended lines
 		"""
-		4006450256177f4a.jpg
+		/4006450256177f4a.jpg
 		"""
 		Then S3 object 4006450256177f4a.jpg will contain JPEG image of size 71x100
 		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/4006450256177f4a.jpg
@@ -79,4 +79,4 @@ Feature: Store limited original image in S3 and thumbnail based on request
 		Then response status will be 200
 		And response content type will be image/png
 		Then response body will contain PNG image of size 50x50
-		And that image pixel at 2x2 should be of color green
+		And that image pixel at 2x2 should be of color green

data/features/step_definitions/httpimagestore_steps.rb

@@ -81,9 +81,14 @@ Then /S3 bucket will not contain (.*)/ do |key|
 	@bucket.objects[key].exists?.should_not be_true
 end
 
-When /I do (.*) request (.*)/ do |method, uri|
+When /I do (.*) request ([^ ]+)$/ do |method, uri|
 	@request_body = nil if method == 'GET'
-	@response = HTTPClient.new.request(method, uri.replace_s3_variables, nil, @request_body, (@request_headers or {}))
+
+	@response = request(method, uri, @request_body, (@request_headers or {}))
+end
+
+When /I do (.*) request with encoded URL (.*)/ do |method, uri|
+	step "I do #{method} request #{URI.encode(uri)}"
 end
 
 Then /response status will be (.*)/ do |status|
@@ -91,11 +96,11 @@ Then /response status will be (.*)/ do |status|
 end
 
 Then /response content type will be (.*)/ do |content_type|
-	@response.header['Content-Type'].first.should == content_type
+	@response.headers['Content-Type'].should == content_type
 end
 
 Then /response Cache-Control will be (.*)/ do |content_type|
-	@response.header['Cache-Control'].first.should == content_type
+	@response.headers['Cache-Control'].should == content_type
 end
 
 Then /response body will be CRLF ended lines like/ do |body|
@@ -110,7 +115,9 @@ Then /response body will be$/ do |body|
 end
 
 Then /response body will be CRLF ended lines$/ do |body|
-	@response.body.should == body.replace_s3_variables.gsub("\n", "\r\n") + "\r\n"
+	res = @response.body.dup
+	res.force_encoding('UTF-8')
+	res.should == body.replace_s3_variables.gsub("\n", "\r\n") + "\r\n"
 end
 
 Then /(http.*) content type will be (.*)/ do |url, content_type|
@@ -125,7 +132,7 @@ Then /(http.*) ([^ ]+) header will not be set/ do |url, header|
 	get_headers(url.replace_s3_variables)[header].should be_nil
 end
 
-Then /(http.*) will contain (.*) image of size (.*)x(.*)/ do |url, format, width, height|
+Then /^(http[^ ]+) will contain (.*) image of size (.*)x(.*)/ do |url, format, width, height|
 	data = get(url.replace_s3_variables)
 
 	@image.destroy! if @image
@@ -136,6 +143,11 @@ Then /(http.*) will contain (.*) image of size (.*)x(.*)/ do |url, format, width
 	@image.rows.should == height.to_i
 end
 
+
+Then /Encoded URL (http.*) will contain (.*) image of size (.*)x(.*)/ do |url, format, width, height|
+	step "#{URI.encode(url)} will contain #{format} image of size #{width}x#{height}"
+end
+
 Then /S3 object (.*) will contain (.*) image of size (.*)x(.*)/ do |key, format, width, height|
 	data = @bucket.objects[key].read
 

data/features/support/env.rb

@@ -12,7 +12,7 @@ require 'rspec/expectations'
 
 require 'daemon'
 require 'timeout'
-require 'httpclient'
+require 'faraday'
 require "open3"
 require "thread"
 require 'tempfile'
@@ -48,24 +48,26 @@ def script(file)
 end
 
 def http_client
-	client = HTTPClient.new
-	#client.debug_dev = STDOUT
-	client
+	@faraday ||= Faraday.new
+end
+
+def request(method, uri, body, headers)
+	http_client.run_request(method.downcase.to_sym, uri.replace_s3_variables, body, headers || {})
 end
 
 def get(url)
-	http_client.get_content(URI.encode(url))
+	http_client.get(url).body
 end
 
 def get_headers(url)
-	http_client.get(URI.encode(url)).headers
+	http_client.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) 
+		stop_server(pid_file)
 	end
 
 	fork do
@@ -85,7 +87,7 @@ def start_server(cmd, pid_file, log_file, test_url)
 	Timeout.timeout(10) do
 		begin
 			get test_url
-		rescue Errno::ECONNREFUSED
+		rescue Faraday::Error::ConnectionFailed
 			sleep 0.1
 			retry
 		end
@@ -96,7 +98,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'
+	#STDERR.puts http_client.get("http://localhost:3000/stats").body if pid_file.to_s.include? 'httpimagestore'
 	pid = pid_file.read.strip.to_i
 
 	Timeout.timeout(20) do

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "1.7.0"
+  s.version = "1.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2014-07-28"
+  s.date = "2014-08-22"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -30,10 +30,12 @@ Gem::Specification.new do |s|
     "features/cache-control.feature",
     "features/compatibility.feature",
     "features/data-uri.feature",
+    "features/encoding.feature",
     "features/error-reporting.feature",
     "features/flexi.feature",
     "features/health-check.feature",
     "features/request-matching.feature",
+    "features/rewrite.feature",
     "features/s3-store-and-thumbnail.feature",
     "features/source-failover.feature",
     "features/step_definitions/httpimagestore_steps.rb",
@@ -77,7 +79,8 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/compute.jpg",
     "spec/support/cuba_response_env.rb",
-    "spec/support/full.cfg"
+    "spec/support/full.cfg",
+    "spec/support/utf_string.txt"
   ]
   s.homepage = "http://github.com/jpastuszek/httpimagestore"
   s.licenses = ["MIT"]
@@ -89,13 +92,13 @@ Gem::Specification.new do |s|
     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.2.0"])
+      s.add_runtime_dependency(%q<unicorn-cuba-base>, ["~> 1.2.2"])
       s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<aws-sdk>, ["~> 1.10"])
       s.add_runtime_dependency(%q<mime-types>, ["~> 1.17"])
       s.add_runtime_dependency(%q<sdl4r>, ["~> 0.9"])
       s.add_runtime_dependency(%q<msgpack>, ["~> 0.5"])
-      s.add_development_dependency(%q<httpclient>, [">= 2.3"])
+      s.add_development_dependency(%q<faraday>, [">= 0.8"])
       s.add_development_dependency(%q<rspec>, ["~> 2.13"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
@@ -104,13 +107,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<prawn>, ["= 0.8.4"])
       s.add_development_dependency(%q<httpthumbnailer>, ["~> 1.2.0"])
     else
-      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.2.0"])
+      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.2.2"])
       s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.2.0"])
       s.add_dependency(%q<aws-sdk>, ["~> 1.10"])
       s.add_dependency(%q<mime-types>, ["~> 1.17"])
       s.add_dependency(%q<sdl4r>, ["~> 0.9"])
       s.add_dependency(%q<msgpack>, ["~> 0.5"])
-      s.add_dependency(%q<httpclient>, [">= 2.3"])
+      s.add_dependency(%q<faraday>, [">= 0.8"])
       s.add_dependency(%q<rspec>, ["~> 2.13"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
@@ -120,13 +123,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httpthumbnailer>, ["~> 1.2.0"])
     end
   else
-    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.2.0"])
+    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.2.2"])
     s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.2.0"])
     s.add_dependency(%q<aws-sdk>, ["~> 1.10"])
     s.add_dependency(%q<mime-types>, ["~> 1.17"])
     s.add_dependency(%q<sdl4r>, ["~> 0.9"])
     s.add_dependency(%q<msgpack>, ["~> 0.5"])
-    s.add_dependency(%q<httpclient>, [">= 2.3"])
+    s.add_dependency(%q<faraday>, [">= 0.8"])
     s.add_dependency(%q<rspec>, ["~> 2.13"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

data/lib/httpimagestore/configuration/file.rb

@@ -86,7 +86,7 @@ module Configuration
 					FileSourceStoreBase.stats.incr_total_file_source_bytes(data.bytesize)
 
 					image = Image.new(data)
-					image.source_url = "file://#{URI.encode(rendered_path.to_s)}"
+					image.source_url = URI::Generic.new('file', nil, nil, nil, nil, "/#{URI.encode(rendered_path.to_s)}", nil, nil, nil, URI::DEFAULT_PARSER, true)
 					image
 				rescue Errno::ENOENT
 					raise NoSuchFileError.new(image_name, rendered_path)
@@ -112,7 +112,7 @@ module Configuration
 			get_named_image_for_storage(request_state) do |image_name, image, rendered_path|
 				storage_path = storage_path(rendered_path)
 
-				image.store_url = "file://#{URI.encode(rendered_path.to_s)}"
+				image.store_url = URI::Generic.new('file', nil, nil, nil, nil, "/#{URI.encode(rendered_path.to_s)}", nil, nil, nil, URI::DEFAULT_PARSER, true)
 
 				log.info "storing '#{image_name}' in file '#{storage_path}' (#{image.data.length} bytes)"
 				storage_path.open('wb'){|io| io.write image.data}

data/lib/httpimagestore/configuration/handler.rb

@@ -98,6 +98,10 @@ module Configuration
 			@output_callback or fail 'no output callback'
 		end
 
+		def render_template(template)
+			RubyStringTemplate.new(template).render(self)
+		end
+
 		def fetch_base_variable(name, base_name)
 			fetch(base_name, nil) or generate_meta_variable(base_name) or raise NoVariableToGenerateMetaVariableError.new(base_name, name)
 		end
@@ -346,18 +350,18 @@ module Configuration
 					name = $1.to_sym
 					value = $2
 					Matcher.new([name], 'QueryKeyValue', "#{name}=#{value}") do
-						->{req[name] && req[name] == value && captures.push(req[name])}
+						->{req.GET[name.to_s] && req.GET[name.to_s] == value && captures.push(req.GET[name.to_s])}
 					end
 				when /^\&:(.+)\?(.*)$/# &:foo?bar
 					name = $1.to_sym
 					default = $2
 					Matcher.new([name], 'QueryKeyDefault', "#{name}=<key>|#{default}") do
-						->{captures.push(req[name] || default)}
+						->{captures.push(req.GET[name.to_s] || default)}
 					end
 				when /^\&:(.+)$/# &:foo
 					name = $1.to_sym
 					Matcher.new([name], 'QueryKey', "#{name}=<key>") do
-						->{req[name] && captures.push(req[name])}
+						->{req.GET[name.to_s] && captures.push(req.GET[name.to_s])}
 					end
 				# Literal URI segment matcher
 				else # foobar