paperclip 4.1.1 → 4.2.0

data/spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+require 'paperclip/matchers'
+
+describe Paperclip::Shoulda::Matchers::ValidateAttachmentPresenceMatcher do
+  extend Paperclip::Shoulda::Matchers
+
+  before do
+    reset_table("dummies") do |d|
+      d.string :avatar_file_name
+    end
+    reset_class "Dummy"
+    Dummy.has_attached_file :avatar
+    Dummy.do_not_validate_attachment_file_type :avatar
+  end
+
+  it "rejects a class with no validation" do
+    expect(matcher).to_not accept(Dummy)
+  end
+
+  it "accepts a class with a matching validation" do
+    Dummy.validates_attachment_presence :avatar
+    expect(matcher).to accept(Dummy)
+  end
+
+  it "accepts an instance with other attachment validations" do
+    reset_table("dummies") do |d|
+      d.string :avatar_file_name
+      d.string :avatar_content_type
+    end
+    Dummy.class_eval do
+      validates_attachment_presence :avatar
+      validates_attachment_content_type :avatar, content_type: 'image/gif'
+    end
+    dummy = Dummy.new
+
+    dummy.avatar = File.new fixture_file('5k.png')
+
+    expect(matcher).to accept(dummy)
+  end
+
+  context "using an :if to control the validation" do
+    before do
+      Dummy.class_eval do
+        validates_attachment_presence :avatar, if: :go
+        attr_accessor :go
+      end
+    end
+
+    it "runs the validation if the control is true" do
+      dummy = Dummy.new
+      dummy.avatar = nil
+      dummy.go = true
+      expect(matcher).to accept(dummy)
+    end
+
+    it "does not run the validation if the control is false" do
+      dummy = Dummy.new
+      dummy.avatar = nil
+      dummy.go = false
+      expect(matcher).to_not accept(dummy)
+    end
+  end
+
+  private
+
+  def matcher
+    self.class.validate_attachment_presence(:avatar)
+  end
+end

data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+require 'paperclip/matchers'
+
+describe Paperclip::Shoulda::Matchers::ValidateAttachmentSizeMatcher do
+  extend Paperclip::Shoulda::Matchers
+
+  before do
+    reset_table("dummies") do |d|
+      d.string :avatar_file_name
+      d.integer :avatar_file_size
+    end
+    reset_class "Dummy"
+    Dummy.do_not_validate_attachment_file_type :avatar
+    Dummy.has_attached_file :avatar
+  end
+
+  context "Limiting size" do
+    it "rejects a class with no validation" do
+      expect(matcher.in(256..1024)).to_not accept(Dummy)
+    end
+
+    it "rejects a class with a validation that's too high" do
+      Dummy.validates_attachment_size :avatar, in: 256..2048
+      expect(matcher.in(256..1024)).to_not accept(Dummy)
+    end
+
+    it "accepts a class with a validation that's too low" do
+      Dummy.validates_attachment_size :avatar, in: 0..1024
+      expect(matcher.in(256..1024)).to_not accept(Dummy)
+    end
+
+    it "accepts a class with a validation that matches" do
+      Dummy.validates_attachment_size :avatar, in: 256..1024
+      expect(matcher.in(256..1024)).to accept(Dummy)
+    end
+  end
+
+  context "allowing anything" do
+    it "given a class with an upper limit" do
+      Dummy.validates_attachment_size :avatar, less_than: 1
+      expect(matcher).to accept(Dummy)
+    end
+
+    it "given a class with a lower limit" do
+      Dummy.validates_attachment_size :avatar, greater_than: 1
+      expect(matcher).to accept(Dummy)
+    end
+  end
+
+  context "using an :if to control the validation" do
+    before do
+      Dummy.class_eval do
+        validates_attachment_size :avatar, greater_than: 1024, if: :go
+        attr_accessor :go
+      end
+    end
+
+    it "run the validation if the control is true" do
+      dummy = Dummy.new
+      dummy.go = true
+      expect(matcher.greater_than(1024)).to accept(dummy)
+    end
+
+    it "not run the validation if the control is false" do
+      dummy = Dummy.new
+      dummy.go = false
+      expect(matcher.greater_than(1024)).to_not accept(dummy)
+    end
+  end
+
+  context "post processing" do
+    before do
+      Dummy.validates_attachment_size :avatar, greater_than: 1024
+    end
+
+    it "be skipped" do
+      dummy = Dummy.new
+      dummy.avatar.expects(:post_process).never
+      expect(matcher.greater_than(1024)).to accept(dummy)
+    end
+  end
+
+  private
+
+  def matcher
+    self.class.validate_attachment_size(:avatar)
+  end
+end

data/{test/media_type_spoof_detector_test.rb → spec/paperclip/media_type_spoof_detector_spec.rb}

@@ -1,32 +1,37 @@
-require './test/helper'
+require 'spec_helper'
 
-class MediaTypeSpoofDetectorTest < Test::Unit::TestCase
-  should 'reject a file that is named .html and identifies as PNG' do
+describe Paperclip::MediaTypeSpoofDetector do
+  it 'rejects a file that is named .html and identifies as PNG' do
     file = File.open(fixture_file("5k.png"))
     assert Paperclip::MediaTypeSpoofDetector.using(file, "5k.html").spoofed?
   end
 
-  should 'not reject a file that is named .jpg and identifies as PNG' do
+  it 'does not reject a file that is named .jpg and identifies as PNG' do
     file = File.open(fixture_file("5k.png"))
     assert ! Paperclip::MediaTypeSpoofDetector.using(file, "5k.jpg").spoofed?
   end
 
-  should 'not reject a file that is named .html and identifies as HTML' do
+  it 'does not reject a file that is named .html and identifies as HTML' do
     file = File.open(fixture_file("empty.html"))
     assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html").spoofed?
   end
 
-  should 'not reject a file that does not have a name' do
+  it 'does not reject a file that does not have a name' do
     file = File.open(fixture_file("empty.html"))
     assert ! Paperclip::MediaTypeSpoofDetector.using(file, "").spoofed?
   end
 
-  should 'not reject when the supplied file is an IOAdapter' do
+  it 'does not reject a file that does have an extension' do
+    file = File.open(fixture_file("empty.html"))
+    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "data").spoofed?
+  end
+
+  it 'does not reject when the supplied file is an IOAdapter' do
     adapter = Paperclip.io_adapters.for(File.new(fixture_file("5k.png")))
     assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename).spoofed?
   end
 
-  should 'not reject when the extension => content_type is in :content_type_mappings' do
+  it 'does not reject when the extension => content_type is in :content_type_mappings' do
     begin
       Paperclip.options[:content_type_mappings] = { pem: "text/plain" }
       file = Tempfile.open(["test", ".PEM"])

data/spec/paperclip/meta_class_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'Metaclasses' do
+  context "A meta-class of dummy" do
+    if active_support_version >= "4.1" || ruby_version < "2.1"
+      before do
+        rebuild_model("Dummy")
+        reset_class("Dummy")
+      end
+
+      it "is able to use Paperclip like a normal class" do
+        @dummy = Dummy.new
+
+        assert_nothing_raised do
+          rebuild_meta_class_of(@dummy)
+        end
+      end
+
+      it "works like any other instance" do
+        @dummy = Dummy.new
+        rebuild_meta_class_of(@dummy)
+
+        assert_nothing_raised do
+          @dummy.avatar = File.new(fixture_file("5k.png"), 'rb')
+        end
+        assert @dummy.save
+      end
+    end
+  end
+end

data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe 'Missing Attachment Styles' do
+  before do
+    Paperclip::AttachmentRegistry.clear
+  end
+
+  after do
+    File.unlink(Paperclip.registered_attachments_styles_path) rescue nil
+  end
+
+  it "enables to get and set path to registered styles file" do
+    assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
+    Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachments.yml'
+    assert_equal '/tmp/config/paperclip_attachments.yml', Paperclip.registered_attachments_styles_path
+    Paperclip.registered_attachments_styles_path = nil
+    assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
+  end
+
+  it "is able to get current attachment styles" do
+    assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
+    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    expected_hash = { Dummy: {avatar: [:big, :croppable]}}
+    assert_equal expected_hash, Paperclip.send(:current_attachments_styles)
+  end
+
+  it "is able to save current attachment styles for further comparison" do
+    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    Paperclip.save_current_attachments_styles!
+    expected_hash = { Dummy: {avatar: [:big, :croppable]}}
+    assert_equal expected_hash, YAML.load_file(Paperclip.registered_attachments_styles_path)
+  end
+
+  it "is able to read registered attachment styles from file" do
+    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    Paperclip.save_current_attachments_styles!
+    expected_hash = { Dummy: {avatar: [:big, :croppable]}}
+    assert_equal expected_hash, Paperclip.send(:get_registered_attachments_styles)
+  end
+
+  it "is able to calculate differences between registered styles and current styles" do
+    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    Paperclip.save_current_attachments_styles!
+    rebuild_model styles: {thumb: 'x100', export: 'x400>', croppable: '600x600>', big: '1000x1000>'}
+    expected_hash = { Dummy: {avatar: [:export, :thumb]} }
+    assert_equal expected_hash, Paperclip.missing_attachments_styles
+
+    ActiveRecord::Base.connection.create_table :books, force: true
+    class ::Book < ActiveRecord::Base
+      has_attached_file :cover, styles: {small: 'x100', large: '1000x1000>'}
+      has_attached_file :sample, styles: {thumb: 'x100'}
+    end
+
+    expected_hash = {
+      Dummy: {avatar: [:export, :thumb]},
+      Book: {sample: [:thumb], cover: [:large, :small]}
+    }
+    assert_equal expected_hash, Paperclip.missing_attachments_styles
+    Paperclip.save_current_attachments_styles!
+    assert_equal Hash.new, Paperclip.missing_attachments_styles
+  end
+
+  it "is able to calculate differences when a new attachment is added to a model" do
+    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    Paperclip.save_current_attachments_styles!
+
+    class ::Dummy
+      has_attached_file :photo, styles: {small: 'x100', large: '1000x1000>'}
+    end
+
+    expected_hash = {
+      Dummy: {photo: [:large, :small]}
+    }
+    assert_equal expected_hash, Paperclip.missing_attachments_styles
+    Paperclip.save_current_attachments_styles!
+    assert_equal Hash.new, Paperclip.missing_attachments_styles
+  end
+
+  # It's impossible to build styles hash without loading from database whole bunch of records
+  it "skips lambda-styles" do
+    rebuild_model styles: lambda{ |attachment| attachment.instance.other == 'a' ? {thumb: "50x50#"} : {large: "400x400"} }
+    assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
+  end
+end

data/{test/paperclip_test.rb → spec/paperclip/paperclip_spec.rb}

@@ -1,29 +1,29 @@
-require './test/helper'
+require 'spec_helper'
 
-class PaperclipTest < Test::Unit::TestCase
-  context "Calling Paperclip.run" do
-    setup do
+describe Paperclip do
+  context ".run" do
+    before do
       Paperclip.options[:log_command] = false
       Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
       @original_command_line_path = Cocaine::CommandLine.path
     end
 
-    teardown do
+    after do
       Paperclip.options[:log_command] = true
       Cocaine::CommandLine.path = @original_command_line_path
     end
 
-    should "run the command with Cocaine" do
+    it "runs the command with Cocaine" do
       Paperclip.run("convert", "stuff")
     end
 
-    should "save Cocaine::CommandLine.path that set before" do
+    it "saves Cocaine::CommandLine.path that set before" do
       Cocaine::CommandLine.path = "/opt/my_app/bin"
       Paperclip.run("convert", "stuff")
       assert_equal [Cocaine::CommandLine.path].flatten.include?("/opt/my_app/bin"), true
     end
 
-    should "not duplicate Cocaine::CommandLine.path on multiple runs" do
+    it "does not duplicate Cocaine::CommandLine.path on multiple runs" do
       Cocaine::CommandLine.expects(:new).with("convert", "more_stuff", {}).returns(stub(:run))
       Cocaine::CommandLine.path = nil
       Paperclip.options[:command_path] = "/opt/my_app/bin"
@@ -33,7 +33,7 @@ class PaperclipTest < Test::Unit::TestCase
     end
   end
 
-  should 'not raise errors when doing a lot of running' do
+  it 'does not raise errors when doing a lot of running' do
     Paperclip.options[:command_path] = ["/usr/local/bin"] * 1024
     Cocaine::CommandLine.path = "/something/else"
     100.times do |x|
@@ -42,80 +42,80 @@ class PaperclipTest < Test::Unit::TestCase
   end
 
   context "Calling Paperclip.log without options[:logger] set" do
-    setup do
+    before do
       Paperclip.logger = nil
       Paperclip.options[:logger] = nil
     end
 
-    teardown do
+    after do
       Paperclip.options[:logger] = ActiveRecord::Base.logger
       Paperclip.logger = ActiveRecord::Base.logger
     end
 
-    should "not raise an error when log is called" do
+    it "does not raise an error when log is called" do
       silence_stream(STDOUT) do
         Paperclip.log('something')
       end
     end
   end
   context "Calling Paperclip.run with a logger" do
-    should "pass the defined logger if :log_command is set" do
+    it "passes the defined logger if :log_command is set" do
       Paperclip.options[:log_command] = true
-      Cocaine::CommandLine.expects(:new).with("convert", "stuff", :logger => Paperclip.logger).returns(stub(:run))
+      Cocaine::CommandLine.expects(:new).with("convert", "stuff", logger: Paperclip.logger).returns(stub(:run))
       Paperclip.run("convert", "stuff")
     end
   end
 
   context "Paperclip.each_instance_with_attachment" do
-    setup do
+    before do
       @file = File.new(fixture_file("5k.png"), 'rb')
-      d1 = Dummy.create(:avatar => @file)
+      d1 = Dummy.create(avatar: @file)
       d2 = Dummy.create
-      d3 = Dummy.create(:avatar => @file)
+      d3 = Dummy.create(avatar: @file)
       @expected = [d1, d3]
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "yield every instance of a model that has an attachment" do
+    it "yields every instance of a model that has an attachment" do
       actual = []
       Paperclip.each_instance_with_attachment("Dummy", "avatar") do |instance|
         actual << instance
       end
-      assert_same_elements @expected, actual
+      expect(actual).to match_array @expected
     end
   end
 
-  should "raise when sent #processor and the name of a class that doesn't exist" do
-    assert_raises(NameError){ Paperclip.processor(:boogey_man) }
+  it "raises when sent #processor and the name of a class that doesn't exist" do
+    assert_raises(LoadError){ Paperclip.processor(:boogey_man) }
   end
 
-  should "return a class when sent #processor and the name of a class under Paperclip" do
+  it "returns a class when sent #processor and the name of a class under Paperclip" do
     assert_equal ::Paperclip::Thumbnail, Paperclip.processor(:thumbnail)
   end
 
-  should "get a class from a namespaced class name" do
+  it "gets a class from a namespaced class name" do
     class ::One; class Two; end; end
     assert_equal ::One::Two, Paperclip.class_for("One::Two")
   end
 
-  should "raise when class doesn't exist in specified namespace" do
+  it "raises when class doesn't exist in specified namespace" do
     class ::Three; end
     class ::Four; end
-    assert_raise NameError do
+    assert_raises NameError do
       Paperclip.class_for("Three::Four")
     end
   end
 
   context "An ActiveRecord model with an 'avatar' attachment" do
-    setup do
-      rebuild_model :path => "tmp/:class/omg/:style.:extension"
+    before do
+      rebuild_model path: "tmp/:class/omg/:style.:extension"
       @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "not error when trying to also create a 'blah' attachment" do
+    it "does not error when trying to also create a 'blah' attachment" do
       assert_nothing_raised do
         Dummy.class_eval do
           has_attached_file :blah
@@ -125,22 +125,22 @@ class PaperclipTest < Test::Unit::TestCase
 
     if using_protected_attributes?
       context "that is attr_protected" do
-        setup do
+        before do
           Dummy.class_eval do
             attr_protected :avatar
           end
           @dummy = Dummy.new
         end
 
-        should "not assign the avatar on mass-set" do
-          @dummy.attributes = { :other => "I'm set!",
-                                :avatar => @file }
+        it "does not assign the avatar on mass-set" do
+          @dummy.attributes = { other: "I'm set!",
+                                avatar: @file }
 
           assert_equal "I'm set!", @dummy.other
           assert ! @dummy.avatar?
         end
 
-        should "still allow assigment on normal set" do
+        it "allows assigment on normal set" do
           @dummy.other  = "I'm set!"
           @dummy.avatar = @file
 
@@ -151,42 +151,42 @@ class PaperclipTest < Test::Unit::TestCase
     end
 
     context "with a subclass" do
-      setup do
+      before do
         class ::SubDummy < Dummy; end
       end
 
-      should "be able to use the attachment from the subclass" do
+      it "is able to use the attachment from the subclass" do
         assert_nothing_raised do
-          @subdummy = SubDummy.create(:avatar => @file)
+          @subdummy = SubDummy.create(avatar: @file)
         end
       end
 
-      teardown do
+      after do
         SubDummy.delete_all
         Object.send(:remove_const, "SubDummy") rescue nil
       end
     end
 
-    should "have an #avatar method" do
+    it "has an avatar getter method" do
       assert Dummy.new.respond_to?(:avatar)
     end
 
-    should "have an #avatar= method" do
+    it "has an avatar setter method" do
       assert Dummy.new.respond_to?(:avatar=)
     end
 
     context "that is valid" do
-      setup do
+      before do
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
 
-      should "be valid" do
+      it "is valid" do
         assert @dummy.valid?
       end
     end
 
-    should "not have Attachment in the ActiveRecord::Base namespace" do
+    it "does not have Attachment in the ActiveRecord::Base namespace" do
       assert_raises(NameError) do
         ActiveRecord::Base::Attachment
       end
@@ -194,7 +194,7 @@ class PaperclipTest < Test::Unit::TestCase
   end
 
   context "configuring a custom processor" do
-    setup do
+    before do
       @freedom_processor = Class.new do
         def make(file, options = {}, attachment = nil)
           file
@@ -206,11 +206,11 @@ class PaperclipTest < Test::Unit::TestCase
       end
     end
 
-    should "be able to find the custom processor" do
+    it "is able to find the custom processor" do
       assert_equal @freedom_processor, Paperclip.processor(:freedom)
     end
 
-    teardown do
+    after do
       Paperclip.clear_processors!
     end
   end