paperclip 3.5.4 → 4.3.7

data/paperclip.gemspec

@@ -12,38 +12,40 @@ Gem::Specification.new do |s|
   s.description       = "Easy upload management for ActiveRecord"
   s.license           = "MIT"
 
-  s.rubyforge_project = "paperclip"
-
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.requirements << "ImageMagick"
   s.required_ruby_version = ">= 1.9.2"
 
-  s.add_dependency('activemodel', '>= 3.0.0')
-  s.add_dependency('activesupport', '>= 3.0.0')
-  s.add_dependency('cocaine', '~> 0.5.3')
+  s.add_dependency('activemodel', '>= 3.2.0')
+  s.add_dependency('activesupport', '>= 3.2.0')
+  s.add_dependency('cocaine', '~> 0.5.5')
   s.add_dependency('mime-types')
+  s.add_dependency('mimemagic', '0.3.0')
 
-  s.add_development_dependency('activerecord', '>= 3.0.0')
+  s.add_development_dependency('activerecord', '>= 3.2.0')
   s.add_development_dependency('shoulda')
+  s.add_development_dependency('rspec', '~> 3.0')
   s.add_development_dependency('appraisal')
   s.add_development_dependency('mocha')
-  s.add_development_dependency('aws-sdk', '>= 1.5.7')
+  s.add_development_dependency('aws-sdk', '>= 1.5.7', "<= 2.0")
   s.add_development_dependency('bourne')
-  s.add_development_dependency('sqlite3', '~> 1.3.4')
-  s.add_development_dependency('cucumber', '~> 1.2.1')
-  s.add_development_dependency('aruba')
+  s.add_development_dependency('cucumber', '~> 1.3.18')
+  s.add_development_dependency('aruba', '~> 0.9.0')
   s.add_development_dependency('nokogiri')
   # Ruby version < 1.9.3 can't install capybara > 2.0.3.
-  s.add_development_dependency('capybara', '= 2.0.3')
+  s.add_development_dependency('capybara')
   s.add_development_dependency('bundler')
-  s.add_development_dependency('fog', '~> 1.0')
+  s.add_development_dependency('fog-aws')
+  s.add_development_dependency('fog-local')
   s.add_development_dependency('launchy')
   s.add_development_dependency('rake')
   s.add_development_dependency('fakeweb')
   s.add_development_dependency('railties')
-  s.add_development_dependency('actionmailer', '>= 3.0.0')
+  s.add_development_dependency('actionmailer', '>= 3.2.0')
+  s.add_development_dependency('generator_spec')
+  s.add_development_dependency('timecop')
 end

data/shoulda_macros/paperclip.rb

@@ -132,4 +132,3 @@ elsif defined?(Test)
     extend Paperclip::Shoulda
   end
 end
-

data/spec/paperclip/attachment_definitions_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "Attachment Definitions" do
+  it 'returns all of the attachments on the class' do
+    reset_class "Dummy"
+    Dummy.has_attached_file :avatar, {path: "abc"}
+    Dummy.has_attached_file :other_attachment, {url: "123"}
+    Dummy.do_not_validate_attachment_file_type :avatar
+    expected = {avatar: {path: "abc"}, other_attachment: {url: "123"}}
+
+    expect(Dummy.attachment_definitions).to eq expected
+  end
+end

data/{test/attachment_processing_test.rb → spec/paperclip/attachment_processing_spec.rb}

@@ -1,16 +1,15 @@
 # encoding: utf-8
-require './test/helper'
-require 'paperclip/attachment'
-
-class AttachmentProcessingTest < Test::Unit::TestCase
-  def setup
-    rebuild_model
-  end
+require 'spec_helper'
 
+describe 'Attachment Processing' do
   context 'using validates_attachment_content_type' do
-    should 'process attachments given a valid assignment' do
+    before do
+      rebuild_class
+    end
+
+    it 'processes attachments given a valid assignment' do
       file = File.new(fixture_file("5k.png"))
-      Dummy.validates_attachment_content_type :avatar, :content_type => "image/png"
+      Dummy.validates_attachment_content_type :avatar, content_type: "image/png"
       instance = Dummy.new
       attachment = instance.avatar
       attachment.expects(:post_process_styles)
@@ -18,9 +17,9 @@ class AttachmentProcessingTest < Test::Unit::TestCase
       attachment.assign(file)
     end
 
-    should 'not process attachments given an invalid assignment with :not' do
+    it 'does not process attachments given an invalid assignment with :not' do
       file = File.new(fixture_file("5k.png"))
-      Dummy.validates_attachment_content_type :avatar, :not => "image/png"
+      Dummy.validates_attachment_content_type :avatar, not: "image/png"
       instance = Dummy.new
       attachment = instance.avatar
       attachment.expects(:post_process_styles).never
@@ -28,9 +27,9 @@ class AttachmentProcessingTest < Test::Unit::TestCase
       attachment.assign(file)
     end
 
-    should 'not process attachments given an invalid assignment with :content_type' do
+    it 'does not process attachments given an invalid assignment with :content_type' do
       file = File.new(fixture_file("5k.png"))
-      Dummy.validates_attachment_content_type :avatar, :content_type => "image/tiff"
+      Dummy.validates_attachment_content_type :avatar, content_type: "image/tiff"
       instance = Dummy.new
       attachment = instance.avatar
       attachment.expects(:post_process_styles).never
@@ -38,9 +37,9 @@ class AttachmentProcessingTest < Test::Unit::TestCase
       attachment.assign(file)
     end
 
-    should 'when validation :if clause returns false, allow what would be an invalid assignment' do
+    it 'allows what would be an invalid assignment when validation :if clause returns false' do
       invalid_assignment = File.new(fixture_file("5k.png"))
-      Dummy.validates_attachment_content_type :avatar, :content_type => "image/tiff", :if => lambda{false}
+      Dummy.validates_attachment_content_type :avatar, content_type: "image/tiff", if: lambda{false}
       instance = Dummy.new
       attachment = instance.avatar
       attachment.expects(:post_process_styles)
@@ -50,9 +49,9 @@ class AttachmentProcessingTest < Test::Unit::TestCase
   end
 
   context 'using validates_attachment' do
-    should 'process attachments given a valid assignment' do
+    it 'processes attachments given a valid assignment' do
       file = File.new(fixture_file("5k.png"))
-      Dummy.validates_attachment :avatar, :content_type => {:content_type => "image/png"}
+      Dummy.validates_attachment :avatar, content_type: {content_type: "image/png"}
       instance = Dummy.new
       attachment = instance.avatar
       attachment.expects(:post_process_styles)
@@ -60,9 +59,9 @@ class AttachmentProcessingTest < Test::Unit::TestCase
       attachment.assign(file)
     end
 
-    should 'not process attachments given an invalid assignment with :not' do
+    it 'does not process attachments given an invalid assignment with :not' do
       file = File.new(fixture_file("5k.png"))
-      Dummy.validates_attachment :avatar, :content_type => {:not => "image/png"}
+      Dummy.validates_attachment :avatar, content_type: {not: "image/png"}
       instance = Dummy.new
       attachment = instance.avatar
       attachment.expects(:post_process_styles).never
@@ -70,9 +69,9 @@ class AttachmentProcessingTest < Test::Unit::TestCase
       attachment.assign(file)
     end
 
-    should 'not process attachments given an invalid assignment with :content_type' do
+    it 'does not process attachments given an invalid assignment with :content_type' do
       file = File.new(fixture_file("5k.png"))
-      Dummy.validates_attachment :avatar, :content_type => {:content_type => "image/tiff"}
+      Dummy.validates_attachment :avatar, content_type: {content_type: "image/tiff"}
       instance = Dummy.new
       attachment = instance.avatar
       attachment.expects(:post_process_styles).never

data/spec/paperclip/attachment_registry_spec.rb

@@ -0,0 +1,130 @@
+require 'spec_helper'
+
+describe 'Attachment Registry' do
+  before do
+    Paperclip::AttachmentRegistry.clear
+  end
+
+  context '.names_for' do
+    it 'includes attachment names for the given class' do
+      foo = Class.new
+      Paperclip::AttachmentRegistry.register(foo, :avatar, {})
+
+      assert_equal [:avatar], Paperclip::AttachmentRegistry.names_for(foo)
+    end
+
+    it 'does not include attachment names for other classes' do
+      foo = Class.new
+      bar = Class.new
+      Paperclip::AttachmentRegistry.register(foo, :avatar, {})
+      Paperclip::AttachmentRegistry.register(bar, :lover, {})
+
+      assert_equal [:lover], Paperclip::AttachmentRegistry.names_for(bar)
+    end
+
+    it 'produces the empty array for a missing key' do
+      assert_empty Paperclip::AttachmentRegistry.names_for(Class.new)
+    end
+  end
+
+  context '.each_definition' do
+    it 'calls the block with the class, attachment name, and options' do
+      foo = Class.new
+      expected_accumulations = [
+        [foo, :avatar, { yo: "greeting" }],
+        [foo, :greeter, { ciao: "greeting" }]
+      ]
+      expected_accumulations.each do |args|
+        Paperclip::AttachmentRegistry.register(*args)
+      end
+      accumulations = []
+
+      Paperclip::AttachmentRegistry.each_definition do |*args|
+        accumulations << args
+      end
+
+      assert_equal expected_accumulations, accumulations
+    end
+  end
+
+  context '.definitions_for' do
+    it 'produces the attachment name and options' do
+      expected_definitions = {
+        avatar: { yo: "greeting" },
+        greeter: { ciao: "greeting" }
+      }
+      foo = Class.new
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :avatar,
+        yo: "greeting"
+      )
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :greeter,
+        ciao: "greeting"
+      )
+
+      definitions = Paperclip::AttachmentRegistry.definitions_for(foo)
+
+      assert_equal expected_definitions, definitions
+    end
+
+    it 'produces defintions for subclasses' do
+      expected_definitions = { avatar: { yo: "greeting" } }
+      foo = Class.new
+      bar = Class.new(foo)
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :avatar,
+        expected_definitions[:avatar]
+      )
+
+      definitions = Paperclip::AttachmentRegistry.definitions_for(bar)
+
+      assert_equal expected_definitions, definitions
+    end
+
+    it 'produces defintions for subclasses but deep merging them' do
+      foo_definitions = { avatar: { yo: "greeting" } }
+      bar_definitions = { avatar: { ciao: "greeting" } }
+      expected_definitions = {
+        avatar: {
+          yo: "greeting",
+          ciao: "greeting"
+        }
+      }
+      foo = Class.new
+      bar = Class.new(foo)
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :avatar,
+        foo_definitions[:avatar]
+      )
+      Paperclip::AttachmentRegistry.register(
+        bar,
+        :avatar,
+        bar_definitions[:avatar]
+      )
+
+      definitions = Paperclip::AttachmentRegistry.definitions_for(bar)
+
+      assert_equal expected_definitions, definitions
+    end
+  end
+
+  context '.clear' do
+    it 'removes all of the existing attachment definitions' do
+      foo = Class.new
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :greeter,
+        ciao: "greeting"
+      )
+
+      Paperclip::AttachmentRegistry.clear
+
+      assert_empty Paperclip::AttachmentRegistry.names_for(foo)
+    end
+  end
+end