httpthumbnailer-client 0.0.1 → 0.0.2

data/Gemfile

@@ -12,5 +12,5 @@ group :development do
   gem "rcov", ">= 0"
   gem "rdoc", "~> 3.9"
   gem "daemon", "~> 1"
-  gem "httpthumbnailer", "~> 0.0.1"
+  gem "httpthumbnailer", "~> 0.0.5"
 end

data/Gemfile.lock

@@ -17,9 +17,9 @@ GEM
     gherkin (2.6.7)
       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.5)
       haml (~> 3)
       mongrel (>= 1.1.5)
       rmagick (~> 2)
@@ -64,7 +64,7 @@ DEPENDENCIES
   cucumber
   daemon (~> 1)
   httpclient (>= 2.2.1)
-  httpthumbnailer (~> 0.0.1)
+  httpthumbnailer (~> 0.0.5)
   jeweler (~> 1.6.4)
   rcov
   rdoc (~> 3.9)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/httpthumbnailer-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer-client"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-11-23"
+  s.date = "2011-11-29"
   s.description = "Thumbnails images using httpthumbniler server"
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,8 @@ Gem::Specification.new do |s|
     "spec/httpthumbnailer-client_spec.rb",
     "spec/multipart_response_spec.rb",
     "spec/spec_helper.rb",
-    "spec/test.jpg"
+    "spec/test.jpg",
+    "spec/test.txt"
   ]
   s.homepage = "http://github.com/jpastuszek/httpthumbnailer-client"
   s.licenses = ["MIT"]
@@ -53,7 +54,7 @@ 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.5"])
     else
       s.add_dependency(%q<httpclient>, [">= 2.2.1"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -63,7 +64,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.5"])
     end
   else
     s.add_dependency(%q<httpclient>, [">= 2.2.1"])
@@ -74,7 +75,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.5"])
   end
 end
 

data/lib/httpthumbnailer-client.rb

@@ -3,6 +3,15 @@ require 'httpclient'
 require 'httpthumbnailer-client/multipart_response'
 
 class HTTPThumbnailerClient
+	class UnsupportedMediaTypeError < ArgumentError
+	end
+
+	class UnknownResponseType < ArgumentError
+	end
+
+	class RemoteServerError < ArgumentError
+	end
+
 	class URIBuilder
 		def initialize(service_uri, &block)
 			@specs = []
@@ -42,15 +51,46 @@ class HTTPThumbnailerClient
 		attr_reader :mime_type, :data
 	end
 
+	class ThumbnailingError
+		def initialize(msg)
+			@message = msg
+		end
+
+		attr_reader :message
+	end
+
 	def initialize(server_url)
 		@server_url = server_url
 	end
 
 	def thumbnail(data, &block)
 		uri = URIBuilder.thumbnail(&block)
-		res = HTTPClient.new.request('PUT', "#{@server_url}#{uri}", nil, data)
-		MultipartResponse.new(res.header['Content-Type'].last, res.body).parts.map do |part|
-			Thumbnail.new(part.header['Content-Type'], part.body)
+		response = HTTPClient.new.request('PUT', "#{@server_url}#{uri}", nil, data)
+		content_type = response.header['Content-Type'].last
+
+		case content_type
+		when 'text/plain'
+			case response.status
+			when 415
+				raise UnsupportedMediaTypeError, response.body.delete("\r")
+			else
+				raise RemoteServerError, response.body.delete("\r")
+			end
+		when /^multipart\/mixed/
+			MultipartResponse.new(content_type, response.body).parts.map do |part|
+				part_content_type = part.header['Content-Type']
+
+				case part_content_type
+				when 'text/plain'
+					ThumbnailingError.new(part.body.delete("\r"))
+				when /^image\//
+					Thumbnail.new(part_content_type, part.body)
+				else
+					raise UnknownResponseType, part_content_type
+				end
+			end
+		else
+			raise UnknownResponseType, content_type
 		end
 	end
 end

data/spec/httpthumbnailer-client_spec.rb

@@ -13,35 +13,90 @@ end
 
 describe HTTPThumbnailerClient do
 	before :all do
-		server_start
-		@data = File.read(spec_dir + 'test.jpg')
+		log = spec_dir + 'server.log'
+		log.truncate(0)
+		
+		start_server(
+			"httpthumbnailer",
+			'/tmp/httpthumbnailer.pid',
+			log,
+			'http://localhost:3100/'
+		)
 	end
 
 	after :all do
-		server_stop
+		stop_server('/tmp/httpthumbnailer.pid')
 	end
 
 	it "should return set of thumbnails matching specified specification" do
-		thumbs = HTTPThumbnailerClient.new('http://localhost:3100').thumbnail(@data) do
+		thumbs = HTTPThumbnailerClient.new('http://localhost:3100').thumbnail((spec_dir + 'test.jpg').read) do
 			thumbnail 'crop', 6, 3, 'JPEG' 
 			thumbnail 'crop', 8, 8, 'PNG'
 			thumbnail 'crop', 4, 4, 'PNG'
 		end
 
+		thumbs[0].should be_kind_of HTTPThumbnailerClient::Thumbnail
 		thumbs[0].mime_type.should == 'image/jpeg'
-		t, s = identify(thumbs[0].data)
-		t.should == 'JPEG'
-		s.should == '6x3'
+		i = identify(thumbs[0].data)
+		i.format.should == 'JPEG'
+		i.width.should == 6
+		i.height.should == 3
 
+		thumbs[1].should be_kind_of HTTPThumbnailerClient::Thumbnail
 		thumbs[1].mime_type.should == 'image/png'
-		t, s = identify(thumbs[1].data)
-		t.should == 'PNG'
-		s.should == '8x8'
+		i = identify(thumbs[1].data)
+		i.format.should == 'PNG'
+		i.width.should == 8
+		i.height.should == 8
 
+		thumbs[2].should be_kind_of HTTPThumbnailerClient::Thumbnail
 		thumbs[2].mime_type.should == 'image/png'
-		t, s = identify(thumbs[2].data)
-		t.should == 'PNG'
-		s.should == '4x4'
+		i = identify(thumbs[2].data)
+		i.format.should == 'PNG'
+		i.width.should == 4
+		i.height.should == 4
+	end
+
+	it "should raise HTTPThumbnailerClient::UnsupportedMediaTypeError error on unsupported media type" do
+		lambda {
+			HTTPThumbnailerClient.new('http://localhost:3100').thumbnail((spec_dir + 'test.txt').read) do
+				thumbnail 'crop', 6, 3, 'JPEG' 
+				thumbnail 'crop', 8, 8, 'PNG'
+			end
+		}.should raise_error HTTPThumbnailerClient::UnsupportedMediaTypeError
+	end
+
+	it "should raise HTTPThumbnailerClient::RemoteServerError error on 404 server error" do
+		lambda {
+			HTTPThumbnailerClient.new('http://localhost:3100/blah').thumbnail((spec_dir + 'test.jpg').read) do
+				thumbnail 'crop', 6, 3, 'JPEG' 
+			end
+		}.should raise_error HTTPThumbnailerClient::RemoteServerError
+	end
+
+	it "should return HTTPThumbnailerClient::ThumbnailingError object with set of returned thumbnail in case of error with particluar thumbanil" do
+		thumbs = HTTPThumbnailerClient.new('http://localhost:3100').thumbnail((spec_dir + 'test.jpg').read) do
+			thumbnail 'crop', 6, 3, 'JPEG' 
+			thumbnail 'crop', 0, 0, 'PNG'
+			thumbnail 'crop', 4, 4, 'PNG'
+		end
+
+		thumbs[0].should be_kind_of HTTPThumbnailerClient::Thumbnail
+		thumbs[0].mime_type.should == 'image/jpeg'
+		i = identify(thumbs[0].data)
+		i.format.should == 'JPEG'
+		i.width.should == 6
+		i.height.should == 3
+
+		thumbs[1].should be_kind_of HTTPThumbnailerClient::ThumbnailingError
+		thumbs[1].message.should == "Error: ArgumentError: invalid result dimension (0, 0 given)\n"
+
+		thumbs[2].should be_kind_of HTTPThumbnailerClient::Thumbnail
+		thumbs[2].mime_type.should == 'image/png'
+		i = identify(thumbs[2].data)
+		i.format.should == 'PNG'
+		i.width.should == 4
+		i.height.should == 4
 	end
 end
 

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ RSpec.configure do |config|
 end
 
 require 'daemon'
+require 'RMagick'
 
 def gem_dir
 	Pathname.new(__FILE__).dirname + '..'
@@ -20,16 +21,34 @@ def spec_dir
 	gem_dir + 'spec'
 end
 
-def server_start
-	File.exist?("/tmp/httpthumbnailer.pid") and server_stop
-	fork do 
-		Daemon.daemonize("/tmp/httpthumbnailer.pid", spec_dir + 'server.log')
-		exec("httpthumbnailer")
+def identify(data)
+	image = Magick::Image.from_blob(data).first
+	out = Struct.new(:format, :width, :height).new(image.format, image.columns, image.rows)
+	image.destroy!
+	out
+end
+
+def get(url)
+	HTTPClient.new.get_content(url)
+end
+
+def start_server(cmd, pid_file, log_file, test_url)
+	stop_server(pid_file)
+
+	fork do
+		Daemon.daemonize(pid_file, log_file)
+		exec(cmd)
+	end
+	Process.wait
+
+	ppid = Process.pid
+	at_exit do
+		stop_server(pid_file) if Process.pid == ppid
 	end
 
 	Timeout.timeout(10) do
-		begin   
-			server_get '/'
+		begin
+			get test_url
 		rescue Errno::ECONNREFUSED
 			sleep 0.1
 			retry
@@ -37,32 +56,21 @@ def server_start
 	end
 end
 
-def server_stop
-	File.open("/tmp/httpthumbnailer.pid") do |pidf|
-		pid = pidf.read
+def stop_server(pid_file)
+	pid_file = Pathname.new(pid_file)
+	return unless pid_file.exist?
 
-		Timeout.timeout(10) do
-			begin   
-				loop do 
-					ret = Process.kill("TERM", pid.strip.to_i)
-					sleep 0.1
-				end
-			rescue Errno::ESRCH
+	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
+			pid_file.unlink
 		end
 	end
 end
 
-def server_get(uri)
-	HTTPClient.new.get_content("http://localhost:3100#{uri}")
-end
-
-def identify(data)
-	Open3.popen3('identify -') do |stdin, stdout, stderr| 
-		stdin.write data
-		stdin.close
-		path, type, size, *rest = *stdout.read.split(' ')
-		return type, size
-	end
-end
-

data/spec/test.txt

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpthumbnailer-client
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 Z
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -145,12 +145,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 21
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 5
+        version: 0.0.5
   prerelease: false
   name: httpthumbnailer
   version_requirements: *id009
@@ -181,6 +181,7 @@ files:
 - spec/multipart_response_spec.rb
 - spec/spec_helper.rb
 - spec/test.jpg
+- spec/test.txt
 homepage: http://github.com/jpastuszek/httpthumbnailer-client
 licenses: 
 - MIT