httpimagestore 1.2.0 → 1.3.0

data/features/flexi.feature

@@ -0,0 +1,260 @@
+Feature: Flexible API with two storage options and Facebook like thumbnailing URL format
+	Features two storage apporaches: with JPEG conversion and limiting in size - for user provided content - and storing literaly.
+	POST requests will end up with server side generated storage key based on input data digest.
+	PUT requsts can be used to store image under provided storage key.
+	Thumbnail GET API is similart to described in https://developers.facebook.com/docs/reference/api/using-pictures/#sizes.
+	Stored object extension and content type is determined from image data.
+
+	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 "hash" "#{input_digest}.#{image_mime_extension}"
+		path "path" "#{path}"
+
+		## User uploaded content - always JPEG converted, not bigger than 2160x2160 and in hight quality compression
+		post "pictures" {
+			thumbnail "input" "original" operation="limit" width=2160 height=2160 format="jpeg" quality=95
+			store_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="hash"
+			output_store_path "original"
+		}
+
+		put "pictures" {
+			thumbnail "input" "original" operation="limit" width=2160 height=2160 format="jpeg" quality=95
+			store_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			output_store_path "original"
+		}
+
+		## Uploaded by us for use on the website - whatever we send
+		post "images" {
+			identify "input"
+			store_s3 "input" bucket="@AWS_S3_TEST_BUCKET@" path="hash"
+			output_store_path "input"
+		}
+
+		put "images" {
+			identify "input"
+			store_s3 "input" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			output_store_path "input"
+		}
+
+		## Thumbailing - keep input format; default JPEG quality is 85
+		get "pictures" "&:width" "&:height" "&:operation?crop" "&:background-color?white" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="background-color:#{background-color}"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "pictures" "&:width" "&:height?1080" "&:operation?fit" "&:background-color?white" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="background-color:#{background-color}"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "pictures" "&:height" "&:width?1080" "&:operation?fit" "&:background-color?white" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="background-color:#{background-color}"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "pictures" "&type=square" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			thumbnail "original" "thumbnail" operation="crop" width="50" height="50"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "pictures" "&type=small" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			thumbnail "original" "thumbnail" operation="fit" width="50" height="2000"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "pictures" "&type=normall" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			thumbnail "original" "thumbnail" operation="fit" width="100" height="2000"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "pictures" "&type=large" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			thumbnail "original" "thumbnail" operation="fit" width="200" height="2000"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		## By default serve original image
+		get "pictures" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			output_image "original" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+		"""
+
+	@flexi @pictures @post
+	Scenario: Posting picture to S3 bucket will store it under input data digest, limit to 2160x1260 and converted to JPEG
+		Given there is no 625d51a1820b607f.jpg file in S3 bucket
+		Given test-large.jpg file content as request body
+		When I do POST request http://localhost:3000/pictures
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		625d51a1820b607f.jpg
+		"""
+		Then S3 object 625d51a1820b607f.jpg will contain JPEG image of size 1529x2160
+		Then S3 object 625d51a1820b607f.jpg content type will be image/jpeg
+		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/625d51a1820b607f.jpg
+		Then response status will be 403
+		Given there is no b0fe25319ba5909a.jpg file in S3 bucket
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/pictures
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		b0fe25319ba5909a.jpg
+		"""
+		Then S3 object b0fe25319ba5909a.jpg will contain JPEG image of size 509x719
+		Then S3 object b0fe25319ba5909a.jpg content type will be image/jpeg
+		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/b0fe25319ba5909a.jpg
+		Then response status will be 403
+
+	@flexi @pictures @put
+	Scenario: Putting picture to S3 bucket will store it under provided path, limit it to 2160x1260 and converted to JPEG
+		Given there is no hello/world file in S3 bucket
+		Given test-large.jpg file content as request body
+		When I do PUT request http://localhost:3000/pictures/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		hello/world
+		"""
+		Then S3 object hello/world will contain JPEG image of size 1529x2160
+		Then S3 object hello/world content type will be image/jpeg
+		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/hello/world
+		Then response status will be 403
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/pictures/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		hello/world
+		"""
+		Then S3 object hello/world will contain JPEG image of size 509x719
+		Then S3 object hello/world content type will be image/jpeg
+		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/hello/world
+		Then response status will be 403
+
+	@flexi @images @post
+	Scenario: Posting picture to S3 bucket will store it under first input data digest
+		Given there is no b0fe25319ba5909a.png file in S3 bucket
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/images
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		b0fe25319ba5909a.png
+		"""
+		Then S3 object b0fe25319ba5909a.png will contain PNG image of size 509x719
+		Then S3 object b0fe25319ba5909a.png content type will be image/png
+		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/b0fe25319ba5909a.png
+		Then response status will be 403
+
+	@flexi @images @put
+	Scenario: Putting picture to S3 bucket will store it under provided path
+		Given there is no hello/world file in S3 bucket
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		hello/world
+		"""
+		Then S3 object hello/world will contain PNG image of size 509x719
+		Then S3 object hello/world content type will be image/png
+		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/hello/world
+		Then response status will be 403
+
+	@flexi @default
+	Scenario: Getting stored image when no query string param is present
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/test.png
+		And I do GET request http://localhost:3000/pictures/test.png
+		Then response status will be 200
+		And response content type will be image/png
+		Then response body will contain PNG image of size 509x719
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/images/test.jpg
+		And I do GET request http://localhost:3000/pictures/test.jpg
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 509x719
+
+	@flexi @type
+	Scenario: Getting square type tumbnail
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/test.png
+		And I do GET request http://localhost:3000/pictures/test.png?type=square
+		Then response status will be 200
+		And response content type will be image/png
+		Then response body will contain PNG image of size 50x50
+
+	@flexi @type
+	Scenario: Getting small type tumbnail
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/test.png
+		And I do GET request http://localhost:3000/pictures/test.png?type=small
+		Then response status will be 200
+		And response content type will be image/png
+		Then response body will contain PNG image of size 50x71
+
+	@flexi @type
+	Scenario: Getting normall type tumbnail
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/test.png
+		And I do GET request http://localhost:3000/pictures/test.png?type=normall
+		Then response status will be 200
+		And response content type will be image/png
+		Then response body will contain PNG image of size 100x141
+
+	@flexi @type
+	Scenario: Getting large type tumbnail
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/test.png
+		And I do GET request http://localhost:3000/pictures/test.png?type=large
+		Then response status will be 200
+		And response content type will be image/png
+		Then response body will contain PNG image of size 200x283
+
+	@flexi @size
+	Scenario: Getting custom size tumbnail
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/test.png
+		And I do GET request http://localhost:3000/pictures/test.png?width=123&height=321
+		Then response status will be 200
+		And response content type will be image/png
+		Then response body will contain PNG image of size 123x321
+
+	@flexi @size
+	Scenario: Getting custom size tumbnail without height
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/test.png
+		And I do GET request http://localhost:3000/pictures/test.png?width=123
+		Then response status will be 200
+		And response content type will be image/png
+		Then response body will contain PNG image of size 123x174
+
+	@flexi @size
+	Scenario: Getting custom size tumbnail without width
+		Given test.png file content as request body
+		When I do PUT request http://localhost:3000/images/test.png
+		And I do GET request http://localhost:3000/pictures/test.png?height=321
+		Then response status will be 200
+		And response content type will be image/png
+		Then response body will contain PNG image of size 227x321
+

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

@@ -10,7 +10,7 @@ Feature: Store limited original image in S3 and thumbnail based on request
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
-		path "original-hash"	"#{digest}.#{mimeextension}"
+		path "original-hash"	"#{input_digest}.#{image_mime_extension}"
 		path "path"		"#{path}"
 
 		put "original" {

data/features/step_definitions/httpimagestore_steps.rb

@@ -51,6 +51,10 @@ Given /^([^ ]*) file content as request body/ do |file|
 	@request_body = File.open(support_dir + file){|f| f.read }
 end
 
+Given /there is no file (.*)/ do |file|
+	Pathname.new(file).exist? and Pathname.new(file).unlink
+end
+
 Given /S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables/ do
 	
 	unless ENV['AWS_ACCESS_KEY_ID'] and ENV['AWS_SECRET_ACCESS_KEY'] and ENV['AWS_S3_TEST_BUCKET']
@@ -78,6 +82,7 @@ Then /S3 bucket will not contain (.*)/ do |key|
 end
 
 When /I do (.*) request (.*)/ do |method, uri|
+	@request_body = nil if method == 'GET'
 	@response = HTTPClient.new.request(method, URI.encode(uri.replace_s3_variables), nil, @request_body, (@request_headers or {}))
 end
 
@@ -134,6 +139,10 @@ Then /S3 object (.*) will contain (.*) image of size (.*)x(.*)/ do |key, format,
 	@image.rows.should == height.to_i
 end
 
+Then /S3 object (.*) content type will be (.*)/ do |key, content_type|
+	@bucket.objects[key].content_type.should == content_type
+end
+
 Then /response body will contain (.*) image of size (.*)x(.*)/ do |format, width, height|
 	data = @response.body
 	Pathname.new('/tmp/out.jpg').open('w'){|io| io.write data}
@@ -146,7 +155,22 @@ Then /response body will contain (.*) image of size (.*)x(.*)/ do |format, width
 	@image.rows.should == height.to_i
 end
 
+Then /response body will contain UUID/ do
+	@response.body.should ~ /[0-f]{8}-[0-f]{4}-[0-f]{4}-[0-f]{4}-[0-f]{12}/
+end
+
 And /that image pixel at (.*)x(.*) should be of color (.*)/ do |x, y, color|
 	@image.pixel_color(x.to_i, y.to_i).to_color.sub(/^#/, '0x').should == color
 end
 
+Then /file (.*) will contain (.*) image of size (.*)x(.*)/ do |file, format, width, height|
+	data = Pathname.new(file).read
+	
+	@image.destroy! if @image
+	@image = Magick::Image.from_blob(data).first
+
+	@image.format.should == format
+	@image.columns.should == width.to_i
+	@image.rows.should == height.to_i
+end
+

data/features/storage.feature

@@ -0,0 +1,199 @@
+Feature: Storing images under different names
+	Storage supports UUID and SHA digest based auto generated storage as well as user provided via request or static configuration string.
+
+
+	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 "input_sha256"					"#{input_sha256}"
+		path "image_digest"					"#{image_digest}"
+		path "image_sha256"					"#{image_sha256}"
+		path "uuid"									"#{uuid}"
+		path "image_meta"						"#{image_width}x#{image_height}.#{image_mime_extension}"
+		path "input_image_meta"			"#{input_image_width}x#{input_image_height}.#{input_image_mime_extension}"
+
+		post "images" "input_digest" {
+			thumbnail "input" "thumbnail" operation="crop" width="50" height="50"
+			store_file "thumbnail" root="/tmp" path="input_digest"
+			output_store_path "thumbnail"
+		}
+
+		post "images" "input_sha256" {
+			thumbnail "input" "thumbnail" operation="crop" width="50" height="50"
+			store_file "thumbnail" root="/tmp" path="input_sha256"
+			output_store_path "thumbnail"
+		}
+
+		post "images" "image_digest" {
+			thumbnail "input" "thumbnail" operation="crop" width="50" height="50"
+			store_file "thumbnail" root="/tmp" path="image_digest"
+			output_store_path "thumbnail"
+		}
+
+		post "images" "image_sha256" {
+			thumbnail "input" "thumbnail" operation="crop" width="50" height="50"
+			store_file "thumbnail" root="/tmp" path="image_sha256"
+			output_store_path "thumbnail"
+		}
+
+		post "images" "uuid" {
+			store_file "input" root="/tmp" path="uuid"
+			output_store_path "input"
+		}
+
+		post "images" "image_meta" "identify" {
+			identify "input"
+			store_file "input" root="/tmp" path="image_meta"
+			output_store_path "input"
+		}
+
+		post "images" "image_meta" "thumbnail" "input" {
+			thumbnail "input" "thumbnail" operation="crop" width="50" height="100"
+			store_file "input" root="/tmp" path="image_meta"
+			output_store_path "input"
+		}
+
+		post "images" "image_meta" "thumbnails" "input" {
+			thumbnail "input" {
+				"thumbnail" operation="crop" width="50" height="100"
+			}
+
+			store_file "input" root="/tmp" path="image_meta"
+			output_store_path "input"
+		}
+
+		post "images" "image_meta" "thumbnail" {
+			thumbnail "input" "thumbnail" operation="crop" width="50" height="100"
+			store_file "thumbnail" root="/tmp" path="image_meta"
+			output_store_path "thumbnail"
+		}
+
+		post "images" "image_meta" "thumbnails" {
+			thumbnail "input" {
+				"thumbnail" operation="crop" width="50" height="100"
+			}
+			store_file "thumbnail" root="/tmp" path="image_meta"
+			output_store_path "thumbnail"
+		}
+
+		post "images" "input_image_meta" "thumbnail" {
+			thumbnail "input" "thumbnail" operation="crop" width="50" height="100"
+			store_file "thumbnail" root="/tmp" path="input_image_meta"
+			output_store_path "thumbnail"
+		}
+		"""
+
+		@storage @input_digest
+		Scenario: Posting picture to file system under input data digest
+		Given there is no file /tmp/b0fe25319ba5909a
+			Given test.png file content as request body
+			When I do POST request http://localhost:3000/images/input_digest
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will be CRLF ended lines
+			"""
+			b0fe25319ba5909a
+			"""
+			Then file /tmp/b0fe25319ba5909a will contain PNG image of size 50x50
+
+		@storage @input_sha256
+		Scenario: Posting picture to file system under input data digest
+			Given there is no file /tmp/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e
+			Given test.png file content as request body
+			When I do POST request http://localhost:3000/images/input_sha256
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will be CRLF ended lines
+			"""
+			b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e
+			"""
+			Then file /tmp/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e will contain PNG image of size 50x50
+
+		@storage @image_digest
+		Scenario: Posting picture to file system under input data digest
+		Given there is no file /tmp/b0fe25319ba5909a
+			Given test.png file content as request body
+			When I do POST request http://localhost:3000/images/image_digest
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will be CRLF ended lines
+			"""
+			091000e2c0aee836
+			"""
+			Then file /tmp/091000e2c0aee836 will contain PNG image of size 50x50
+
+		@storage @image_sha256
+		Scenario: Posting picture to file system under input data digest
+			Given there is no file /tmp/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e
+			Given test.png file content as request body
+			When I do POST request http://localhost:3000/images/image_sha256
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will be CRLF ended lines
+			"""
+			091000e2c0aee836fff432c1151faba86d46690c900c0f6355247a353defa37f
+			"""
+			Then file /tmp/091000e2c0aee836fff432c1151faba86d46690c900c0f6355247a353defa37f will contain PNG image of size 50x50
+
+		@storage @uuid
+		Scenario: Posting picture to file system under input data digest
+			Given test.png file content as request body
+			When I do POST request http://localhost:3000/images/uuid
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will contain UUID
+
+		@storage @image_meta @identify
+		Scenario: Posting picture to file system under input data digest
+			Given there is no file /tmp/509x719.png
+			Given test.png file content as request body
+			When I do POST request http://localhost:3000/images/image_meta/identify
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will be CRLF ended lines
+			"""
+			509x719.png
+			"""
+			Then file /tmp/509x719.png will contain PNG image of size 509x719
+
+		@storage @image_meta @thumbnail
+		Scenario: Posting picture to file system under input data digest
+			Given test.png file content as request body
+			Given there is no file /tmp/50x100.png
+			When I do POST request http://localhost:3000/images/image_meta/thumbnail
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will be CRLF ended lines
+			"""
+			50x100.png
+			"""
+			Then file /tmp/50x100.png will contain PNG image of size 50x100
+
+		@storage @image_meta @thumbnails
+		Scenario: Posting picture to file system under input data digest
+			Given test.png file content as request body
+			Given there is no file /tmp/50x100.png
+			When I do POST request http://localhost:3000/images/image_meta/thumbnails
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will be CRLF ended lines
+			"""
+			50x100.png
+			"""
+			Then file /tmp/50x100.png will contain PNG image of size 50x100
+
+		@storage @input_image_meta
+		Scenario: Input image meta variables
+			Given there is no file /tmp/509x719.png
+			Given test.png file content as request body
+			When I do POST request http://localhost:3000/images/input_image_meta/thumbnail
+			Then response status will be 200
+			And response content type will be text/plain
+			And response body will be CRLF ended lines
+			"""
+			509x719.png
+			"""
+			Then file /tmp/509x719.png will contain PNG image of size 50x100
+

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2013-07-29"
+  s.date = "2013-09-11"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -30,20 +30,23 @@ Gem::Specification.new do |s|
     "features/cache-control.feature",
     "features/compatibility.feature",
     "features/error-reporting.feature",
-    "features/facebook.feature",
+    "features/flexi.feature",
     "features/health-check.feature",
     "features/s3-store-and-thumbnail.feature",
     "features/step_definitions/httpimagestore_steps.rb",
+    "features/storage.feature",
     "features/support/env.rb",
     "features/support/test-large.jpg",
     "features/support/test.empty",
     "features/support/test.jpg",
+    "features/support/test.png",
     "features/support/test.txt",
     "httpimagestore.gemspec",
     "lib/httpimagestore/aws_sdk_regions_hack.rb",
     "lib/httpimagestore/configuration.rb",
     "lib/httpimagestore/configuration/file.rb",
     "lib/httpimagestore/configuration/handler.rb",
+    "lib/httpimagestore/configuration/identify.rb",
     "lib/httpimagestore/configuration/output.rb",
     "lib/httpimagestore/configuration/path.rb",
     "lib/httpimagestore/configuration/s3.rb",
@@ -56,6 +59,7 @@ Gem::Specification.new do |s|
     "load_test/thumbnail_specs.csv",
     "spec/configuration_file_spec.rb",
     "spec/configuration_handler_spec.rb",
+    "spec/configuration_identify_spec.rb",
     "spec/configuration_output_spec.rb",
     "spec/configuration_path_spec.rb",
     "spec/configuration_s3_spec.rb",
@@ -77,8 +81,8 @@ 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.0"])
-      s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<unicorn-cuba-base>, ["~> 1.1"])
+      s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 1.1"])
       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"])
@@ -91,8 +95,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<prawn>, ["= 0.8.4"])
       s.add_development_dependency(%q<httpthumbnailer>, [">= 0"])
     else
-      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.0"])
-      s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.0"])
+      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.1"])
+      s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.1"])
       s.add_dependency(%q<aws-sdk>, ["~> 1.10"])
       s.add_dependency(%q<mime-types>, ["~> 1.17"])
       s.add_dependency(%q<sdl4r>, ["~> 0.9"])
@@ -106,8 +110,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httpthumbnailer>, [">= 0"])
     end
   else
-    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.0"])
-    s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.0"])
+    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.1"])
+    s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.1"])
     s.add_dependency(%q<aws-sdk>, ["~> 1.10"])
     s.add_dependency(%q<mime-types>, ["~> 1.17"])
     s.add_dependency(%q<sdl4r>, ["~> 0.9"])

data/lib/httpimagestore/configuration/file.rb

@@ -63,7 +63,7 @@ module Configuration
 		end
 
 		def self.parse(configuration, node)
-			configuration.image_sources << super
+			configuration.sources << super
 		end
 
 		def realize(request_state)