paperclip 4.1.1 → 4.2.0

data/{test/storage/fog_test.rb → spec/paperclip/storage/fog_spec.rb}

@@ -1,81 +1,82 @@
-require './test/helper'
+require 'spec_helper'
 require 'fog'
+require 'timecop'
 
-class FogTest < Test::Unit::TestCase
+describe Paperclip::Storage::Fog do
   context "" do
-    setup { Fog.mock! }
+    before { Fog.mock! }
 
     context "with credentials provided in a path string" do
-      setup do
-        rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
-                      :storage => :fog,
-                      :url => '/:attachment/:filename',
-                      :fog_directory => "paperclip",
-                      :fog_credentials => fixture_file('fog.yml')
+      before do
+        rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
+                      storage: :fog,
+                      url: '/:attachment/:filename',
+                      fog_directory: "paperclip",
+                      fog_credentials: fixture_file('fog.yml')
         @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
 
-      teardown { @file.close }
+      after { @file.close }
 
-      should "have the proper information loading credentials from a file" do
+      it "has the proper information loading credentials from a file" do
         assert_equal @dummy.avatar.fog_credentials[:provider], 'AWS'
       end
     end
 
     context "with credentials provided in a File object" do
-      setup do
-        rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
-                      :storage => :fog,
-                      :url => '/:attachment/:filename',
-                      :fog_directory => "paperclip",
-                      :fog_credentials => File.open(fixture_file('fog.yml'))
+      before do
+        rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
+                      storage: :fog,
+                      url: '/:attachment/:filename',
+                      fog_directory: "paperclip",
+                      fog_credentials: File.open(fixture_file('fog.yml'))
         @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
 
-      teardown { @file.close }
+      after { @file.close }
 
-      should "have the proper information loading credentials from a file" do
+      it "has the proper information loading credentials from a file" do
         assert_equal @dummy.avatar.fog_credentials[:provider], 'AWS'
       end
     end
 
     context "with default values for path and url" do
-      setup do
-        rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
-                      :storage => :fog,
-                      :url => '/:attachment/:filename',
-                      :fog_directory => "paperclip",
-                      :fog_credentials => {
-                        :provider => 'AWS',
-                        :aws_access_key_id => 'AWS_ID',
-                        :aws_secret_access_key => 'AWS_SECRET'
+      before do
+        rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
+                      storage: :fog,
+                      url: '/:attachment/:filename',
+                      fog_directory: "paperclip",
+                      fog_credentials: {
+                        provider: 'AWS',
+                        aws_access_key_id: 'AWS_ID',
+                        aws_secret_access_key: 'AWS_SECRET'
                       }
         @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
 
-      teardown { @file.close }
+      after { @file.close }
 
-      should "be able to interpolate the path without blowing up" do
-        assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../tmp/public/avatars/5k.png")),
-                     @dummy.avatar.path
+      it "is able to interpolate the path without blowing up" do
+        assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../../tmp/public/avatars/5k.png")),
+          @dummy.avatar.path
       end
     end
 
     context "with no path or url given and using defaults" do
-      setup do
-        rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
-                      :storage => :fog,
-                      :fog_directory => "paperclip",
-                      :fog_credentials => {
-                        :provider => 'AWS',
-                        :aws_access_key_id => 'AWS_ID',
-                        :aws_secret_access_key => 'AWS_SECRET'
+      before do
+        rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
+                      storage: :fog,
+                      fog_directory: "paperclip",
+                      fog_credentials: {
+                        provider: 'AWS',
+                        aws_access_key_id: 'AWS_ID',
+                        aws_secret_access_key: 'AWS_SECRET'
                       }
         @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
@@ -83,18 +84,18 @@ class FogTest < Test::Unit::TestCase
         @dummy.avatar = @file
       end
 
-      teardown { @file.close }
+      after { @file.close }
 
-      should "have correct path and url from interpolated defaults" do
+      it "has correct path and url from interpolated defaults" do
         assert_equal "dummies/avatars/000/000/001/original/5k.png", @dummy.avatar.path
       end
     end
 
     context "with file params provided as lambda" do
-      setup do
-        fog_file = lambda{ |a| { :custom_header => a.instance.custom_method }}
-        klass = rebuild_model :storage => :fog,
-                              :fog_file => fog_file
+      before do
+        fog_file = lambda{ |a| { custom_header: a.instance.custom_method }}
+        klass = rebuild_model storage: :fog,
+                              fog_file: fog_file
 
         klass.class_eval do
           def custom_method
@@ -106,56 +107,56 @@ class FogTest < Test::Unit::TestCase
         @dummy = Dummy.new
       end
 
-      should "be able to evaluate correct values for file headers" do
-        assert_equal @dummy.avatar.send(:fog_file), { :custom_header => 'foobar' }
+      it "is able to evaluate correct values for file headers" do
+        assert_equal @dummy.avatar.send(:fog_file), { custom_header: 'foobar' }
       end
     end
 
-    setup do
+    before do
       @fog_directory = 'papercliptests'
 
       @credentials = {
-        :provider               => 'AWS',
-        :aws_access_key_id      => 'ID',
-        :aws_secret_access_key  => 'SECRET'
+        provider: 'AWS',
+        aws_access_key_id: 'ID',
+        aws_secret_access_key: 'SECRET'
       }
 
       @connection = Fog::Storage.new(@credentials)
       @connection.directories.create(
-        :key => @fog_directory
+        key: @fog_directory
       )
 
       @options = {
-        :fog_directory    => @fog_directory,
-        :fog_credentials  => @credentials,
-        :fog_host         => nil,
-        :fog_file         => {:cache_control => 1234},
-        :path             => ":attachment/:basename.:extension",
-        :storage          => :fog
+        fog_directory: @fog_directory,
+        fog_credentials: @credentials,
+        fog_host: nil,
+        fog_file: {cache_control: 1234},
+        path: ":attachment/:basename:dotextension",
+        storage: :fog
       }
 
       rebuild_model(@options)
     end
 
-    should "be extended by the Fog module" do
+    it "is extended by the Fog module" do
       assert Dummy.new.avatar.is_a?(Paperclip::Storage::Fog)
     end
 
     context "when assigned" do
-      setup do
+      before do
         @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
 
-      teardown do
+      after do
         @file.close
-        directory = @connection.directories.new(:key => @fog_directory)
+        directory = @connection.directories.new(key: @fog_directory)
         directory.files.each {|file| file.destroy}
         directory.destroy
       end
 
-      should "be rewinded after flush_writes" do
+      it "is rewound after flush_writes" do
         @dummy.avatar.instance_eval "def after_flush_writes; end"
 
         files = @dummy.avatar.queued_for_write.values
@@ -163,14 +164,14 @@ class FogTest < Test::Unit::TestCase
         assert files.none?(&:eof?), "Expect all the files to be rewinded."
       end
 
-      should "be removed after after_flush_writes" do
+      it "is removed after after_flush_writes" do
         paths = @dummy.avatar.queued_for_write.values.map(&:path)
         @dummy.save
-        assert paths.none?{ |path| File.exists?(path) },
+        assert paths.none?{ |path| File.exist?(path) },
           "Expect all the files to be deleted."
       end
 
-      should 'be able to be copied to a local file' do
+      it 'is able to be copied to a local file' do
         @dummy.save
         tempfile = Tempfile.new("known_location")
         tempfile.binmode
@@ -181,7 +182,7 @@ class FogTest < Test::Unit::TestCase
         tempfile.close
       end
 
-      should "pass the content type to the Fog::Storage::AWS::Files instance" do
+      it "passes the content type to the Fog::Storage::AWS::Files instance" do
         Fog::Storage::AWS::Files.any_instance.expects(:create).with do |hash|
           hash[:content_type]
         end
@@ -189,235 +190,239 @@ class FogTest < Test::Unit::TestCase
       end
 
       context "without a bucket" do
-        setup do
+        before do
           @connection.directories.get(@fog_directory).destroy
         end
 
-        should "create the bucket" do
+        it "creates the bucket" do
           assert @dummy.save
           assert @connection.directories.get(@fog_directory)
         end
       end
 
       context "with a bucket" do
-        should "succeed" do
+        it "succeeds" do
           assert @dummy.save
         end
       end
 
       context "without a fog_host" do
-        setup do
-          rebuild_model(@options.merge(:fog_host => nil))
+        before do
+          rebuild_model(@options.merge(fog_host: nil))
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new('.')
           @dummy.save
         end
 
-        should "provide a public url" do
+        it "provides a public url" do
           assert !@dummy.avatar.url.nil?
         end
       end
 
       context "with a fog_host" do
-        setup do
-          rebuild_model(@options.merge(:fog_host => 'http://example.com'))
+        before do
+          rebuild_model(@options.merge(fog_host: 'http://example.com'))
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new(".\n")
           @dummy.save
         end
 
-        should "provide a public url" do
-          assert @dummy.avatar.url =~ /^http:\/\/example\.com\/avatars\/data\.txt\?\d*$/
+        it "provides a public url" do
+          expect(@dummy.avatar.url).to match(/^http:\/\/example\.com\/avatars\/data\?\d*$/)
         end
       end
 
       context "with a fog_host that includes a wildcard placeholder" do
-        setup do
+        before do
           rebuild_model(
-            :fog_directory    => @fog_directory,
-            :fog_credentials  => @credentials,
-            :fog_host         => 'http://img%d.example.com',
-            :path             => ":attachment/:basename.:extension",
-            :storage          => :fog
+            fog_directory: @fog_directory,
+            fog_credentials: @credentials,
+            fog_host: 'http://img%d.example.com',
+            path: ":attachment/:basename:dotextension",
+            storage: :fog
           )
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new(".\n")
           @dummy.save
         end
 
-        should "provide a public url" do
-          assert @dummy.avatar.url =~ /^http:\/\/img[0123]\.example\.com\/avatars\/data\.txt\?\d*$/
+        it "provides a public url" do
+          expect(@dummy.avatar.url).to match(/^http:\/\/img[0123]\.example\.com\/avatars\/data\?\d*$/)
         end
       end
 
       context "with fog_public set to false" do
-        setup do
-          rebuild_model(@options.merge(:fog_public => false))
+        before do
+          rebuild_model(@options.merge(fog_public: false))
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new('.')
           @dummy.save
         end
 
-        should 'set the @fog_public instance variable to false' do
+        it 'sets the @fog_public instance variable to false' do
           assert_equal false, @dummy.avatar.instance_variable_get('@options')[:fog_public]
           assert_equal false, @dummy.avatar.fog_public
         end
       end
 
       context "with styles set and fog_public set to false" do
-        setup do
-          rebuild_model(@options.merge(:fog_public => false, :styles => { :medium => "300x300>", :thumb => "100x100>" }))
+        before do
+          rebuild_model(@options.merge(fog_public: false, styles: { medium: "300x300>", thumb: "100x100>" }))
           @file = File.new(fixture_file('5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.avatar = @file
           @dummy.save
         end
 
-        should 'set the @fog_public for a particular style to false' do
+        it 'sets the @fog_public for a particular style to false' do
           assert_equal false, @dummy.avatar.instance_variable_get('@options')[:fog_public]
           assert_equal false, @dummy.avatar.fog_public(:thumb)
         end
       end
 
       context "with styles set and fog_public set per-style" do
-        setup do
-          rebuild_model(@options.merge(:fog_public => { :medium => false, :thumb => true}, :styles => { :medium => "300x300>", :thumb => "100x100>" }))
+        before do
+          rebuild_model(@options.merge(fog_public: { medium: false, thumb: true}, styles: { medium: "300x300>", thumb: "100x100>" }))
           @file = File.new(fixture_file('5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.avatar = @file
           @dummy.save
         end
 
-        should 'set the fog_public for a particular style to correct value' do
+        it 'sets the fog_public for a particular style to correct value' do
           assert_equal false, @dummy.avatar.fog_public(:medium)
           assert_equal true, @dummy.avatar.fog_public(:thumb)
         end
       end
 
       context "with fog_public not set" do
-        setup do
+        before do
           rebuild_model(@options)
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new('.')
           @dummy.save
         end
 
-        should "default fog_public to true" do
+        it "defaults fog_public to true" do
           assert_equal true, @dummy.avatar.fog_public
         end
       end
 
       context "with a valid bucket name for a subdomain" do
-        should "provide an url in subdomain style" do
+        it "provides an url in subdomain style" do
           assert_match(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/, @dummy.avatar.url)
         end
 
-        should "provide 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\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
         end
       end
 
       context "generating an expiring url" do
-        should "generate the same url when using Times and Integer offsets" do
-          rebuild_model(@options)
-          dummy = Dummy.new
-          dummy.avatar = StringIO.new('.')
-
-          assert_equal dummy.avatar.expiring_url(1234), dummy.avatar.expiring_url(Time.now + 1234)
+        it "generates the same url when using Times and Integer offsets" do
+          Timecop.freeze do
+            offset = 1234
+            rebuild_model(@options)
+            dummy = Dummy.new
+            dummy.avatar = StringIO.new('.')
+
+            assert_equal dummy.avatar.expiring_url(offset),
+              dummy.avatar.expiring_url(Time.now + offset )
+          end
         end
 
-        should 'match the default url if there is no assignment' do
+        it 'matches the default url if there is no assignment' do
           dummy = Dummy.new
           assert_equal dummy.avatar.url, dummy.avatar.expiring_url
         end
 
-        should 'match the default url when given a style if there is no assignment' do
+        it 'matches the default url when given a style if there is no assignment' do
           dummy = Dummy.new
           assert_equal dummy.avatar.url(:thumb), dummy.avatar.expiring_url(3600, :thumb)
         end
       end
 
       context "with an invalid bucket name for a subdomain" do
-        setup do
-          rebuild_model(@options.merge(:fog_directory => "this_is_invalid"))
+        before do
+          rebuild_model(@options.merge(fog_directory: "this_is_invalid"))
           @dummy = Dummy.new
           @dummy.avatar = @file
           @dummy.save
         end
 
-        should "not match the bucket-subdomain restrictions" do
+        it "does not match the bucket-subdomain restrictions" do
           invalid_subdomains = %w(this_is_invalid in iamareallylongbucketnameiamareallylongbucketnameiamareallylongbu invalid- inval..id inval-.id inval.-id -invalid 192.168.10.2)
           invalid_subdomains.each do |name|
             assert_no_match Paperclip::Storage::Fog::AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX, name
           end
         end
 
-        should "provide an url in folder style" do
+        it "provides an url in folder style" do
           assert_match(/^https:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png\?\d*$/, @dummy.avatar.url)
         end
 
-        should "provide 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\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
         end
 
       end
 
       context "with a proc for a bucket name evaluating a model method" do
-        setup do
+        before do
           @dynamic_fog_directory = 'dynamicpaperclip'
-          rebuild_model(@options.merge(:fog_directory => lambda { |attachment| attachment.instance.bucket_name }))
+          rebuild_model(@options.merge(fog_directory: lambda { |attachment| attachment.instance.bucket_name }))
           @dummy = Dummy.new
           @dummy.stubs(:bucket_name).returns(@dynamic_fog_directory)
           @dummy.avatar = @file
           @dummy.save
         end
 
-        should "have created the bucket" do
+        it "has created the bucket" do
           assert @connection.directories.get(@dynamic_fog_directory).inspect
         end
 
       end
 
       context "with a proc for the fog_host evaluating a model method" do
-        setup do
-          rebuild_model(@options.merge(:fog_host => lambda { |attachment| attachment.instance.fog_host }))
+        before do
+          rebuild_model(@options.merge(fog_host: lambda { |attachment| attachment.instance.fog_host }))
           @dummy = Dummy.new
           @dummy.stubs(:fog_host).returns('http://dynamicfoghost.com')
           @dummy.avatar = @file
           @dummy.save
         end
 
-        should "provide a public url" do
+        it "provides a public url" do
           assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.url)
         end
 
       end
 
       context "with a custom fog_host" do
-        setup do
-          rebuild_model(@options.merge(:fog_host => "http://dynamicfoghost.com"))
+        before do
+          rebuild_model(@options.merge(fog_host: "http://dynamicfoghost.com"))
           @dummy = Dummy.new
           @dummy.avatar = @file
           @dummy.save
         end
 
-        should "provide a public url" do
+        it "provides a public url" do
           assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.url)
         end
 
-        should "provide an expiring url" do
+        it "provides an expiring url" do
           assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url)
         end
 
         context "with an invalid bucket name for a subdomain" do
-          setup do
-            rebuild_model(@options.merge({:fog_directory => "this_is_invalid", :fog_host => "http://dynamicfoghost.com"}))
+          before do
+            rebuild_model(@options.merge({fog_directory: "this_is_invalid", fog_host: "http://dynamicfoghost.com"}))
             @dummy = Dummy.new
             @dummy.avatar = @file
             @dummy.save
           end
 
-          should "provide an expiring url" do
+          it "provides an expiring url" do
             assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url)
           end
         end
@@ -425,20 +430,20 @@ class FogTest < Test::Unit::TestCase
       end
 
       context "with a proc for the fog_credentials evaluating a model method" do
-        setup do
+        before do
           @dynamic_fog_credentials = {
-            :provider               => 'AWS',
-            :aws_access_key_id      => 'DYNAMIC_ID',
-            :aws_secret_access_key  => 'DYNAMIC_SECRET'
+            provider: 'AWS',
+            aws_access_key_id: 'DYNAMIC_ID',
+            aws_secret_access_key: 'DYNAMIC_SECRET'
           }
-          rebuild_model(@options.merge(:fog_credentials => lambda { |attachment| attachment.instance.fog_credentials }))
+          rebuild_model(@options.merge(fog_credentials: lambda { |attachment| attachment.instance.fog_credentials }))
           @dummy = Dummy.new
           @dummy.stubs(:fog_credentials).returns(@dynamic_fog_credentials)
           @dummy.avatar = @file
           @dummy.save
         end
 
-        should "provide a public url" do
+        it "provides a public url" do
           assert_equal @dummy.avatar.fog_credentials, @dynamic_fog_credentials
         end
       end
@@ -447,26 +452,26 @@ class FogTest < Test::Unit::TestCase
   end
 
   context "when using local storage" do
-    setup do
+    before do
       Fog.unmock!
-      rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
-                    :storage => :fog,
-                    :url => '/:attachment/:filename',
-                    :fog_directory => "paperclip",
-                    :fog_credentials => { :provider => :local, :local_root => "." },
-                    :fog_host => 'localhost'
+      rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
+                    storage: :fog,
+                    url: '/:attachment/:filename',
+                    fog_directory: "paperclip",
+                    fog_credentials: { provider: :local, local_root: "." },
+                    fog_host: 'localhost'
 
       @file = File.new(fixture_file('5k.png'), 'rb')
       @dummy = Dummy.new
       @dummy.avatar = @file
     end
 
-    teardown do
+    after do
       @file.close
       Fog.mock!
     end
 
-    should "return the public url in place of the expiring url" do
+    it "returns the public url in place of the expiring url" do
       assert_match @dummy.avatar.public_url, @dummy.avatar.expiring_url
     end
   end