httpimagestore 1.4.1 → 1.5.0

data/features/storage.feature

@@ -1,18 +1,17 @@
 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}"
+		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"
@@ -196,4 +195,3 @@ Feature: Storing images under different names
 			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.4.1"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2013-10-07"
+  s.date = "2013-10-22"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -19,6 +19,17 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".idea/.name",
+    ".idea/.rakeTasks",
+    ".idea/codeStyleSettings.xml",
+    ".idea/dictionaries/wcc.xml",
+    ".idea/encodings.xml",
+    ".idea/httpimagestore.iml",
+    ".idea/jenkinsSettings.xml",
+    ".idea/misc.xml",
+    ".idea/modules.xml",
+    ".idea/scopes/scope_settings.xml",
+    ".idea/vcs.xml",
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
@@ -32,6 +43,7 @@ Gem::Specification.new do |s|
     "features/error-reporting.feature",
     "features/flexi.feature",
     "features/health-check.feature",
+    "features/request-matching.feature",
     "features/s3-store-and-thumbnail.feature",
     "features/step_definitions/httpimagestore_steps.rb",
     "features/storage.feature",
@@ -81,7 +93,7 @@ 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.1.1"])
+      s.add_runtime_dependency(%q<unicorn-cuba-base>, ["~> 1.1.2"])
       s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 1.1.1"])
       s.add_runtime_dependency(%q<aws-sdk>, ["~> 1.10"])
       s.add_runtime_dependency(%q<mime-types>, ["~> 1.17"])
@@ -96,7 +108,7 @@ 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.1.1"])
+      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.1.2"])
       s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.1.1"])
       s.add_dependency(%q<aws-sdk>, ["~> 1.10"])
       s.add_dependency(%q<mime-types>, ["~> 1.17"])
@@ -112,7 +124,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httpthumbnailer>, [">= 0"])
     end
   else
-    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.1.1"])
+    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.1.2"])
     s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.1.1"])
     s.add_dependency(%q<aws-sdk>, ["~> 1.10"])
     s.add_dependency(%q<mime-types>, ["~> 1.17"])

data/lib/httpimagestore/configuration/handler.rb

@@ -66,12 +66,11 @@ module Configuration
 				request_state[name] = request_state.generate_meta_variable(name) or raise VariableNotDefinedError.new(name)
 			end
 
-			merge! query_string
 			self[:path] = path
 			merge! matches
 			self[:query_string_options] = query_string.sort.map{|kv| kv.join(':')}.join(',')
 
-			log.debug "processing request with body length: #{body.bytesize} bytes and variables: #{self} "
+			log.debug "processing request with body length: #{body.bytesize} bytes and variables: #{map{|k,v| "#{k}: '#{v}'"}.join(', ')}"
 
 			@body = body
 			@images = Images.new(memory_limit)
@@ -177,14 +176,6 @@ module Configuration
 		end
 	end
 
-	class OutputOK
-		def realize(request_state)
-			request_state.output do
-				write_plain 200, 'OK'
-			end
-		end
-	end
-
 	class InclusionMatcher
 		def initialize(value, template)
 			@value = value
@@ -259,13 +250,28 @@ module Configuration
 	end
 
 	class Matcher
-		def initialize(name, &matcher)
-			@name = name
+		def initialize(names, debug_type = '', debug_value = '', &matcher)
+			@names = names
 			@matcher = matcher
+			@debug_type = debug_type
+			@debug_value = case debug_value
+			when Regexp
+				"/#{debug_value.source}/"
+			else
+				debug_value.inspect
+			end
 		end
 
-		attr_reader :name
+		attr_reader :names
 		attr_reader :matcher
+
+		def to_s
+			if @names.empty?
+				"#{@debug_type}(#{@debug_value})"
+			else
+				"#{@debug_type}(#{@names.join(',')} => #{@debug_value})"
+			end
+		end
 	end
 
 	class Handler < Scope
@@ -280,7 +286,7 @@ module Configuration
 		end
 
 		def self.parse(configuration, node)
-			handler_configuration = 
+			handler_configuration =
 				Struct.new(
 					:global,
 					:http_method,
@@ -295,45 +301,64 @@ module Configuration
 			handler_configuration.http_method = node.name
 			handler_configuration.uri_matchers = node.values.map do |matcher|
 				case matcher
-				# URI component matchers
+				# URI matchers
 				when %r{^:([^/]+)/(.*)/$} # :foobar/.*/
-					name = $1
-					regexp = $2
-					Matcher.new(name.to_sym) do
-						Regexp.new("(#{regexp})")
+					name = $1.to_sym
+					_regexp = Regexp.new($2)
+					regexp = Regexp.new("(#{$2})")
+					Matcher.new([name], 'Regexp', _regexp) do
+						regexp
+					end
+				when %r{^/(.*)/$} # /.*/
+					regexp = $1
+					_regexp = Regexp.new($1)
+					names = Regexp.new($1).names.map{|n| n.to_sym}
+					Matcher.new(names, 'Regexp', _regexp) do
+						-> {
+							matchdata = env["PATH_INFO"].match(/\A\/(?<_match_>#{regexp})(?<_tail_>(?:\/|\z))/)
+
+							next false unless matchdata
+
+							path, *vars = matchdata.captures
+
+							env["SCRIPT_NAME"] += "/#{path}"
+							env["PATH_INFO"] = "#{vars.pop}#{matchdata.post_match}"
+
+							captures.push(*vars)
+						}
 					end
 				when /^:(.+)\?(.*)$/ # :foo?bar
 					name = $1.to_sym
 					default = $2
-					Matcher.new(name) do
+					Matcher.new([name], 'SegmentDefault', "<segment>|#{default}") do
 						->{match(name) || captures.push(default)}
 					end
 				when /^:(.+)$/ # :foobar
 					name = $1.to_sym
-					Matcher.new(name) do
+					Matcher.new([name], 'Segment', '<segment>') do
 						name
 					end
 				# Query string matchers
 				when /^\&([^=]+)=(.+)$/# ?foo=bar
-					name = $1
+					name = $1.to_sym
 					value = $2
-					Matcher.new(nil) do
-						->{req[name] && req[name] == value}
+					Matcher.new([name], 'QueryKeyValue', "#{name}=#{value}") do
+						->{req[name] && req[name] == value && captures.push(req[name])}
 					end
 				when /^\&:(.+)\?(.*)$/# &:foo?bar
-					name = $1
+					name = $1.to_sym
 					default = $2
-					Matcher.new(name.to_sym) do
+					Matcher.new([name], 'QueryKeyDefault', "#{name}=<key>|#{default}") do
 						->{captures.push(req[name] || default)}
 					end
 				when /^\&:(.+)$/# &:foo
-					name = $1
-					Matcher.new(name.to_sym) do
+					name = $1.to_sym
+					Matcher.new([name], 'QueryKey', "#{name}=<key>") do
 						->{req[name] && captures.push(req[name])}
 					end
-				# String URI component matcher
+				# Literal URI segment matcher
 				else # foobar
-					Matcher.new(nil) do
+					Matcher.new([], "Literal", matcher) do
 						Regexp.escape(matcher)
 					end
 				end

data/lib/httpimagestore/configuration/output.rb

@@ -1,4 +1,5 @@
 require 'httpimagestore/configuration/handler'
+require 'httpimagestore/ruby_string_template'
 
 module Configuration
 	class StorePathNotSetForImage < ConfigurationError
@@ -13,6 +14,53 @@ module Configuration
 		end
 	end
 
+	class OutputText
+		def self.match(node)
+			node.name == 'output_text'
+		end
+
+		def self.parse(configuration, node)
+			configuration.output and raise StatementCollisionError.new(node, 'output')
+			text = node.grab_values('text').first
+			status, cache_control = *node.grab_attributes('status', 'cache-control')
+			configuration.output = OutputText.new(text, status || 200, cache_control)
+		end
+
+		def initialize(text, status, cache_control)
+			@text = RubyStringTemplate.new(text || fail("no text?!"))
+			@status = status || 200
+			@cache_control = cache_control
+		end
+
+		def realize(request_state)
+			# make sure variables are available in request context
+			status = @status
+			text = @text.render(request_state)
+			cache_control = @cache_control
+			request_state.output do
+				res['Cache-Control'] = cache_control if cache_control
+				write_plain status.to_i, text.to_s
+			end
+		end
+	end
+
+	class OutputOK < OutputText
+		def self.match(node)
+			node.name == 'output_ok'
+		end
+
+		def self.parse(configuration, node)
+			configuration.output and raise StatementCollisionError.new(node, 'output')
+			cache_control = node.grab_attributes('cache-control').first
+			configuration.output = OutputOK.new(cache_control)
+		end
+
+		def initialize(cache_control = nil)
+			super 'OK', 200, cache_control
+		end
+	end
+	Handler::register_node_parser OutputText
+
 	class OutputMultiBase
 		class ImageName < String
 			include ConditionalInclusion
@@ -39,7 +87,8 @@ module Configuration
 			@names = names
 		end
 	end
-	
+	Handler::register_node_parser OutputOK
+
 	class OutputImage
 		include ClassLogging
 
@@ -61,7 +110,7 @@ module Configuration
 
 		def realize(request_state)
 			image = request_state.images[@name]
-			mime_type = 
+			mime_type =
 				if image.mime_type
 					image.mime_type
 				else

data/spec/configuration_handler_spec.rb

@@ -28,10 +28,10 @@ describe Configuration do
 				subject.handlers.length.should == 3
 
 				subject.handlers[0].http_method.should == 'get'
-				subject.handlers[0].uri_matchers.map{|m| m.name}.should == [nil, nil, :operation, :width, :height, :options]
+				subject.handlers[0].uri_matchers.map{|m| m.names}.flatten.should == [:operation, :width, :height, :options]
 
 				subject.handlers[1].http_method.should == 'put'
-				subject.handlers[1].uri_matchers.map{|m| m.name}.should == [nil, nil, :test]
+				subject.handlers[1].uri_matchers.map{|m| m.names}.flatten.should == [:test]
 
 				subject.handlers[2].http_method.should == 'post'
 				subject.handlers[2].uri_matchers.should be_empty
@@ -62,11 +62,6 @@ describe Configuration do
 					subject[:path].should == '/hello/world.jpg'
 				end
 
-				it 'should provide query string params' do
-					subject[:width].should == '123'
-					subject[:height].should == '321'
-				end
-
 				it 'should provide matches' do
 					subject[:operation].should == 'pad'
 				end
@@ -149,7 +144,7 @@ describe Configuration do
 							subject[:input_digest]
 						}.to raise_error Configuration::NoRequestBodyToGenerateMetaVariableError, %q{need not empty request body to generate value for 'input_digest'}
 					end
-					
+
 					it 'should raise ImageNotLoadedError when asking for image related variable of not loaded image' do
 						expect {
 							subject.with_locals(image_name: 'abc')[:image_mime_extension]
@@ -202,7 +197,7 @@ describe Configuration do
 				limit.borrow 1
 				request_state.images['test'] = Configuration::Image.new('x')
 				limit.limit.should == 1
-				
+
 				limit.borrow 1
 				limit.limit.should == 0
 				request_state.images['test'] = Configuration::Image.new('x')
@@ -255,19 +250,6 @@ describe Configuration do
 				subject.handlers[1].output.should be_a Configuration::OutputOK
 				subject.handlers[2].output.should be_a Configuration::OutputOK
 			end
-
-			describe Configuration::OutputOK do
-				it 'should output 200 with OK text/plain message when realized' do
-					state = Configuration::RequestState.new('abc')
-					subject.handlers[2].output.realize(state)
-
-					env = CubaResponseEnv.new
-					env.instance_eval &state.output_callback
-					env.res.status.should == 200
-					env.res.data.should == "OK\r\n"
-					env.res['Content-Type'].should == 'text/plain'
-				end
-			end
 		end
 	end
 end

data/spec/configuration_output_spec.rb

@@ -17,6 +17,91 @@ describe Configuration do
 		CubaResponseEnv.new
 	end
 
+	describe Configuration::OutputText do
+		subject do
+			Configuration.read(<<-'EOF')
+			get "test" {
+				output_text "hello world"
+			}
+			get "test" {
+				output_text "bad stuff" status=500
+			}
+			get "test" {
+				output_text "welcome" cache-control="public"
+			}
+			get "test" {
+				output_text "test1: #{test1} test2: #{test2}"
+			}
+			EOF
+		end
+
+		it 'should output hello world with default 200 status' do
+			subject.handlers[0].output.realize(state)
+			env = CubaResponseEnv.new
+			env.instance_eval &state.output_callback
+			env.res.status.should == 200
+			env.res.data.should == "hello world\r\n"
+			env.res['Content-Type'].should == 'text/plain'
+			env.res['Cache-Control'].should be_nil
+		end
+
+		it 'should output bad stuff with 500 status' do
+			subject.handlers[1].output.realize(state)
+			env = CubaResponseEnv.new
+			env.instance_eval &state.output_callback
+			env.res.status.should == 500
+			env.res.data.should == "bad stuff\r\n"
+			env.res['Content-Type'].should == 'text/plain'
+			env.res['Cache-Control'].should be_nil
+		end
+
+		it 'should output welcome with public cache control' do
+			subject.handlers[2].output.realize(state)
+			env = CubaResponseEnv.new
+			env.instance_eval &state.output_callback
+			env.res.status.should == 200
+			env.res.data.should == "welcome\r\n"
+			env.res['Content-Type'].should == 'text/plain'
+			env.res['Cache-Control'].should == 'public'
+		end
+
+		it 'should output text interpolated with variable values' do
+			state = Configuration::RequestState.new
+			state[:test1] = 'abc'
+			state[:test2] = 'xyz'
+
+			subject.handlers[3].output.realize(state)
+			env = CubaResponseEnv.new
+			env.instance_eval &state.output_callback
+			env.res.data.should == "test1: abc test2: xyz\r\n"
+		end
+	end
+
+	describe Configuration::OutputOK do
+		subject do
+			Configuration.read(<<-EOF)
+			put "test" {
+				output_ok
+			}
+			EOF
+		end
+
+		before :each do
+			subject.handlers[0].sources[0].realize(state)
+		end
+
+		it 'should output 200 with OK text/plain message when realized' do
+			state = Configuration::RequestState.new('abc')
+			subject.handlers[0].output.realize(state)
+
+			env = CubaResponseEnv.new
+			env.instance_eval &state.output_callback
+			env.res.status.should == 200
+			env.res.data.should == "OK\r\n"
+			env.res['Content-Type'].should == 'text/plain'
+		end
+	end
+
 	describe Configuration::OutputImage do
 		subject do
 			Configuration.read(<<-EOF)
@@ -270,7 +355,7 @@ describe Configuration do
 				env.res['Content-Type'].should == 'text/uri-list'
 				env.res.data.should == "file://test.out\r\nfile://test.out2\r\n"
 			end
-			
+
 			describe 'conditional inclusion support' do
 				let :state do
 					Configuration::RequestState.new('abc', list: 'input,image2')
@@ -335,4 +420,3 @@ describe Configuration do
 		end
 	end
 end
-