paperclip 2.4.5 → 2.5.0

data/test/helper.rb

@@ -10,7 +10,8 @@ require 'active_record'
 require 'active_record/version'
 require 'active_support'
 require 'mime/types'
-require 'pry'
+require 'pathname'
+
 require 'pathname'
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
@@ -53,6 +54,10 @@ ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FIL
 ActiveRecord::Base.establish_connection(config['test'])
 Paperclip.options[:logger] = ActiveRecord::Base.logger
 
+Dir[File.join(File.dirname(__FILE__), 'support','*')].each do |f|
+  require f
+end
+
 def reset_class class_name
   ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, class_name) rescue nil
@@ -152,3 +157,21 @@ def with_exitstatus_returning(code)
     `ruby -e 'exit #{saved_exitstatus.to_i}'`
   end
 end
+
+def fixture_file(filename)
+ File.join(File.dirname(__FILE__), 'fixtures', filename)
+end
+
+def assert_success_response(url)
+  Net::HTTP.get_response(URI.parse(url)) do |response|
+    assert_equal "200", response.code,
+      "Expected HTTP response code 200, got #{response.code}"
+  end
+end
+
+def assert_not_found_response(url)
+  Net::HTTP.get_response(URI.parse(url)) do |response|
+    assert_equal "404", response.code,
+      "Expected HTTP response code 404, got #{response.code}"
+  end
+end

data/test/interpolations_test.rb

@@ -88,6 +88,13 @@ class InterpolationsTest < Test::Unit::TestCase
     assert_equal 23, Paperclip::Interpolations.id(attachment, :style)
   end
 
+  should "return nil for attachments to new records" do
+    attachment = mock
+    attachment.expects(:id).returns(nil)
+    attachment.expects(:instance).returns(attachment)
+    assert_nil Paperclip::Interpolations.id(attachment, :style)
+  end
+
   should "return the partitioned id of the attachment when the id is an integer" do
     attachment = mock
     attachment.expects(:id).returns(23)
@@ -102,6 +109,13 @@ class InterpolationsTest < Test::Unit::TestCase
     assert_equal "32f/nj2/3oi", Paperclip::Interpolations.id_partition(attachment, :style)
   end
 
+  should "return nil for the partitioned id of an attachment to a new record (when the id is nil)" do
+    attachment = mock
+    attachment.expects(:id).returns(nil)
+    attachment.expects(:instance).returns(attachment)
+    assert_nil Paperclip::Interpolations.id_partition(attachment, :style)
+  end
+
   should "return the name of the attachment" do
     attachment = mock
     attachment.expects(:name).returns("file")
@@ -181,14 +195,14 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return attachment's hash when passing both arguments" do
     attachment = mock
     fake_hash = "a_wicked_secure_hash"
-    attachment.expects(:hash).returns(fake_hash)
+    attachment.expects(:hash_key).returns(fake_hash)
     assert_equal fake_hash, Paperclip::Interpolations.hash(attachment, :style)
   end
 
   should "return Object#hash when passing no argument" do
     attachment = mock
     fake_hash = "a_wicked_secure_hash"
-    attachment.expects(:hash).never.returns(fake_hash)
+    attachment.expects(:hash_key).never.returns(fake_hash)
     assert_not_equal fake_hash, Paperclip::Interpolations.hash
   end
 

data/test/paperclip_missing_attachment_styles_test.rb

@@ -68,6 +68,22 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
       Paperclip.save_current_attachments_styles!
       assert_equal Hash.new, Paperclip.missing_attachments_styles
     end
+    
+    should "be 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
     should "skip lambda-styles" do

data/test/paperclip_test.rb

@@ -86,6 +86,16 @@ class PaperclipTest < Test::Unit::TestCase
         has_attached_file :blah
       end
     end
+
+    should "not generate warning if attachment is redifined with the same url string but has :class in it" do
+      Paperclip.expects(:log).never
+      Dummy.class_eval do
+        has_attached_file :blah, :url => "/system/:class/:attachment/:id/:style/:filename"
+      end
+      Dummy2.class_eval do
+        has_attached_file :blah, :url => "/system/:class/:attachment/:id/:style/:filename"
+      end
+    end
   end
 
   context "An ActiveRecord model with an 'avatar' attachment" do
@@ -170,38 +180,78 @@ class PaperclipTest < Test::Unit::TestCase
     end
 
     context "a validation with an if guard clause" do
-      setup do
-        Dummy.send(:"validates_attachment_presence", :avatar, :if => lambda{|i| i.foo })
-        @dummy = Dummy.new
-        @dummy.stubs(:avatar_file_name).returns(nil)
-      end
+      context "as a lambda" do
+        setup do
+          Dummy.send(:"validates_attachment_presence", :avatar, :if => lambda{|i| i.foo })
+          @dummy = Dummy.new
+          @dummy.stubs(:avatar_file_name).returns(nil)
+        end
 
-      should "attempt validation if the guard returns true" do
-        @dummy.expects(:foo).returns(true)
-        assert ! @dummy.valid?
+        should "attempt validation if the guard returns true" do
+          @dummy.expects(:foo).returns(true)
+          assert ! @dummy.valid?
+        end
+
+        should "not attempt validation if the guard returns false" do
+          @dummy.expects(:foo).returns(false)
+          assert @dummy.valid?
+        end
       end
 
-      should "not attempt validation if the guard returns false" do
-        @dummy.expects(:foo).returns(false)
-        assert @dummy.valid?
+      context "as a method name" do
+        setup do
+          Dummy.send(:"validates_attachment_presence", :avatar, :if => :foo)
+          @dummy = Dummy.new
+          @dummy.stubs(:avatar_file_name).returns(nil)
+        end
+
+        should "attempt validation if the guard returns true" do
+          @dummy.expects(:foo).returns(true)
+          assert ! @dummy.valid?
+        end
+
+        should "not attempt validation if the guard returns false" do
+          @dummy.expects(:foo).returns(false)
+          assert @dummy.valid?
+        end
       end
     end
 
     context "a validation with an unless guard clause" do
-      setup do
-        Dummy.send(:"validates_attachment_presence", :avatar, :unless => lambda{|i| i.foo })
-        @dummy = Dummy.new
-        @dummy.stubs(:avatar_file_name).returns(nil)
-      end
+      context "as a lambda" do
+        setup do
+          Dummy.send(:"validates_attachment_presence", :avatar, :unless => lambda{|i| i.foo })
+          @dummy = Dummy.new
+          @dummy.stubs(:avatar_file_name).returns(nil)
+        end
+
+        should "attempt validation if the guard returns true" do
+          @dummy.expects(:foo).returns(false)
+          assert ! @dummy.valid?
+        end
 
-      should "attempt validation if the guard returns true" do
-        @dummy.expects(:foo).returns(false)
-        assert ! @dummy.valid?
+        should "not attempt validation if the guard returns false" do
+          @dummy.expects(:foo).returns(true)
+          assert @dummy.valid?
+        end
       end
 
-      should "not attempt validation if the guard returns false" do
-        @dummy.expects(:foo).returns(true)
-        assert @dummy.valid?
+      context "as a method name" do
+        setup do
+          Dummy.send(:"validates_attachment_presence", :avatar, :unless => :foo)
+          @dummy = Dummy.new
+          @dummy.stubs(:avatar_file_name).returns(nil)
+        end
+
+        should "attempt validation if the guard returns true" do
+          @dummy.expects(:foo).returns(false)
+          assert ! @dummy.valid?
+        end
+
+        should "not attempt validation if the guard returns false" do
+          @dummy.expects(:foo).returns(true)
+          assert @dummy.valid?
+        end
       end
     end
 

data/test/schema_test.rb

@@ -0,0 +1,98 @@
+require './test/helper'
+require 'paperclip/schema'
+
+class MockSchema
+  include Paperclip::Schema
+
+  def initialize(table_name = nil)
+    @table_name = table_name
+    @columns = {}
+    @deleted_columns = []
+  end
+
+  def column(name, type)
+    @columns[name] = type
+  end
+
+  def remove_column(table_name, column_name)
+    return if @table_name && @table_name != table_name
+    @columns.delete(column_name)
+    @deleted_columns.push(column_name)
+  end
+
+  def has_column?(column_name)
+    @columns.key?(column_name)
+  end
+
+  def deleted_column?(column_name)
+    @deleted_columns.include?(column_name)
+  end
+
+  def type_of(column_name)
+    @columns[column_name]
+  end
+end
+
+class SchemaTest < Test::Unit::TestCase
+  context "Migrating up" do
+    setup do
+      @schema = MockSchema.new
+      @schema.has_attached_file :avatar
+    end
+
+    should "create the file_name column" do
+      assert @schema.has_column?(:avatar_file_name)
+    end
+
+    should "create the content_type column" do
+      assert @schema.has_column?(:avatar_content_type)
+    end
+
+    should "create the file_size column" do
+      assert @schema.has_column?(:avatar_file_size)
+    end
+
+    should "create the updated_at column" do
+      assert @schema.has_column?(:avatar_updated_at)
+    end
+
+    should "make the file_name column a string" do
+      assert_equal :string, @schema.type_of(:avatar_file_name)
+    end
+
+    should "make the content_type column a string" do
+      assert_equal :string, @schema.type_of(:avatar_content_type)
+    end
+
+    should "make the file_size column an integer" do
+      assert_equal :integer, @schema.type_of(:avatar_file_size)
+    end
+
+    should "make the updated_at column a datetime" do
+      assert_equal :datetime, @schema.type_of(:avatar_updated_at)
+    end
+  end
+
+  context "Migrating down" do
+    setup do
+      @schema = MockSchema.new(:users)
+      @schema.drop_attached_file :users, :avatar
+    end
+
+    should "remove the file_name column" do
+      assert @schema.deleted_column?(:avatar_file_name)
+    end
+
+    should "remove the content_type column" do
+      assert @schema.deleted_column?(:avatar_content_type)
+    end
+
+    should "remove the file_size column" do
+      assert @schema.deleted_column?(:avatar_file_size)
+    end
+
+    should "remove the updated_at column" do
+      assert @schema.deleted_column?(:avatar_updated_at)
+    end
+  end
+end

data/test/storage/filesystem_test.rb

@@ -6,7 +6,7 @@ class FileSystemTest < Test::Unit::TestCase
       rebuild_model :styles => { :thumbnail => "25x25#" }
       @dummy = Dummy.create!
 
-      @dummy.avatar = File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "5k.png"))
+      @dummy.avatar = File.open(fixture_file('5k.png'))
     end
 
     should "allow file assignment" do
@@ -36,7 +36,7 @@ class FileSystemTest < Test::Unit::TestCase
         rebuild_model :styles => { :thumbnail => "25x25#" }
         @dummy = Dummy.create!
 
-        @dummy.avatar = File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "spaced file.png"))
+        @dummy.avatar = File.open(fixture_file('spaced file.png'))
         @dummy.save
       end
 

data/test/{fog_test.rb → storage/fog_test.rb}

@@ -12,9 +12,9 @@ class FogTest < Test::Unit::TestCase
                       :storage => :fog,
                       :url => '/:attachment/:filename',
                       :fog_directory => "paperclip",
-                      :fog_credentials => File.join(File.dirname(__FILE__), 'fixtures', 'fog.yml')
+                      :fog_credentials => fixture_file('fog.yml')
         @dummy = Dummy.new
-        @dummy.avatar = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+        @dummy.avatar = File.new(fixture_file('5k.png'), 'rb')
       end
 
       should "have the proper information loading credentials from a file" do
@@ -28,9 +28,9 @@ class FogTest < Test::Unit::TestCase
                       :storage => :fog,
                       :url => '/:attachment/:filename',
                       :fog_directory => "paperclip",
-                      :fog_credentials => File.open(File.join(File.dirname(__FILE__), 'fixtures', 'fog.yml'))
+                      :fog_credentials => File.open(fixture_file('fog.yml'))
         @dummy = Dummy.new
-        @dummy.avatar = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+        @dummy.avatar = File.new(fixture_file('5k.png'), 'rb')
       end
 
       should "have the proper information loading credentials from a file" do
@@ -50,10 +50,10 @@ class FogTest < Test::Unit::TestCase
                         :aws_secret_access_key => 'AWS_SECRET'
                       }
         @dummy = Dummy.new
-        @dummy.avatar = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+        @dummy.avatar = File.new(fixture_file('5k.png'), 'rb')
       end
       should "be able to interpolate the path without blowing up" do
-        assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../public/avatars/5k.png")),
+        assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../public/avatars/5k.png")),
                      @dummy.avatar.path
       end
 
@@ -98,7 +98,7 @@ class FogTest < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -181,11 +181,38 @@ class FogTest < Test::Unit::TestCase
         end
 
         should 'set the @fog_public instance variable to false' do
-          assert_equal false, @dummy.avatar.options.fog_public
+          assert_equal false, @dummy.avatar.instance_variable_get('@options')[:fog_public]
           assert_equal false, @dummy.avatar.fog_public
         end
       end
 
+      context "with a valid bucket name for a subdomain" do
+        should "provide an url in subdomain style" do
+          assert_match /^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?\d*$/, @dummy.avatar.url
+        end
+      end
+
+      context "with an invalid bucket name for a subdomain" do
+        setup do
+          rebuild_model(@options.merge(:fog_directory => "this_is_invalid"))
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        should "not match the bucket-subdomain restrictions" do
+          invalid_subdomains = %w(this_is_invalid in iamareallylongbucketnameiamareallylongbucketnameiamareallylongbu invalid- inval..id inval-.id inval.-id -invalid 192.168.10.2)
+          invalid_subdomains.each do |name|
+            assert_no_match Paperclip::Storage::Fog::AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX, name
+          end
+        end
+
+        should "provide an url in folder style" do
+          assert_match /^https:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png\?\d*$/, @dummy.avatar.url
+        end
+
+      end
+
     end
 
   end

data/test/storage/s3_live_test.rb

@@ -1,15 +1,31 @@
 require './test/helper'
-require 'aws/s3'
+require 'aws'
 
-unless ENV["S3_TEST_BUCKET"].blank?
+unless ENV["S3_BUCKET"].blank?
   class S3LiveTest < Test::Unit::TestCase
+
+    context "Generating an expiring url on a nonexistant attachment" do
+      setup do
+        rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
+                      :storage => :s3,
+                      :bucket => ENV["S3_BUCKET"],
+                      :path => ":class/:attachment/:id/:style.:extension",
+                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
+
+        @dummy = Dummy.new
+      end
+      should "return nil" do
+        assert_nil @dummy.avatar.expiring_url
+      end
+    end
+
     context "Using S3 for real, an attachment with S3 storage" do
       setup do
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
                       :storage => :s3,
-                      :bucket => ENV["S3_TEST_BUCKET"],
+                      :bucket => ENV["S3_BUCKET"],
                       :path => ":class/:attachment/:id/:style.:extension",
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "s3.yml"))
+                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
 
         Dummy.delete_all
         @dummy = Dummy.new
@@ -21,7 +37,7 @@ unless ENV["S3_TEST_BUCKET"].blank?
 
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+          @file = File.new(fixture_file('5k.png'), 'rb')
           @dummy.avatar = @file
         end
 
@@ -54,18 +70,16 @@ unless ENV["S3_TEST_BUCKET"].blank?
     context "An attachment that uses S3 for storage and has spaces in file name" do
       setup do
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
-                      :storage => :s3,
-                      :bucket => ENV["S3_TEST_BUCKET"],
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "s3.yml"))
+          :storage => :s3,
+          :bucket => ENV["S3_BUCKET"],
+          :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
 
         Dummy.delete_all
         @dummy = Dummy.new
-        @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', 'spaced file.png'), 'rb')
+        @dummy.avatar = File.new(fixture_file('spaced file.png'), 'rb')
         @dummy.save
       end
 
-      teardown { @dummy.destroy }
-
       should "return an unescaped version for path" do
         assert_match /.+\/spaced file\.png/, @dummy.avatar.path
       end
@@ -75,13 +89,49 @@ unless ENV["S3_TEST_BUCKET"].blank?
       end
 
       should "be accessible" do
-        assert_match /200 OK/, `curl -I #{@dummy.avatar.url}`
+        assert_success_response @dummy.avatar.url
       end
 
       should "be destoryable" do
         url = @dummy.avatar.url
         @dummy.destroy
-        assert_match /404 Not Found/, `curl -I #{url}`
+        assert_not_found_response url
+      end
+    end
+
+    context "An attachment that uses S3 for storage and has a question mark in file name" do
+      setup do
+        rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
+                      :storage => :s3,
+                      :bucket => ENV["S3_BUCKET"],
+                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
+
+        Dummy.delete_all
+        @dummy = Dummy.new
+        @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', 'question?mark.png'), 'rb')
+        @dummy.save
+      end
+
+      should "return an unescaped version for path" do
+        assert_match /.+\/question\?mark\.png/, @dummy.avatar.path
+      end
+
+      should "return an escaped version for url" do
+        assert_match /.+\/question%3Fmark\.png/, @dummy.avatar.url
+      end
+
+      should "be accessible" do
+        assert_success_response @dummy.avatar.url
+      end
+
+      should "be accessible with an expiring url" do
+        assert_success_response @dummy.avatar.expiring_url
+      end
+
+      should "be destroyable" do
+        url = @dummy.avatar.url
+        @dummy.destroy
+        assert_not_found_response url
       end
     end
   end