paperclip 4.2.2 → 6.1.0

data/spec/paperclip/schema_spec.rb

@@ -25,12 +25,12 @@ describe Paperclip::Schema do
           end
         end
 
-        columns = Dummy.columns.map{ |column| [column.name, column.type] }
+        columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-        expect(columns).to include(['avatar_file_name', :string])
-        expect(columns).to include(['avatar_content_type', :string])
-        expect(columns).to include(['avatar_file_size', :integer])
-        expect(columns).to include(['avatar_updated_at', :datetime])
+        expect(columns).to include(['avatar_file_name', "varchar"])
+        expect(columns).to include(['avatar_content_type', "varchar"])
+        expect(columns).to include(['avatar_file_size', "bigint"])
+        expect(columns).to include(['avatar_updated_at', "datetime"])
       end
 
       it "displays deprecation warning" do
@@ -50,12 +50,12 @@ describe Paperclip::Schema do
       end
 
       it "creates attachment columns" do
-        columns = Dummy.columns.map{ |column| [column.name, column.type] }
+        columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-        expect(columns).to include(['avatar_file_name', :string])
-        expect(columns).to include(['avatar_content_type', :string])
-        expect(columns).to include(['avatar_file_size', :integer])
-        expect(columns).to include(['avatar_updated_at', :datetime])
+        expect(columns).to include(['avatar_file_name', "varchar"])
+        expect(columns).to include(['avatar_content_type', "varchar"])
+        expect(columns).to include(['avatar_file_size', "bigint"])
+        expect(columns).to include(['avatar_updated_at', "datetime"])
       end
     end
 
@@ -89,12 +89,12 @@ describe Paperclip::Schema do
         end
 
         it "creates attachment columns" do
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-          expect(columns).to include(['avatar_file_name', :string])
-          expect(columns).to include(['avatar_content_type', :string])
-          expect(columns).to include(['avatar_file_size', :integer])
-          expect(columns).to include(['avatar_updated_at', :datetime])
+          expect(columns).to include(['avatar_file_name', "varchar"])
+          expect(columns).to include(['avatar_content_type', "varchar"])
+          expect(columns).to include(['avatar_file_size', "bigint"])
+          expect(columns).to include(['avatar_updated_at', "datetime"])
         end
       end
 
@@ -119,16 +119,16 @@ describe Paperclip::Schema do
         end
 
         it "creates attachment columns" do
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-          expect(columns).to include(['avatar_file_name', :string])
-          expect(columns).to include(['avatar_content_type', :string])
-          expect(columns).to include(['avatar_file_size', :integer])
-          expect(columns).to include(['avatar_updated_at', :datetime])
-          expect(columns).to include(['photo_file_name', :string])
-          expect(columns).to include(['photo_content_type', :string])
-          expect(columns).to include(['photo_file_size', :integer])
-          expect(columns).to include(['photo_updated_at', :datetime])
+          expect(columns).to include(['avatar_file_name', "varchar"])
+          expect(columns).to include(['avatar_content_type', "varchar"])
+          expect(columns).to include(['avatar_file_size', "bigint"])
+          expect(columns).to include(['avatar_updated_at', "datetime"])
+          expect(columns).to include(['photo_file_name', "varchar"])
+          expect(columns).to include(['photo_content_type', "varchar"])
+          expect(columns).to include(['photo_file_size', "bigint"])
+          expect(columns).to include(['photo_updated_at', "datetime"])
         end
       end
 
@@ -164,7 +164,7 @@ describe Paperclip::Schema do
         Dummy.connection.change_table :dummies do |t|
           t.column :avatar_file_name, :string
           t.column :avatar_content_type, :string
-          t.column :avatar_file_size, :integer
+          t.column :avatar_file_size, :bigint
           t.column :avatar_updated_at, :datetime
         end
       end
@@ -178,12 +178,12 @@ describe Paperclip::Schema do
             Dummy.connection.drop_attached_file :dummies, :avatar
           end
 
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-          expect(columns).to_not include(['avatar_file_name', :string])
-          expect(columns).to_not include(['avatar_content_type', :string])
-          expect(columns).to_not include(['avatar_file_size', :integer])
-          expect(columns).to_not include(['avatar_updated_at', :datetime])
+          expect(columns).to_not include(['avatar_file_name', "varchar"])
+          expect(columns).to_not include(['avatar_content_type', "varchar"])
+          expect(columns).to_not include(['avatar_file_size', "bigint"])
+          expect(columns).to_not include(['avatar_updated_at', "datetime"])
         end
 
         it "displays a deprecation warning" do
@@ -200,12 +200,12 @@ describe Paperclip::Schema do
           end
 
           it "removes the attachment columns" do
-            columns = Dummy.columns.map{ |column| [column.name, column.type] }
+            columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-            expect(columns).to_not include(['avatar_file_name', :string])
-            expect(columns).to_not include(['avatar_content_type', :string])
-            expect(columns).to_not include(['avatar_file_size', :integer])
-            expect(columns).to_not include(['avatar_updated_at', :datetime])
+            expect(columns).to_not include(['avatar_file_name', "varchar"])
+            expect(columns).to_not include(['avatar_content_type', "varchar"])
+            expect(columns).to_not include(['avatar_file_size', "bigint"])
+            expect(columns).to_not include(['avatar_updated_at', "datetime"])
           end
         end
 
@@ -214,7 +214,7 @@ describe Paperclip::Schema do
             Dummy.connection.change_table :dummies do |t|
               t.column :photo_file_name, :string
               t.column :photo_content_type, :string
-              t.column :photo_file_size, :integer
+              t.column :photo_file_size, :bigint
               t.column :photo_updated_at, :datetime
             end
 
@@ -222,16 +222,16 @@ describe Paperclip::Schema do
           end
 
           it "removes the attachment columns" do
-            columns = Dummy.columns.map{ |column| [column.name, column.type] }
-
-            expect(columns).to_not include(['avatar_file_name', :string])
-            expect(columns).to_not include(['avatar_content_type', :string])
-            expect(columns).to_not include(['avatar_file_size', :integer])
-            expect(columns).to_not include(['avatar_updated_at', :datetime])
-            expect(columns).to_not include(['photo_file_name', :string])
-            expect(columns).to_not include(['photo_content_type', :string])
-            expect(columns).to_not include(['photo_file_size', :integer])
-            expect(columns).to_not include(['photo_updated_at', :datetime])
+            columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
+
+            expect(columns).to_not include(['avatar_file_name', "varchar"])
+            expect(columns).to_not include(['avatar_content_type', "varchar"])
+            expect(columns).to_not include(['avatar_file_size', "bigint"])
+            expect(columns).to_not include(['avatar_updated_at', "datetime"])
+            expect(columns).to_not include(['photo_file_name', "varchar"])
+            expect(columns).to_not include(['photo_content_type', "varchar"])
+            expect(columns).to_not include(['photo_file_size', "bigint"])
+            expect(columns).to_not include(['photo_updated_at', "datetime"])
           end
         end
 

data/spec/paperclip/storage/fog_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
-require 'fog'
+require 'fog/aws'
+require 'fog/local'
 require 'timecop'
 
 describe Paperclip::Storage::Fog do
@@ -182,6 +183,13 @@ describe Paperclip::Storage::Fog do
         tempfile.close
       end
 
+      it 'is able to be handled when missing while copying to a local file' do
+        tempfile = Tempfile.new("known_location")
+        tempfile.binmode
+        assert_equal false, @dummy.avatar.copy_to_local_file(:original, tempfile.path)
+        tempfile.close
+      end
+
       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]
@@ -198,6 +206,11 @@ describe Paperclip::Storage::Fog do
           assert @dummy.save
           assert @connection.directories.get(@fog_directory)
         end
+
+        it "sucessfully rewinds the file during bucket creation" do
+          assert @dummy.save
+          expect(Paperclip.io_adapters.for(@dummy.avatar).read.length).to be > 0
+        end
       end
 
       context "with a bucket" do
@@ -265,6 +278,22 @@ describe Paperclip::Storage::Fog do
         end
       end
 
+      context "with fog_public as a proc" do
+        let(:proc) { ->(attachment) { !attachment } }
+
+        before do
+          rebuild_model(@options.merge(fog_public: proc))
+          @dummy = Dummy.new
+          @dummy.avatar = StringIO.new(".")
+          @dummy.save
+        end
+
+        it "sets the @fog_public instance variable to false" do
+          assert_equal proc, @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
         before do
           rebuild_model(@options.merge(fog_public: false, styles: { medium: "300x300>", thumb: "100x100>" }))
@@ -320,6 +349,9 @@ describe Paperclip::Storage::Fog do
         it "honors the scheme in public url" do
           assert_match(/^http:\/\//, @dummy.avatar.url)
         end
+        it "honors the scheme in expiring url" do
+          assert_match(/^http:\/\//, @dummy.avatar.expiring_url)
+        end
       end
 
       context "with scheme not set" do
@@ -334,15 +366,20 @@ describe Paperclip::Storage::Fog do
         it "provides HTTPS public url" do
           assert_match(/^https:\/\//, @dummy.avatar.url)
         end
+        it "provides HTTPS expiring url" do
+          assert_match(/^https:\/\//, @dummy.avatar.expiring_url)
+        end
       end
 
       context "with a valid bucket name for a subdomain" do
+        before { @dummy.stubs(:new_record?).returns(false) }
+
         it "provides an url in subdomain style" do
           assert_match(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/, @dummy.avatar.url)
         end
 
         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(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
       end
 
@@ -390,7 +427,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.+Expires=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^https:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
 
       end
@@ -409,6 +446,9 @@ describe Paperclip::Storage::Fog do
           assert @connection.directories.get(@dynamic_fog_directory).inspect
         end
 
+        it "provides an url using dynamic bucket name" do
+          assert_match(/^https:\/\/dynamicpaperclip.s3.amazonaws.com\/avatars\/5k.png\?\d*$/, @dummy.avatar.url)
+        end
       end
 
       context "with a proc for the fog_host evaluating a model method" do
@@ -475,6 +515,25 @@ describe Paperclip::Storage::Fog do
           assert_equal @dummy.avatar.fog_credentials, @dynamic_fog_credentials
         end
       end
+
+      context "with custom fog_options" do
+        before do
+          rebuild_model(
+            @options.merge(fog_options: { multipart_chunk_size: 104857600 }),
+          )
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+
+        it "applies the options to the fog #create call" do
+          files = stub
+          @dummy.avatar.stubs(:directory).returns stub(files: files)
+          files.expects(:create).with(
+            has_entries(multipart_chunk_size: 104857600),
+          )
+          @dummy.save
+        end
+      end
     end
 
   end
@@ -492,6 +551,7 @@ describe Paperclip::Storage::Fog do
       @file = File.new(fixture_file('5k.png'), 'rb')
       @dummy = Dummy.new
       @dummy.avatar = @file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     after do

data/spec/paperclip/storage/s3_live_spec.rb

@@ -8,9 +8,10 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
         @file = File.new(fixture_file("5k.png"))
@@ -45,9 +46,10 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
         @dummy = Dummy.new
@@ -64,9 +66,10 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
         Dummy.delete_all
@@ -105,9 +108,12 @@ unless ENV["S3_BUCKET"].blank?
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
           storage: :s3,
           bucket: ENV["S3_BUCKET"],
+          s3_region: ENV["S3_REGION"],
+          url: ":s3_domain_url",
+          path: "/:class/:attachment/:id_partition/:style/:filename",
           s3_credentials: {
-            aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-            aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+            access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+            secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
           }
 
         Dummy.delete_all
@@ -136,7 +142,7 @@ unless ENV["S3_BUCKET"].blank?
       it "is destroyable" do
         url = @dummy.avatar.url
         @dummy.destroy
-        assert_not_found_response url
+        assert_forbidden_response url
       end
     end
 
@@ -146,12 +152,12 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       },
-                      s3_server_side_encryption: :aes256
-
+                      s3_server_side_encryption: "AES256"
         Dummy.delete_all
         @dummy = Dummy.new
       end
@@ -173,7 +179,7 @@ unless ENV["S3_BUCKET"].blank?
           end
 
           it "is encrypted on S3" do
-            assert @dummy.avatar.s3_object.server_side_encryption == :aes256
+            assert @dummy.avatar.s3_object.server_side_encryption == "AES256"
           end
         end
       end