httpimagestore 1.8.1 → 1.9.0

data/spec/ruby_string_template_spec.rb

@@ -1,61 +0,0 @@
-require_relative 'spec_helper'
-require 'httpimagestore/ruby_string_template'
-
-describe RubyStringTemplate do
-	subject do
-		RubyStringTemplate.new('>#{hello}-#{world}#{test}<')
-	end
-
-	it 'should replace holders with given values' do
-		subject.render(hello: 'hello', world: 'world', test: 123).should == '>hello-world123<'
-	end
-
-	it 'should raise NoValueForTemplatePlaceholderError if template value was not provided' do
-		expect {
-			subject.render(hello: 'hello', test: 123)
-		}.to raise_error RubyStringTemplate::NoValueForTemplatePlaceholderError, %q{no value for '#{world}' in template '>#{hello}-#{world}#{test}<'}
-	end
-
-	it 'should not process nested placeholders' do
-		subject.render(hello: '#{nested}', world: 'world', test: 123, nested: 'xxx').should == '>#{nested}-world123<'
-	end
-
-	describe 'with custom resolver' do
-		subject do
-			RubyStringTemplate.new('>#{hello}-#{world}#{test}<') do |locals, name|
-				case name
-				when :test
-					321
-				else
-					locals[name]
-				end
-			end
-		end
-
-		it 'should ask for values using provided resolver' do
-			subject.render(hello: 'hello', world: 'world').should == '>hello-world321<'
-			subject.render(hello: 'hello', world: 'world', test: 123).should == '>hello-world321<'
-		end
-
-		it 'should raise NoValueForTemplatePlaceholderError if template value was not provided' do
-			expect {
-				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
-

data/spec/spec_helper.rb

@@ -1,89 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'faraday'
-require 'daemon'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-
-end
-
-def support_dir
-	Pathname.new('spec/support')
-end
-
-def http_client
-	@faraday ||= Faraday.new
-end
-
-def request(method, uri, body, headers)
-	http_client.run_request(method.downcase.to_sym, uri.replace_s3_variables, body, headers || {})
-end
-
-def get(url)
-	http_client.get(url).body
-end
-
-def status(url)
-	http_client.get(url).status
-end
-
-def headers(url)
-	http_client.get(url).headers
-end
-
-@@running_cmd = {}
-def start_server(cmd, pid_file, log_file, test_url)
-	if @@running_cmd[pid_file]
-		return if @@running_cmd[pid_file] == cmd
-		stop_server(pid_file)
-	end
-
-	fork do
-		Daemon.daemonize(pid_file, log_file)
-		log_file = Pathname.new(log_file)
-		log_file.truncate(0) if log_file.exist?
-		exec(cmd)
-	end
-
-	@@running_cmd[pid_file] = cmd
-
-	ppid = Process.pid
-	at_exit do
-		stop_server(pid_file) if Process.pid == ppid
-	end
-
-	Timeout.timeout(10) do
-		begin
-			get test_url
-		rescue Faraday::Error::ConnectionFailed
-			sleep 0.1
-			retry
-		end
-	end
-end
-
-def stop_server(pid_file)
-	pid_file = Pathname.new(pid_file)
-	return unless pid_file.exist?
-
-	STDERR.puts http_client.get_content("http://localhost:3000/stats") if pid_file.to_s.include? 'httpimagestore'
-	pid = pid_file.read.strip.to_i
-
-	Timeout.timeout(20) do
-		begin
-			loop do
-				Process.kill("TERM", pid)
-				sleep 0.1
-			end
-		rescue Errno::ESRCH
-			@@running_cmd.delete pid_file.to_s
-			pid_file.unlink
-		end
-	end
-end
-

data/spec/support/cuba_response_env.rb

@@ -1,40 +0,0 @@
-require 'unicorn-cuba-base/plugin/response_helpers'
-class CubaResponseEnv
-	include Plugin::ResponseHelpers
-
-	class Response < Struct.new(:status, :data)
-		extend Forwardable
-
-		def initialize
-			super
-			@headers = {}
-		end
-
-		def write(data)
-			(self.data ||= '') << data
-		end
-
-		def_delegators :@headers, :[]=, :[]
-	end
-
-	class Request
-		class Body
-			def read
-				''
-			end
-		end
-
-		def body
-			Body.new
-		end
-	end
-
-	def initialize
-		@res = Response.new
-		@req = Request.new
-	end
-
-	attr_reader :res
-	attr_reader :req
-end
-

data/spec/support/full.cfg

@@ -1,183 +0,0 @@
-s3 key="AKIAJ672BX2L6KYBFWSQ" secret="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" ssl=false
-
-# API - v2 thumbnails - /thumbnails/<path>[?<query>]
-path "hash"       "#{input_digest}.#{image_mime_extension}"
-path "path"       "#{path}"
-path "uri_part"   "/thumbnails/#{input_digest}/#{name}.#{image_mime_extension}"
-
-## User uploaded content - always JPEG converted, not bigger than 2160x2160 and in hight quality compression
-post "iss" "v2" "thumbnails" "pictures" "/(?<name>.+?)(\\.[^\\.]+)?$/" {
-	thumbnail "input" "original" operation="limit" width=2160 height=2160 format="jpeg" quality=95
-	store_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	output_store_path "original" path="uri_part"
-}
-
-post "iss" "v2" "thumbnails" "pictures" {
-	thumbnail "input" "original" operation="limit" width=2160 height=2160 format="jpeg" quality=95
-	store_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	output_store_path "original"
-}
-
-put "iss" "v2" "thumbnails" "pictures" {
-	thumbnail "input" "original" operation="limit" width=2160 height=2160 format="jpeg" quality=95
-	store_s3 "original" bucket="test.s3.whatclinic.com" path="path" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	output_store_path "original"
-}
-
-## Uploaded by us for use on the website - whatever we send
-post "iss" "v2" "thumbnails" "images" "/(?<name>.+?)(\\.[^\\.]+)?$/" {
-	identify "input"
-	store_s3 "input" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	output_store_path "input" path="uri_part"
-}
-
-post "iss" "v2" "thumbnails" "images" {
-	identify "input"
-	store_s3 "input" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	output_store_path "input"
-}
-
-put "iss" "v2" "thumbnails" "images" {
-	identify "input"
-	store_s3 "input" bucket="test.s3.whatclinic.com" path="path" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	output_store_path "input"
-}
-
-## Thumbailing - keep input format; default JPEG quality is 85
-### Data URI
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&:width" "&:height" "&:operation?crop" "&:float-y?0.5" "&:background-color?white" "&data-uri=true" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="float-y:#{float-y},background-color:#{background-color},quality:30"
-	output_data_uri_image "thumbnail" cache-control="s-maxage=31557600"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&:width" "&:height?1080" "&:operation?fit" "&:float-y?0.5" "&:background-color?white" "&data-uri=true" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="float-y:#{float-y},background-color:#{background-color},quality:30"
-	output_data_uri_image "thumbnail" cache-control="s-maxage=31557600"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&:height" "&:width?1080" "&:operation?fit" "&:float-y?0.5" "&:background-color?white" "&data-uri=true" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="float-y:#{float-y},background-color:#{background-color},quality:30"
-	output_data_uri_image "thumbnail" cache-control="s-maxage=31557600"
-}
-
-### Thumbnailing based on query string parameters
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&:width" "&:height" "&:operation?crop" "&:float-y?0.5" "&:background-color?white" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="float-y:#{float-y},background-color:#{background-color}"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&:width" "&:height?1080" "&:operation?fit" "&:float-y?0.5" "&:background-color?white" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="float-y:#{float-y},background-color:#{background-color}"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&:height" "&:width?1080" "&:operation?fit" "&:float-y?0.5" "&:background-color?white" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="float-y:#{float-y},background-color:#{background-color}"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-### Thumbnailing to predefined thumbnail sepcs
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=search" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="162" height="162" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=search_v2" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="crop" width="242" height="162" options="float-y:0.2,background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-# Special version of search type that can be included in Data URL; will be cache by Varnish only for it's own use in ESI
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=search_v2_dataurl" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="crop" width="242" height="162" options="float-y:0.2,background-color:0xF0F0F0,quality:30"
-	output_data_uri_image "thumbnail" cache-control="s-maxage=31557600"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=mobile_search_v2" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="98" height="148"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-# Special version of search type that can be included in Data URL; will be cache by Varnish only for it's own use in ESI
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=mobile_search_v2_dataurl" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="98" height="148" options="quality:30"
-	output_data_uri_image "thumbnail" cache-control="s-maxage=31557600"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=original" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="crop" width="input" height="input" options="background-color:white"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=search_thumb" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="28" height="28" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=brochure" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="264" height="264" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=brochure_thumb" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="40" height="40" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=admin" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="160" height="160" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=admin_thumb" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="65" height="65" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=treatment_thumb" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="80" height="60" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=staff_member_thumb" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="50" height="50" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=consultation" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="126" height="126" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=clinic_google_map_thumb" {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="pad" width="74" height="74" options="background-color:0xF0F0F0"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-
-get "iss" "v2" "thumbnails" "/(|.+?\\/)(?<input_digest>[0-f]{16}).*\\.(?<image_mime_extension>...)$/" "&type=large"  {
-	source_s3 "original" bucket="test.s3.whatclinic.com" path="hash" prefix="dev/httpimagestore/v1/" cache-root="/var/cache/httpimagestore/s3"
-	thumbnail "original" "thumbnail" operation="limit" width="1200" height="900" interlace="PlaneInterlace"
-	output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-}
-

data/spec/support/utf_string.txt

@@ -1 +0,0 @@
-zażółć gęślą jaźń