paperclip 5.0.0.beta2 → 5.3.0

data/spec/paperclip/storage/s3_live_spec.rb

@@ -10,8 +10,8 @@ unless ENV["S3_BUCKET"].blank?
                       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"))
@@ -48,8 +48,8 @@ unless ENV["S3_BUCKET"].blank?
                       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
@@ -68,8 +68,8 @@ unless ENV["S3_BUCKET"].blank?
                       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
@@ -109,9 +109,11 @@ unless ENV["S3_BUCKET"].blank?
           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
@@ -152,8 +154,8 @@ unless ENV["S3_BUCKET"].blank?
                       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"
         Dummy.delete_all

data/spec/paperclip/storage/s3_spec.rb

@@ -114,7 +114,7 @@ describe Paperclip::Storage::S3 do
     end
 
     it "returns a url based on an S3 path" do
-      assert_match %r{^http://s3.amazonaws.com/bucket/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//s3.amazonaws.com/bucket/avatars/data[^\.]}, @dummy.avatar.url
     end
 
     it "uses the correct bucket" do
@@ -252,11 +252,11 @@ describe Paperclip::Storage::S3 do
     end
 
     it "returns a url based on an :s3_host_name path" do
-      assert_match %r{^http://s3-ap-northeast-1.amazonaws.com/bucket/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//s3-ap-northeast-1.amazonaws.com/bucket/avatars/data[^\.]}, @dummy.avatar.url
     end
 
     it "uses the S3 bucket with the correct host name" do
-      assert_equal "s3-ap-northeast-1.amazonaws.com",
+      assert_equal "s3.ap-northeast-1.amazonaws.com",
         @dummy.avatar.s3_bucket.client.config.endpoint.host
     end
   end
@@ -278,7 +278,60 @@ describe Paperclip::Storage::S3 do
 
     it "uses s3_host_name as a proc if available" do
       @dummy.value = "s3.something.com"
-      assert_equal "http://s3.something.com/bucket/avatars/data", @dummy.avatar.url(:original, timestamp: false)
+      assert_equal "//s3.something.com/bucket/avatars/data", @dummy.avatar.url(:original, timestamp: false)
+    end
+  end
+
+  context "use_accelerate_endpoint", if: aws_accelerate_available? do
+    context "defaults to false" do
+      before do
+        rebuild_model(
+          storage: :s3,
+          s3_credentials: {},
+          bucket: "bucket",
+          path: ":attachment/:basename:dotextension",
+          s3_host_name: "s3-ap-northeast-1.amazonaws.com",
+          s3_region: "ap-northeast-1",
+        )
+        @dummy = Dummy.new
+        @dummy.avatar = stringy_file
+        @dummy.stubs(:new_record?).returns(false)
+      end
+
+      it "returns a url based on an :s3_host_name path" do
+        assert_match %r{^//s3-ap-northeast-1.amazonaws.com/bucket/avatars/data[^\.]},
+          @dummy.avatar.url
+      end
+
+      it "uses the S3 client with the use_accelerate_endpoint config is false" do
+        expect(@dummy.avatar.s3_bucket.client.config.use_accelerate_endpoint).to be(false)
+      end
+    end
+
+    context "set to true", if: aws_accelerate_available? do
+      before do
+        rebuild_model(
+          storage: :s3,
+          s3_credentials: {},
+          bucket: "bucket",
+          path: ":attachment/:basename:dotextension",
+          s3_host_name: "s3-accelerate.amazonaws.com",
+          s3_region: "ap-northeast-1",
+          use_accelerate_endpoint: true,
+        )
+        @dummy = Dummy.new
+        @dummy.avatar = stringy_file
+        @dummy.stubs(:new_record?).returns(false)
+      end
+
+      it "returns a url based on an :s3_host_name path" do
+        assert_match %r{^//s3-accelerate.amazonaws.com/bucket/avatars/data[^\.]},
+          @dummy.avatar.url
+      end
+
+      it "uses the S3 client with the use_accelerate_endpoint config is true" do
+        expect(@dummy.avatar.s3_bucket.client.config.use_accelerate_endpoint).to be(true)
+      end
     end
   end
 
@@ -364,6 +417,58 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  context "An attachment that uses S3 for storage and has styles" do
+    before do
+      rebuild_model(
+        (aws2_add_region).merge(
+          storage: :s3,
+          styles: { thumb: ["90x90#", :jpg] },
+          bucket: "bucket",
+          s3_credentials: {
+            "access_key_id" => "12345",
+            "secret_access_key" => "54321" }
+        )
+      )
+
+      @file = File.new(fixture_file("5k.png"), "rb")
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+      @dummy.save
+    end
+
+    context "reprocess" do
+      before do
+        @object = stub
+        @dummy.avatar.stubs(:s3_object).with(:original).returns(@object)
+        @dummy.avatar.stubs(:s3_object).with(:thumb).returns(@object)
+        @object.stubs(:get).yields(@file.read)
+        @object.stubs(:exists?).returns(true)
+      end
+
+      it "uploads original" do
+        @object.expects(:upload_file).with(
+          anything,
+          content_type: "image/png",
+          acl: :"public-read").returns(true)
+        @object.expects(:upload_file).with(
+          anything,
+          content_type: "image/jpeg",
+          acl: :"public-read").returns(true)
+        @dummy.avatar.reprocess!
+      end
+
+      it "doesn't upload original" do
+        @object.expects(:upload_file).with(
+          anything,
+          content_type: "image/jpeg",
+          acl: :"public-read").returns(true)
+        @dummy.avatar.reprocess!(:thumb)
+      end
+    end
+
+    after { @file.close }
+  end
+
   context "An attachment that uses S3 for storage and has spaces in file name" do
     before do
       rebuild_model(
@@ -406,7 +511,7 @@ describe Paperclip::Storage::S3 do
           "question?mark.png"
         end
       end
-      file = Paperclip.io_adapters.for(stringio)
+      file = Paperclip.io_adapters.for(stringio, hash_digest: Digest::MD5)
       @dummy = Dummy.new
       @dummy.avatar = file
       @dummy.save
@@ -435,7 +540,7 @@ describe Paperclip::Storage::S3 do
     end
 
     it "returns a url based on an S3 subdomain" do
-      assert_match %r{^http://bucket.s3.amazonaws.com/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//bucket.s3.amazonaws.com/avatars/data[^\.]}, @dummy.avatar.url
     end
   end
 
@@ -458,7 +563,34 @@ describe Paperclip::Storage::S3 do
     end
 
     it "returns a url based on the host_alias" do
-      assert_match %r{^http://something.something.com/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//something.something.com/avatars/data[^\.]}, @dummy.avatar.url
+    end
+  end
+
+  context "generating a url with a prefixed host alias" do
+    before do
+      rebuild_model(
+        aws2_add_region.merge(
+          storage: :s3,
+          s3_credentials: {
+            production: { bucket: "prod_bucket" },
+            development: { bucket: "dev_bucket" },
+          },
+          bucket: "bucket",
+          s3_host_alias: "something.something.com",
+          s3_prefixes_in_alias: 2,
+          path: "prefix1/prefix2/:attachment/:basename:dotextension",
+          url: ":s3_alias_url",
+        )
+      )
+      @dummy = Dummy.new
+      @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
+    end
+
+    it "returns a url with the prefixes removed" do
+      assert_match %r{^//something.something.com/avatars/data[^\.]},
+                   @dummy.avatar.url
     end
   end
 
@@ -482,8 +614,8 @@ describe Paperclip::Storage::S3 do
     end
 
     it "returns a url based on the host_alias" do
-      assert_match %r{^http://cdn1.example.com/avatars/data[^\.]}, @dummy.avatar.url
-      assert_match %r{^http://cdn2.example.com/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//cdn1.example.com/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//cdn2.example.com/avatars/data[^\.]}, @dummy.avatar.url
     end
 
     it "still returns the bucket name" do
@@ -672,7 +804,9 @@ describe Paperclip::Storage::S3 do
           s3_host_name: "s3-world-end.amazonaws.com" },
         development: {
           s3_region: "ap-northeast-1",
-          s3_host_name: "s3-ap-northeast-1.amazonaws.com" }
+          s3_host_name: "s3-ap-northeast-1.amazonaws.com" },
+        test: {
+          s3_region: "" }
         }
       @dummy = Dummy.new
     end
@@ -687,8 +821,9 @@ describe Paperclip::Storage::S3 do
 
     it "gets the right s3_host_name in development" do
       rails_env("development") do
-        assert_match %r{^s3-ap-northeast-1.amazonaws.com}, @dummy.avatar.s3_host_name
-        assert_match %r{^s3-ap-northeast-1.amazonaws.com},
+        assert_match %r{^s3.ap-northeast-1.amazonaws.com},
+          @dummy.avatar.s3_host_name
+        assert_match %r{^s3.ap-northeast-1.amazonaws.com},
           @dummy.avatar.s3_bucket.client.config.endpoint.host
       end
     end
@@ -735,7 +870,7 @@ describe Paperclip::Storage::S3 do
       it "does not get a bucket to get a URL" do
         @dummy.avatar.expects(:s3).never
         @dummy.avatar.expects(:s3_bucket).never
-        assert_match %r{^http://s3\.amazonaws\.com/testing/avatars/original/5k\.png}, @dummy.avatar.url
+        assert_match %r{^//s3\.amazonaws\.com/testing/avatars/original/5k\.png}, @dummy.avatar.url
       end
 
       it "is rewound after flush_writes" do
@@ -1205,7 +1340,7 @@ describe Paperclip::Storage::S3 do
           'access_key_id' => "12345",
           'secret_access_key' => "54321"
         },
-        s3_server_side_encryption: :aes256
+        s3_server_side_encryption: "AES256"
     end
 
     context "when assigned" do
@@ -1225,7 +1360,7 @@ describe Paperclip::Storage::S3 do
           object.expects(:upload_file)
             .with(anything, content_type: "image/png",
                   acl: :"public-read",
-                  server_side_encryption: :aes256)
+                  server_side_encryption: "AES256")
           @dummy.save
         end
 
@@ -1472,29 +1607,6 @@ describe Paperclip::Storage::S3 do
           }
         )
       end
-
-      context "when assigned" do
-        before do
-          @file = File.new(fixture_file('5k.png'), 'rb')
-          @dummy = Dummy.new
-          @dummy.stubs(:private_attachment? => true)
-          @dummy.avatar = @file
-        end
-
-        after { @file.close }
-
-        context "and saved" do
-          before do
-            @dummy.save
-          end
-
-          it "succeeds" do
-            assert @dummy.avatar.url().include?       "https://"
-            assert @dummy.avatar.url(:thumb).include? "http://"
-          end
-        end
-      end
-
     end
   end
 
@@ -1578,5 +1690,4 @@ describe Paperclip::Storage::S3 do
       Rails.env = stored_env
     end
   end
-
 end

data/spec/paperclip/tempfile_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe Paperclip::Tempfile do
+  context "A Paperclip Tempfile" do
+    before do
+      @tempfile = described_class.new(["file", ".jpg"])
+    end
+
+    after { @tempfile.close }
+
+    it "has its path contain a real extension" do
+      assert_equal ".jpg", File.extname(@tempfile.path)
+    end
+
+    it "is a real Tempfile" do
+      assert @tempfile.is_a?(::Tempfile)
+    end
+  end
+
+  context "Another Paperclip Tempfile" do
+    before do
+      @tempfile = described_class.new("file")
+    end
+
+    after { @tempfile.close }
+
+    it "does not have an extension if not given one" do
+      assert_equal "", File.extname(@tempfile.path)
+    end
+
+    it "is a real Tempfile" do
+      assert @tempfile.is_a?(::Tempfile)
+    end
+  end
+end

data/spec/paperclip/thumbnail_spec.rb

@@ -1,38 +1,6 @@
 require 'spec_helper'
 
 describe Paperclip::Thumbnail do
-  context "A Paperclip Tempfile" do
-    before do
-      @tempfile = Paperclip::Tempfile.new(["file", ".jpg"])
-    end
-
-    after { @tempfile.close }
-
-    it "has its path contain a real extension" do
-      assert_equal ".jpg", File.extname(@tempfile.path)
-    end
-
-    it "is a real Tempfile" do
-      assert @tempfile.is_a?(::Tempfile)
-    end
-  end
-
-  context "Another Paperclip Tempfile" do
-    before do
-      @tempfile = Paperclip::Tempfile.new("file")
-    end
-
-    after { @tempfile.close }
-
-    it "does not have an extension if not given one" do
-      assert_equal "", File.extname(@tempfile.path)
-    end
-
-    it "is a real Tempfile" do
-      assert @tempfile.is_a?(::Tempfile)
-    end
-  end
-
   context "An image" do
     before do
       @file = File.new(fixture_file("5k.png"), 'rb')
@@ -80,7 +48,7 @@ describe Paperclip::Thumbnail do
       it "lets us know when a command isn't found versus a processing error" do
         old_path = ENV['PATH']
         begin
-          Cocaine::CommandLine.path = ''
+          Terrapin::CommandLine.path = ''
           Paperclip.options[:command_path] = ''
           ENV['PATH'] = ''
           assert_raises(Paperclip::Errors::CommandNotFoundError) do
@@ -134,7 +102,7 @@ describe Paperclip::Thumbnail do
 
       output_file = thumb.make
 
-      command = Cocaine::CommandLine.new("identify", "-format %wx%h :file")
+      command = Terrapin::CommandLine.new("identify", "-format %wx%h :file")
       assert_equal "50x50", command.run(file: output_file.path).strip
     end
 
@@ -221,7 +189,7 @@ describe Paperclip::Thumbnail do
         it "lets us know when a command isn't found versus a processing error" do
           old_path = ENV['PATH']
           begin
-            Cocaine::CommandLine.path = ''
+            Terrapin::CommandLine.path = ''
             Paperclip.options[:command_path] = ''
             ENV['PATH'] = ''
             assert_raises(Paperclip::Errors::CommandNotFoundError) do
@@ -480,6 +448,41 @@ describe Paperclip::Thumbnail do
         assert_equal "50x50", `#{cmd}`.chomp
       end
     end
+
+    context "with a specified frame_index" do
+      before do
+        @thumb = Paperclip::Thumbnail.new(
+          @file,
+          geometry: "50x50",
+          frame_index: 5,
+          format: :jpg,
+        )
+      end
+
+      it "creates the thumbnail from the frame index when sent #make" do
+        @thumb.make
+        assert_equal 5, @thumb.frame_index
+      end
+    end
+
+    context "with a specified frame_index out of bounds" do
+      before do
+        @thumb = Paperclip::Thumbnail.new(
+          @file,
+          geometry: "50x50",
+          frame_index: 20,
+          format: :jpg,
+        )
+      end
+
+      it "errors when trying to create the thumbnail" do
+        assert_raises(Paperclip::Error) do
+          silence_stream(STDERR) do
+            @thumb.make
+          end
+        end
+      end
+    end
   end
 
   context "with a really long file name" do