httpimagestore 1.8.0 → 1.8.1

data/Gemfile

@@ -1,26 +1,27 @@
-source "http://rubygems.org"
-ruby "1.9.3"
+source 'http://rubygems.org'
+ruby '1.9.3'
 
-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"
-gem "aws-sdk", "~> 1.10"
-gem "mime-types", "~> 1.17"
-gem "sdl4r", "~> 0.9"
-gem "msgpack", "~> 0.5"
+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'
+gem 'aws-sdk', '~> 1.10'
+gem 'mime-types', '~> 1.17'
+gem 'sdl4r', '~> 0.9'
+gem 'msgpack', '~> 0.5'
+gem 'addressable', '~> 2.3'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "faraday", ">= 0.8"
-  gem "rspec", "~> 2.13"
-  gem "cucumber", ">= 0"
-  gem "jeweler", "~> 1.8.4"
-  gem "rdoc", "~> 3.9"
-  gem "daemon", "~> 1"
-  gem "prawn", "= 0.8.4"
-  #gem "httpthumbnailer", path: '../httpthumbnailer'
-  gem "httpthumbnailer", "~> 1.2.0"
+  gem 'faraday', '>= 0.8'
+  gem 'rspec', '~> 2.13'
+  gem 'cucumber', '>= 0'
+  gem 'jeweler', '~> 1.8.4'
+  gem 'rdoc', '~> 3.9'
+  gem 'daemon', '~> 1'
+  gem 'prawn', '= 0.8.4'
+  #gem 'httpthumbnailer', path: '../httpthumbnailer'
+  gem 'httpthumbnailer', '~> 1.2.0'
 end
 

data/Gemfile.lock

@@ -110,6 +110,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  addressable (~> 2.3)
   aws-sdk (~> 1.10)
   cucumber
   daemon (~> 1)

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

data/features/compatibility.feature

@@ -152,3 +152,14 @@ Feature: Image list based thumbnailing and S3 storage
 		Then response status will be 200
 		And response content type will be image/jpeg
 		Then response body will contain JPEG image of size 100x141
+
+	@compatibility
+	Scenario: Input file extension should be based on content detected mime type and not on provided path
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/thumbnail/blah/test/image/test.gif
+		Then response status will be 400
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		no thumbnailing specs were selected, please use at least one of: small, tiny_png, bad
+		"""

data/features/encoding.feature

@@ -2,34 +2,102 @@ 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 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 "path"             "#{path}"
 
-		post "encoding" "encoded" {
+		post "file" "encoding" "encoded" {
 			store_file "input" root="/tmp" path="path"
 			output_store_uri "input" path="path"
 		}
 
-		post "encoding" "decoded" {
+		post "file" "encoding" "decoded" {
 			store_file "input" root="/tmp" path="path"
 			output_store_path "input" path="path"
 		}
+
+		post "s3" "encoding" "encoded" {
+			store_s3 "input" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			output_store_uri "input" path="path"
+		}
+
+		post "s3" "encoding" "decoded" {
+			store_s3 "input" bucket="@AWS_S3_TEST_BUCKET@" path="path"
+			output_store_path "input" path="path"
+		}
 		"""
 
-	Scenario: JavaScript encode() + URL encoded variable decoding and URL encoding
+	Scenario: JavaScript encode() + URL encoded variable decoding and URL encoding for file based storage
 		Given test.png file content as request body
-		When I do POST request http://localhost:3000/encoding/encoded/triple%20kro%25u0301l.png
+		When I do POST request http://localhost:3000/file/encoding/encoded/triple%20kro%25u0301l.png
+		And response content type will be text/uri-list
 		And response body will be CRLF ended lines
 		"""
-		/triple%20kro%CC%81l.png
+		/triple%20kr%C3%B3l.png
 		"""
 
-	Scenario: URL encoded variable decoding
+	Scenario: JavaScript encode() + URL encoded variable decoding and URL encoding for S3 based storage
 		Given test.png file content as request body
-		When I do POST request http://localhost:3000/encoding/decoded/triple%20kr%C3%B3l.png
+		When I do POST request http://localhost:3000/s3/encoding/encoded/triple%20kro%25u0301l.png
+		And response content type will be text/uri-list
+		And response body will be CRLF ended lines
+		"""
+		/triple%20kr%C3%B3l.png
+		"""
+
+	Scenario: URL encoded variable decoding and URL encoding with ? for file based storage
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/file/encoding/encoded/hello%3Fworld.png
+		And response content type will be text/uri-list
+		And response body will be CRLF ended lines
+		"""
+		/hello%3Fworld.png
+		"""
+
+	Scenario: URL encoded variable decoding and URL encoding with ? for S3 based storage
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/s3/encoding/encoded/hello%3Fworld.png
+		And response content type will be text/uri-list
+		And response body will be CRLF ended lines
+		"""
+		/hello%3Fworld.png
+		"""
+
+	Scenario: URL encoded variable decoding for file based storage
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/file/encoding/decoded/triple%20kr%C3%B3l.png
+		And response content type will be text/plain
 		And response body will be CRLF ended lines
 		"""
 		triple król.png
 		"""
+
+	Scenario: URL encoded variable decoding for S3 based storage
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/s3/encoding/decoded/triple%20kr%C3%B3l.png
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		triple król.png
+		"""
+
+	Scenario: URL path normalization with ? for file based storage
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/file/encoding/decoded/hello%3Fworld.png
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		hello?world.png
+		"""
+
+	Scenario: URL path normalization with ? S3 file based storage
+		Given test.png file content as request body
+		When I do POST request http://localhost:3000/s3/encoding/decoded/hello%3Fworld.png
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		hello?world.png
+		"""

data/features/rewrite.feature

@@ -52,7 +52,7 @@ Feature: Rewrite of the output path and URL
 
 		post "rewrite" "demo" {
 			store_file "input" root="/tmp" path="input_digest"
-			output_store_url "input" scheme="ftp" host="example.com" port="21" path="demo"
+			output_store_url "input" scheme="ftp" host="example.com" port="421" path="demo"
 		}
 		"""
 
@@ -109,7 +109,7 @@ Feature: Rewrite of the output path and URL
 		When I do POST request http://localhost:3000/rewrite/url/port?number=41
 		And response body will be CRLF ended lines
 		"""
-		file::41/b0fe25319ba5909a
+		file://localhost:41/b0fe25319ba5909a
 		"""
 
 	Scenario: Store URL rewriting demo
@@ -117,6 +117,6 @@ Feature: Rewrite of the output path and URL
 		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
+		ftp://example.com:421/image/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e.jpg
 		"""
 

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "1.8.0"
+  s.version = "1.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2014-08-22"
+  s.date = "2014-08-28"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -98,6 +98,7 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<addressable>, ["~> 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"])
@@ -113,6 +114,7 @@ Gem::Specification.new do |s|
       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<addressable>, ["~> 2.3"])
       s.add_dependency(%q<faraday>, [">= 0.8"])
       s.add_dependency(%q<rspec>, ["~> 2.13"])
       s.add_dependency(%q<cucumber>, [">= 0"])
@@ -129,6 +131,7 @@ Gem::Specification.new do |s|
     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<addressable>, ["~> 2.3"])
     s.add_dependency(%q<faraday>, [">= 0.8"])
     s.add_dependency(%q<rspec>, ["~> 2.13"])
     s.add_dependency(%q<cucumber>, [">= 0"])

data/lib/httpimagestore/configuration/file.rb

@@ -2,7 +2,7 @@ require 'httpimagestore/configuration/path'
 require 'httpimagestore/configuration/handler'
 require 'httpimagestore/configuration/source_failover'
 require 'pathname'
-require 'uri'
+require 'addressable/uri'
 
 module Configuration
 	class FileStorageOutsideOfRootDirError < ConfigurationError
@@ -42,22 +42,27 @@ module Configuration
 		end
 
 		def initialize(global, image_name, matcher, root_dir, path_spec)
-			super global, image_name, matcher
+			super global, image_name, matcher, path_spec
 			@root_dir = Pathname.new(root_dir).cleanpath
-			@path_spec = path_spec
 		end
 
 		def storage_path(rendered_path)
 			path = Pathname.new(rendered_path)
 
 			storage_path = (@root_dir + path).cleanpath
-			storage_path.to_s =~ /^#{@root_dir.to_s}/ or raise FileStorageOutsideOfRootDirError.new(@image_name, path)
+			storage_path.to_s =~ /^#{@root_dir.to_s}/ or raise FileStorageOutsideOfRootDirError.new(image_name, path)
 
 			storage_path
 		end
 
+		def file_url(rendered_path)
+			uri = rendered_path.to_uri
+			uri.scheme = 'file'
+			uri
+		end
+
 		def to_s
-			"FileSource[image_name: '#{@image_name}' root_dir: '#{@root_dir}' path_spec: '#{@path_spec}']"
+			"FileSource[image_name: '#{image_name}' root_dir: '#{@root_dir}' path_spec: '#{path_spec}']"
 		end
 	end
 
@@ -86,7 +91,7 @@ module Configuration
 					FileSourceStoreBase.stats.incr_total_file_source_bytes(data.bytesize)
 
 					image = Image.new(data)
-					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.source_url = file_url(rendered_path)
 					image
 				rescue Errno::ENOENT
 					raise NoSuchFileError.new(image_name, rendered_path)
@@ -112,7 +117,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 = URI::Generic.new('file', nil, nil, nil, nil, "/#{URI.encode(rendered_path.to_s)}", nil, nil, nil, URI::DEFAULT_PARSER, true)
+				image.store_url = file_url(rendered_path)
 
 				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

@@ -85,7 +85,8 @@ module Configuration
 		attr_reader :memory_limit
 		attr_reader :headers
 
-		def with_locals(locals)
+		def with_locals(*locals)
+			locals = locals.reduce{|a, b| a.merge(b)}
 			log.debug "using additional local variables: #{locals}"
 			self.dup.merge!(locals)
 		end
@@ -98,10 +99,6 @@ 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
@@ -195,51 +192,86 @@ module Configuration
 		end
 	end
 
-	module ConditionalInclusion
-		def inclusion_matcher(matcher)
-			(@matchers ||= []) << matcher if matcher
-		end
+	class HandlerStatement
+		module ImageName
+			attr_reader :image_name
 
-		def included?(request_state)
-			return true unless @matchers
-			@matchers.any? do |matcher|
-				matcher.included?(request_state)
+			def initialize(global, *args)
+				@image_name = args.pop
+
+				super(global, *args)
+
+				config_local :imagename, @image_name # deprecated
+				config_local :image_name, @image_name
 			end
 		end
 
-		def excluded?(request_state)
-			not included? request_state
+		module PathSpec
+			attr_reader :path_spec
+
+			def initialize(global, *args)
+				@path_spec = args.pop
+				super(global, *args)
+			end
+
+			def path_template
+				@global.paths[@path_spec]
+			end
 		end
-	end
 
-	class SourceStoreBase
-		include ConditionalInclusion
+		module ConditionalInclusion
+			def initialize(global, *args)
+				@matchers = []
+				matcher = args.pop
+				@matchers << matcher if matcher
+				super(global, *args)
+			end
 
-		def initialize(global, image_name, matcher)
-			@global = global
-			@image_name = image_name
-			@locals = {}
+			def inclusion_matcher(matcher)
+				@matchers << matcher
+			end
+
+			def included?(request_state)
+				return true if @matchers.empty?
+				@matchers.any? do |matcher|
+					matcher.included?(request_state)
+				end
+			end
 
-			inclusion_matcher matcher
-			local :imagename, @image_name # deprecated
-			local :image_name, @image_name
+			def excluded?(request_state)
+				not included? request_state
+			end
 		end
 
-		private
+		def initialize(global, *args)
+			@global = global
+			@config_locals = {}
+			@module_args = args
+		end
 
-		attr_accessor :image_name
+		attr_reader :config_locals
+		def config_local(name, value)
+			@config_locals[name] = value
+		end
 
-		def local(name, value)
-			@locals[name] = value
+		def path_template(path_spec)
+			@global.paths[path_spec]
 		end
+	end
 
-		def rendered_path(request_state)
-			path = @global.paths[@path_spec]
-			Pathname.new(path.render(request_state.with_locals(@locals))).cleanpath.to_s
+	class SourceStoreBase < HandlerStatement
+		include ImageName
+		include PathSpec
+		include ConditionalInclusion
+
+		def initialize(global, image_name, matcher, path_spec)
+			super(global, image_name, path_spec, matcher)
 		end
 
+		private
+
 		def put_sourced_named_image(request_state)
-			rendered_path = rendered_path(request_state)
+			rendered_path = path_template.render(request_state.with_locals(config_locals))
 
 			image = yield @image_name, rendered_path
 
@@ -249,7 +281,7 @@ module Configuration
 
 		def get_named_image_for_storage(request_state)
 			image = request_state.images[@image_name]
-			rendered_path = rendered_path(request_state)
+			rendered_path = path_template.render(request_state.with_locals(config_locals))
 			image.store_path = rendered_path
 
 			yield @image_name, image, rendered_path

data/lib/httpimagestore/configuration/identify.rb

@@ -3,7 +3,7 @@ require 'httpimagestore/ruby_string_template'
 require 'httpimagestore/configuration/handler'
 
 module Configuration
-	class Identify
+	class Identify < HandlerStatement
 		include ClassLogging
 
 		extend Stats
@@ -12,8 +12,6 @@ module Configuration
 			:total_identify_requests_bytes
 		)
 
-		include ConditionalInclusion
-
 		def self.match(node)
 			node.name == 'identify'
 		end
@@ -27,10 +25,11 @@ module Configuration
 			configuration.processors << self.new(configuration.global, image_name, matcher)
 		end
 
+		include ImageName
+		include ConditionalInclusion
+
 		def initialize(global, image_name, matcher = nil)
-			@global = global
-			@image_name = image_name
-			inclusion_matcher matcher if matcher
+			super(global, image_name, matcher)
 		end
 
 		def realize(request_state)

data/lib/httpimagestore/configuration/output.rb

@@ -1,6 +1,6 @@
 require 'httpimagestore/configuration/handler'
 require 'httpimagestore/ruby_string_template'
-require 'uri'
+require 'addressable/uri'
 require 'base64'
 
 module Configuration
@@ -64,60 +64,47 @@ module Configuration
 	Handler::register_node_parser OutputText
 
 	class OutputMultiBase
-		class OutputSpec
+		class OutputSpec < HandlerStatement
+			include ImageName
+			include PathSpec
 			include ConditionalInclusion
-			attr_reader :image_name
-			attr_reader :path_spec
 
 			def initialize(global, image_name, scheme, host, port, path_spec, matcher)
-				@global = global
-				@image_name = image_name
-				@scheme = scheme
-				@host = host
-				@port = port
-				@path_spec = path_spec
-				inclusion_matcher matcher
+				super(global, image_name, path_spec, matcher)
+				@scheme = scheme && scheme.to_template
+				@host = host && host.to_template
+				@port = port && port.to_template
 			end
 
 			def store_path(request_state)
 				store_path = request_state.images[@image_name].store_path or raise StorePathNotSetForImage.new(@image_name)
 				return store_path unless @path_spec
 
-				locals = {
-					image_name: @image_name,
-					path: store_path
-				}
-
-				rendered_path(request_state.with_locals(locals))
+				path_template.render(request_state.with_locals(config_locals, path: store_path))
 			end
 
 			def store_url(request_state)
 				url = request_state.images[@image_name].store_url or raise StoreURLNotSetForImage.new(@image_name)
 				url = url.dup
+				store_path = request_state.images[@image_name].store_path or raise StorePathNotSetForImage.new(@image_name)
 
-				locals = {
-					image_name: @image_name,
-					path: URI.utf_decode(url.path),
+				request_locals = {
+					path: store_path,
 					url: url.to_s
 				}
-				locals[:scheme] = url.scheme if url.scheme
-				locals[:host] = url.host if url.host
-				locals[:port] = url.port if url.port
+				request_locals[:scheme] = url.scheme if url.scheme
+				request_locals[:host] = url.host if url.host
+				request_locals[:port] = url.port if url.port
 
-				request_state = request_state.with_locals(locals)
+				request_state = request_state.with_locals(config_locals, request_locals)
 
 				# optional rewrites
-				url.scheme = request_state.render_template(@scheme) if @scheme
-				url.host = request_state.render_template(@host) if @host
-				url.port = request_state.render_template(@port).to_i if @port
-				url.path = URI.encode(rendered_path(request_state)).tap{|path| path.replace('/' + path) if path[0] != '/'} if @path_spec
-
-				url
-			end
+				url.scheme = @scheme.render(request_state) if @scheme
+				url.host = @host.render(request_state) if @host
+				(url.host ||= 'localhost'; url.port = @port.render(request_state).to_i) if @port
+				url.path = path_template.render(request_state).to_uri if @path_spec
 
-		private
-			def rendered_path(request_state)
-				Pathname.new(@global.paths[@path_spec].render(request_state)).cleanpath.to_s
+				url.normalize
 			end
 		end
 

data/lib/httpimagestore/configuration/path.rb

@@ -1,5 +1,6 @@
 require 'httpimagestore/ruby_string_template'
 require 'digest/sha2'
+require 'addressable/uri'
 
 module Configuration
 	class PathNotDefinedError < ConfigurationError
@@ -21,6 +22,14 @@ module Configuration
 	end
 
 	class Path < RubyStringTemplate
+		class RenderedPath < String
+			def to_uri
+				uri_path = self.gsub(/^\/?([a-zA-Z])[\|:][\\\/]/){"/#{$1.downcase}:/"} # fix windows backslash
+				uri_path = Addressable::URI::SLASH + uri_path if uri_path[0] != Addressable::URI::SLASH # make absolute
+				Addressable::URI.new(path: uri_path).normalize
+			end
+		end
+
 		def self.match(node)
 			node.name == 'path'
 		end
@@ -50,6 +59,10 @@ module Configuration
 				end or raise NoValueForPathTemplatePlaceholerError.new(path_name, template, name)
 			end
 		end
+
+		def render(locals = {})
+			RenderedPath.new(super)
+		end
 	end
 	Global.register_node_parser Path
 end

data/lib/httpimagestore/configuration/s3.rb

@@ -1,6 +1,7 @@
 require 'aws-sdk'
 require 'digest/sha2'
 require 'msgpack'
+require 'addressable/uri'
 require 'httpimagestore/aws_sdk_regions_hack'
 require 'httpimagestore/configuration/path'
 require 'httpimagestore/configuration/handler'
@@ -177,7 +178,7 @@ module Configuration
 			end
 
 			def private_url
-				s3_object.url_for(:read, expires: 60 * 60 * 24 * 365 * 20) # expire in 20 years
+				s3_object.url_for(:read, expires: 60 * 60 * 24 * 365 * 20)
 			end
 
 			def public_url
@@ -237,19 +238,19 @@ module Configuration
 			end
 
 			def private_url
-				url = @cache_file.header['private_url'] and return URI(url)
+				url = @cache_file.header['private_url'] and return Addressable::URI.parse(url)
 				dirty! :private_url
 				url = super
 				@cache_file.header['private_url'] = url.to_s
-				url
+				Addressable::URI.parse(url)
 			end
 
 			def public_url
-				url = @cache_file.header['public_url'] and return URI(url)
+				url = @cache_file.header['public_url'] and return Addressable::URI.parse(url)
 				dirty! :public_url
 				url = super
 				@cache_file.header['public_url'] = url.to_s
-				url
+				Addressable::URI.parse(url)
 			end
 
 			def content_type
@@ -314,9 +315,8 @@ module Configuration
 		end
 
 		def initialize(global, image_name, matcher, bucket, path_spec, public_access, cache_control, prefix, cache_root)
-			super global, image_name, matcher
+			super global, image_name, matcher, path_spec
 			@bucket = bucket
-			@path_spec = path_spec
 			@public_access = public_access
 			@cache_control = cache_control
 			@prefix = prefix
@@ -333,7 +333,7 @@ module Configuration
 				log.warn "not using S3 object cache for image '#{image_name}'", error
 			end
 
-			local :bucket, @bucket
+			config_local :bucket, @bucket
 		end
 
 		def client
@@ -406,7 +406,7 @@ module Configuration
 		end
 
 		def to_s
-			"S3Source[image_name: '#{@image_name}' bucket: '#{@bucket}' prefix: '#{@prefix}' path_spec: '#{@path_spec}']"
+			"S3Source[image_name: '#{image_name}' bucket: '#{@bucket}' prefix: '#{@prefix}' path_spec: '#{path_spec}']"
 		end
 	end
 	Handler::register_node_parser S3Source

data/lib/httpimagestore/configuration/thumbnailer.rb

@@ -31,7 +31,13 @@ module Configuration
 		end
 	end
 
-	class Thumbnail
+	class NoSpecSelectedError < RuntimeError
+		def initialize(specs)
+			super "no thumbnailing specs were selected, please use at least one of: #{specs.join(', ')}"
+		end
+	end
+
+	class Thumbnail < HandlerStatement
 		include ClassLogging
 
 		extend Stats
@@ -55,34 +61,27 @@ module Configuration
 			attr_reader :remote_error
 		end
 
-		class ThumbnailSpec
-			class Spec < RubyStringTemplate
-				def initialize(image_name, sepc_name, template)
-					super(template) do |locals, name|
-						locals[name] or raise NoValueForSpecTemplatePlaceholerError.new(image_name, sepc_name, name, template)
-					end
-				end
-			end
-
+		class ThumbnailSpec < HandlerStatement
+			include ImageName
 			include ConditionalInclusion
 
 			def initialize(image_name, method, width, height, format, options = {}, matcher = nil)
-				@image_name = image_name
-				@method = Spec.new(image_name, 'method', method)
-				@width = Spec.new(image_name, 'width', width)
-				@height = Spec.new(image_name, 'height', height)
-				@format = Spec.new(image_name, 'format', format)
-				@options = options.inject({}){|h, v| h[v.first] = Spec.new(image_name, v.first, v.last); h}
-				inclusion_matcher matcher if matcher
+				super(nil, image_name, matcher)
+				@method = method.to_template.with_missing_resolver{|locals, key| raise NoValueForSpecTemplatePlaceholerError.new(image_name, 'method', key, method)}
+				@width =  width.to_s.to_template.with_missing_resolver{|locals, key| raise NoValueForSpecTemplatePlaceholerError.new(image_name, 'width', key, width)}
+				@height = height.to_s.to_template.with_missing_resolver{|locals, key| raise NoValueForSpecTemplatePlaceholerError.new(image_name, 'height', key, height)}
+				@format = format.to_template.with_missing_resolver{|locals, key| raise NoValueForSpecTemplatePlaceholerError.new(image_name, 'format', key, format)}
+
+				@options = options.merge(options) do |option, old, template|
+					template.to_s.to_template.with_missing_resolver{|locals, field| raise NoValueForSpecTemplatePlaceholerError.new(image_name, option, field, template)}
+				end
 			end
 
-			attr_reader :image_name
-
 			def render(locals = {})
 				options = @options.inject({}){|h, v| h[v.first] = v.last.render(locals); h}
 				nested_options = options['options'] ? Hash[options.delete('options').to_s.split(',').map{|pair| pair.split(':', 2)}] : {}
 				{
-					@image_name =>
+					image_name =>
 						[
 							@method.render(locals),
 							@width.render(locals),
@@ -94,8 +93,6 @@ module Configuration
 			end
 		end
 
-		include ConditionalInclusion
-
 		def self.match(node)
 			node.name == 'thumbnail'
 		end
@@ -142,12 +139,13 @@ module Configuration
 			)
 		end
 
+		include ConditionalInclusion
+
 		def initialize(global, source_image_name, specs, use_multipart_api, matcher)
-			@global = global
+			super(global, matcher)
 			@source_image_name = source_image_name
 			@specs = specs
 			@use_multipart_api = use_multipart_api
-			inclusion_matcher matcher
 		end
 
 		def realize(request_state)
@@ -159,6 +157,9 @@ module Configuration
 			end.each do |spec|
 				rendered_specs.merge! spec.render(request_state)
 			end
+
+			rendered_specs.empty? and raise NoSpecSelectedError.new(@specs.map(&:image_name))
+
 			source_image = request_state.images[@source_image_name]
 
 			thumbnails = {}

data/lib/httpimagestore/error_reporter.rb

@@ -16,7 +16,10 @@ class ErrorReporter < Controller
 			write_error status, error
 		end
 
-		on error Configuration::ZeroBodyLengthError do |error|
+		on error(
+			Configuration::ZeroBodyLengthError,
+			Configuration::NoSpecSelectedError
+		) do |error|
 			write_error 400, error
 		end
 

data/lib/httpimagestore/ruby_string_template.rb

@@ -1,4 +1,4 @@
-class RubyStringTemplate
+class RubyStringTemplate < String
 	class NoValueForTemplatePlaceholderError < ArgumentError
 		def initialize(name, template)
 			super "no value for '\#{#{name}}' in template '#{template}'"
@@ -6,18 +6,32 @@ class RubyStringTemplate
 	end
 
 	def initialize(template, &resolver)
-		@template = template.to_s
-		@resolver = resolver ? resolver : ->(locals, name){locals[name]}
+		super(template.to_s)
+		@resolvers = []
+		@resolvers << resolver if resolver
+		@resolvers << ->(locals, name){locals[name]}
+	end
+
+	def initialize_copy(source)
+		super
+		# copy resolvers array
+		resolvers =
+		source.instance_eval do
+			resolvers = @resolvers
+		end
+		@resolvers = resolvers.dup
 	end
 
 	def render(locals = {})
-		template = @template.dup
+		template = self.to_s
 		values = {}
 
+		# use gsub with block instead!
 		template.scan(/#\{[^\}]+\}/um).uniq.each do |placeholder|
 			name = placeholder.match(/#\{([^\}]*)\}/u).captures.first.to_sym
-			value = @resolver.call(locals, name)
-			value or fail NoValueForTemplatePlaceholderError.new(name, @template)
+
+			value = nil
+			@resolvers.find{|resolver| value = resolver.call(locals, name)} or fail NoValueForTemplatePlaceholderError.new(name, self)
 			values[placeholder] = value.to_s
 		end
 
@@ -27,5 +41,28 @@ class RubyStringTemplate
 
 		template
 	end
+
+	def to_template
+		self
+	end
+
+	#def inspect
+		#super + "[#{@resolvers}]"
+	#end
+
+	def add_missing_resolver(&resolver)
+		@resolvers << resolver
+	end
+
+	def with_missing_resolver(&resolver)
+		new_template = self.dup
+		new_template.add_missing_resolver(&resolver)
+		new_template
+	end
 end
 
+class String
+	def to_template
+		RubyStringTemplate.new(self)
+	end
+end

data/spec/configuration_file_spec.rb

@@ -52,7 +52,7 @@ describe Configuration do
 		it 'should have source path and url' do
 			subject.handlers[0].sources[0].realize(state)
 
-			state.images['original'].source_path.should == "test.in"
+			state.images['original'].source_path.to_s.should == "test.in"
 			state.images['original'].source_url.to_s.should == "file:/test.in"
 		end
 
@@ -75,7 +75,7 @@ describe Configuration do
 
 			it 'should provide image name to be used as #{image_name}' do
 				subject.handlers[0].sources[0].realize(state)
-				state.images['test-image-name'].source_path.should == 'test-image-name.jpg'
+				state.images['test-image-name'].source_path.to_s.should == 'test-image-name.jpg'
 				state.images['test-image-name'].data.should == 'hello world'
 			end
 		end

data/spec/configuration_output_spec.rb

@@ -543,7 +543,7 @@ describe Configuration do
 					env.res.data.should == "file://localhost/abc/test.out\r\n"
 				end
 
-				it 'should allow rewriting port component' do
+				it 'should allow rewriting port component (defaults host to localhost)' do
 					subject = Configuration.read(<<-'EOF')
 					path  "out"	  "abc/test.out"
 
@@ -560,13 +560,13 @@ describe Configuration do
 
 					env.instance_eval &state.output_callback
 					env.res['Content-Type'].should == 'text/uri-list'
-					env.res.data.should == "file::21/abc/test.out\r\n"
+					env.res.data.should == "file://localhost:21/abc/test.out\r\n"
 				end
 
 				it 'should allow using variables for all supported rewrites' do
 					state = Configuration::RequestState.new('abc',
 						remote: 'example.com',
-						remote_port: 21,
+						remote_port: 421,
 						proto: 'ftp'
 					)
 					subject = Configuration.read(<<-'EOF')
@@ -586,7 +586,7 @@ describe Configuration do
 
 					env.instance_eval &state.output_callback
 					env.res['Content-Type'].should == 'text/uri-list'
-					env.res.data.should == "ftp://example.com:21/hello/abc/world/test-xyz.out\r\n"
+					env.res.data.should == "ftp://example.com:421/hello/abc/world/test-xyz.out\r\n"
 				end
 			end
 

data/spec/configuration_s3_spec.rb

@@ -218,7 +218,7 @@ else
 				it 'should keep private source URL' do
 					subject.handlers[0].sources[0].realize(state)
 
-					state.images['original'].source_url.should be_a URI::HTTPS
+					state.images['original'].source_url.should be_a Addressable::URI
 					state.images['original'].source_url.to_s.should == 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg?' + ENV['AWS_ACCESS_KEY_ID']
 				end
 
@@ -232,7 +232,7 @@ else
 					EOF
 					subject.handlers[0].sources[0].realize(state)
 
-					state.images['original'].source_url.should be_a URI::HTTPS
+					state.images['original'].source_url.should be_a Addressable::URI
 					state.images['original'].source_url.to_s.should == 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg'
 				end
 

data/spec/configuration_thumbnailer_spec.rb

@@ -1,8 +1,8 @@
 require_relative 'spec_helper'
 require 'httpimagestore/configuration'
-require 'httpimagestore/configuration/output'
 MemoryLimit.logger = Configuration::Scope.logger = RootLogger.new('/dev/null')
 
+require 'httpimagestore/configuration/output'
 require 'httpimagestore/configuration/thumbnailer'
 
 describe Configuration do

data/spec/ruby_string_template_spec.rb

@@ -42,6 +42,20 @@ describe RubyStringTemplate do
 				subject.render(hello: 'hello', test: 123)
 			}.to raise_error RubyStringTemplate::NoValueForTemplatePlaceholderError, %q{no value for '#{world}' in template '>#{hello}-#{world}#{test}<'}
 		end
+
+		it 'should allow using custom missing value resolver' do
+			template = subject
+			expect {
+				template.with_missing_resolver do |locals, key|
+					fail "missing key: #{key}"
+				end
+				.render(hello: 'hello', test: 123)
+			}.to raise_error RuntimeError, "missing key: world"
+
+			expect {
+				template.render(hello: 'hello', test: 123)
+			}.to raise_error RubyStringTemplate::NoValueForTemplatePlaceholderError, %q{no value for '#{world}' in template '>#{hello}-#{world}#{test}<'}
+		end
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpimagestore
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn-cuba-base
@@ -107,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4420249284992726613
+      hash: 3314645469105412308
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: