httpimagestore 1.7.0 → 1.8.0

data/spec/configuration_s3_spec.rb

@@ -1,11 +1,10 @@
 require_relative 'spec_helper'
 require 'aws-sdk'
 require 'httpimagestore/configuration'
-require 'httpimagestore/configuration/output'
-Configuration::Scope.logger = Logger.new('/dev/null')
+MemoryLimit.logger = Configuration::Scope.logger = RootLogger.new('/dev/null')
 
+require 'httpimagestore/configuration/output'
 require 'httpimagestore/configuration/s3'
-MemoryLimit.logger = Logger.new('/dev/null')
 
 unless ENV['AWS_ACCESS_KEY_ID'] and ENV['AWS_SECRET_ACCESS_KEY'] and ENV['AWS_S3_TEST_BUCKET']
 	puts "AWS_ACCESS_KEY_ID or AWS_SECRET_ACCESS_KEY or AWS_S3_TEST_BUCKET environment variables not set - Skipping S3 specs"
@@ -131,10 +130,10 @@ else
 				subject.handlers[0].sources[0].realize(state)
 
 				state.images['original'].source_path.should == "test.jpg"
-				state.images['original'].source_url.should start_with "https://"
-				state.images['original'].source_url.should include ENV['AWS_S3_TEST_BUCKET']
-				state.images['original'].source_url.should include "/test.jpg"
-				state.images['original'].source_url.should include ENV['AWS_ACCESS_KEY_ID']
+				state.images['original'].source_url.to_s.should start_with "https://"
+				state.images['original'].source_url.to_s.should include ENV['AWS_S3_TEST_BUCKET']
+				state.images['original'].source_url.to_s.should include "/test.jpg"
+				state.images['original'].source_url.to_s.should include ENV['AWS_ACCESS_KEY_ID']
 				status(state.images['original'].source_url).should == 200
 			end
 
@@ -152,10 +151,10 @@ else
 				it 'should still provide valid HTTPS URL incliding prefix' do
 					subject.handlers[0].sources[0].realize(state)
 
-					state.images['original'].source_url.should start_with "https://"
-					state.images['original'].source_url.should include ENV['AWS_S3_TEST_BUCKET']
-					state.images['original'].source_url.should include "/test_prefix/test.jpg"
-					state.images['original'].source_url.should include ENV['AWS_ACCESS_KEY_ID']
+					state.images['original'].source_url.to_s.should start_with "https://"
+					state.images['original'].source_url.to_s.should include ENV['AWS_S3_TEST_BUCKET']
+					state.images['original'].source_url.to_s.should include "/test_prefix/test.jpg"
+					state.images['original'].source_url.to_s.should include ENV['AWS_ACCESS_KEY_ID']
 					status(state.images['original'].source_url).should == 200
 				end
 
@@ -219,7 +218,8 @@ else
 				it 'should keep private source URL' do
 					subject.handlers[0].sources[0].realize(state)
 
-					state.images['original'].source_url.should == 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg?' + ENV['AWS_ACCESS_KEY_ID']
+					state.images['original'].source_url.should be_a URI::HTTPS
+					state.images['original'].source_url.to_s.should == 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg?' + ENV['AWS_ACCESS_KEY_ID']
 				end
 
 				it 'should keep public source URL' do
@@ -232,7 +232,8 @@ else
 					EOF
 					subject.handlers[0].sources[0].realize(state)
 
-					state.images['original'].source_url.should == 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg'
+					state.images['original'].source_url.should be_a URI::HTTPS
+					state.images['original'].source_url.to_s.should == 'https://s3-eu-west-1.amazonaws.com/test/ghost.jpg'
 				end
 
 				describe 'read-through' do
@@ -417,10 +418,10 @@ else
 
 				it 'should provide source HTTP url' do
 					subject.handlers[0].sources[0].realize(state)
-					state.images['original'].source_url.should start_with "http://"
-					state.images['original'].source_url.should include ENV['AWS_S3_TEST_BUCKET']
-					state.images['original'].source_url.should include "/test.jpg"
-					state.images['original'].source_url.should include ENV['AWS_ACCESS_KEY_ID']
+					state.images['original'].source_url.to_s.should start_with "http://"
+					state.images['original'].source_url.to_s.should include ENV['AWS_S3_TEST_BUCKET']
+					state.images['original'].source_url.to_s.should include "/test.jpg"
+					state.images['original'].source_url.to_s.should include ENV['AWS_ACCESS_KEY_ID']
 					status(state.images['original'].source_url).should == 200
 				end
 			end
@@ -627,10 +628,10 @@ else
 				subject.handlers[0].stores[0].realize(state)
 
 				state.images['input'].store_path.should == "test_out.jpg"
-				state.images['input'].store_url.should start_with "https://"
-				state.images['input'].store_url.should include ENV['AWS_S3_TEST_BUCKET']
-				state.images['input'].store_url.should include "/test_out.jpg"
-				state.images['input'].store_url.should include ENV['AWS_ACCESS_KEY_ID']
+				state.images['input'].store_url.to_s.should start_with "https://"
+				state.images['input'].store_url.to_s.should include ENV['AWS_S3_TEST_BUCKET']
+				state.images['input'].store_url.to_s.should include "/test_out.jpg"
+				state.images['input'].store_url.to_s.should include ENV['AWS_ACCESS_KEY_ID']
 				status(state.images['input'].store_url).should == 200
 			end
 
@@ -648,10 +649,10 @@ else
 				it 'should still provide valid HTTPS URL incliding prefix' do
 					subject.handlers[0].stores[0].realize(state)
 
-					state.images['input'].store_url.should start_with "https://"
-					state.images['input'].store_url.should include ENV['AWS_S3_TEST_BUCKET']
-					state.images['input'].store_url.should include "test_prefix/test_out.jpg"
-					state.images['input'].store_url.should include ENV['AWS_ACCESS_KEY_ID']
+					state.images['input'].store_url.to_s.should start_with "https://"
+					state.images['input'].store_url.to_s.should include ENV['AWS_S3_TEST_BUCKET']
+					state.images['input'].store_url.to_s.should include "test_prefix/test_out.jpg"
+					state.images['input'].store_url.to_s.should include ENV['AWS_ACCESS_KEY_ID']
 					status(state.images['input'].store_url).should == 200
 				end
 
@@ -683,10 +684,10 @@ else
 				it 'should provide source HTTP url' do
 					subject.handlers[0].stores[0].realize(state)
 
-					state.images['input'].store_url.should start_with "http://"
-					state.images['input'].store_url.should include ENV['AWS_S3_TEST_BUCKET']
-					state.images['input'].store_url.should include "/test_out.jpg"
-					state.images['input'].store_url.should include ENV['AWS_ACCESS_KEY_ID']
+					state.images['input'].store_url.to_s.should start_with "http://"
+					state.images['input'].store_url.to_s.should include ENV['AWS_S3_TEST_BUCKET']
+					state.images['input'].store_url.to_s.should include "/test_out.jpg"
+					state.images['input'].store_url.to_s.should include ENV['AWS_ACCESS_KEY_ID']
 					status(state.images['input'].store_url).should == 200
 				end
 			end
@@ -694,7 +695,7 @@ else
 			describe 'permission control' do
 				it 'should store images that are not accessible by public by default' do
 					subject.handlers[0].stores[0].realize(state)
-					status(state.images['input'].store_url[/^[^\?]*/]).should == 403
+					status(state.images['input'].store_url.to_s[/^[^\?]*/]).should == 403
 				end
 
 				describe 'public' do
@@ -717,10 +718,10 @@ else
 					it 'should provide public source HTTPS url' do
 						subject.handlers[0].stores[0].realize(state)
 
-						state.images['input'].store_url.should start_with "https://"
-						state.images['input'].store_url.should include ENV['AWS_S3_TEST_BUCKET']
-						state.images['input'].store_url.should include "/test_out.jpg"
-						state.images['input'].store_url.should_not include ENV['AWS_ACCESS_KEY_ID']
+						state.images['input'].store_url.to_s.should start_with "https://"
+						state.images['input'].store_url.to_s.should include ENV['AWS_S3_TEST_BUCKET']
+						state.images['input'].store_url.to_s.should include "/test_out.jpg"
+						state.images['input'].store_url.to_s.should_not include ENV['AWS_ACCESS_KEY_ID']
 						status(state.images['input'].store_url).should == 200
 					end
 
@@ -738,10 +739,10 @@ else
 						it 'should provide public source HTTP url' do
 							subject.handlers[0].stores[0].realize(state)
 
-							state.images['input'].store_url.should start_with "http://"
-							state.images['input'].store_url.should include ENV['AWS_S3_TEST_BUCKET']
-							state.images['input'].store_url.should include "/test_out.jpg"
-							state.images['input'].store_url.should_not include ENV['AWS_ACCESS_KEY_ID']
+							state.images['input'].store_url.to_s.should start_with "http://"
+							state.images['input'].store_url.to_s.should include ENV['AWS_S3_TEST_BUCKET']
+							state.images['input'].store_url.to_s.should include "/test_out.jpg"
+							state.images['input'].store_url.to_s.should_not include ENV['AWS_ACCESS_KEY_ID']
 							status(state.images['input'].store_url).should == 200
 						end
 					end

data/spec/configuration_source_failover_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 require 'httpimagestore/configuration'
-Configuration::Scope.logger = Logger.new('/dev/null')
+MemoryLimit.logger = Configuration::Scope.logger = RootLogger.new('/dev/null')
 
 require 'httpimagestore/configuration/source_failover'
 require 'httpimagestore/configuration/file'

data/spec/configuration_spec.rb

@@ -1,7 +1,6 @@
 require_relative 'spec_helper'
 require 'httpimagestore/configuration'
-
-Configuration::Scope.logger = Logger.new('/dev/null')
+MemoryLimit.logger = Configuration::Scope.logger = RootLogger.new('/dev/null')
 
 require 'pathname'
 Pathname.glob('lib/httpimagestore/configuration/*.rb').each do |conf|

data/spec/configuration_thumbnailer_spec.rb

@@ -1,10 +1,9 @@
 require_relative 'spec_helper'
 require 'httpimagestore/configuration'
 require 'httpimagestore/configuration/output'
-Configuration::Scope.logger = Logger.new('/dev/null')
+MemoryLimit.logger = Configuration::Scope.logger = RootLogger.new('/dev/null')
 
 require 'httpimagestore/configuration/thumbnailer'
-MemoryLimit.logger = Logger.new('/dev/null')
 
 describe Configuration do
 	describe 'thumbnailer' do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
-require 'httpclient'
+require 'faraday'
 require 'daemon'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -9,30 +9,38 @@ require 'daemon'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end
 
 def support_dir
 	Pathname.new('spec/support')
 end
 
+def http_client
+	@faraday ||= Faraday.new
+end
+
+def request(method, uri, body, headers)
+	http_client.run_request(method.downcase.to_sym, uri.replace_s3_variables, body, headers || {})
+end
+
 def get(url)
-	HTTPClient.new.get_content(url)
+	http_client.get(url).body
 end
 
 def status(url)
-	HTTPClient.new.get(url).status
+	http_client.get(url).status
 end
 
 def headers(url)
-	HTTPClient.new.get(url).headers
+	http_client.get(url).headers
 end
 
 @@running_cmd = {}
 def start_server(cmd, pid_file, log_file, test_url)
 	if @@running_cmd[pid_file]
 		return if @@running_cmd[pid_file] == cmd
-		stop_server(pid_file) 
+		stop_server(pid_file)
 	end
 
 	fork do
@@ -52,7 +60,7 @@ def start_server(cmd, pid_file, log_file, test_url)
 	Timeout.timeout(10) do
 		begin
 			get test_url
-		rescue Errno::ECONNREFUSED
+		rescue Faraday::Error::ConnectionFailed
 			sleep 0.1
 			retry
 		end

data/spec/support/utf_string.txt

@@ -0,0 +1 @@
+zażółć gęślą jaźń

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpimagestore
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn-cuba-base
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: httpthumbnailer-client
   requirement: !ruby/object:Gem::Requirement
@@ -108,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -257,10 +257,12 @@ files:
 - features/cache-control.feature
 - features/compatibility.feature
 - features/data-uri.feature
+- features/encoding.feature
 - features/error-reporting.feature
 - features/flexi.feature
 - features/health-check.feature
 - features/request-matching.feature
+- features/rewrite.feature
 - features/s3-store-and-thumbnail.feature
 - features/source-failover.feature
 - features/step_definitions/httpimagestore_steps.rb
@@ -305,6 +307,7 @@ files:
 - spec/support/compute.jpg
 - spec/support/cuba_response_env.rb
 - spec/support/full.cfg
+- spec/support/utf_string.txt
 homepage: http://github.com/jpastuszek/httpimagestore
 licenses:
 - MIT
@@ -320,7 +323,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3070670501834592299
+      hash: -4420249284992726613
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: