httpimagestore 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/httpimagestore

@@ -105,13 +105,15 @@ sinatra.get '/' do
 	"hello"
 end
 
-sinatra.put %r{/thumbnail/([^/]*)/(.*)} do |classes, image_path|
-	raise BadRequestError, "Path is empty" if image_path.empty?
-	image_path = Pathname.new(image_path)
+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
 
 	classes = classes.split(',').map{|tc| settings.thumbnail_classes[tc]}
 	image = request.body.read
-	image_hash = digest(image)
 
 	thumbs = $thumbnailer.thumbnail(image) do
 		classes.each do |tc|
@@ -126,11 +128,13 @@ sinatra.put %r{/thumbnail/([^/]*)/(.*)} do |classes, image_path|
 
 	urls = []
 
+	image_hash = digest(image)
+
 	# store all images
-	urls << $s3.put_image(image_path.original_image(image_hash).to_s, thumbs.input_mime_type, image)
+	urls << $s3.put_image(image_path.original_image(image_hash, thumbs.input_mime_type).to_s, thumbs.input_mime_type, image)
 
 	thumbs.zip(classes).each do |thumb, thumbnail_class|
-		urls << $s3.put_image(image_path.thumbnail_image(image_hash, thumbnail_class.name, thumb.mime_type).to_s, thumb.mime_type, thumb.data)
+		urls << $s3.put_image(image_path.thumbnail_image(image_hash, thumb.mime_type, thumbnail_class.name).to_s, thumb.mime_type, thumb.data)
 	end
 
 	status 200

data/features/httpimagestore.feature

@@ -22,6 +22,24 @@ Feature: Storing of original image and specified classes of its thumbnails on S3
 		Given issthumbtest S3 bucket with key AKIAJMUYVYOSACNXLPTQ and secret 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
 
 	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
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/thumbnail/small,tiny
+		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
+
+	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
@@ -39,7 +57,7 @@ Feature: Storing of original image and specified classes of its thumbnails on S3
 		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 with UTF characters (encoded) in the path and name
+	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
@@ -136,16 +154,6 @@ Feature: Storing of original image and specified classes of its thumbnails on S3
 		Error: Configuration::ThumbnailClassDoesNotExistError: Class 'bogous' does not exist
 		"""
 
-	Scenario: Handling of bad path
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/thumbnail/small/
-		Then response status will be 400
-		And response content type will be text/plain
-		And response body will be CRLF ended lines like
-		"""
-		Error: BadRequestError: Path is empty
-		"""
-
 	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

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2012-01-05"
+  s.date = "2012-01-10"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]

data/lib/httpimagestore/pathname.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpimagestore
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime