httpthumbnailer-client 0.0.3 → 0.1.0

data/Gemfile

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

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     builder (3.0.0)
     cgi_multipart_eof_fix (2.5.0)
+    cli (1.1.0)
     cucumber (1.1.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -19,10 +20,12 @@ GEM
     git (1.2.5)
     haml (3.1.4)
     httpclient (2.2.3)
-    httpthumbnailer (0.0.7)
+    httpthumbnailer (0.1.0)
+      cli (~> 1.1.0)
       haml (~> 3)
       mongrel (>= 1.1.5)
       rmagick (~> 2)
+      ruby-ip (~> 0.9)
       sinatra (>= 1.2.6)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -49,6 +52,7 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    ruby-ip (0.9.1)
     sinatra (1.3.1)
       rack (~> 1.3, >= 1.3.4)
       rack-protection (~> 1.1, >= 1.1.2)
@@ -64,7 +68,7 @@ DEPENDENCIES
   cucumber
   daemon (~> 1)
   httpclient (>= 2.2.1)
-  httpthumbnailer (~> 0.0.7)
+  httpthumbnailer (~> 0.1.0)
   jeweler (~> 1.6.4)
   rcov
   rdoc (~> 3.9)

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/httpthumbnailer-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer-client"
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-11-30"
+  s.date = "2012-01-04"
   s.description = "Thumbnails images using httpthumbniler server"
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [
@@ -55,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.7"])
+      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
     else
       s.add_dependency(%q<httpclient>, [">= 2.2.1"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -65,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.7"])
+      s.add_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
     end
   else
     s.add_dependency(%q<httpclient>, [">= 2.2.1"])
@@ -76,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.7"])
+    s.add_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
   end
 end
 

data/lib/httpthumbnailer-client.rb

@@ -54,6 +54,10 @@ class HTTPThumbnailerClient
 		attr_reader :mime_type, :data
 	end
 
+	module ThumbnailsInputMimeTypeMeta
+		attr_accessor :input_mime_type
+	end
+
 	class ThumbnailingError
 		def initialize(msg)
 			@message = msg
@@ -83,7 +87,7 @@ class HTTPThumbnailerClient
 				raise RemoteServerError, response.body.delete("\r")
 			end
 		when /^multipart\/mixed/
-			MultipartResponse.new(content_type, response.body).parts.map do |part|
+			thumbnails = MultipartResponse.new(content_type, response.body).parts.map do |part|
 				part_content_type = part.header['Content-Type']
 
 				case part_content_type
@@ -95,6 +99,13 @@ class HTTPThumbnailerClient
 					raise UnknownResponseType, part_content_type
 				end
 			end
+
+			unless response.header['X-Input-Image-Content-Type'].empty?
+				thumbnails.extend(ThumbnailsInputMimeTypeMeta)
+				thumbnails.input_mime_type = response.header['X-Input-Image-Content-Type'].first
+			end
+
+			return thumbnails
 		else
 			raise UnknownResponseType, content_type
 		end

data/spec/httpthumbnailer-client_spec.rb

@@ -57,6 +57,15 @@ describe HTTPThumbnailerClient do
 		i.height.should == 4
 	end
 
+	describe "meta data" do
+		it "should provide input image mime type" do
+			thumbs = HTTPThumbnailerClient.new('http://localhost:3100').thumbnail((spec_dir + 'test.jpg').read) do
+				thumbnail 'crop', 6, 3, 'JPEG' 
+			end
+			thumbs.input_mime_type.should == 'image/jpeg'
+		end
+	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
@@ -70,7 +79,7 @@ describe HTTPThumbnailerClient 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'
+				thumbnail 'crop', 7000, 7000, 'PNG'
 			end
 		}.should raise_error HTTPThumbnailerClient::ImageTooLargeError
 	end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpthumbnailer-client
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -145,12 +145,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 27
         segments: 
         - 0
+        - 1
         - 0
-        - 7
-        version: 0.0.7
+        version: 0.1.0
   prerelease: false
   name: httpthumbnailer
   version_requirements: *id009