httpimagestore 1.2.0 → 1.3.0

data/Gemfile

@@ -1,11 +1,14 @@
 source "http://rubygems.org"
 ruby "1.9.3"
 
-gem "unicorn-cuba-base", "~> 1.0"
-gem "httpthumbnailer-client", "~> 1.0"
+#gem "unicorn-cuba-base", "~> 1.0"
+gem "unicorn-cuba-base", path: '../unicorn-cuba-base'
+#gem "httpthumbnailer-client", "~> 1.0"
+gem "httpthumbnailer-client", path: '../httpthumbnailer-client'
 gem "aws-sdk", "~> 1.10"
 gem "mime-types", "~> 1.17"
 gem "sdl4r", "~> 0.9"
+gem "msgpack", "~> 0.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -5,6 +5,25 @@ PATH
       rmagick (~> 2)
       unicorn-cuba-base (~> 1.0)
 
+PATH
+  remote: ../httpthumbnailer-client
+  specs:
+    httpthumbnailer-client (1.0.0)
+      cli (~> 1.1.0)
+      httpclient (>= 2.3)
+      multipart-parser (~> 0.1.1)
+
+PATH
+  remote: ../unicorn-cuba-base
+  specs:
+    unicorn-cuba-base (1.0.0)
+      cli (~> 1.1.0)
+      cuba (~> 3.0)
+      facter (~> 1.6.11)
+      raindrops (~> 0.11)
+      ruby-ip (~> 0.9)
+      unicorn (>= 4.6.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -28,10 +47,6 @@ GEM
       json (>= 1.4.6)
     git (1.2.5)
     httpclient (2.3.3)
-    httpthumbnailer-client (1.0.0)
-      cli (~> 1.1.0)
-      httpclient (>= 2.3)
-      multipart-parser (~> 0.1.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -40,6 +55,7 @@ GEM
     json (1.7.5)
     kgio (2.8.0)
     mime-types (1.17.2)
+    msgpack (0.5.5)
     multipart-parser (0.1.1)
     nokogiri (1.5.9)
     prawn (0.8.4)
@@ -65,17 +81,10 @@ GEM
     rspec-mocks (2.13.1)
     ruby-ip (0.9.1)
     sdl4r (0.9.11)
-    unicorn (4.6.2)
+    unicorn (4.6.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-cuba-base (1.0.0)
-      cli (~> 1.1.0)
-      cuba (~> 3.0)
-      facter (~> 1.6.11)
-      raindrops (~> 0.11)
-      ruby-ip (~> 0.9)
-      unicorn (>= 4.6.2)
     uuidtools (2.1.4)
 
 PLATFORMS
@@ -87,11 +96,12 @@ DEPENDENCIES
   daemon (~> 1)
   httpclient (>= 2.3)
   httpthumbnailer!
-  httpthumbnailer-client (~> 1.0)
+  httpthumbnailer-client!
   jeweler (~> 1.8.4)
   mime-types (~> 1.17)
+  msgpack (~> 0.5)
   prawn (= 0.8.4)
   rdoc (~> 3.9)
   rspec (~> 2.13)
   sdl4r (~> 0.9)
-  unicorn-cuba-base (~> 1.0)
+  unicorn-cuba-base!

data/README.md

@@ -16,6 +16,13 @@ It is using [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) as
 
 ## Changelog
 
+### 1.3.0
+
+* `identify` statement support (requires [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) v1.1.0 or higher)
+* changed variable names: `imagename` to `image_name`, `mimeextension` to `image_mime_extension`, `digest` to `input_digest` (old names can still be used)
+* added support for new variables: `uuid`, `input_sha256`, `image_digest`, `image_sha256`, `image_width`, `image_height`, `input_image_mime_extension`, `input_image_width`, `input_image_height`
+* improved variable processing and logging
+
 ### 1.2.0
 
 * matching for query string key and value
@@ -96,25 +103,41 @@ Arguments:
 
 Variables:
 
-* `digest` - input image digest based on it's content only; this is first 16 hex characters from SHA2 digest; ex. `2cf24dba5fb0a30e`
+* `input_digest` - input image digest based on it's content only; this is first 16 hex characters from SHA256 digest; ex. `9f86d081884c7d65`
+* `digest` - same as `input_digest`; deprecated, please use `input_digest` instead
+* `input_sha256` - input image digest based on it's content only; this is whole hex encoded SHA256 digest; ex. `9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08`
+* `input_image_mime_extension` - extension of input image determined from image mime type
+* `input_image_width` - width in pixels of the input image
+* `input_image_height` - height in pixels of the input image
+* `image_digest` - digest of image being stored based on it's content only; this is first 16 hex characters from SHA256 digest; ex. `9f86d081884c7d65`
+* `image_sha256` - digest of image being stored based on it's content only; this is whole hex encoded SHA256 digest; ex. `9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08`
+* `image_name` - name of the image that is being stored or sourced
+* `imagename` - same as `image_name`; deprecated, please use `image_name` instead
+* `image_mime_extension` - extension of image being stored determined from image mime type
+* `mimeextension` - same as `image_mime_extension`; deprecated, please use `image_mime_extension` instead
+* `image_width` - width in pixels of the image that is being stored
+* `image_height` - height in pixels of the image that is being stored
 * `path` - remaining (unmatched) request URL path
 * `basename` - name of the file without it's extension determined from `path`
 * `direname` - name of the directory determined form `path`
 * `extension` - file extension determined from `path`
-* `mimeextension` - image extension based on mime type; mime type will be updated based on information from [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) for input image and output thumbnails - content determined
-* `imagename` - name of the image that is being stored or sourced
+* `uuid` - unique ID for request; ex. `1b68a767-8163-425a-a32c-db6ed7200343`
 * URL matches and query string parameters - other variables can be matched from URL pattern and query string parameters - see API configuration
 
+Notes:
+* Input based variables can only be calculated for non GET requests where body is not empty.
+* Image mime type, width and height will only be know if that image was sent to or received from [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) during thumbnailing or via `identify` statement.
+
 Example:
 
 ```sdl
 path "uri"						"#{path}"
-path "hash"						"#{digest}.#{extension}"
+path "hash"						"#{input_digest}.#{extension}"
 
 path {
-	"hash-name"					"#{digest}/#{imagename}.#{extension}"
-	"structured"				"#{dirname}/#{digest}/#{basename}.#{extension}"
-	"structured-name"			"#{dirname}/#{digest}/#{basename}-#{imagename}.#{extension}"
+	"hash-name"					"#{input_digest}/#{image_name}.#{extension}"
+	"structured"				"#{dirname}/#{input_digest}/#{basename}.#{extension}"
+	"structured-name"			"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{extension}"
 }
 ```
 
@@ -225,6 +248,8 @@ get "small" {
 
 Requesting `/small` URI will result with image fetched from S3 bucket `mybucket` and key `myimage.jpg` and named `original`.
 
+### API endpoint processing operations
+
 #### thumbnail
 
 This source will provide new images based on already sourced images by processing them with [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) backend.
@@ -270,6 +295,25 @@ put ":operation" ":width" ":height" ":options" {
 }
 ```
 
+#### identify
+
+This statement allows for image mime type, width and height identification based on image content with use of [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer).
+This is usefull when image is not taking part in thumbnailing process but variables that are based on meta data needs to be used for storage.
+
+Example:
+
+```sdl
+path "size" "#{image_width}x#{image_height}.#{image_mime_extension}"
+
+put "images" {
+		identify "input"
+		store_s3 "input" bucket="mybucket" path="size"
+		output_store_path "input"
+}
+```
+
+In this example input image is indentified by [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer). Received information is used to populate `image_width`, `image_height` and `image_mime_extension` variables used to generate S3 storage key.
+
 ### API endpoint storage operations
 
 This statements are executed after all source statements are finished.
@@ -291,8 +335,8 @@ Options:
 Example:
 
 ```sdl
-path "imagename"	"#{name}"
-path "hash"			"#{digest}"
+path "imagename"	"#{image_name}"
+path "hash"			"#{input_digest}"
 
 put "store" ":name" {
 	store_file "input" root="/srv/images" path="imagename"
@@ -323,8 +367,8 @@ Example:
 ```sdl
 s3 key="AIAITCKMELYWQZPJP7HQ" secret="V37lCu0F48Tv9s7QVqIT/sLf/wwqhNSB4B0Em7Ei" ssl=false
 
-path "imagename"	"#{name}"
-path "hash"			"#{digest}"
+path "imagename"	"#{image_name}"
+path "hash"			"#{input_digest}"
 
 put ":name" {
 	store_s3 "input" bucket="mybucket" path="imagename"
@@ -431,8 +475,8 @@ Example:
 ```sdl
 s3 key="AIAITCKMELYWQZPJP7HQ" secret="V37lCu0F48Tv9s7QVqIT/sLf/wwqhNSB4B0Em7Ei" ssl=false
 
-path "hash"			"#{digest}.#{mimeextension}"
-path "hash-name"	"#{digest}/#{imagename}.#{mimeextension}"
+path "hash"			"#{input_digest}.#{image_mime_extension}"
+path "hash-name"	"#{input_digest}/#{image_name}.#{image_mime_extension}"
 
 put "thumbnail" {
 	thumbnail "input" {
@@ -478,18 +522,115 @@ The list is in format `image name[,image name]*`.
 
 This option is useful when building API that works on predefined set of image operations and allows to select witch set of operations to perform with list included in the URL.
 
-### Complete example
+## Configuration examples
+
+### Flexible API example
+
+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 [Facebook APIs](https://developers.facebook.com/docs/reference/api/using-pictures/#sizes) for thumbnailing.
+Stored object extension and content type is determined from image data.
+
+```sdl
+s3 key="AIAITCKMELYWQZPJP7HQ" secret="V37lCu0F48Tv9s7QVqIT/sLf/wwqhNSB4B0Em7Ei" 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="mybucket" 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="mybucket" path="path"
+	output_store_path "original"
+}
+
+## Uploaded by admin for use on the website for example - store whatever was send
+post "images" {
+	identify "input"
+	store_s3 "input" bucket="mybucket" path="hash"
+	output_store_path "input"
+}
+
+put "images" {
+	identify "input"
+	store_s3 "input" bucket="mybucket" path="path"
+	output_store_path "input"
+}
+
+## Thumbailing - keep input format; default JPEG quality is 85
+### Thumbnail specification from query string paramaters
+get "pictures" "&:width" "&:height" "&:operation?crop" "&:background-color?white" {
+	source_s3 "original" bucket="mybucket" 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="mybucket" 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="mybucket" 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"
+}
+
+### Predefined thumbnailing specification
+get "pictures" "&type=square" {
+	source_s3 "original" bucket="mybucket" 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="mybucket" 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="mybucket" 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="mybucket" 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 as is - JPEG for user content and what was send for admin uploaded images
+get "pictures" {
+	source_s3 "original" bucket="mybucket" path="path"
+	output_image "original" cache-control="public, max-age=31557600, s-maxage=0"
+}
+```
+
+For more information see [flexi feature test](https://github.com/jpastuszek/httpimagestore/blob/master/features/flexi.feature).
+
+### Compatible and on demand API examples
 
-This complete API configuration presents API compatible with previous version of httpimagestore (v0.5.0) and thumbnail on demand API.
+This example can be used to create new API and migration between old and new approach.
+It presents API compatible with previous version of httpimagestore (v0.5.0) and one possible thumbnail on demand approach API.
 
 ```sdl
 s3 key="AIAITCKMELYWQZPJP7HQ" secret="V37lCu0F48Tv9s7QVqIT/sLf/wwqhNSB4B0Em7Ei" ssl=false
 
 # Compatibility API
-path "compat-hash"				"#{digest}.#{mimeextension}"
-path "compat-hash-name"			"#{digest}/#{imagename}.#{mimeextension}"
-path "compat-structured"		"#{dirname}/#{digest}/#{basename}.#{mimeextension}"
-path "compat-structured-name"	"#{dirname}/#{digest}/#{basename}-#{imagename}.#{mimeextension}"
+path "compat-hash"				"#{input_digest}.#{image_mime_extension}"
+path "compat-hash-name"			"#{input_digest}/#{image_name}.#{image_mime_extension}"
+path "compat-structured"		"#{dirname}/#{input_digest}/#{basename}.#{image_mime_extension}"
+path "compat-structured-name"	"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
 
 put "thumbnail" ":name_list" ":path/.+/" {
 	thumbnail "input" {
@@ -552,30 +693,24 @@ put "thumbnail" ":name_list" {
 }
 
 # Thumbnail on demand API 
-path "hash"	"#{digest}.#{mimeextension}"
+path "hash"	"#{input_digest}.#{image_mime_extension}"
 path "path"	"#{path}"
 
 put "v1" "original" {
 	thumbnail "input" "original" operation="limit" width=2160 height=2160 format="jpeg" quality=95
-
 	store_s3 "original" bucket="mybucket_v1" path="hash"
-
 	output_store_path "original"
 }
 
 get "v1" "thumbnail" ":path" ":operation" ":width" ":height" ":options?" {
 	source_s3 "original" bucket="mybucket_v1" path="path"
-
 	thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="#{options}" quality=84 format="jpeg"
-
 	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
 }
 
 get "v2" "thumbnail" ":operation" ":width" ":height" {
 	source_s3 "original" bucket="mybucket_v1" path="path"
-
 	thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="#{query_string_options}" quality=84 format="png"
-
 	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
 }
 ```
@@ -682,85 +817,6 @@ $ 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/bin/httpimagestore

@@ -84,8 +84,11 @@ Application.new('httpimagestore', port: 3000, processor_count_factor: 2) do
 
 						state = Configuration::RequestState.new(req.body.read, matches, path, query_string, memory_limit)
 
-						handler.image_sources.each do |image_source|
-							image_source.realize(state) unless image_source.respond_to? :excluded? and image_source.excluded?(state)
+						handler.sources.each do |source|
+							source.realize(state) unless source.respond_to? :excluded? and source.excluded?(state)
+						end
+						handler.processors.each do |processor|
+							processor.realize(state) unless processor.respond_to? :excluded? and processor.excluded?(state)
 						end
 						handler.stores.each do |store|
 							store.realize(state) unless store.respond_to? :excluded? and store.excluded?(state)
@@ -123,6 +126,7 @@ Application.new('httpimagestore', port: 3000, processor_count_factor: 2) do
 		require 'httpimagestore/configuration/path'
 		require 'httpimagestore/configuration/handler'
 		require 'httpimagestore/configuration/thumbnailer'
+		require 'httpimagestore/configuration/identify'
 		require 'httpimagestore/configuration/file'
 		require 'httpimagestore/configuration/output'
 		require 'httpimagestore/configuration/s3'

data/features/cache-control.feature

@@ -8,8 +8,8 @@ Feature: S3 object Cache-Control header settings
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
-		path "hash"			"#{digest}.#{mimeextension}"
-		path "hash-name"		"#{digest}-#{imagename}.#{mimeextension}"
+		path "hash"			"#{input_digest}.#{image_mime_extension}"
+		path "hash-name"		"#{input_digest}-#{image_name}.#{image_mime_extension}"
 
 		put "thumbnail" {
 			thumbnail "input" {

data/features/compatibility.feature

@@ -9,10 +9,10 @@ Feature: Image list based thumbnailing and S3 storage
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
-		path "hash"		"#{digest}.#{mimeextension}"
-		path "hash-name"	"#{digest}/#{imagename}.#{mimeextension}"
-		path "structured"	"#{dirname}/#{digest}/#{basename}.#{mimeextension}"
-		path "structured-name"	"#{dirname}/#{digest}/#{basename}-#{imagename}.#{mimeextension}"
+		path "hash"		"#{input_digest}.#{image_mime_extension}"
+		path "hash-name"	"#{input_digest}/#{image_name}.#{image_mime_extension}"
+		path "structured"	"#{dirname}/#{input_digest}/#{basename}.#{image_mime_extension}"
+		path "structured-name"	"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
 
 		put "thumbnail" ":name_list" ":path/.+/" {
 			thumbnail "input" {

data/features/error-reporting.feature

@@ -9,7 +9,7 @@ Feature: Image list based thumbnailing and S3 storage
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
-		path "structured-name"	"#{dirname}/#{digest}/#{basename}-#{imagename}.#{mimeextension}"
+		path "structured-name"	"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
 		path "missing"		"blah"
 		path "zero"		"zero"
 
@@ -44,6 +44,21 @@ Feature: Image list based thumbnailing and S3 storage
 		get "zero" {
 			source_file "original" root="/dev" path="zero"
 		}
+
+		path "not_defined" "#{bogous}"
+		get "not_defined" {
+			source_file "original" root="/tmp" path="not_defined"
+		}
+
+		path "body" "#{input_digest}"
+		get "body" {
+			source_file "original" root="/tmp" path="body"
+		}
+
+		path "no_image_meta" "#{image_mime_extension}"
+		put "no_image_meta" {
+			store_file "input" root="/tmp" path="no_image_meta"
+		}
 		"""
 
 	@error-reporting
@@ -148,7 +163,7 @@ Feature: Image list based thumbnailing and S3 storage
 		thumbnailing of 'input' into 'bad_dim' failed: bad dimension value: 128x
 		"""
 
-	@error-reporting
+	@error-reporting @413 @load
 	Scenario: Too large image - uploaded image too big to fit in memory limit
 		Given test-large.jpg file content as request body
 		When I do PUT request http://localhost:3000/multipart/large_png
@@ -166,7 +181,7 @@ Feature: Image list based thumbnailing and S3 storage
 		thumbnailing of 'input' into 'large_png' failed: image too large: cache resources exhausted
 		"""
 
-	@error-reporting
+	@error-reporting @413 @thumbnail
 	Scenario: Too large image - memory exhausted when thmbnailing
 		Given test.jpg file content as request body
 		When I do PUT request http://localhost:3000/multipart/superlarge
@@ -205,3 +220,34 @@ Feature: Image list based thumbnailing and S3 storage
 		memory limit exceeded
 		"""
 
+	@error-reporting @variables
+	Scenario: Bad variable use - not defined
+		When I do GET request http://localhost:3000/not_defined
+		Then response status will be 500
+		And response content type will be text/plain
+		And response body will be CRLF ended lines like
+		"""
+		cannot generate path 'not_defined' from template '\#{bogous}': variable 'bogous' not defined
+		"""
+
+	@error-reporting @variables
+	Scenario: Bad variable use - no body
+		When I do GET request http://localhost:3000/body
+		Then response status will be 500
+		And response content type will be text/plain
+		And response body will be CRLF ended lines like
+		"""
+		cannot generate path 'body' from template '#{input_digest}': need not empty request body to generate value for 'input_digest'
+		"""
+
+	@error-reporting @variables
+	Scenario: Bad variable use - no image meta
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/no_image_meta
+		Then response status will be 500
+		And response content type will be text/plain
+		And response body will be CRLF ended lines like
+		"""
+		cannot generate path 'no_image_meta' from template '#{image_mime_extension}': image 'input' does not have data for variable 'image_mime_extension'
+		"""
+