httpimagestore 0.0.3 → 0.0.4

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem "sinatra", ">= 1.2.6"
 gem "mongrel", ">= 1.1.5"
 gem "s3", "~> 0.3"
-gem "httpthumbnailer-client", "~> 0.0.1"
+gem "httpthumbnailer-client", "~> 0.0.3"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -15,5 +15,5 @@ group :development do
   gem "rcov", ">= 0"
   gem "rdoc", "~> 3.9"
   gem "daemon", "~> 1"
-  gem "httpthumbnailer", "~> 0.0.1"
+  gem "httpthumbnailer", "~> 0.0.7"
 end

data/Gemfile.lock

@@ -3,10 +3,10 @@ GEM
   specs:
     builder (3.0.0)
     cgi_multipart_eof_fix (2.5.0)
-    cucumber (1.1.2)
+    cucumber (1.1.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.2)
+      gherkin (~> 2.6.7)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     daemon (1.1.0)
@@ -14,23 +14,23 @@ GEM
     diff-lcs (1.1.3)
     fastthread (1.0.7)
     gem_plugin (0.2.3)
-    gherkin (2.6.5)
+    gherkin (2.6.8)
       json (>= 1.4.6)
     git (1.2.5)
-    haml (3.1.3)
+    haml (3.1.4)
     httpclient (2.2.3)
-    httpthumbnailer (0.0.1)
+    httpthumbnailer (0.0.7)
       haml (~> 3)
       mongrel (>= 1.1.5)
       rmagick (~> 2)
       sinatra (>= 1.2.6)
-    httpthumbnailer-client (0.0.1)
+    httpthumbnailer-client (0.0.3)
       httpclient (>= 2.2.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
+    json (1.6.2)
     mongrel (1.1.5)
       cgi_multipart_eof_fix (>= 2.4)
       daemons (>= 1.0.3)
@@ -42,7 +42,8 @@ GEM
       rack
     rake (0.9.2.2)
     rcov (0.9.11)
-    rdoc (3.9.4)
+    rdoc (3.11)
+      json (~> 1.4)
     rmagick (2.13.1)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -68,8 +69,8 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   cucumber
   daemon (~> 1)
-  httpthumbnailer (~> 0.0.1)
-  httpthumbnailer-client (~> 0.0.1)
+  httpthumbnailer (~> 0.0.7)
+  httpthumbnailer-client (~> 0.0.3)
   jeweler (~> 1.6.4)
   mongrel (>= 1.1.5)
   rcov

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/httpimagestore

@@ -45,19 +45,36 @@ end
 
 sinatra.before do
 	# singletons
-	@s3 ||= S3Put.new(settings.s3_key_id, settings.s3_key_secret, settings.s3_bucket, :logger => logger)
-	@thumbnailer ||= HTTPThumbnailerClient.new(settings.thumbnailer_url)
+	$s3 ||= S3Put.new(settings.s3_key_id, settings.s3_key_secret, settings.s3_bucket, :logger => logger)
+	$thumbnailer ||= HTTPThumbnailerClient.new(settings.thumbnailer_url)
 end
 
 sinatra.helpers do
-	def plain_exception(exception)
+	def hatl_response(status, msg)
 		headers "Content-Type" => "text/plain"
-		body "Error: #{exception.class.name}: #{exception}\n"
+		body msg.gsub("\n", "\r\n") + "\r\n"
+		halt status
+	end
+
+	def halt_exception(status, exception)
+		hatl_response(status, "Error: #{exception.class.name}: #{exception}")
 	end
 
 	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
@@ -65,22 +82,31 @@ sinatra.get '/' do
 end
 
 sinatra.put %r{/thumbnail/([^/]*)/(.*)} do |classes, image_path|
-	urls = []
+	raise BadRequestError, "Path is empty" if image_path.empty?
+	image_path = Pathname.new(image_path)
 
-	classes = classes.split(',').map{|tc| settings.thumbnail_classes[tc] or fail "Class '#{tc}' not configured"}
+	classes = classes.split(',').map{|tc| settings.thumbnail_classes[tc]}
 	image = request.body.read
 	image_hash = digest(image)
 
-	urls << @s3.put_image(Pathname.new(image_path).original_image(image_hash).to_s, response.headers['Content-Type'], image)
-
-	thumbs = @thumbnailer.thumbnail(image) do
+	thumbs = $thumbnailer.thumbnail(image) do
 		classes.each do |tc|
 			thumbnail tc.method, tc.width, tc.height, tc.format, tc.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
+	end
+
+	urls = []
+
+	# store all images
+	urls << $s3.put_image(image_path.original_image(image_hash).to_s, response.headers['Content-Type'], image)
+
 	thumbs.zip(classes).each do |thumb, thumbnail_class|
-		urls << @s3.put_image(Pathname.new(image_path).thumbnail_image(image_hash, thumbnail_class.name).to_s, thumb.mime_type, thumb.data)
+		urls << $s3.put_image(image_path.thumbnail_image(image_hash, thumbnail_class.name).to_s, thumb.mime_type, thumb.data)
 	end
 
 	status 200
@@ -88,9 +114,45 @@ sinatra.put %r{/thumbnail/([^/]*)/(.*)} do |classes, image_path|
 	body urls.map{|u| u + "\r\n"}.join
 end
 
+sinatra.error HTTPThumbnailerClient::UnsupportedMediaTypeError do
+	halt_exception(415, env['sinatra.error'])
+end
+
+sinatra.error HTTPThumbnailerClient::ImageTooLargeError do
+	halt_exception(413, env['sinatra.error'])
+end
+
+# problem with singe thumbnail
+sinatra.error ThumbnailingError do
+	e = env['sinatra.error']
+	case e.remote_error.type
+	when "Thumbnailer::ImageTooLargeError"
+		halt_exception(413, e)
+	else
+		halt_exception(500, e)
+	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
+
+sinatra.error Sinatra::NotFound do
+	hatl_response(404, "Resource '#{request.path_info}' not found")
+end
+
 sinatra.error do
-	plain_exception(env['sinatra.error'])
+	halt_exception(500, env['sinatra.error'])
 end
 
-sinatra.run!
+begin
+	sinatra.run!
+rescue Errno::EACCES, Errno::EADDRNOTAVAIL, SocketError => e
+	puts "Error: failed to bind HTTP server socket (#{options[:bind]}): #{e}"
+	exit 5
+end
 

data/features/httpimagestore.feature

@@ -4,29 +4,117 @@ Feature: Original image and it's thumnails generation and storing on S2
 	The respons will be paths to files storred in S3
 
 	Background:
+		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 'rhthumbnails'
+		s3_bucket 'issthumbtest'
 
 		thumbnail_class 'small', 'crop', 128, 128
 		thumbnail_class 'tiny', 'crop', 32, 32
+		thumbnail_class 'bad', 'crop', 0, 0
+		thumbnail_class 'superlarge', 'crop', 16000, 16000
 		"""
+		Given httpthumbnailer log is empty
 		Given httpthumbnailer server is running at http://localhost:3100/
+		Given issthumbtest S3 bucket with key AKIAJMUYVYOSACNXLPTQ and secret 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
 
 	Scenario: Putting thumbnails and original to S3 bucket
+		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/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 endend lines
 		"""
-		http://rhthumbnails.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg
-		http://rhthumbnails.s3.amazonaws.com/test/image/4006450256177f4a/test-small.jpg
-		http://rhthumbnails.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny.jpg
+		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: Reporitng 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 endend lines
+		"""
+		Resource '/blah' not found
+		"""
+
+	Scenario: Reporitng 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 endend 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: Reporitng 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 endend 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 endend lines like
+		"""
+		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 endend lines like
+		"""
+		Error: BadRequestError: Path is empty
+		"""
+
+	Scenario: Too large image - uploaded image too big to load
+		Given test-large.jpg file content as request body
+		When I do PUT request http://localhost:3000/thumbnail/small/test/image/test.jpg
+		Then response status will be 413
+		And response content type will be text/plain
+		And response body will be CRLF endend 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 endend lines like
+		"""
+		Error: ThumbnailingError: Thumbnailing for class 'superlarge' failed: Error: Thumbnailer::ImageTooLargeError:
 		"""
-		And http://rhthumbnails.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg will contain JPEG image of size 509x719
-		And http://rhthumbnails.s3.amazonaws.com/test/image/4006450256177f4a/test-small.jpg will contain JPEG image of size 128x128
-		And http://rhthumbnails.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny.jpg will contain JPEG image of size 32x32
 

data/features/step_definitions/httpimagestore_steps.rb

@@ -24,10 +24,26 @@ Given /httpthumbnailer server is running at (.*)/ do |url|
 	)
 end
 
+Given /httpimagestore log is empty/ do
+		(support_dir + 'server.log').truncate(0)
+end
+
+Given /httpthumbnailer log is empty/ do
+		(support_dir + 'thumbniler.log').truncate(0)
+end
+
 Given /(.*) file content as request body/ do |file|
 	@request_body = File.open(support_dir + file){|f| f.read }
 end
 
+Given /(.*) S3 bucket with key (.*) and secret (.*)/ do |bucket, key_id, key_secret|
+		@bucket = S3::Service.new(:access_key_id => key_id, :secret_access_key => key_secret).buckets.find(bucket)
+end
+
+Given /there is no (.*) file in S3 bucket/ do |path|
+	@bucket.objects.find(path).destroy rescue S3::Error::NoSuchKey
+end
+
 When /I do (.*) request (.*)/ do |method, uri|
 	@response = HTTPClient.new.request(method, uri, nil, @request_body)
 end
@@ -40,18 +56,34 @@ Then /response content type will be (.*)/ do |content_type|
 	@response.header['Content-Type'].first.should == content_type
 end
 
-Then /response body will be CRLF endend lines/ do |body|	
-	@response.body.should == body.gsub!("\n", "\r\n")
+Then /response body will be CRLF endend lines like/ do |body|	
+	@response.body.should match(body)
+	@response.body.each do |line|
+		line[-2,2].should == "\r\n"
+	end
+end
+
+Then /response body will be CRLF endend lines$/ do |body|	
+	@response.body.should == body.gsub("\n", "\r\n") + "\r\n"
 end
 
-Then /(.*) will contain (.*) image of size (.*)/ do |url, image_type, image_size|
+Then /(.*) will contain (.*) image of size (.*)x(.*)/ do |url, format, width, height|
 	data = get(url)
-	Open3.popen3('identify -') do |stdin, stdout, stderr| 
-		stdin.write data
-		stdin.close
-		path, type, size, *rest = *stdout.read.split(' ')
-		type.should == image_type
-		size.should == image_size
+	
+	@image.destroy! if @image
+	@image = Magick::Image.from_blob(data).first
+
+	@image.format.should == format
+	@image.columns.should == width.to_i
+	@image.rows.should == height.to_i
+end
+
+Then /S3 bucket will not contain (.*)/ do |path|
+	begin
+		@bucket.objects.find(path)
+		true.should eq(false, "object #{path} found in bucket")
+	rescue S3::Error::NoSuchKey
+		true.should == true
 	end
 end
 

data/features/support/env.rb

@@ -16,6 +16,8 @@ require 'httpclient'
 require "open3"
 require "thread"
 require 'tempfile'
+require 'RMagick'
+require 's3'
 
 def gem_dir
 		Pathname.new(__FILE__).dirname + '..' + '..'

data/features/support/test.txt

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

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-11-25"
+  s.date = "2011-11-30"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -30,7 +30,9 @@ Gem::Specification.new do |s|
     "features/httpimagestore.feature",
     "features/step_definitions/httpimagestore_steps.rb",
     "features/support/env.rb",
+    "features/support/test-large.jpg",
     "features/support/test.jpg",
+    "features/support/test.txt",
     "httpimagestore.gemspec",
     "lib/httpimagestore/configuration.rb",
     "lib/httpimagestore/pathname.rb",
@@ -53,7 +55,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_runtime_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_runtime_dependency(%q<s3>, ["~> 0.3"])
-      s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 0.0.1"])
+      s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 0.0.3"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -61,12 +63,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_development_dependency(%q<daemon>, ["~> 1"])
-      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.0.1"])
+      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
     else
       s.add_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_dependency(%q<s3>, ["~> 0.3"])
-      s.add_dependency(%q<httpthumbnailer-client>, ["~> 0.0.1"])
+      s.add_dependency(%q<httpthumbnailer-client>, ["~> 0.0.3"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -74,13 +76,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_dependency(%q<daemon>, ["~> 1"])
-      s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.1"])
+      s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 1.2.6"])
     s.add_dependency(%q<mongrel>, [">= 1.1.5"])
     s.add_dependency(%q<s3>, ["~> 0.3"])
-    s.add_dependency(%q<httpthumbnailer-client>, ["~> 0.0.1"])
+    s.add_dependency(%q<httpthumbnailer-client>, ["~> 0.0.3"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -88,7 +90,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.9"])
     s.add_dependency(%q<daemon>, ["~> 1"])
-    s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.1"])
+    s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
   end
 end
 

data/lib/httpimagestore/configuration.rb

@@ -2,8 +2,17 @@ require 'httpimagestore/thumbnail_class'
 require 'pathname'
 
 class Configuration
+	class ThumbnailClassDoesNotExistError < RuntimeError
+		def initialize(name)
+			super "Class '#{name}' does not exist"
+		end
+	end
+
 	def initialize(&block)
-		@thumbnail_classes = {}
+		@thumbnail_classes = Hash.new do |h, k|
+			raise ThumbnailClassDoesNotExistError, k
+		end
+
 		@thumbnailer_url = "http://localhost:3100"
 
 		@port = 3000

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpimagestore
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -71,12 +71,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 25
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 3
+        version: 0.0.3
   prerelease: false
   name: httpthumbnailer-client
   version_requirements: *id004
@@ -192,12 +192,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 17
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 7
+        version: 0.0.7
   prerelease: false
   name: httpthumbnailer
   version_requirements: *id012
@@ -223,7 +223,9 @@ files:
 - features/httpimagestore.feature
 - features/step_definitions/httpimagestore_steps.rb
 - features/support/env.rb
+- features/support/test-large.jpg
 - features/support/test.jpg
+- features/support/test.txt
 - httpimagestore.gemspec
 - lib/httpimagestore/configuration.rb
 - lib/httpimagestore/pathname.rb