kt-paperclip 5.4.0 → 7.1.1

data/spec/paperclip/style_spec.rb

@@ -1,11 +1,10 @@
-# encoding: utf-8
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Style do
   context "A style rule" do
     before do
       @attachment = attachment path: ":basename.:extension",
-                               styles: { foo: {geometry: "100x100#", format: :png} },
+                               styles: { foo: { geometry: "100x100#", format: :png } },
                                whiny: true
       @style = @attachment.styles[:foo]
     end
@@ -40,13 +39,13 @@ describe Paperclip::Style do
     before do
       @attachment = attachment path: ":basename.:extension",
                                whiny_thumbnails: true,
-                               processors: lambda {|a| [:test]},
+                               processors: lambda { |_a| [:test] },
                                styles: {
-                                 foo: lambda{|a| "300x300#"},
+                                 foo: lambda { |_a| "300x300#" },
                                  bar: {
-                                   geometry: lambda{|a| "300x300#"},
-                                   convert_options: lambda{|a| "-do_stuff"},
-                                   source_file_options: lambda{|a| "-do_extra_stuff"}
+                                   geometry: lambda { |_a| "300x300#" },
+                                   convert_options: lambda { |_a| "-do_stuff" },
+                                   source_file_options: lambda { |_a| "-do_extra_stuff" }
                                  }
                                }
     end
@@ -65,7 +64,7 @@ describe Paperclip::Style do
     before do
       styles = {}
       styles[:aslist] = ["100x100", :png]
-      styles[:ashash] = {geometry: "100x100", format: :png}
+      styles[:ashash] = { geometry: "100x100", format: :png }
       styles[:asstring] = "100x100"
       @attachment = attachment path: ":basename.:extension",
                                styles: styles
@@ -102,21 +101,21 @@ describe Paperclip::Style do
   context "An attachment with :convert_options" do
     it "does not have called extra_options_for(:thumb/:large) on initialization" do
       @attachment = attachment path: ":basename.:extension",
-                               styles: {thumb: "100x100", large: "400x400"},
-                               convert_options: {all: "-do_stuff", thumb: "-thumbnailize"}
-      @attachment.expects(:extra_options_for).never
+                               styles: { thumb: "100x100", large: "400x400" },
+                               convert_options: { all: "-do_stuff", thumb: "-thumbnailize" }
+      expect(@attachment).to_not receive(:extra_options_for)
       @style = @attachment.styles[:thumb]
     end
 
     it "calls extra_options_for(:thumb/:large) when convert options are requested" do
       @attachment = attachment path: ":basename.:extension",
-                               styles: {thumb: "100x100", large: "400x400"},
-                               convert_options: {all: "-do_stuff", thumb: "-thumbnailize"}
+                               styles: { thumb: "100x100", large: "400x400" },
+                               convert_options: { all: "-do_stuff", thumb: "-thumbnailize" }
       @style = @attachment.styles[:thumb]
       @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
+      allow(@file).to receive(:original_filename).and_return("file.jpg")
 
-      @attachment.expects(:extra_options_for).with(:thumb)
+      expect(@attachment).to receive(:extra_options_for).with(:thumb)
       @attachment.styles[:thumb].convert_options
     end
   end
@@ -124,21 +123,21 @@ describe Paperclip::Style do
   context "An attachment with :source_file_options" do
     it "does not have called extra_source_file_options_for(:thumb/:large) on initialization" do
       @attachment = attachment path: ":basename.:extension",
-                               styles: {thumb: "100x100", large: "400x400"},
-                               source_file_options: {all: "-density 400", thumb: "-depth 8"}
-      @attachment.expects(:extra_source_file_options_for).never
+                               styles: { thumb: "100x100", large: "400x400" },
+                               source_file_options: { all: "-density 400", thumb: "-depth 8" }
+      expect(@attachment).to_not receive(:extra_source_file_options_for)
       @style = @attachment.styles[:thumb]
     end
 
     it "calls extra_options_for(:thumb/:large) when convert options are requested" do
       @attachment = attachment path: ":basename.:extension",
-                               styles: {thumb: "100x100", large: "400x400"},
-                               source_file_options: {all: "-density 400", thumb: "-depth 8"}
+                               styles: { thumb: "100x100", large: "400x400" },
+                               source_file_options: { all: "-density 400", thumb: "-depth 8" }
       @style = @attachment.styles[:thumb]
       @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
+      allow(@file).to receive(:original_filename).and_return("file.jpg")
 
-      @attachment.expects(:extra_source_file_options_for).with(:thumb)
+      expect(@attachment).to receive(:extra_source_file_options_for).with(:thumb)
       @attachment.styles[:thumb].source_file_options
     end
   end
@@ -151,21 +150,20 @@ describe Paperclip::Style do
                                    geometry: "100x100#",
                                    format: :png,
                                    processors: [:test]
-                                  }
-                                },
+                                 }
+                               },
                                processors: [:thumbnail]
       @style = @attachment.styles[:foo]
     end
 
     it "does not get processors from the attachment" do
-      @attachment.expects(:processors).never
+      expect(@attachment).to_not receive(:processors)
       assert_not_equal [:thumbnail], @style.processors
     end
 
     it "reports its own processors" do
       assert_equal [:test], @style.processors
     end
-
   end
 
   context "A style rule with :processors supplied as procs" do
@@ -175,9 +173,9 @@ describe Paperclip::Style do
                                  foo: {
                                    geometry: "100x100#",
                                    format: :png,
-                                   processors: lambda{|a| [:test]}
-                                  }
-                                },
+                                   processors: lambda { |_a| [:test] }
+                                 }
+                               },
                                processors: [:thumbnail]
     end
 
@@ -195,13 +193,12 @@ describe Paperclip::Style do
       @attachment = attachment path: ":basename.:extension",
                                styles: {
                                  thumb: "100x100",
-                                 large: {geometry: "400x400",
-                                            convert_options: "-do_stuff",
-                                            source_file_options: "-do_extra_stuff"
-                                 }
+                                 large: { geometry: "400x400",
+                                          convert_options: "-do_stuff",
+                                          source_file_options: "-do_extra_stuff" }
                                }
       @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
+      allow(@file).to receive(:original_filename).and_return("file.jpg")
     end
 
     it "has empty options for :thumb style" do
@@ -216,40 +213,39 @@ describe Paperclip::Style do
   end
 
   context "A style rule supplied with default format" do
-     before do
-       @attachment = attachment default_format: :png,
-                                styles: {
-                                  asstring: "300x300#",
-                                  aslist: ["300x300#", :jpg],
-                                  ashash: {
-                                    geometry: "300x300#",
-                                    convert_options: "-do_stuff"
-                                  }
-                                }
-     end
-
-     it "has the right number of styles" do
-       expect(@attachment.styles).to be_a Hash
-       assert_equal 3, @attachment.styles.size
-     end
-
-     it "has styles as Style objects" do
-       [:aslist, :ashash, :aslist].each do |s|
-         expect(@attachment.styles[s]).to be_a Paperclip::Style
-       end
-     end
-
-     it "has the right geometries" do
-       [:aslist, :ashash, :aslist].each do |s|
-         assert_equal @attachment.styles[s].geometry, "300x300#"
-       end
-     end
-
-     it "has the right formats" do
-       assert_equal @attachment.styles[:aslist].format,    :jpg
-       assert_equal @attachment.styles[:ashash].format,    :png
-       assert_equal @attachment.styles[:asstring].format,  :png
-     end
-
-   end
+    before do
+      @attachment = attachment default_format: :png,
+                               styles: {
+                                 asstring: "300x300#",
+                                 aslist: ["300x300#", :jpg],
+                                 ashash: {
+                                   geometry: "300x300#",
+                                   convert_options: "-do_stuff"
+                                 }
+                               }
+    end
+
+    it "has the right number of styles" do
+      expect(@attachment.styles).to be_a Hash
+      assert_equal 3, @attachment.styles.size
+    end
+
+    it "has styles as Style objects" do
+      [:aslist, :ashash, :aslist].each do |s|
+        expect(@attachment.styles[s]).to be_a Paperclip::Style
+      end
+    end
+
+    it "has the right geometries" do
+      [:aslist, :ashash, :aslist].each do |s|
+        assert_equal @attachment.styles[s].geometry, "300x300#"
+      end
+    end
+
+    it "has the right formats" do
+      assert_equal @attachment.styles[:aslist].format,    :jpg
+      assert_equal @attachment.styles[:ashash].format,    :png
+      assert_equal @attachment.styles[:asstring].format,  :png
+    end
+  end
 end

data/spec/paperclip/tempfile_factory_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::TempfileFactory do
   it "is able to generate a tempfile with the right name" do
@@ -17,14 +17,14 @@ describe Paperclip::TempfileFactory do
   end
 
   it "is able to generate a tempfile from a file with a really long name" do
-    filename = "#{"longfilename" * 100}.png"
+    filename = "#{'longfilename' * 100}.png"
     file = subject.generate(filename)
     assert File.extname(file.path), "png"
   end
 
-  it 'is able to take nothing as a parameter and not error' do
-   file = subject.generate
-   assert File.exist?(file.path)
+  it "is able to take nothing as a parameter and not error" do
+    file = subject.generate
+    assert File.exist?(file.path)
   end
 
   it "does not throw Errno::ENAMETOOLONG when it has a really long name" do

data/spec/paperclip/thumbnail_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Thumbnail do
   context "An image" do
     before do
-      @file = File.new(fixture_file("5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), "rb")
     end
 
     after { @file.close }
@@ -11,15 +11,14 @@ describe Paperclip::Thumbnail do
     [["600x600>", "434x66"],
      ["400x400>", "400x61"],
      ["32x32<", "434x66"],
-     [nil, "434x66"]
-    ].each do |args|
+     [nil, "434x66"]].each do |args|
       context "being thumbnailed with a geometry of #{args[0]}" do
         before do
           @thumb = Paperclip::Thumbnail.new(@file, geometry: args[0])
         end
 
         it "starts with dimensions of 434x66" do
-          cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
+          cmd = %[identify -format "%wx%h" "#{@file.path}"]
           assert_equal "434x66", `#{cmd}`.chomp
         end
 
@@ -33,7 +32,7 @@ describe Paperclip::Thumbnail do
           end
 
           it "is the size we expect it to be" do
-            cmd = %Q[identify -format "%wx%h" "#{@thumb_result.path}"]
+            cmd = %[identify -format "%wx%h" "#{@thumb_result.path}"]
             assert_equal args[1], `#{cmd}`.chomp
           end
         end
@@ -46,18 +45,18 @@ describe Paperclip::Thumbnail do
       end
 
       it "lets us know when a command isn't found versus a processing error" do
-        old_path = ENV['PATH']
+        old_path = ENV["PATH"]
         begin
-          Terrapin::CommandLine.path = ''
-          Paperclip.options[:command_path] = ''
-          ENV['PATH'] = ''
+          Terrapin::CommandLine.path = ""
+          Paperclip.options[:command_path] = ""
+          ENV["PATH"] = ""
           assert_raises(Paperclip::Errors::CommandNotFoundError) do
             silence_stream(STDERR) do
               @thumb.make
             end
           end
         ensure
-          ENV['PATH'] = old_path
+          ENV["PATH"] = old_path
         end
       end
 
@@ -83,9 +82,9 @@ describe Paperclip::Thumbnail do
       end
 
       it "sends the right command to convert when sent #make" do
-        @thumb.expects(:convert).with do |*arg|
+        expect(@thumb).to receive(:convert) do |*arg|
           arg[0] == ':source -auto-orient -resize "x50" -crop "100x50+114+0" +repage :dest' &&
-          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+            arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -96,8 +95,8 @@ describe Paperclip::Thumbnail do
       end
     end
 
-    it 'crops a EXIF-rotated image properly' do
-      file = File.new(fixture_file('rotated.jpg'))
+    it "crops a EXIF-rotated image properly" do
+      file = File.new(fixture_file("rotated.jpg"))
       thumb = Paperclip::Thumbnail.new(file, geometry: "50x50#")
 
       output_file = thumb.make
@@ -118,9 +117,9 @@ describe Paperclip::Thumbnail do
       end
 
       it "sends the right command to convert when sent #make" do
-        @thumb.expects(:convert).with do |*arg|
+        expect(@thumb).to receive(:convert) do |*arg|
           arg[0] == '-strip :source -auto-orient -resize "x50" -crop "100x50+114+0" +repage :dest' &&
-          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+            arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -159,9 +158,9 @@ describe Paperclip::Thumbnail do
       end
 
       it "sends the right command to convert when sent #make" do
-        @thumb.expects(:convert).with do |*arg|
+        expect(@thumb).to receive(:convert) do |*arg|
           arg[0] == ':source -auto-orient -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
-          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+            arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -179,26 +178,28 @@ 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 do
               @thumb.make
-            end
+            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']
+          old_path = ENV["PATH"]
           begin
-            Terrapin::CommandLine.path = ''
-            Paperclip.options[:command_path] = ''
-            ENV['PATH'] = ''
+            Terrapin::CommandLine.path = ""
+            Paperclip.options[:command_path] = ""
+            ENV["PATH"] = ""
             assert_raises(Paperclip::Errors::CommandNotFoundError) do
               silence_stream(STDERR) do
                 @thumb.make
               end
             end
           ensure
-            ENV['PATH'] = old_path
+            ENV["PATH"] = old_path
           end
         end
       end
@@ -219,9 +220,9 @@ describe Paperclip::Thumbnail do
     context "being thumbnailed with default animated option (true)" do
       it "calls identify to check for animated images when sent #make" do
         thumb = Paperclip::Thumbnail.new(@file, geometry: "100x50#")
-        thumb.expects(:identify).at_least_once.with do |*arg|
-          arg[0] == '-format %m :file' &&
-          arg[1][:file] == "#{File.expand_path(thumb.file.path)}[0]"
+        expect(thumb).to receive(:identify).at_least(1).times do |*arg|
+          arg[0] == "-format %m :file" &&
+            arg[1][:file] == "#{File.expand_path(thumb.file.path)}[0]"
         end
         thumb.make
       end
@@ -234,27 +235,27 @@ describe Paperclip::Thumbnail do
 
       it "produces the appropriate transformation_command" do
         GeoParser = Class.new do
-          def self.from_file(file)
+          def self.from_file(_file)
             new
           end
 
-          def transformation_to(target, should_crop)
+          def transformation_to(_target, _should_crop)
             ["SCALE", "CROP"]
           end
         end
 
-        thumb = Paperclip::Thumbnail.new(@file, geometry: '50x50', file_geometry_parser: ::GeoParser)
+        thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", file_geometry_parser: ::GeoParser)
 
         transformation_command = thumb.transformation_command
 
-        assert transformation_command.include?('-crop'),
-          %{expected #{transformation_command.inspect} to include '-crop'}
+        assert transformation_command.include?("-crop"),
+               %{expected #{transformation_command.inspect} to include '-crop'}
         assert transformation_command.include?('"CROP"'),
-          %{expected #{transformation_command.inspect} to include '"CROP"'}
-        assert transformation_command.include?('-resize'),
-          %{expected #{transformation_command.inspect} to include '-resize'}
+               %{expected #{transformation_command.inspect} to include '"CROP"'}
+        assert transformation_command.include?("-resize"),
+               %{expected #{transformation_command.inspect} to include '-resize'}
         assert transformation_command.include?('"SCALE"'),
-          %{expected #{transformation_command.inspect} to include '"SCALE"'}
+               %{expected #{transformation_command.inspect} to include '"SCALE"'}
       end
     end
 
@@ -265,7 +266,7 @@ describe Paperclip::Thumbnail do
 
       it "produces the appropriate transformation_command" do
         GeoParser = Class.new do
-          def self.parse(s)
+          def self.parse(_s)
             new
           end
 
@@ -274,26 +275,26 @@ describe Paperclip::Thumbnail do
           end
         end
 
-        thumb = Paperclip::Thumbnail.new(@file, geometry: '50x50', string_geometry_parser: ::GeoParser)
+        thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", string_geometry_parser: ::GeoParser)
 
         transformation_command = thumb.transformation_command
 
         assert transformation_command.include?('"151x167"'),
-          %{expected #{transformation_command.inspect} to include '151x167'}
+               %{expected #{transformation_command.inspect} to include '151x167'}
       end
     end
   end
 
   context "A multipage PDF" do
     before do
-      @file = File.new(fixture_file("twopage.pdf"), 'rb')
+      @file = File.new(fixture_file("twopage.pdf"), "rb")
     end
 
     after { @file.close }
 
     it "starts with two pages with dimensions 612x792" do
-      cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
-      assert_equal "612x792"*2, `#{cmd}`.chomp
+      cmd = %[identify -format "%wx%h" "#{@file.path}"]
+      assert_equal "612x792" * 2, `#{cmd}`.chomp
     end
 
     context "being thumbnailed at 100x100 with cropping" do
@@ -319,37 +320,37 @@ describe Paperclip::Thumbnail do
 
   context "An animated gif" do
     before do
-      @file = File.new(fixture_file("animated.gif"), 'rb')
+      @file = File.new(fixture_file("animated.gif"), "rb")
     end
 
     after { @file.close }
 
     it "starts with 12 frames with size 100x100" do
-      cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
-      assert_equal "100x100"*12, `#{cmd}`.chomp
+      cmd = %[identify -format "%wx%h" "#{@file.path}"]
+      assert_equal "100x100" * 12, `#{cmd}`.chomp
     end
 
     context "with static output" do
       before do
-       @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", format: :jpg)
+        @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", format: :jpg)
       end
 
       it "creates the single frame thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
+        cmd = %[identify -format "%wx%h" "#{dst.path}"]
         assert_equal "50x50", `#{cmd}`.chomp
       end
     end
 
     context "with animated output format" do
       before do
-       @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", format: :gif)
+        @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", format: :gif)
       end
 
       it "creates the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
-        frames = `#{cmd}`.chomp.split(',')
+        cmd = %[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(",")
         assert_equal 12, frames.size
         assert_frame_dimensions (45..50), frames
       end
@@ -365,13 +366,13 @@ describe Paperclip::Thumbnail do
 
     context "with omitted output format" do
       before do
-       @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50")
+        @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50")
       end
 
       it "creates the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
-        frames = `#{cmd}`.chomp.split(',')
+        cmd = %[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(",")
         assert_equal 12, frames.size
         assert_frame_dimensions (45..50), frames
       end
@@ -387,14 +388,14 @@ describe Paperclip::Thumbnail do
 
     context "with unidentified source format" do
       before do
-        @unidentified_file = File.new(fixture_file("animated.unknown"), 'rb')
+        @unidentified_file = File.new(fixture_file("animated.unknown"), "rb")
         @thumb = Paperclip::Thumbnail.new(@file, geometry: "60x60")
       end
 
       it "creates the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
-        frames = `#{cmd}`.chomp.split(',')
+        cmd = %[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(",")
         assert_equal 12, frames.size
         assert_frame_dimensions (55..60), frames
       end
@@ -410,14 +411,14 @@ describe Paperclip::Thumbnail do
 
     context "with no source format" do
       before do
-        @unidentified_file = File.new(fixture_file("animated"), 'rb')
+        @unidentified_file = File.new(fixture_file("animated"), "rb")
         @thumb = Paperclip::Thumbnail.new(@file, geometry: "70x70")
       end
 
       it "creates the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
-        frames = `#{cmd}`.chomp.split(',')
+        cmd = %[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(",")
         assert_equal 12, frames.size
         assert_frame_dimensions (60..70), frames
       end
@@ -433,18 +434,18 @@ describe Paperclip::Thumbnail do
 
     context "with animated option set to false" do
       before do
-       @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", animated: false)
+        @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", animated: false)
       end
 
       it "outputs the gif format" do
         dst = @thumb.make
-        cmd = %Q[identify "#{dst.path}"]
+        cmd = %[identify "#{dst.path}"]
         assert_match /GIF/, `#{cmd}`.chomp
       end
 
       it "creates the single frame thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
+        cmd = %[identify -format "%wx%h" "#{dst.path}"]
         assert_equal "50x50", `#{cmd}`.chomp
       end
     end
@@ -455,7 +456,7 @@ describe Paperclip::Thumbnail do
           @file,
           geometry: "50x50",
           frame_index: 5,
-          format: :jpg,
+          format: :jpg
         )
       end
 
@@ -471,7 +472,7 @@ describe Paperclip::Thumbnail do
           @file,
           geometry: "50x50",
           frame_index: 20,
-          format: :jpg,
+          format: :jpg
         )
       end