Commit 8e0eb4ce by Jon Yurek

Fog upgraded how expiring_urls are made

During the fixing of the previous commit, the tests broken. Turns out
that between fog 1.22.0 and fog 1.25.0, there was a change to how fog
builds S3 expiring URLs. This changes to test to be the common point
between the two versions. All we need to do here is make sure that the
expiring URL is being constructed.

In the process, this also updates all the appraisal-generated Gemfiles.

Also, in the process, this meant I had to take away the builder version
restriction. This was put in so that `bundle`ing wouldn't take forever,
but I'm unsire whether this needed to happen with this version or if
builder just needed to be separate from the Gemfile. I'm commimtting
this and asking the people who reported the problem. If you don't see a
revet commit, everything was fine.
parent 8d70c198
......@@ -16,6 +16,6 @@ gem 'pry'
# Prevents bundler from taking a long-time to resolve
group :development, :test do
gem 'mime-types', '~> 1.16'
gem 'builder', '~> 3.1.4'
gem 'builder'
gem 'activerecord-import'
end
......@@ -2,12 +2,19 @@
source "https://rubygems.org"
gem "sqlite3", "1.3.8", :platforms=>:ruby
gem "jruby-openssl", :platforms=>:jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
gem "rubysl", :platforms=>:rbx
gem "racc", :platforms=>:rbx
gem "sqlite3", "1.3.8", :platforms => :ruby
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rubysl", :platforms => :rbx
gem "racc", :platforms => :rbx
gem "pry"
gem "rails", "~> 3.2.15"
gem "paperclip", :path=>"../"
gem "paperclip", :path => "../"
gemspec :path=>"../"
\ No newline at end of file
group :development, :test do
gem "mime-types", "~> 1.16"
gem "builder"
gem "activerecord-import"
end
gemspec :path => "../"
......@@ -2,12 +2,19 @@
source "https://rubygems.org"
gem "sqlite3", "1.3.8", :platforms=>:ruby
gem "jruby-openssl", :platforms=>:jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
gem "rubysl", :platforms=>:rbx
gem "racc", :platforms=>:rbx
gem "sqlite3", "1.3.8", :platforms => :ruby
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rubysl", :platforms => :rbx
gem "racc", :platforms => :rbx
gem "pry"
gem "rails", "~> 4.0.0"
gem "paperclip", :path=>"../"
gem "paperclip", :path => "../"
gemspec :path=>"../"
\ No newline at end of file
group :development, :test do
gem "mime-types", "~> 1.16"
gem "builder"
gem "activerecord-import"
end
gemspec :path => "../"
......@@ -2,12 +2,19 @@
source "https://rubygems.org"
gem "sqlite3", "1.3.8", :platforms=>:ruby
gem "jruby-openssl", :platforms=>:jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
gem "rubysl", :platforms=>:rbx
gem "racc", :platforms=>:rbx
gem "sqlite3", "1.3.8", :platforms => :ruby
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rubysl", :platforms => :rbx
gem "racc", :platforms => :rbx
gem "pry"
gem "rails", "~> 4.1.0.beta"
gem "paperclip", :path=>"../"
gem "paperclip", :path => "../"
gemspec :path=>"../"
group :development, :test do
gem "mime-types", "~> 1.16"
gem "builder"
gem "activerecord-import"
end
gemspec :path => "../"
......@@ -342,7 +342,7 @@ describe Paperclip::Storage::Fog do
end
it "provides an url that expires in subdomain style" do
assert_match(/^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
assert_match(/^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
end
end
......@@ -390,7 +390,7 @@ describe Paperclip::Storage::Fog do
end
it "provides a url that expires in folder style" do
assert_match(/^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
assert_match(/^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment