httpthumbnailer-client 0.0.2 → 0.0.3

data/Gemfile

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

data/Gemfile.lock

@@ -19,7 +19,7 @@ GEM
     git (1.2.5)
     haml (3.1.4)
     httpclient (2.2.3)
-    httpthumbnailer (0.0.5)
+    httpthumbnailer (0.0.7)
       haml (~> 3)
       mongrel (>= 1.1.5)
       rmagick (~> 2)
@@ -64,7 +64,7 @@ DEPENDENCIES
   cucumber
   daemon (~> 1)
   httpclient (>= 2.2.1)
-  httpthumbnailer (~> 0.0.5)
+  httpthumbnailer (~> 0.0.7)
   jeweler (~> 1.6.4)
   rcov
   rdoc (~> 3.9)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/httpthumbnailer-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer-client"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-11-29"
+  s.date = "2011-11-30"
   s.description = "Thumbnails images using httpthumbniler server"
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "spec/httpthumbnailer-client_spec.rb",
     "spec/multipart_response_spec.rb",
     "spec/spec_helper.rb",
+    "spec/test-large.jpg",
     "spec/test.jpg",
     "spec/test.txt"
   ]
@@ -54,7 +55,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.5"])
+      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
     else
       s.add_dependency(%q<httpclient>, [">= 2.2.1"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -64,7 +65,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.5"])
+      s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
     end
   else
     s.add_dependency(%q<httpclient>, [">= 2.2.1"])
@@ -75,7 +76,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.5"])
+    s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
   end
 end
 

data/lib/httpthumbnailer-client.rb

@@ -6,6 +6,9 @@ class HTTPThumbnailerClient
 	class UnsupportedMediaTypeError < ArgumentError
 	end
 
+	class ImageTooLargeError < ArgumentError
+	end
+
 	class UnknownResponseType < ArgumentError
 	end
 
@@ -54,9 +57,10 @@ class HTTPThumbnailerClient
 	class ThumbnailingError
 		def initialize(msg)
 			@message = msg
+			@type = msg.match(/Error: (.*?): /)[1] rescue NoMethodError
 		end
 
-		attr_reader :message
+		attr_reader :type, :message
 	end
 
 	def initialize(server_url)
@@ -73,6 +77,8 @@ class HTTPThumbnailerClient
 			case response.status
 			when 415
 				raise UnsupportedMediaTypeError, response.body.delete("\r")
+			when 413
+				raise ImageTooLargeError, response.body.delete("\r")
 			else
 				raise RemoteServerError, response.body.delete("\r")
 			end

data/spec/httpthumbnailer-client_spec.rb

@@ -66,6 +66,15 @@ describe HTTPThumbnailerClient do
 		}.should raise_error HTTPThumbnailerClient::UnsupportedMediaTypeError
 	end
 
+	it "should raise HTTPThumbnailerClient::ImageTooLargeError error on too large image data to fit in memory limits" do
+		lambda {
+			HTTPThumbnailerClient.new('http://localhost:3100').thumbnail((spec_dir + 'test-large.jpg').read) do
+				thumbnail 'crop', 6, 3, 'JPEG' 
+				thumbnail 'crop', 8, 8, 'PNG'
+			end
+		}.should raise_error HTTPThumbnailerClient::ImageTooLargeError
+	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
@@ -89,6 +98,7 @@ describe HTTPThumbnailerClient do
 		i.height.should == 3
 
 		thumbs[1].should be_kind_of HTTPThumbnailerClient::ThumbnailingError
+		thumbs[1].type.should == "ArgumentError"
 		thumbs[1].message.should == "Error: ArgumentError: invalid result dimension (0, 0 given)\n"
 
 		thumbs[2].should be_kind_of HTTPThumbnailerClient::Thumbnail
@@ -98,5 +108,31 @@ describe HTTPThumbnailerClient do
 		i.width.should == 4
 		i.height.should == 4
 	end
+
+	it "should return HTTPThumbnailerClient::ThumbnailingError object with set of returned thumbnail in case of memory exhaustion while thumbnailing" do
+		thumbs = HTTPThumbnailerClient.new('http://localhost:3100').thumbnail((spec_dir + 'test.jpg').read) do
+			thumbnail 'crop', 6, 3, 'JPEG' 
+			thumbnail 'crop', 16000, 16000, '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].type.should == "Thumbnailer::ImageTooLargeError"
+		thumbs[1].message.should =~ /^Error: Thumbnailer::ImageTooLargeError:/
+
+		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
 

metadata

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