httpimagestore 0.2.0 → 0.2.1

data/Gemfile

@@ -11,7 +11,7 @@ gem "mime-types", "~> 1.17.2"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", "~> 2.8.0"
   gem "cucumber", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"

data/Gemfile.lock

@@ -56,14 +56,14 @@ GEM
     rdoc (3.11)
       json (~> 1.4)
     rmagick (2.13.1)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.8.0)
     ruby-ip (0.9.0)
     s3 (0.3.9)
       proxies (~> 0.2.0)
@@ -90,7 +90,7 @@ DEPENDENCIES
   prawn (= 0.8.4)
   rcov
   rdoc (~> 3.9)
-  rspec (~> 2.3.0)
+  rspec (~> 2.8.0)
   ruby-ip (~> 0.9)
   s3 (~> 0.3)
   sinatra (>= 1.2.6)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/httpimagestore

@@ -17,13 +17,13 @@ options = CLI.new do
 end.parse!
 
 require 'sinatra/base'
-require 's3'
 require 'httpthumbnailer-client'
 require 'digest/sha2'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'httpimagestore/configuration'
-require 'httpimagestore/pathname'
+require 'httpimagestore/image_path'
+require 'httpimagestore/s3_service'
 
 sinatra = Sinatra.new
 
@@ -43,33 +43,19 @@ sinatra.set :uri_encode, (not options.no_uri_encode)
 
 Configuration.from_file(options.config).put(sinatra)
 
-class S3Put
-	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"
+class ThumbnailingError < RuntimeError
+	def initialize(thumbnail_class, remote_error)
+		@remote_error = remote_error
+		super "Thumbnailing for class '#{thumbnail_class.name}' failed: #{remote_error.message}"
 	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)
-		file.content_type = content_type
-		file.content = data
-		file.save
-
-		"http://#{@bucket.name}.s3.amazonaws.com/#{image_path}"
-	end
+	attr_reader :remote_error
 end
 
 sinatra.before do
 	logger.level = Logger::DEBUG if settings.logging and settings.debug
 	# singletons
-	$s3 ||= S3Put.new(settings.s3_key_id, settings.s3_key_secret, settings.s3_bucket, :logger => logger)
+	$s3 ||= S3Service.new(settings.s3_key_id, settings.s3_key_secret, settings.s3_bucket, :logger => logger)
 	$thumbnailer ||= HTTPThumbnailerClient.new(settings.thumbnailer_url)
 end
 
@@ -87,54 +73,42 @@ sinatra.helpers do
 	def digest(data)
 		Digest::SHA2.new.update(data).to_s[0,16]
 	end
-
-	class BadRequestError < RuntimeError
-	end
-
-	class ThumbnailingError < RuntimeError
-		def initialize(thumbnail_class, remote_error)
-			@remote_error = remote_error
-			super "Thumbnailing for class '#{thumbnail_class.name}' failed: #{remote_error.message}"
-		end
-
-		attr_reader :remote_error
-	end
 end
 
 sinatra.get '/' do
 	"hello"
 end
 
-sinatra.put %r{/thumbnail/([^/]*)/?(.*)} do |classes, image_path|
-	if image_path.empty?
-		image_path = Pathname.new(image_path).extend(Pathname::AutoPath)
-	else
-		image_path = Pathname.new(image_path).extend(Pathname::CustomPath)
-	end
+sinatra.put %r{/thumbnail/([^/]*)/?(.*)} do |thumbnail_classes, image_path|
+	thumbnail_classes = thumbnail_classes.split(',').map{|thumbnail_class| settings.thumbnail_classes[thumbnail_class]}
 
-	classes = classes.split(',').map{|tc| settings.thumbnail_classes[tc]}
 	image = request.body.read
+	image_hash = digest(image)
+
+	unless image_path.empty?
+		image_path = ImagePath::Custom.new(image_hash, image_path)
+	else
+		image_path = ImagePath::Auto.new(image_hash)
+	end
 
-	thumbs = $thumbnailer.thumbnail(image) do
-		classes.each do |tc|
-			thumbnail tc.method, tc.width, tc.height, tc.format, tc.options
+	thumbnails = $thumbnailer.thumbnail(image) do
+		thumbnail_classes.each do |thumbnail_class|
+			thumbnail thumbnail_class.method, thumbnail_class.width, thumbnail_class.height, thumbnail_class.format, thumbnail_class.options
 		end
 	end
 
 	# check for errors
-	thumbs.zip(classes).each do |thumb, thumbnail_class|
-		raise ThumbnailingError.new(thumbnail_class, thumb) if thumb.kind_of? HTTPThumbnailerClient::ThumbnailingError
+	thumbnails.zip(thumbnail_classes).each do |thumbnail, thumbnail_class|
+		raise ThumbnailingError.new(thumbnail_class, thumbnail) if thumbnail.kind_of? HTTPThumbnailerClient::ThumbnailingError
 	end
 
 	urls = []
 
-	image_hash = digest(image)
-
 	# store all images
-	urls << $s3.put_image(image_path.original_image(image_hash, thumbs.input_mime_type).to_s, thumbs.input_mime_type, image)
+	urls << $s3.put_image(image_path.original_image(thumbnails.input_mime_type), thumbnails.input_mime_type, image)
 
-	thumbs.zip(classes).each do |thumb, thumbnail_class|
-		urls << $s3.put_image(image_path.thumbnail_image(image_hash, thumb.mime_type, thumbnail_class.name).to_s, thumb.mime_type, thumb.data)
+	thumbnails.zip(thumbnail_classes).each do |thumbnail, thumbnail_class|
+		urls << $s3.put_image(image_path.thumbnail_image(thumbnail.mime_type, thumbnail_class.name), thumbnail.mime_type, thumbnail.data)
 	end
 
 	status 200
@@ -162,10 +136,6 @@ sinatra.error ThumbnailingError do
 	end
 end
 
-sinatra.error BadRequestError do
-	halt_exception(400, env['sinatra.error'])
-end
-
 sinatra.error Configuration::ThumbnailClassDoesNotExistError do
 	halt_exception(404, env['sinatra.error'])
 end

data/features/httpimagestore.feature

@@ -12,7 +12,7 @@ Feature: Storing of original image and specified classes of its thumbnails on S3
 
 		thumbnail_class 'small', 'crop', 128, 128
 		thumbnail_class 'tiny', 'crop', 32, 32
-		thumbnail_class 'png', 'crop', 32, 32, 'PNG'
+		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'
@@ -24,84 +24,74 @@ Feature: Storing of original image and specified classes of its thumbnails on S3
 	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.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
+		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.jpg
-		"""
-		And http://issthumbtest.s3.amazonaws.com/4006450256177f4a.jpg will contain JPEG image of size 509x719
-		And http://issthumbtest.s3.amazonaws.com/4006450256177f4a/small.jpg will contain JPEG image of size 128x128
-		And http://issthumbtest.s3.amazonaws.com/4006450256177f4a/tiny.jpg will contain JPEG image of size 32x32
+		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.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/test/image/test.jpg
+		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.jpg
-		"""
-		And 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-small.jpg will contain JPEG image of size 128x128
-		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny.jpg will contain JPEG image of size 32x32
-
-	Scenario: Putting original and its thumbnails to S3 bucket under custom path with UTF characters (encoded) in the path and name
-		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/图像/测试.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/%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
+		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny_png.png
 		"""
-		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
+		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: Input image content type determined from content
+	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
-		And Content-Type header set to application/octet-stream
-		When I do PUT request http://localhost:3000/thumbnail/tiny/test/image/test.jpg
+		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.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: Thumbnail image content type and file extension determined from configured format
-		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-tiny.jpg file in S3 bucket
-		And there is no test/image/4006450256177f4a/test-png.png file in S3 bucket
+	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/tiny,png/test/image/test.jpg
+		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/image/4006450256177f4a/test.jpg
-		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny.jpg
-		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-png.png
+		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/image/4006450256177f4a/test-tiny.jpg content type will be image/jpeg
-		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-png.png content type will be image/png
+		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

data/httpimagestore.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
@@ -35,10 +35,11 @@ Gem::Specification.new do |s|
     "features/support/test.txt",
     "httpimagestore.gemspec",
     "lib/httpimagestore/configuration.rb",
-    "lib/httpimagestore/pathname.rb",
+    "lib/httpimagestore/image_path.rb",
+    "lib/httpimagestore/s3_service.rb",
     "lib/httpimagestore/thumbnail_class.rb",
     "spec/configuration_spec.rb",
-    "spec/pathname_spec.rb",
+    "spec/image_path_spec.rb",
     "spec/spec_helper.rb",
     "spec/test.cfg"
   ]
@@ -59,7 +60,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ruby-ip>, ["~> 0.9"])
       s.add_runtime_dependency(%q<cli>, ["~> 1.1.0"])
       s.add_runtime_dependency(%q<mime-types>, ["~> 1.17.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -76,7 +77,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-ip>, ["~> 0.9"])
       s.add_dependency(%q<cli>, ["~> 1.1.0"])
       s.add_dependency(%q<mime-types>, ["~> 1.17.2"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -94,7 +95,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby-ip>, ["~> 0.9"])
     s.add_dependency(%q<cli>, ["~> 1.1.0"])
     s.add_dependency(%q<mime-types>, ["~> 1.17.2"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/httpimagestore/image_path.rb

@@ -0,0 +1,54 @@
+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

@@ -0,0 +1,25 @@
+require 's3'
+
+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)
+		file.content_type = content_type
+		file.content = data
+		file.save
+
+		"http://#{@bucket.name}.s3.amazonaws.com/#{image_path}"
+	end
+end
+

data/spec/image_path_spec.rb

@@ -0,0 +1,72 @@
+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
+ 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpimagestore
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -134,12 +134,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
         - 2
-        - 3
+        - 8
         - 0
-        version: 2.3.0
+        version: 2.8.0
   prerelease: false
   name: rspec
   version_requirements: *id008
@@ -291,10 +291,11 @@ files:
 - features/support/test.txt
 - httpimagestore.gemspec
 - lib/httpimagestore/configuration.rb
-- lib/httpimagestore/pathname.rb
+- lib/httpimagestore/image_path.rb
+- lib/httpimagestore/s3_service.rb
 - lib/httpimagestore/thumbnail_class.rb
 - spec/configuration_spec.rb
-- spec/pathname_spec.rb
+- spec/image_path_spec.rb
 - spec/spec_helper.rb
 - spec/test.cfg
 homepage: http://github.com/jpastuszek/httpimagestore

data/lib/httpimagestore/pathname.rb

@@ -1,33 +0,0 @@
-require 'mime/types'
-
-class Pathname
-	def mime_extension(mime_type)
-		mime = MIME::Types[mime_type].first or return extname
-		'.' + (mime.extensions.select{|e| e.length == 3}.first or mime.extensions.first)
-	end
-
-	module AutoPath
-		# <id>.<ext>
-		def original_image(id, mime_type)
-			"#{id.to_s}#{mime_extension(mime_type)}"
-		end
-
-		# <id>/<class>.<ext>
-		def thumbnail_image(id, mime_type, thumbnail_class)
-			"#{id.to_s}/#{thumbnail_class}#{mime_extension(mime_type)}"
-		end
-	end
-
-	module CustomPath
-		# abc/xyz.jpg => abc/<id>/xyz.jpg
-		def original_image(id, mime_type)
-			dirname + id.to_s + basename
-		end
-
-		# abc/xyz.jpg => abc/<id>/xyz-<class>.jpg
-		def thumbnail_image(id, mime_type, thumbnail_class)
-			dirname + id.to_s + "#{basename(extname)}-#{thumbnail_class}#{mime_extension(mime_type)}"
-		end
-	end
-end
-

data/spec/pathname_spec.rb

@@ -1,17 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'httpimagestore/pathname'
-
-describe Pathname do
-	describe "#original_image" do
-		it "returns path with tid" do
-			Pathname.new("test/file/path.jpg").original_image(123).to_s.should == "test/file/123/path.jpg"
-		end
-	end
-
-	describe "#thumbnail_image" do
-		it "returns path with tid and thumbnail class name in file name" do
-			Pathname.new("test/file/path.jpg").thumbnail_image(123, 'small').to_s.should == "test/file/123/path-small.jpg"
-		end
-	end
-end
-