httpimagestore 0.5.0 → 1.0.0

data/features/httpimagestore.feature

@@ -1,167 +0,0 @@
-Feature: Storing of original image and specified classes of its thumbnails on S3
-	In order to store original image and its thumbnails in preconfigured S3 bucket
-	A user must PUT the image data to URI representing its path within the bucket
-	The response will be paths to files stored in S3
-
-	Background:
-		Given issthumbtest S3 bucket with key AKIAJMUYVYOSACNXLPTQ and secret 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
-		Given httpimagestore log is empty
-		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
-		"""
-		s3_key 'AKIAJMUYVYOSACNXLPTQ', 'MAeGhvW+clN7kzK3NboASf3/kZ6a81PRtvwMZj4Y'
-		s3_bucket 'issthumbtest'
-
-		thumbnail_class 'small', 'crop', 128, 128
-		thumbnail_class 'tiny', 'crop', 32, 32
-		thumbnail_class 'tiny_png', 'crop', 32, 32, 'PNG'
-		thumbnail_class 'bad', 'crop', 0, 0
-		thumbnail_class 'superlarge', 'crop', 16000, 16000
-		thumbnail_class 'large_png', 'crop', 7000, 7000, 'PNG'
-		"""
-		Given httpthumbnailer log is empty
-		Given httpthumbnailer server is running at http://localhost:3100/
-		Given Content-Type header set to image/autodetect
-
-	Scenario: Putting original and its thumbnails to S3 bucket
-		Given there is no 4006450256177f4a.jpg file in S3 bucket
-		And there is no 4006450256177f4a/small.jpg file in S3 bucket
-		And there is no 4006450256177f4a/tiny_png.png file in S3 bucket
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/small,tiny_png
-		Then response status will be 200
-		And response content type will be text/uri-list
-		And response body will be CRLF ended lines
-		"""
-		http://issthumbtest.s3.amazonaws.com/4006450256177f4a.jpg
-		http://issthumbtest.s3.amazonaws.com/4006450256177f4a/small.jpg
-		http://issthumbtest.s3.amazonaws.com/4006450256177f4a/tiny_png.png
-		"""
-		Then http://issthumbtest.s3.amazonaws.com/4006450256177f4a.jpg will contain JPEG image of size 509x719
-		And http://issthumbtest.s3.amazonaws.com/4006450256177f4a.jpg content type will be image/jpeg
-		Then http://issthumbtest.s3.amazonaws.com/4006450256177f4a/small.jpg will contain JPEG image of size 128x128
-		And http://issthumbtest.s3.amazonaws.com/4006450256177f4a/small.jpg content type will be image/jpeg
-		Then http://issthumbtest.s3.amazonaws.com/4006450256177f4a/tiny_png.png will contain PNG image of size 32x32
-		And http://issthumbtest.s3.amazonaws.com/4006450256177f4a/tiny_png.png content type will be image/png
-
-	Scenario: Putting original and its thumbnails to S3 bucket under custom path
-		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-small.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-tiny_png.png file in S3 bucket
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/small,tiny_png/test/image/test
-		Then response status will be 200
-		And response content type will be text/uri-list
-		And response body will be CRLF ended lines
-		"""
-		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg
-		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-small.jpg
-		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny_png.png
-		"""
-		Then http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg will contain JPEG image of size 509x719
-		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg content type will be image/jpeg
-		Then http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-small.jpg will contain JPEG image of size 128x128
-		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-small.jpg content type will be image/jpeg
-		Then http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny_png.png will contain PNG image of size 32x32
-		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny_png.png content type will be image/png
-
-	Scenario: Custom path name can contain file name extension that may be used as failback to content based detection
-		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-tiny_png.jpg file in S3 bucket
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/tiny_png/test/image/test.jpg
-		Then response status will be 200
-		And response content type will be text/uri-list
-		And response body will be CRLF ended lines
-		"""
-		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg
-		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny_png.png
-		"""
-		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg content type will be image/jpeg
-		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny_png.png content type will be image/png
-
-	Scenario: Custom path name encoding when UTF-8 characters can be used
-		Given there is no test/图像/4006450256177f4a/测试.jpg file in S3 bucket
-		And there is no test/图像/4006450256177f4a/测试-small.jpg file in S3 bucket
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/small/test/图像/测试
-		Then response status will be 200
-		And response content type will be text/uri-list
-		And response body will be CRLF ended lines
-		"""
-		http://issthumbtest.s3.amazonaws.com/test/%E5%9B%BE%E5%83%8F/4006450256177f4a/%E6%B5%8B%E8%AF%95.jpg
-		http://issthumbtest.s3.amazonaws.com/test/%E5%9B%BE%E5%83%8F/4006450256177f4a/%E6%B5%8B%E8%AF%95-small.jpg
-		"""
-		And http://issthumbtest.s3.amazonaws.com/test/图像/4006450256177f4a/测试.jpg will contain JPEG image of size 509x719
-		And http://issthumbtest.s3.amazonaws.com/test/图像/4006450256177f4a/测试-small.jpg will contain JPEG image of size 128x128
-
-	Scenario: Reporting of missing resource
-		When I do GET request http://localhost:3000/blah
-		Then response status will be 404
-		And response content type will be text/plain
-		And response body will be CRLF ended lines
-		"""
-		Resource '/blah' not found
-		"""
-
-	Scenario: Reporting of unsupported media type
-		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-small.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-tiny.jpg file in S3 bucket
-		Given test.txt file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/small,tiny/test/image/test.jpg
-		Then response status will be 415
-		And response content type will be text/plain
-		And response body will be CRLF ended lines like
-		"""
-		Error: HTTPThumbnailerClient::UnsupportedMediaTypeError:
-		"""
-		And S3 bucket will not contain test/image/4006450256177f4a/test.jpg
-		And S3 bucket will not contain test/image/4006450256177f4a/test-small.jpg
-		And S3 bucket will not contain test/image/4006450256177f4a/test-tiny.jpg
-
-	Scenario: Reporting and handling of thumbnailing errors
-		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-small.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-tiny.jpg file in S3 bucket
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/small,tiny,bad/test/image/test.jpg
-		Then response status will be 500
-		And response content type will be text/plain
-		And response body will be CRLF ended lines like
-		"""
-		Error: ThumbnailingError: Thumbnailing for class 'bad' failed: Error: ArgumentError:
-		"""
-		And S3 bucket will not contain test/image/4006450256177f4a/test.jpg
-		And S3 bucket will not contain test/image/4006450256177f4a/test-small.jpg
-		And S3 bucket will not contain test/image/4006450256177f4a/test-tiny.jpg
-
-	Scenario: Reporting of missing class error
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/small,bogous,bad/test/image/test.jpg
-		Then response status will be 404
-		And response content type will be text/plain
-		And response body will be CRLF ended lines like
-		"""
-		Error: Configuration::ThumbnailClassDoesNotExistError: Class 'bogous' does not exist
-		"""
-
-	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/thumbnail/large_png/test/image/test.jpg
-		Then response status will be 413
-		And response content type will be text/plain
-		And response body will be CRLF ended lines like
-		"""
-		Error: HTTPThumbnailerClient::ImageTooLargeError:
-		"""
-
-	Scenario: Too large image - memory exhausted when thmbnailing
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/superlarge/test/image/test.jpg
-		Then response status will be 413
-		And response content type will be text/plain
-		And response body will be CRLF ended lines like
-		"""
-		Error: ThumbnailingError: Thumbnailing for class 'superlarge' failed: Error: Thumbnailer::ImageTooLargeError:
-		"""
-

data/lib/httpimagestore/image_path.rb

@@ -1,54 +0,0 @@
-require 'mime/types'
-require 'pathname'
-
-class ImagePath
-	class CouldNotDetermineFileExtensionError < ArgumentError
-		def initialize(mime_type)
-			super "could not determine file extension for mime type: #{mime_type}"
-		end
-	end
-
-	def initialize(id)
-		@id = id.to_s
-	end
-
-	private
-
-	def mime_extension(mime_type)
-		mime = MIME::Types[mime_type].first or raise CouldNotDetermineFileExtensionError, mime_type
-		'.' + (mime.extensions.select{|e| e.length == 3}.first or mime.extensions.first)
-	end
-
-	class Auto < ImagePath
-		def original_image(mime_type)
-			"#{@id}#{mime_extension(mime_type)}"
-		end
-
-		def thumbnail_image(mime_type, thumbnail_class)
-			"#{@id}/#{thumbnail_class}#{mime_extension(mime_type)}"
-		end
-	end
-
-	class Custom < ImagePath
-		def initialize(id, path)
-			super(id)
-			@path = Pathname.new(path)
-		end
-
-		def original_image(mime_type)
-			extension = begin
-				mime_extension(mime_type)
-			rescue CouldNotDetermineFileExtensionError
-				raise if @path.extname.empty?
-				@path.extname
-			end
-
-			(@path.dirname + @id + "#{@path.basename(@path.extname)}#{extension}").to_s
-		end
-
-		def thumbnail_image(mime_type, thumbnail_class)
-			(@path.dirname + @id + "#{@path.basename(@path.extname)}-#{thumbnail_class}#{mime_extension(mime_type)}").to_s
-		end
-	end
-end
-

data/lib/httpimagestore/s3_service.rb

@@ -1,37 +0,0 @@
-require 's3'
-require 'retry-this'
-
-class S3Service
-	def initialize(key_id, key_secret, bucket, options = {})
-		@options = options
-		@logger = (options[:logger] or Logger.new('/dev/null'))
-
-		@s3 = S3::Service.new(:access_key_id => key_id, :secret_access_key => key_secret)
-
-		@logger.info "Getting bucket: #{bucket}"
-		@bucket = @s3.buckets.find(bucket) or fail "no buckte '#{bucket}' found"
-	end
-
-	def put_image(image_path, content_type, data)
-		@logger.info "Putting image in bucket '#{@bucket.name}': #{image_path}"
-
-		file = @bucket.objects.build(image_path)
-		cache_control = @options[:cache_control].join(', ') if @options.include?(:cache_control) and not @options[:cache_control].empty?
-		file.cache_control = cache_control unless cache_control.empty?
-
-		file.content_type = content_type
-		file.content = data
-
-		RetryThis.retry_this(
-			:times => (@options[:upload_retry_times] or 1),
-			:sleep => (@options[:upload_retry_delay] or 0.0),
-			:error_types => [Errno::ECONNRESET, Timeout::Error, S3::Error::RequestTimeout]
-		) do |attempt|
-			@logger.warn "Retrying S3 save operation" if attempt > 1
-			file.save
-		end
-
-		"http://#{@bucket.name}.s3.amazonaws.com/#{image_path}"
-	end
-end
-

data/lib/httpimagestore/thumbnail_class.rb

@@ -1,13 +0,0 @@
-class ThumbnailClass
-	def initialize(name, method, width, height, format = 'JPEG', options = {})
-		@name = name
-		@method = method
-		@width = width
-		@height = height 
-		@format = format
-		@options = options
-	end
-
-	attr_reader :name, :method, :width, :height, :format, :options
-end
-

data/spec/image_path_spec.rb

@@ -1,72 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'httpimagestore/image_path'
-require 'pathname'
-
-shared_examples "extension handling" do |image_path|
-	describe "#original_image" do
-		it "determines extension based on mime type" do
-			Pathname.new(image_path.original_image("image/jpeg")).extname.should == ".jpg"
-			Pathname.new(image_path.original_image("image/tiff")).extname.should == ".tif"
-			Pathname.new(image_path.original_image("image/png")).extname.should == ".png"
-		end
-
-		it "should fail if provided extension from mime type could not be determined" do
-			lambda {
-				image_path.original_image("image/xyz")
-			}.should raise_error ImagePath::CouldNotDetermineFileExtensionError, "could not determine file extension for mime type: image/xyz"
-		end
-	end
-
-	describe "#thumbnail_image" do
-		it "determines extension based on mime type" do
-			Pathname.new(image_path.thumbnail_image("image/jpeg", "small")).extname.should == ".jpg"
-			Pathname.new(image_path.thumbnail_image("image/tiff", "small")).extname.should == ".tif"
-			Pathname.new(image_path.thumbnail_image("image/png", "small")).extname.should == ".png"
-		end
-
-		it "should fail if provided extension from mime type could not be determined" do
-			lambda {
-				image_path.thumbnail_image("image/xyz", "small")
-			}.should raise_error ImagePath::CouldNotDetermineFileExtensionError, "could not determine file extension for mime type: image/xyz"
-		end
-	end
-end
-
-describe ImagePath do
-	describe ImagePath::Auto do
-		describe "#original_image" do
-			it "returns path in format <id>.<ext>" do
-				ImagePath::Auto.new(123).original_image("image/jpeg").should == "123.jpg"
-			end
-		end
-
-		describe "#thumbnail_image" do
-			it "returns path in format <id>/<class>.<ext>" do
-				ImagePath::Auto.new(123).thumbnail_image("image/jpeg", "small").should == "123/small.jpg"
-			end
-		end
-
-		include_examples "extension handling", ImagePath::Auto.new(123)
-	end
-
-	describe ImagePath::Custom do
-		describe "#original_image" do
-			it "returns path in format abc/<id>/xyz.<ext>" do
-				ImagePath::Custom.new(123, "test/file/path.jpg").original_image("image/jpeg").should == "test/file/123/path.jpg"
-			end
-
-			it "should fail back to provided extension if extension from mime type could not be determined" do
-				Pathname.new(ImagePath::Custom.new(123, "test/file/path.abc").original_image("image/xyz")).extname.should == ".abc"
-			end
-		end
-
-		describe "#thumbnail_image" do
-			it "returns path in format abc/<id>/xyz-<class>.<ext>" do
-				ImagePath::Custom.new(123, "test/file/path.jpg").thumbnail_image("image/jpeg", "small").should == "test/file/123/path-small.jpg"
-			end
-		end
-
-		include_examples "extension handling", ImagePath::Custom.new(123, "test/file/path")
-	end
-end
- 

data/spec/test.cfg

@@ -1,8 +0,0 @@
-s3_key 'abc', 'xyz'
-s3_bucket 'test'
-thumbnailer_url 'http://test'
-
-thumbnail_class 'small', 'crop', 128, 128, 'JPEG', :magick => 'option', :number => 42
-thumbnail_class 'tiny', 'pad', 32, 48, 'PNG'
-thumbnail_class 'test', 'pad', 32, 48
-