httpimagestore 0.0.10 → 0.1.0

data/Gemfile

@@ -3,9 +3,10 @@ source "http://rubygems.org"
 gem "sinatra", ">= 1.2.6"
 gem "mongrel", ">= 1.1.5"
 gem "s3", "~> 0.3"
-gem "httpthumbnailer-client", "~> 0.0.3"
+gem "httpthumbnailer-client", "~> 0.1.0"
 gem "ruby-ip", "~> 0.9"
-gem "cli", "~> 0.0.3"
+gem "cli", "~> 1.1.0"
+gem "mime-types", "~> 1.17.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -17,6 +18,6 @@ group :development do
   gem "rcov", ">= 0"
   gem "rdoc", "~> 3.9"
   gem "daemon", "~> 1"
-  gem "httpthumbnailer", "~> 0.0.8"
+  gem "httpthumbnailer", "~> 0.1.0"
   gem "prawn", "= 0.8.4"
 end

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     builder (3.0.0)
     cgi_multipart_eof_fix (2.5.0)
-    cli (0.0.3)
+    cli (1.1.0)
     cucumber (1.1.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -14,27 +14,27 @@ GEM
     daemons (1.1.4)
     diff-lcs (1.1.3)
     fastthread (1.0.7)
-    fcgi (0.8.8)
     gem_plugin (0.2.3)
     gherkin (2.6.8)
       json (>= 1.4.6)
     git (1.2.5)
     haml (3.1.4)
-    httpclient (2.2.3)
-    httpthumbnailer (0.0.8)
-      cli (~> 0.0)
-      fcgi (~> 0.8)
+    httpclient (2.2.4)
+    httpthumbnailer (0.1.0)
+      cli (~> 1.1.0)
       haml (~> 3)
       mongrel (>= 1.1.5)
       rmagick (~> 2)
+      ruby-ip (~> 0.9)
       sinatra (>= 1.2.6)
-    httpthumbnailer-client (0.0.3)
+    httpthumbnailer-client (0.1.0)
       httpclient (>= 2.2.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.6.2)
+    mime-types (1.17.2)
     mongrel (1.1.5)
       cgi_multipart_eof_fix (>= 2.4)
       daemons (>= 1.0.3)
@@ -79,12 +79,13 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  cli (~> 0.0.3)
+  cli (~> 1.1.0)
   cucumber
   daemon (~> 1)
-  httpthumbnailer (~> 0.0.8)
-  httpthumbnailer-client (~> 0.0.3)
+  httpthumbnailer (~> 0.1.0)
+  httpthumbnailer-client (~> 0.1.0)
   jeweler (~> 1.6.4)
+  mime-types (~> 1.17.2)
   mongrel (>= 1.1.5)
   prawn (= 0.8.4)
   rcov

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.1.0

data/bin/httpimagestore

@@ -125,10 +125,10 @@ sinatra.put %r{/thumbnail/([^/]*)/(.*)} do |classes, image_path|
 	urls = []
 
 	# store all images
-	urls << $s3.put_image(image_path.original_image(image_hash).to_s, response.headers['Content-Type'], image)
+	urls << $s3.put_image(image_path.original_image(image_hash).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).to_s, thumb.mime_type, thumb.data)
+		urls << $s3.put_image(image_path.thumbnail_image(image_hash, thumbnail_class.name, thumb.mime_type).to_s, thumb.mime_type, thumb.data)
 	end
 
 	status 200

data/features/httpimagestore.feature

@@ -12,8 +12,10 @@ Feature: Storing of original image and specified classes of its thumbnails on S3
 
 		thumbnail_class 'small', 'crop', 128, 128
 		thumbnail_class 'tiny', 'crop', 32, 32
+		thumbnail_class 'png', 'crop', 32, 32, 'PNG'
 		thumbnail_class 'bad', 'crop', 0, 0
 		thumbnail_class 'superlarge', 'crop', 16000, 16000
+		thumbnail_class 'large_png', 'crop', 7000, 7000, 'PNG'
 		"""
 		Given httpthumbnailer log is empty
 		Given httpthumbnailer server is running at http://localhost:3100/
@@ -37,6 +39,37 @@ 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: Input image content type determined from content
+		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
+		Given test.jpg file content as request body
+		And Content-Type header set to application/octet-stream
+		When I do PUT request http://localhost:3000/thumbnail/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 ended lines
+		"""
+		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg
+		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny.jpg
+		"""
+		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg content type will be image/jpeg
+
+	Scenario: Thumbnail image content type and file extension determined from configured format
+		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
+		And there is no test/image/4006450256177f4a/test-tiny.jpg file in S3 bucket
+		And there is no test/image/4006450256177f4a/test-png.png file in S3 bucket
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/thumbnail/tiny,png/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 ended lines
+		"""
+		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg
+		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny.jpg
+		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-png.png
+		"""
+		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny.jpg content type will be image/jpeg
+		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-png.png content type will be image/png
+
 	Scenario: Reporting of missing resource
 		When I do GET request http://localhost:3000/blah
 		Then response status will be 404
@@ -100,7 +133,7 @@ Feature: Storing of original image and specified classes of its thumbnails on S3
 
 	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/small/test/image/test.jpg
+		When I do PUT request http://localhost:3000/thumbnail/large_png/test/image/test.jpg
 		Then response status will be 413
 		And response content type will be text/plain
 		And response body will be CRLF ended lines like

data/features/step_definitions/httpimagestore_steps.rb

@@ -44,8 +44,13 @@ Given /there is no (.*) file in S3 bucket/ do |path|
 	@bucket.objects.find(path).destroy rescue S3::Error::NoSuchKey
 end
 
+Given /(.*) header set to (.*)/ do |header, value|
+	@request_headers ||= {}
+	@request_headers[header] = value
+end
+
 When /I do (.*) request (.*)/ do |method, uri|
-	@response = HTTPClient.new.request(method, uri, nil, @request_body)
+	@response = HTTPClient.new.request(method, uri, nil, @request_body, (@request_headers or {}))
 end
 
 Then /response status will be (.*)/ do |status|
@@ -67,6 +72,10 @@ Then /response body will be CRLF ended lines$/ do |body|
 	@response.body.should == body.gsub("\n", "\r\n") + "\r\n"
 end
 
+Then /(http.*) content type will be (.*)/ do |url, content_type|
+	get_headers(url)['Content-Type'].should == content_type
+end
+
 Then /(.*) will contain (.*) image of size (.*)x(.*)/ do |url, format, width, height|
 	data = get(url)
 	

data/features/support/env.rb

@@ -39,6 +39,10 @@ def get(url)
 	HTTPClient.new.get_content(url)
 end
 
+def get_headers(url)
+	HTTPClient.new.get(url).headers
+end
+
 def start_server(cmd, pid_file, log_file, test_url)
 	stop_server(pid_file)
 

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "0.0.10"
+  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-12-01"
+  s.date = "2012-01-04"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -55,9 +55,10 @@ 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.3"])
+      s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 0.1.0"])
       s.add_runtime_dependency(%q<ruby-ip>, ["~> 0.9"])
-      s.add_runtime_dependency(%q<cli>, ["~> 0.0.3"])
+      s.add_runtime_dependency(%q<cli>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<mime-types>, ["~> 1.17.2"])
       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"])
@@ -65,15 +66,16 @@ 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.8"])
+      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
       s.add_development_dependency(%q<prawn>, ["= 0.8.4"])
     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.3"])
+      s.add_dependency(%q<httpthumbnailer-client>, ["~> 0.1.0"])
       s.add_dependency(%q<ruby-ip>, ["~> 0.9"])
-      s.add_dependency(%q<cli>, ["~> 0.0.3"])
+      s.add_dependency(%q<cli>, ["~> 1.1.0"])
+      s.add_dependency(%q<mime-types>, ["~> 1.17.2"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -81,16 +83,17 @@ 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.8"])
+      s.add_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
       s.add_dependency(%q<prawn>, ["= 0.8.4"])
     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.3"])
+    s.add_dependency(%q<httpthumbnailer-client>, ["~> 0.1.0"])
     s.add_dependency(%q<ruby-ip>, ["~> 0.9"])
-    s.add_dependency(%q<cli>, ["~> 0.0.3"])
+    s.add_dependency(%q<cli>, ["~> 1.1.0"])
+    s.add_dependency(%q<mime-types>, ["~> 1.17.2"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -98,7 +101,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.8"])
+    s.add_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
     s.add_dependency(%q<prawn>, ["= 0.8.4"])
   end
 end

data/lib/httpimagestore/pathname.rb

@@ -1,10 +1,19 @@
+require 'mime/types'
+
 class Pathname
 	def original_image(id)
 		dirname + id.to_s + basename
 	end
 
-	def thumbnail_image(id, thumbnail_class)
-		dirname + id.to_s + "#{basename(extname)}-#{thumbnail_class}#{extname}"
+	def thumbnail_image(id, thumbnail_class, mime_type)
+		dirname + id.to_s + "#{basename(extname)}-#{thumbnail_class}#{mime_extension(mime_type) or extname}"
+	end
+
+	private
+
+	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)
 	end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpimagestore
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 10
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 Z
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -71,12 +71,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 27
         segments: 
         - 0
+        - 1
         - 0
-        - 3
-        version: 0.0.3
+        version: 0.1.0
   prerelease: false
   name: httpthumbnailer-client
   version_requirements: *id004
@@ -102,18 +102,34 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        - 0
-        - 3
-        version: 0.0.3
+        version: 1.1.0
   prerelease: false
   name: cli
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 87
+        segments: 
+        - 1
+        - 17
+        - 2
+        version: 1.17.2
+  prerelease: false
+  name: mime-types
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,10 +142,10 @@ dependencies:
         version: 2.3.0
   prerelease: false
   name: rspec
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,10 +156,10 @@ dependencies:
         version: "0"
   prerelease: false
   name: cucumber
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -156,10 +172,10 @@ dependencies:
         version: 1.0.0
   prerelease: false
   name: bundler
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -172,10 +188,10 @@ dependencies:
         version: 1.6.4
   prerelease: false
   name: jeweler
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -186,10 +202,10 @@ dependencies:
         version: "0"
   prerelease: false
   name: rcov
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -201,10 +217,10 @@ dependencies:
         version: "3.9"
   prerelease: false
   name: rdoc
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -215,26 +231,26 @@ dependencies:
         version: "1"
   prerelease: false
   name: daemon
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 27
         segments: 
         - 0
+        - 1
         - 0
-        - 8
-        version: 0.0.8
+        version: 0.1.0
   prerelease: false
   name: httpthumbnailer
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -247,7 +263,7 @@ dependencies:
         version: 0.8.4
   prerelease: false
   name: prawn
-  version_requirements: *id015
+  version_requirements: *id016
 description: Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)
 email: jpastuszek@gmail.com
 executables: