httpimagestore 0.0.2 → 0.0.3

data/VERSION

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

data/bin/httpimagestore

@@ -83,7 +83,9 @@ sinatra.put %r{/thumbnail/([^/]*)/(.*)} do |classes, image_path|
 		urls << @s3.put_image(Pathname.new(image_path).thumbnail_image(image_hash, thumbnail_class.name).to_s, thumb.mime_type, thumb.data)
 	end
 
-	return urls.join("\n")
+	status 200
+	headers "Content-Type" => "text/uri-list"
+	body urls.map{|u| u + "\r\n"}.join
 end
 
 sinatra.error do

data/features/httpimagestore.feature

@@ -17,9 +17,16 @@ Feature: Original image and it's thumnails generation and storing on S2
 	Scenario: Putting thumbnails and original to 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 I will get the following response body
+		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
+
 		"""
+		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

@@ -32,11 +32,26 @@ When /I do (.*) request (.*)/ do |method, uri|
 	@response = HTTPClient.new.request(method, uri, nil, @request_body)
 end
 
-Then /I will get matching response body/ do |body|	
-	@response.body.should =~ Regexp.new(/^#{body}$/m)
+Then /response status will be (.*)/ do |status|
+	@response.status.should == status.to_i
 end
 
-Then /I will get the following response body/ do |body|	
-	@response.body.should == body
+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")
+end
+
+Then /(.*) will contain (.*) image of size (.*)/ do |url, image_type, image_size|
+	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
+	end
 end
 

data/httpimagestore.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  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"]
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     "features/httpimagestore.feature",
     "features/step_definitions/httpimagestore_steps.rb",
     "features/support/env.rb",
-    "features/support/test.cfg",
     "features/support/test.jpg",
     "httpimagestore.gemspec",
     "lib/httpimagestore/configuration.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpimagestore
 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
@@ -223,7 +223,6 @@ files:
 - features/httpimagestore.feature
 - features/step_definitions/httpimagestore_steps.rb
 - features/support/env.rb
-- features/support/test.cfg
 - features/support/test.jpg
 - httpimagestore.gemspec
 - lib/httpimagestore/configuration.rb

data/features/support/test.cfg

@@ -1,6 +0,0 @@
-s3_key 'AKIAJMUYVYOSACNXLPTQ', 'MAeGhvW+clN7kzK3NboASf3/kZ6a81PRtvwMZj4Y'
-s3_bucket 'rhthumbnails'
-
-thumbnail_class 'small', 'crop', 128, 128
-thumbnail_class 'tiny', 'crop', 32, 32
-