paperclip 4.3.7 → 6.1.0

data/spec/paperclip/style_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Paperclip::Style do

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
 
@@ -211,17 +179,19 @@ describe Paperclip::Thumbnail do
         end
 
         it "errors when trying to create the thumbnail" do
-          assert_raises(Paperclip::Error) do
-            silence_stream(STDERR) do
+          silence_stream(STDERR) do
+            expect {
               @thumb.make
-            end
+            }.to raise_error(
+              Paperclip::Error, /unrecognized option `-this-aint-no-option'/
+            )
           end
         end
 
         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 +450,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

data/spec/paperclip/url_generator_spec.rb

@@ -1,14 +1,12 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Paperclip::UrlGenerator do
   it "uses the given interpolator" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
+    mock_attachment = MockAttachment.new(interpolator: mock_interpolator)
 
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment,
-                                                { interpolator: mock_interpolator })
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     result = url_generator.for(:style_name, {})
 
     assert_equal expected, result
@@ -17,12 +15,12 @@ describe Paperclip::UrlGenerator do
   end
 
   it "uses the default URL when no file is assigned" do
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new
     default_url = "the default url"
-    options = { interpolator: mock_interpolator, default_url: default_url}
+    options = { interpolator: mock_interpolator, default_url: default_url }
+    mock_attachment = MockAttachment.new(options)
 
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(default_url),
@@ -30,12 +28,12 @@ describe Paperclip::UrlGenerator do
   end
 
   it "executes the default URL lambda when no file is assigned" do
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new
     default_url = lambda {|attachment| "the #{attachment.class.name} default url" }
     options = { interpolator: mock_interpolator, default_url: default_url}
+    mock_attachment = MockAttachment.new(options)
 
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?("the MockAttachment default url"),
@@ -44,12 +42,16 @@ describe Paperclip::UrlGenerator do
 
   it "executes the method named by the symbol as the default URL when no file is assigned" do
     mock_model = FakeModel.new
-    mock_attachment = MockAttachment.new(model: mock_model)
-    mock_interpolator = MockInterpolator.new
     default_url = :to_s
-    options = { interpolator: mock_interpolator, default_url: default_url}
-
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_interpolator = MockInterpolator.new
+    options = {
+      interpolator: mock_interpolator,
+      default_url: default_url,
+      model: mock_model,
+    }
+    mock_attachment = MockAttachment.new(options)
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(mock_model.to_s),
@@ -58,10 +60,10 @@ describe Paperclip::UrlGenerator do
 
   it "URL-escapes spaces if asked to" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {escape: true})
 
@@ -74,10 +76,10 @@ describe Paperclip::UrlGenerator do
         "the escaped result"
       end
     end.new
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {escape: true})
 
@@ -86,10 +88,10 @@ describe Paperclip::UrlGenerator do
 
   it "leaves spaces unescaped as asked to" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {escape: false})
 
@@ -98,10 +100,10 @@ describe Paperclip::UrlGenerator do
 
   it "defaults to leaving spaces unescaped" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {})
 
@@ -111,9 +113,9 @@ describe Paperclip::UrlGenerator do
   it "produces URLs without the updated_at value when the object does not respond to updated_at" do
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(responds_to_updated_at: false)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = { interpolator: mock_interpolator, responds_to_updated_at: false }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: true})
 
@@ -123,9 +125,13 @@ describe Paperclip::UrlGenerator do
   it "produces URLs without the updated_at value when the updated_at value is nil" do
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(responds_to_updated_at: true, updated_at: nil)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = {
+      responds_to_updated_at: true,
+      updated_at: nil,
+      interpolator: mock_interpolator,
+    }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: true})
 
@@ -136,9 +142,9 @@ describe Paperclip::UrlGenerator do
     expected = "the expected result"
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(updated_at: updated_at)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = { interpolator: mock_interpolator, updated_at: updated_at }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: true})
 
@@ -149,9 +155,9 @@ describe Paperclip::UrlGenerator do
     expected = "the?expected=result"
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(updated_at: updated_at)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = { interpolator: mock_interpolator, updated_at: updated_at }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: true})
 
@@ -162,9 +168,9 @@ describe Paperclip::UrlGenerator do
     expected = "the expected result"
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(updated_at: updated_at)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = { interpolator: mock_interpolator, updated_at: updated_at }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: false})
 
@@ -173,11 +179,15 @@ describe Paperclip::UrlGenerator do
 
   it "produces the correct URL when the instance has a file name" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new(original_filename: 'exists')
     mock_interpolator = MockInterpolator.new
-    options = { interpolator: mock_interpolator, url: expected}
-
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = {
+      interpolator: mock_interpolator,
+      url: expected,
+      original_filename: "exists",
+    }
+    mock_attachment = MockAttachment.new(options)
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(expected),
@@ -186,10 +196,10 @@ describe Paperclip::UrlGenerator do
 
   describe "should be able to escape (, ), [, and ]." do
     def generate(expected, updated_at=nil)
-      mock_attachment = MockAttachment.new(updated_at: updated_at)
       mock_interpolator = MockInterpolator.new(result: expected)
-      options = { interpolator: mock_interpolator }
-      url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+      options = { interpolator: mock_interpolator, updated_at: updated_at }
+      mock_attachment = MockAttachment.new(options)
+      url_generator = Paperclip::UrlGenerator.new(mock_attachment)
       def url_generator.respond_to(params)
         false if params == :escape
       end

data/spec/paperclip/validators/attachment_size_validator_spec.rb

@@ -12,14 +12,6 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     ))
   end
 
-  def self.storage_units
-    if defined?(ActiveSupport::NumberHelper) # Rails 4.0+
-      { 5120 => '5 KB',       10240 => '10 KB' }
-    else
-      { 5120 => '5120 Bytes', 10240 => '10240 Bytes' }
-    end
-  end
-
   def self.should_allow_attachment_file_size(size)
     context "when the attachment size is #{size}" do
       it "adds error to dummy object" do
@@ -158,8 +150,10 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "is invalid. (Between #{storage_units[5120]} and #{storage_units[10240]} please.)"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "is invalid. (Between 5 KB and 10 KB please.)"
+      )
     end
 
     context "given :less_than and :greater_than" do
@@ -169,8 +163,10 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "is invalid. (Between #{storage_units[5120]} and #{storage_units[10240]} please.)"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "is invalid. (Between 5 KB and 10 KB please.)"
+      )
     end
   end
 
@@ -181,10 +177,15 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           less_than: 10.kilobytes
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "must be less than #{storage_units[10240]}"
-      should_not_allow_attachment_file_size 4.kilobytes,
-        message: "must be greater than #{storage_units[5120]}"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "must be less than 10 KB"
+      )
+
+      should_not_allow_attachment_file_size(
+        4.kilobytes,
+        message: "must be greater than 5 KB"
+      )
     end
 
     context "given a size range" do
@@ -192,10 +193,15 @@ describe Paperclip::Validators::AttachmentSizeValidator do
         build_validator in: (5.kilobytes..10.kilobytes)
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "must be in between #{storage_units[5120]} and #{storage_units[10240]}"
-      should_not_allow_attachment_file_size 4.kilobytes,
-        message: "must be in between #{storage_units[5120]} and #{storage_units[10240]}"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "must be in between 5 KB and 10 KB"
+      )
+
+      should_not_allow_attachment_file_size(
+        4.kilobytes,
+        message: "must be in between 5 KB and 10 KB"
+      )
     end
   end