Revert "Fog upgraded how expiring_urls are made"

This reverts commit 8e0eb4ce.

Gemfile

@@ -16,6 +16,6 @@ gem 'pry'
 # Prevents bundler from taking a long-time to resolve
 # Prevents bundler from taking a long-time to resolve
 group :development, :test do
 group :development, :test do
   gem 'mime-types', '~> 1.16'
   gem 'mime-types', '~> 1.16'
-  gem 'builder'
+  gem 'builder', '~> 3.1.4'
   gem 'activerecord-import'
   gem 'activerecord-import'
 end
 end

gemfiles/3.2.gemfile

@@ -2,19 +2,12 @@
 
 
 source "https://rubygems.org"
 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 "pry"
+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 "rails", "~> 3.2.15"
 gem "rails", "~> 3.2.15"
-gem "paperclip", :path => "../"
+gem "paperclip", :path=>"../"
 
 
-group :development, :test do
-  gem "mime-types", "~> 1.16"
+gemspec :path=>"../"
\ No newline at end of file
-  gem "builder"
-  gem "activerecord-import"
-end
-
-gemspec :path => "../"

gemfiles/4.0.gemfile

@@ -2,19 +2,12 @@
 
 
 source "https://rubygems.org"
 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 "pry"
+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 "rails", "~> 4.0.0"
 gem "rails", "~> 4.0.0"
-gem "paperclip", :path => "../"
+gem "paperclip", :path=>"../"
 
 
-group :development, :test do
-  gem "mime-types", "~> 1.16"
+gemspec :path=>"../"
\ No newline at end of file
-  gem "builder"
-  gem "activerecord-import"
-end
-
-gemspec :path => "../"

gemfiles/4.1.gemfile

@@ -2,19 +2,12 @@
 
 
 source "https://rubygems.org"
 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 "pry"
+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 "rails", "~> 4.1.0.beta"
 gem "rails", "~> 4.1.0.beta"
-gem "paperclip", :path => "../"
+gem "paperclip", :path=>"../"
 
 
-group :development, :test do
-  gem "mime-types", "~> 1.16"
-  gem "builder"
-  gem "activerecord-import"
-end
-
-gemspec :path => "../"
+gemspec :path=>"../"

spec/paperclip/storage/fog_spec.rb

@@ -342,7 +342,7 @@ describe Paperclip::Storage::Fog do
         end
         end
 
 
         it "provides an url that expires in subdomain style" do
         it "provides an url that expires in subdomain style" do
-          assert_match(/^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
         end
         end
       end
       end
 
 
@@ -390,7 +390,7 @@ describe Paperclip::Storage::Fog do
         end
         end
 
 
         it "provides a url that expires in folder style" do
         it "provides a url that expires in folder style" do
-          assert_match(/^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
         end
         end
 
 
       end
       end