Skip to content
This repository has been archived by the owner on Nov 23, 2018. It is now read-only.

Upgraded mime-types, fixed url underscores, fix blank? not defined #15

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ GIT
PATH
remote: .
specs:
uber-s3 (0.2.3)
mime-types (~> 1.17)
uber-s3 (0.2.4)
mime-types

GEM
remote: http://rubygems.org/
Expand All @@ -36,7 +36,7 @@ GEM
http_parser.rb (0.5.3)
http_parser.rb (0.5.3-java)
method_source (0.7.1)
mime-types (1.19)
mime-types (2.4.3)
pry (0.9.8.4)
coderay (~> 1.0.5)
method_source (~> 0.7.1)
Expand Down
2 changes: 1 addition & 1 deletion lib/uber-s3/connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def initialize(s3, options={})
headers['Authorization'] = "AWS #{access_key}:#{signature}"

# Make the request
if self.region.blank?
if self.region.nil?
url = "http://#{s3.bucket}.s3.amazonaws.com/#{path}"
else
url = "http://#{s3.bucket}.s3-#{self.region}.amazonaws.com/#{path}"
Expand Down
4 changes: 2 additions & 2 deletions lib/uber-s3/connection/net_http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ def request(verb, url, headers={}, body=nil)
headers['Accept-Encoding'] = 'gzip, deflate'
end

self.uri = URI.parse(url)
self.uri = URI.parse(url.gsub('_','-'))

# Init and open a HTTP connection
http_connect! if http.nil? || !http.started?

req_klass = instance_eval("Net::HTTP::"+verb.to_s.capitalize)
req = req_klass.new(uri.to_s, headers)
req = req_klass.new(url, headers)

req.body = body if !body.nil? && !body.empty?

Expand Down
2 changes: 1 addition & 1 deletion uber-s3.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.files = Dir['README.md', 'lib/**/*']
s.require_path = 'lib'

s.add_dependency('mime-types', ['~> 1.17'])
s.add_dependency('mime-types') # , ['~> 1.17'])

s.add_development_dependency('rake')
s.add_development_dependency('rspec', ['~> 2.7.0'])
Expand Down