httpimagestore 1.8.1 → 1.9.0

data/features/storage.feature

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

data/features/support/env.rb

@@ -1,116 +0,0 @@
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'rspec/expectations'
-
-require 'daemon'
-require 'timeout'
-require 'faraday'
-require "open3"
-require "thread"
-require 'tempfile'
-require 'RMagick'
-require 'aws-sdk'
-require 'httpimagestore/aws_sdk_regions_hack'
-require 'digest'
-
-class String
-	def replace_s3_variables
-		string = self.dup
-		string.gsub!(/@AWS_ACCESS_KEY_ID@/, ENV['AWS_ACCESS_KEY_ID'])
-		string.gsub!(/@AWS_SECRET_ACCESS_KEY@/, ENV['AWS_SECRET_ACCESS_KEY'])
-		string.gsub!(/@AWS_S3_TEST_BUCKET@/, ENV['AWS_S3_TEST_BUCKET'])
-		string
-	end
-end
-
-def gem_dir
-		Pathname.new(__FILE__).dirname + '..' + '..'
-end
-
-def features_dir
-		gem_dir + 'features'
-end
-
-def support_dir
-		features_dir + 'support'
-end
-
-def script(file)
-		gem_dir + 'bin' + file
-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 get_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("http://localhost:3000/stats").body 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/features/support/test.txt

@@ -1 +0,0 @@
-hello world

data/features/xid-forwarding.feature

@@ -1,49 +0,0 @@
-Feature: Forwarding of transaction ID header to thumbnailer
-	HTTP Image Store should forward transaction ID header found in the request to HTTP Thumbnailer
-
-	Background:
-		Given httpthumbnailer server is running at http://localhost:3100/health_check
-		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
-		"""
-		post "identify" {
-			identify "input"
-		}
-
-		post "single" {
-			thumbnail "input" "thumbnail" operation="pad" width="8" height="8"
-		}
-
-		post "multi" {
-			thumbnail "input" {
-				"small"             operation="crop"        width=128       height=128      format="jpeg"
-				"tiny_png"          operation="crop"        width=32        height=32       format="png"
-			}
-		}
-		"""
-
-	@xid-forwarding
-	Scenario: Should forward XID with identify requests
-		Given tiny.png file content as request body
-		And XID header set to 123
-		When I do POST request http://localhost:3000/identify
-		Then response status will be 200
-		And httpimagestore log will contain xid="123"
-		And httpthumbnailer log will contain xid="123"
-
-	@xid-forwarding
-	Scenario: Should forward XID with single thumbnail requests
-		Given tiny.png file content as request body
-		And XID header set to 123
-		When I do POST request http://localhost:3000/single
-		Then response status will be 200
-		And httpimagestore log will contain xid="123"
-		And httpthumbnailer log will contain xid="123"
-
-	@xid-forwarding
-	Scenario: Should forward XID with multi thumbnail requests
-		Given tiny.png file content as request body
-		And XID header set to 123
-		When I do POST request http://localhost:3000/multi
-		Then response status will be 200
-		And httpimagestore log will contain xid="123"
-		And httpthumbnailer log will contain xid="123"

data/httpimagestore.gemspec

@@ -1,145 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "httpimagestore"
-  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-28"
-  s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
-  s.email = "jpastuszek@gmail.com"
-  s.executables = ["httpimagestore"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/httpimagestore",
-    "features/cache-control.feature",
-    "features/compatibility.feature",
-    "features/data-uri.feature",
-    "features/encoding.feature",
-    "features/error-reporting.feature",
-    "features/flexi.feature",
-    "features/health-check.feature",
-    "features/request-matching.feature",
-    "features/rewrite.feature",
-    "features/s3-store-and-thumbnail.feature",
-    "features/source-failover.feature",
-    "features/step_definitions/httpimagestore_steps.rb",
-    "features/storage.feature",
-    "features/support/env.rb",
-    "features/support/test-large.jpg",
-    "features/support/test.empty",
-    "features/support/test.jpg",
-    "features/support/test.png",
-    "features/support/test.txt",
-    "features/support/tiny.png",
-    "features/xid-forwarding.feature",
-    "httpimagestore.gemspec",
-    "lib/httpimagestore/aws_sdk_regions_hack.rb",
-    "lib/httpimagestore/configuration.rb",
-    "lib/httpimagestore/configuration/file.rb",
-    "lib/httpimagestore/configuration/handler.rb",
-    "lib/httpimagestore/configuration/identify.rb",
-    "lib/httpimagestore/configuration/output.rb",
-    "lib/httpimagestore/configuration/path.rb",
-    "lib/httpimagestore/configuration/s3.rb",
-    "lib/httpimagestore/configuration/source_failover.rb",
-    "lib/httpimagestore/configuration/thumbnailer.rb",
-    "lib/httpimagestore/error_reporter.rb",
-    "lib/httpimagestore/ruby_string_template.rb",
-    "load_test/load_test.1k.23a022f6e.m1.small-comp.csv",
-    "load_test/load_test.1k.ec9bde794.m1.small.csv",
-    "load_test/load_test.jmx",
-    "load_test/thumbnail_specs.csv",
-    "load_test/thumbnail_specs_v2.csv",
-    "spec/configuration_file_spec.rb",
-    "spec/configuration_handler_spec.rb",
-    "spec/configuration_identify_spec.rb",
-    "spec/configuration_output_spec.rb",
-    "spec/configuration_path_spec.rb",
-    "spec/configuration_s3_spec.rb",
-    "spec/configuration_source_failover_spec.rb",
-    "spec/configuration_spec.rb",
-    "spec/configuration_thumbnailer_spec.rb",
-    "spec/ruby_string_template_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/compute.jpg",
-    "spec/support/cuba_response_env.rb",
-    "spec/support/full.cfg",
-    "spec/support/utf_string.txt"
-  ]
-  s.homepage = "http://github.com/jpastuszek/httpimagestore"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "HTTP based image storage and thumbnailer"
-
-  if s.respond_to? :specification_version then
-    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.2.2"])
-      s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<aws-sdk>, ["~> 1.10"])
-      s.add_runtime_dependency(%q<mime-types>, ["~> 1.17"])
-      s.add_runtime_dependency(%q<sdl4r>, ["~> 0.9"])
-      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"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.9"])
-      s.add_development_dependency(%q<daemon>, ["~> 1"])
-      s.add_development_dependency(%q<prawn>, ["= 0.8.4"])
-      s.add_development_dependency(%q<httpthumbnailer>, ["~> 1.2.0"])
-    else
-      s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.2.2"])
-      s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.2.0"])
-      s.add_dependency(%q<aws-sdk>, ["~> 1.10"])
-      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"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<rdoc>, ["~> 3.9"])
-      s.add_dependency(%q<daemon>, ["~> 1"])
-      s.add_dependency(%q<prawn>, ["= 0.8.4"])
-      s.add_dependency(%q<httpthumbnailer>, ["~> 1.2.0"])
-    end
-  else
-    s.add_dependency(%q<unicorn-cuba-base>, ["~> 1.2.2"])
-    s.add_dependency(%q<httpthumbnailer-client>, ["~> 1.2.0"])
-    s.add_dependency(%q<aws-sdk>, ["~> 1.10"])
-    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"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<rdoc>, ["~> 3.9"])
-    s.add_dependency(%q<daemon>, ["~> 1"])
-    s.add_dependency(%q<prawn>, ["= 0.8.4"])
-    s.add_dependency(%q<httpthumbnailer>, ["~> 1.2.0"])
-  end
-end
-