httpimagestore 1.1.0 → 1.2.0

data/README.md

@@ -14,6 +14,20 @@ It is using [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) as
 * storage under custom paths including image hash, content determined extension or used URL path
 * based on [Unicorn HTTP server](http://unicorn.bogomips.org) with UNIX socket communication support
 
+## Changelog
+
+### 1.2.0
+
+* matching for query string key and value
+* getting query string key value into variable
+* optional query string matchers with default value
+* default values for optional component matchers
+* S3 storage prefix support
+
+### 1.1.0
+
+* passing thumbnailer options via query string parameters
+
 ## Installing
 
 HTTP Image Store is released as gem and can be installed from [RubyGems](http://rubygems.org) with:
@@ -113,13 +127,26 @@ Endpoints will be evaluated in order of definition until one is matched.
 
 Statement should start with one of the following HTTP verbs in lowercase: `get`, `post`, `put`, `delete`, followed by list of URI component matchers:
 
-* `string` - character string will match whole URI component in that position
-* `:symbol` - string beginning with `:` will match any URI component in that position and will store matched component string in variable named as symbol; this variable can then be used to build path, thumbnail parameters or in any other places where variables are expanded
-* `:symbol?` - string beginning with `:`  and followed with `?` will be optionally matched; request URI may not contain component in this location (usually at the end of URI) to be matched for this endpoint to be evaluated
-* `:symbol/regexp/` - in this format symbol will be matched only if `/` surrounded [regular expression](http://rubular.com) matches the URI section
+* `<string>` - `<string>` literally match against URI component in that position for the endpoint to be evaluated
+* `:<symbol>` - match any URI component in that position and store matched component value in variable named `<symbol>`
+* `:<symbol>?[defalut]` - optionally match URI component in that position and store matched component value in variable named `<symbol>`; request URI may not contain component in that position (usually at the end of URI) to be matched for this endpoint to be evaluated; if `[default]` value is specified it will be used when no value was found in the URI, otherwise empty string will be used
+* `:<symbol>/<regexp>/` - match URI component using `/` surrounded [regular expression](http://rubular.com) and store matched component value in variable named `<symbol>`
+* `&<key>=<value>` - match this endpoint when query string contains key `<key>` with value of `<value>`
+* `&:<key>` - match query string parameter of key `<key>` and store it's value in variable named `<key>`
+* `&:<key>?[default]` - optionally match query string parameter of key `<key>`; when `[default]` is specified it will be used as variable value, otherwise empty string will be used
+
+Note that any remaining unmatched URI is stored in `path` variable.
+All query string parameters are available as variables named by their key. 
+Additionally `query_string_options` variable is build from query string parameters and can be used to specify options to [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer).
 
-Note that any remaining URI are is stored in `path` variable.
-Also any query string parameters are available as variables. Additionally `query_string_options` is build from query string parameters and can be used to specify options to [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer).
+Note that variables can get overwritten in order of evaluation:
+1. all query string parameters
+2. `path` variable value
+3. all matched URI components and query string parameters in order of specification from left to right
+4. `query_string_options` variable value
+
+Note that URI components are URI decoded after they are matched. 
+Query string parameter values are URI decoded before they are matched.
 
 Example:
 
@@ -183,6 +210,7 @@ Options:
 
 * `bucket` - name of bucket to source image from
 * `path` - name of predefined path that will be used to generate key to object to source
+* `prefix` - prefix object key with given prefix value; this does not affect fromat of output URL; prefix will not be included in source path output; default: ``
 
 Example:
 
@@ -288,6 +316,7 @@ Options:
 * `bucket` - name of bucket to store image in
 * `path` - name of predefined path that will be used to generate key to store object under
 * `public` - if set to `true` the image will be readable by everybody; this affects fromat of output URL; default: `false`
+* `prefix` - prefix storeage key with given prefix value; this does not affect fromat of output URL; prefix will not be included in storage path output; default: ``
 
 Example:
 
@@ -602,7 +631,7 @@ On demand API example:
 $ curl -X PUT 10.1.1.24:3000/v1/original -q --data-binary @Pictures/compute.jpg 
 4006450256177f4a.jpg
 
-# Obtainig fit method 100x1000 thumbnail to /tmp/test.jpg
+# Getting fit operation 100x1000 thumbnail to /tmp/test.jpg
 $ curl 10.1.1.24:3000/v1/thumbnail/4006450256177f4a.jpg/fit/100/1000 -v -s -o /tmp/test.jpg
 * About to connect() to 10.1.1.24 port 3000 (#0)
 *   Trying 10.1.1.24... connected
@@ -653,6 +682,85 @@ $ identify /tmp/test.jpg
 /tmp/test.jpg JPEG 100x100 100x100+0+0 8-bit sRGB 3.31KB 0.000u 0:00.000
 ```
 
+## Facebook like API example
+
+Based on [Facebook APIs](https://developers.facebook.com/docs/reference/api/using-pictures/#sizes).
+
+```sdl
+s3 key="AIAITCKMELYWQZPJP7HQ" secret="V37lCu0F48Tv9s7QVqIT/sLf/wwqhNSB4B0Em7Ei" ssl=false
+
+path "hash"	"#{digest}"
+path "path"	"#{path}"
+
+put "original" {
+	thumbnail "input" "original" operation="limit" width=100 height=100 format="jpeg" quality=95
+
+	store_s3 "original" bucket="mybucket_v1" path="hash"
+
+	output_store_path "original"
+}
+
+# type selected
+get "&type=square" {
+	source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+
+	thumbnail "original" "thumbnail" operation="crop" width="50" height="50" format="input"
+
+	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+}
+
+get "&type=small" {
+	source_s3 "original" bucket="mybucket_v1" path="path"
+
+	thumbnail "original" "thumbnail" operation="fit" width="50" height="2000" format="input"
+
+	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+}
+
+get "&type=normall" {
+	source_s3 "original" bucket="mybucket_v1" path="path"
+
+	thumbnail "original" "thumbnail" operation="fit" width="100" height="2000" format="input"
+
+	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+}
+
+get "&type=large" {
+	source_s3 "original" bucket="mybucket_v1" path="path"
+
+	thumbnail "original" "thumbnail" operation="fit" width="200" height="2000" format="input"
+
+	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+}
+
+# crop to specified width and height
+get "&:width" "&:height" {
+	source_s3 "original" bucket="mybucket_v1" path="path"
+
+	thumbnail "original" "thumbnail" operation="crop" width="#{width}" height="#{height}" format="input"
+
+	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+}
+
+# fit to width when no height is specified
+get "&:width" "&:height?1080" {
+	source_s3 "original" bucket="mybucket_v1" path="path"
+
+	thumbnail "original" "thumbnail" operation="fit" width="#{width}" height="#{height}" format="input"
+
+	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+}
+
+# default to small class
+get {
+	source_s3 "original" bucket="bmybucket_v1" path="path"
+
+	thumbnail "original" "thumbnail" operation="crop" width="50" height="50" format="input"
+
+	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+}
+```
+
 ## Usage
 
 After installation of the gem the `httpimagestore` executable is installed in **PATH**. 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/features/cache-control.feature

@@ -3,7 +3,8 @@ Feature: S3 object Cache-Control header settings
 
 	Background:
 		Given S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables
-		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
+		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
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
@@ -21,7 +22,6 @@ Feature: S3 object Cache-Control header settings
 			store_s3 "cache"	bucket="@AWS_S3_TEST_BUCKET@" public=true path="hash-name" cache-control="public, max-age=31557600, s-maxage=0"
 		}
 		"""
-		Given httpthumbnailer server is running at http://localhost:3100/
 
 	@cache-control
 	Scenario: Image files get don't get Cache-Control header by default

data/features/compatibility.feature

@@ -4,7 +4,8 @@ Feature: Image list based thumbnailing and S3 storage
 
 	Background:
 		Given S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables
-		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
+		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
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
@@ -49,7 +50,6 @@ Feature: Image list based thumbnailing and S3 storage
 			}
 		}
 		"""
-		Given httpthumbnailer server is running at http://localhost:3100/
 
 	@compatibility @test
 	Scenario: Putting original and its thumbnails to S3 bucket

data/features/error-reporting.feature

@@ -4,7 +4,8 @@ Feature: Image list based thumbnailing and S3 storage
 
 	Background:
 		Given S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables
-		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
+		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
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
@@ -44,7 +45,6 @@ Feature: Image list based thumbnailing and S3 storage
 			source_file "original" root="/dev" path="zero"
 		}
 		"""
-		Given httpthumbnailer server is running at http://localhost:3100/
 
 	@error-reporting
 	Scenario: Reporting of missing resource

data/features/facebook.feature

@@ -0,0 +1,149 @@
+Feature: Store limited original image in S3 and thumbnail on facebook API
+	Similar API to described in https://developers.facebook.com/docs/reference/api/using-pictures/#sizes
+
+	Background:
+		Given S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables
+		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
+		"""
+		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
+
+		path "original-hash"	"#{digest}"
+		path "path"		"#{path}"
+
+		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"
+
+			output_store_path "original"
+		}
+
+		get "&type=square" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+
+			thumbnail "original" "thumbnail" operation="crop" width="50" height="50" format="input"
+
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "&type=small" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+
+			thumbnail "original" "thumbnail" operation="fit" width="50" height="2000" format="input"
+
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "&type=normall" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+
+			thumbnail "original" "thumbnail" operation="fit" width="100" height="2000" format="input"
+
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "&type=large" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+
+			thumbnail "original" "thumbnail" operation="fit" width="200" height="2000" format="input"
+
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "&:width" "&:height" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+
+			thumbnail "original" "thumbnail" operation="crop" width="#{width}" height="#{height}" format="input"
+
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "&:width" "&:height?1080" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+
+			thumbnail "original" "thumbnail" operation="fit" width="#{width}" height="#{height}" format="input"
+
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+
+			thumbnail "original" "thumbnail" operation="crop" width="50" height="50" format="input"
+
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+		"""
+
+	@facebook @type
+	Scenario: Putting original to S3 bucket
+		Given there is no 4006450256177f4a file in S3 bucket
+		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 body will be CRLF ended lines
+		"""
+		4006450256177f4a
+		"""
+		Then S3 object 4006450256177f4a will contain JPEG image of size 71x100
+		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/4006450256177f4a
+		Then response status will be 403
+
+	@facebook @type
+	Scenario: Getting square type tumbnail
+		Given test.jpg file content is stored in S3 under 4006450256177f4a
+		When I do GET request http://localhost:3000/4006450256177f4a?type=square
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 50x50
+
+	@facebook @type
+	Scenario: Getting small type tumbnail
+		Given test.jpg file content is stored in S3 under 4006450256177f4a
+		When I do GET request http://localhost:3000/4006450256177f4a?type=small
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 50x71
+
+	@facebook @type
+	Scenario: Getting normall type tumbnail
+		Given test.jpg file content is stored in S3 under 4006450256177f4a
+		When I do GET request http://localhost:3000/4006450256177f4a?type=normall
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 100x141
+
+	@facebook @type
+	Scenario: Getting large type tumbnail
+		Given test.jpg file content is stored in S3 under 4006450256177f4a
+		When I do GET request http://localhost:3000/4006450256177f4a?type=large
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 200x283
+
+	@facebook @type
+	Scenario: Getting square type tumbnail when no type is specified
+		Given test.jpg file content is stored in S3 under 4006450256177f4a
+		When I do GET request http://localhost:3000/4006450256177f4a
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 50x50
+
+	@facebook @size
+	Scenario: Getting custom size tumbnail
+		Given test.jpg file content is stored in S3 under 4006450256177f4a
+		When I do GET request http://localhost:3000/4006450256177f4a?width=123&height=321
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 123x321
+
+	@facebook @size
+	Scenario: Getting custom size tumbnail without height
+		Given test.jpg file content is stored in S3 under 4006450256177f4a
+		When I do GET request http://localhost:3000/4006450256177f4a?width=123
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 123x174
+

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

@@ -5,7 +5,8 @@ Feature: Store limited original image in S3 and thumbnail based on request
 
 	Background:
 		Given S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables
-		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
+		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
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
@@ -36,7 +37,6 @@ Feature: Store limited original image in S3 and thumbnail based on request
 			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
 		}
 		"""
-		Given httpthumbnailer server is running at http://localhost:3100/
 
 	@s3-store-and-thumbnail
 	Scenario: Putting original to S3 bucket

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2013-07-24"
+  s.date = "2013-07-29"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "features/cache-control.feature",
     "features/compatibility.feature",
     "features/error-reporting.feature",
+    "features/facebook.feature",
     "features/health-check.feature",
     "features/s3-store-and-thumbnail.feature",
     "features/step_definitions/httpimagestore_steps.rb",

data/lib/httpimagestore/configuration/handler.rb

@@ -42,7 +42,7 @@ module Configuration
 			@locals[:query_string_options] = query_string.sort.map{|kv| kv.join(':')}.join(',')
 			log.debug "processing request with body length: #{body.bytesize} bytes and locals: #{@locals} "
 
-			@locals[:body] = body
+			@locals[:_body] = body
 
 			@images = Images.new(memory_limit)
 			@memory_limit = memory_limit
@@ -81,8 +81,8 @@ module Configuration
 
 	class InputSource
 		def realize(request_state)
-			request_state.locals[:body].empty? and raise ZeroBodyLengthError
-			request_state.images['input'] = Image.new(request_state.locals[:body])
+			request_state.locals[:_body].empty? and raise ZeroBodyLengthError
+			request_state.images['input'] = Image.new(request_state.locals[:_body])
 		end
 	end
 
@@ -202,24 +202,46 @@ module Configuration
 			handler_configuration.http_method = node.name
 			handler_configuration.uri_matchers = node.values.map do |matcher|
 				case matcher
-				when %r{^:[^/]+/.*/$}
-					name, regexp = *matcher.match(%r{^:([^/]+)/(.*)/$}).captures
+				# URI component matchers
+				when %r{^:([^/]+)/(.*)/$} # :foobar/.*/
+					name = $1
+					regexp = $2
 					Matcher.new(name.to_sym) do
 						Regexp.new("(#{regexp})")
 					end
-				when /^:.+\?$/
-					name = matcher.sub(/^:(.+)\?$/, '\1').to_sym
+				when /^:(.+)\?(.*)$/ # :foo?bar
+					name = $1.to_sym
+					default = $2
 					Matcher.new(name) do
-						->{match(name) || captures.push('')}
+						->{match(name) || captures.push(default)}
 					end
-				when /^:/
-					name = matcher.sub(/^:/, '').to_sym
+				when /^:(.+)$/ # :foobar
+					name = $1.to_sym
 					Matcher.new(name) do
 						name
 					end
-				else
+				# Query string matchers
+				when /^\&([^=]+)=(.+)$/# ?foo=bar
+					name = $1
+					value = $2
 					Matcher.new(nil) do
-						matcher
+						->{req[name] && req[name] == value}
+					end
+				when /^\&:(.+)\?(.*)$/# &:foo?bar
+					name = $1
+					default = $2
+					Matcher.new(name.to_sym) do
+						->{captures.push(req[name] || default)}
+					end
+				when /^\&:(.+)$/# &:foo
+					name = $1
+					Matcher.new(name.to_sym) do
+						->{req[name] && captures.push(req[name])}
+					end
+				# String URI component matcher
+				else # foobar
+					Matcher.new(nil) do
+						Regexp.escape(matcher)
 					end
 				end
 			end

data/lib/httpimagestore/configuration/path.rb

@@ -62,7 +62,7 @@ module Configuration
 					Pathname.new(path).extname.delete('.')
 				when :digest
 					return locals[:_digest] if locals.include? :_digest
-					data = locals[:body] or raise NoMetaValueForPathTemplatePlaceholerError.new(path_name, template, :body, name) 
+					data = locals[:_body] or raise NoMetaValueForPathTemplatePlaceholerError.new(path_name, template, :body, name) 
 					digest = Digest::SHA2.new.update(data).to_s[0,16]
 					# cache digest in request locals
 					locals[:_digest] = digest

data/lib/httpimagestore/configuration/s3.rb

@@ -75,9 +75,10 @@ module Configuration
 			node.required_attributes('bucket', 'path')
 			node.valid_attribute_values('public_access', true, false, nil)
 
-			bucket, path_spec, cache_control, public_access, if_image_name_on = 
-				*node.grab_attributes('bucket', 'path', 'cache-control', 'public', 'if-image-name-on')
+			bucket, path_spec, public_access, cache_control, prefix, if_image_name_on = 
+				*node.grab_attributes('bucket', 'path', 'public', 'cache-control', 'prefix', 'if-image-name-on')
 			public_access = false if public_access.nil?
+			prefix = '' if prefix.nil?
 
 			self.new(
 				configuration.global, 
@@ -86,16 +87,18 @@ module Configuration
 				bucket, 
 				path_spec, 
 				public_access, 
-				cache_control
+				cache_control,
+				prefix
 			)
 		end
 
-		def initialize(global, image_name, matcher, bucket, path_spec, public_access, cache_control)
+		def initialize(global, image_name, matcher, bucket, path_spec, public_access, cache_control, prefix)
 			super global, image_name, matcher
 			@bucket = bucket
 			@path_spec = path_spec
 			@public_access = public_access
 			@cache_control = cache_control
+			@prefix = prefix
 			local :bucket, @bucket
 		end
 
@@ -114,7 +117,7 @@ module Configuration
 		def object(path)
 			begin
 				bucket = client.buckets[@bucket]
-				yield bucket.objects[path]
+				yield bucket.objects[@prefix + path]
 			rescue AWS::S3::Errors::AccessDenied
 				raise S3AccessDenied.new(@bucket, path)
 			rescue AWS::S3::Errors::NoSuchBucket

data/spec/configuration_path_spec.rb

@@ -18,10 +18,10 @@ describe Configuration do
 			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(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'
 		end
 
 		describe 'error handling' do

data/spec/configuration_s3_spec.rb

@@ -87,6 +87,7 @@ else
 				s3_client = AWS::S3.new(use_ssl: false)
 				s3_test_bucket = s3_client.buckets[ENV['AWS_S3_TEST_BUCKET']]
 				s3_test_bucket.objects['test.jpg'].write(@test_data, content_type: 'image/jpeg')
+				s3_test_bucket.objects['test_prefix/test.jpg'].write(@test_data, content_type: 'image/jpeg')
 			end
 
 			it 'should source image from S3 using path spec' do
@@ -113,6 +114,34 @@ else
 				status(state.images['original'].source_url).should == 200
 			end
 
+			describe 'storage prefix' do
+				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" prefix="test_prefix/"
+					}
+					EOF
+				end
+
+				it 'should still provide valid HTTPS URL incliding prefix' do
+					subject.handlers[0].image_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']
+					state.images['original'].source_url.should include "/test_prefix/test.jpg"
+					state.images['original'].source_url.should include ENV['AWS_ACCESS_KEY_ID']
+					status(state.images['original'].source_url).should == 200
+				end
+
+				it 'should provide source path without prefix' do
+					subject.handlers[0].image_sources[0].realize(state)
+
+					state.images['original'].source_path.should == "test.jpg"
+				end
+			end
+
 			describe 'non encrypted connection mode' do
 				subject do
 					Configuration.read(<<-EOF)
@@ -292,6 +321,8 @@ else
 				s3_test_bucket = s3_client.buckets[ENV['AWS_S3_TEST_BUCKET']]
 				@test_object = s3_test_bucket.objects['test_out.jpg']
 				@test_object.delete
+				test_object = s3_test_bucket.objects['test_prefix/test_out.jpg']
+				test_object.delete
 			end
 
 			before :each do
@@ -323,6 +354,34 @@ else
 				status(state.images['input'].store_url).should == 200
 			end
 
+			describe 'storage prefix' do
+				subject do
+					Configuration.read(<<-EOF)
+					s3 key="#{ENV['AWS_ACCESS_KEY_ID']}" secret="#{ENV['AWS_SECRET_ACCESS_KEY']}"
+					path "hash" "\#{test_image}"
+					post {
+						store_s3 "input" bucket="#{ENV['AWS_S3_TEST_BUCKET']}" path="hash" prefix="test_prefix/"
+					}
+					EOF
+				end
+
+				it 'should still provide valid HTTPS URL incliding prefix' do
+					subject.handlers[0].stores[0].realize(state)
+
+					state.images['input'].store_url.should start_with "https://"
+					state.images['input'].store_url.should include ENV['AWS_S3_TEST_BUCKET']
+					state.images['input'].store_url.should include "test_prefix/test_out.jpg"
+					state.images['input'].store_url.should include ENV['AWS_ACCESS_KEY_ID']
+					status(state.images['input'].store_url).should == 200
+				end
+
+				it 'should provide storage path without prefix' do
+					subject.handlers[0].stores[0].realize(state)
+
+					state.images['input'].store_path.should == "test_out.jpg"
+				end
+			end
+
 			describe 'non encrypted connection mode' do
 				subject do
 					Configuration.read(<<-EOF)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpimagestore
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn-cuba-base
@@ -241,6 +241,7 @@ files:
 - features/cache-control.feature
 - features/compatibility.feature
 - features/error-reporting.feature
+- features/facebook.feature
 - features/health-check.feature
 - features/s3-store-and-thumbnail.feature
 - features/step_definitions/httpimagestore_steps.rb
@@ -291,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1029095012750983706
+      hash: -1673888350520322204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: