httpimagestore 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/httpimagestore

@@ -9,6 +9,7 @@ options = CLI.new do
 	switch :no_bind, :description => "Do not bind to TCP socket - useful with -s fastcgi option"
 	switch :no_logging, :description => "Disable logging"
 	switch :debug, :description => "Enable debugging"
+	switch :no_uri_encode, :description => "Disable output URI encoding"
 	option :bind, :short => :b, :default => IP.new('127.0.0.1'), :cast => IP, :description => "HTTP server bind address - use 0.0.0.0 to bind to all interfaces"
 	option :port, :short => :p, :default => 3000, :cast => Integer, :description => "HTTP server TCP port"
 	option :server, :short => :s, :default => 'mongrel', :description => "Rack server handler like thin, mongrel, webrick, fastcgi etc."
@@ -38,6 +39,7 @@ sinatra.set :server, options.server
 sinatra.set :lock, true
 sinatra.set :logging, (not options.no_logging)
 sinatra.set :debug, options.debug
+sinatra.set :uri_encode, (not options.no_uri_encode)
 
 Configuration.from_file(options.config).put(sinatra)
 
@@ -133,7 +135,8 @@ sinatra.put %r{/thumbnail/([^/]*)/(.*)} do |classes, image_path|
 
 	status 200
 	headers "Content-Type" => "text/uri-list"
-	body urls.map{|u| u + "\r\n"}.join
+
+	body urls.map{|u| settings.uri_encode ? URI.encode(u) : u}.map{|u| u + "\r\n"}.join
 end
 
 sinatra.error HTTPThumbnailerClient::UnsupportedMediaTypeError do

data/features/httpimagestore.feature

@@ -39,6 +39,21 @@ 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: Putting original and its thumbnails to S3 bucket with UTF characters (encoded) in the path and name
+		Given there is no test/图像/4006450256177f4a/测试.jpg file in S3 bucket
+		And there is no test/图像/4006450256177f4a/测试-small.jpg file in S3 bucket
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/thumbnail/small/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/%E5%9B%BE%E5%83%8F/4006450256177f4a/%E6%B5%8B%E8%AF%95.jpg
+		http://issthumbtest.s3.amazonaws.com/test/%E5%9B%BE%E5%83%8F/4006450256177f4a/%E6%B5%8B%E8%AF%95-small.jpg
+		"""
+		And http://issthumbtest.s3.amazonaws.com/test/图像/4006450256177f4a/测试.jpg will contain JPEG image of size 509x719
+		And http://issthumbtest.s3.amazonaws.com/test/图像/4006450256177f4a/测试-small.jpg will contain JPEG image of size 128x128
+
 	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

data/features/step_definitions/httpimagestore_steps.rb

@@ -50,7 +50,7 @@ Given /(.*) header set to (.*)/ do |header, value|
 end
 
 When /I do (.*) request (.*)/ do |method, uri|
-	@response = HTTPClient.new.request(method, uri, nil, @request_body, (@request_headers or {}))
+	@response = HTTPClient.new.request(method, URI.encode(uri), nil, @request_body, (@request_headers or {}))
 end
 
 Then /response status will be (.*)/ do |status|

data/features/support/env.rb

@@ -36,11 +36,11 @@ def script(file)
 end
 
 def get(url)
-	HTTPClient.new.get_content(url)
+	HTTPClient.new.get_content(URI.encode(url))
 end
 
 def get_headers(url)
-	HTTPClient.new.get(url).headers
+	HTTPClient.new.get(URI.encode(url)).headers
 end
 
 def start_server(cmd, pid_file, log_file, test_url)

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2012-01-04"
+  s.date = "2012-01-05"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpimagestore
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime