paperclip 2.3.8 → 2.3.9

data/test/helper.rb

@@ -90,7 +90,7 @@ end
 class FakeModel
   attr_accessor :avatar_file_name,
                 :avatar_file_size,
-                :avatar_last_updated,
+                :avatar_updated_at,
                 :avatar_content_type,
                 :avatar_fingerprint,
                 :id

data/test/integration_test.rb

@@ -34,6 +34,22 @@ class IntegrationTest < Test::Unit::TestCase
     should "create its thumbnails properly" do
       assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
     end
+    
+    context 'reprocessing with unreadable original' do
+      setup { File.chmod(0000, @dummy.avatar.path) }
+      
+      should "not raise an error" do
+        assert_nothing_raised do
+          @dummy.avatar.reprocess!
+        end
+      end
+      
+      should "return false" do
+        assert ! @dummy.avatar.reprocess!
+      end
+      
+      teardown { File.chmod(0644, @dummy.avatar.path) }
+    end
 
     context "redefining its attachment styles" do
       setup do
@@ -53,6 +69,78 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
+  context "Attachment" do
+    setup do
+      @thumb_path = "./test/../public/system/avatars/1/thumb/5k.png"
+      File.delete(@thumb_path) if File.exists?(@thumb_path)
+      rebuild_model :styles => { :thumb => "50x50#" }
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__),
+                                 "fixtures",
+                                 "5k.png"), 'rb')
+
+    end
+
+    teardown { @file.close }
+
+    should "not create the thumbnails upon saving when post-processing is disabled" do
+      @dummy.avatar.post_processing = false
+      @dummy.avatar = @file
+      assert @dummy.save
+      assert !File.exists?(@thumb_path)
+    end
+
+    should "create the thumbnails upon saving when post_processing is enabled" do
+      @dummy.avatar.post_processing = true
+      @dummy.avatar = @file
+      assert @dummy.save
+      assert File.exists?(@thumb_path)
+    end
+  end
+
+  context "Attachment with no generated thumbnails" do
+    setup do
+      @thumb_small_path = "./test/../public/system/avatars/1/thumb_small/5k.png"
+      @thumb_large_path = "./test/../public/system/avatars/1/thumb_large/5k.png"
+      File.delete(@thumb_small_path) if File.exists?(@thumb_small_path)
+      File.delete(@thumb_large_path) if File.exists?(@thumb_large_path)
+      rebuild_model :styles => { :thumb_small => "50x50#", :thumb_large => "60x60#" }
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__),
+                                 "fixtures",
+                                 "5k.png"), 'rb')
+
+      @dummy.avatar.post_processing = false
+      @dummy.avatar = @file
+      assert @dummy.save
+      @dummy.avatar.post_processing = true
+    end
+
+    teardown { @file.close }
+
+    should "allow us to create all thumbnails in one go" do
+      assert !File.exists?(@thumb_small_path)
+      assert !File.exists?(@thumb_large_path)
+
+      @dummy.avatar.reprocess!
+
+      assert File.exists?(@thumb_small_path)
+      assert File.exists?(@thumb_large_path)
+    end
+
+    should "allow us to selectively create each thumbnail" do
+      assert !File.exists?(@thumb_small_path)
+      assert !File.exists?(@thumb_large_path)
+
+      @dummy.avatar.reprocess! :thumb_small
+      assert File.exists?(@thumb_small_path)
+      assert !File.exists?(@thumb_large_path)
+
+      @dummy.avatar.reprocess! :thumb_large
+      assert File.exists?(@thumb_large_path)
+    end
+  end
+
   context "A model that modifies its original" do
     setup do
       rebuild_model :styles => { :original => "2x2#" }

data/test/interpolations_test.rb

@@ -112,9 +112,25 @@ class InterpolationsTest < Test::Unit::TestCase
 
   should "return the timestamp" do
     now = Time.now
+    zone = 'UTC'
     attachment = mock
     attachment.expects(:instance_read).with(:updated_at).returns(now)
-    assert_equal now.to_s, Paperclip::Interpolations.timestamp(attachment, :style)
+    attachment.expects(:time_zone).returns(zone)
+    assert_equal now.in_time_zone(zone).to_s, Paperclip::Interpolations.timestamp(attachment, :style)
+  end
+
+  should "return updated_at" do
+    attachment = mock
+    seconds_since_epoch = 1234567890
+    attachment.expects(:updated_at).returns(seconds_since_epoch)
+    assert_equal seconds_since_epoch, Paperclip::Interpolations.updated_at(attachment, :style)
+  end
+
+  should "return hash" do
+    attachment = mock
+    fake_hash = "a_wicked_secure_hash"
+    attachment.expects(:hash).returns(fake_hash)
+    assert_equal fake_hash, Paperclip::Interpolations.hash(attachment, :style)
   end
 
   should "call all expected interpolations with the given arguments" do

data/test/paperclip_test.rb

@@ -252,6 +252,21 @@ class PaperclipTest < Test::Unit::TestCase
       should_validate validation, options, valid_file, invalid_file
     end
 
+    context "with content_type validation and lambda message" do
+      context "and assigned an invalid file" do
+        setup do
+          Dummy.send(:"validates_attachment_content_type", :avatar, :content_type => %r{image/.*}, :message => lambda {'lambda content type message'})
+          @dummy = Dummy.new
+          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "text.txt"), "rb")
+          @dummy.valid?
+        end
+
+        should "have a content type error message" do
+          assert [@dummy.errors[:avatar_content_type]].flatten.any?{|error| error =~ %r/lambda content type message/ }
+        end
+      end
+    end
+
     context "with size validation and less_than 10240 option" do
       context "and assigned an invalid file" do
         setup do
@@ -267,5 +282,20 @@ class PaperclipTest < Test::Unit::TestCase
       end
     end
 
+    context "with size validation and less_than 10240 option with lambda message" do
+      context "and assigned an invalid file" do
+        setup do
+          Dummy.send(:"validates_attachment_size", :avatar, :less_than => 10240, :message => lambda {'lambda between 0 and 10240 bytes'})
+          @dummy = Dummy.new
+          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "12k.png"), "rb")
+          @dummy.valid?
+        end
+
+        should "have a file size min/max error message" do
+          assert [@dummy.errors[:avatar_file_size]].flatten.any?{|error| error =~ %r/lambda between 0 and 10240 bytes/ }
+        end
+      end
+    end
+
   end
 end

data/test/storage_test.rb

@@ -7,6 +7,29 @@ class StorageTest < Test::Unit::TestCase
       Object.const_set(:Rails, stub('Rails', :env => env))
     end
   end
+  
+  context "filesystem" do
+    setup do
+      rebuild_model :styles => { :thumbnail => "25x25#" }
+      @dummy = Dummy.create!
+
+      @dummy.avatar = File.open(File.join(File.dirname(__FILE__), "fixtures", "5k.png"))
+    end
+    
+    should "allow file assignment" do
+      assert @dummy.save
+    end
+    
+    should "store the original" do
+      @dummy.save
+      assert File.exists?(@dummy.avatar.path)
+    end
+    
+    should "store the thumbnail" do
+      @dummy.save
+      assert File.exists?(@dummy.avatar.path(:thumbnail))
+    end
+  end
 
   context "Parsing S3 credentials" do
     setup do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 2
   - 3
-  - 8
-  version: 2.3.8
+  - 9
+  version: 2.3.9
 platform: ruby
 authors: 
 - Jon Yurek
@@ -15,39 +15,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -05:00
+date: 2011-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: activerecord
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
+        - 3
         - 0
-        version: "0"
-  requirement: *id001
+        version: 2.3.0
   type: :runtime
-  name: activerecord
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+        - 2
+        - 3
+        - 2
+        version: 2.3.2
   type: :runtime
-  name: activesupport
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,12 +62,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :development
-  name: shoulda
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: appraisal
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -70,12 +76,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   type: :development
-  name: appraisal
-  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -84,12 +90,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   type: :development
-  name: mocha
-  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: aws-s3
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,12 +104,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
   type: :development
-  name: aws-s3
-  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,10 +118,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
   type: :development
-  name: sqlite3-ruby
-  prerelease: false
+  version_requirements: *id007
 description: Easy upload management for ActiveRecord
 email: jyurek@thoughtbot.com
 executables: []
@@ -123,9 +127,9 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 files: 
-- README.rdoc
+- README.md
 - LICENSE
 - Rakefile
 - init.rb
@@ -133,53 +137,30 @@ files:
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
 - lib/generators/paperclip/USAGE
 - lib/paperclip/attachment.rb
-- lib/paperclip/attachment.rbc
 - lib/paperclip/callback_compatability.rb
-- lib/paperclip/callback_compatability.rbc
 - lib/paperclip/command_line.rb
-- lib/paperclip/command_line.rbc
 - lib/paperclip/geometry.rb
-- lib/paperclip/geometry.rbc
-- lib/paperclip/glue.rbc
 - lib/paperclip/interpolations.rb
-- lib/paperclip/interpolations.rbc
 - lib/paperclip/iostream.rb
-- lib/paperclip/iostream.rbc
 - lib/paperclip/matchers/have_attached_file_matcher.rb
-- lib/paperclip/matchers/have_attached_file_matcher.rbc
 - lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
-- lib/paperclip/matchers/validate_attachment_content_type_matcher.rbc
 - lib/paperclip/matchers/validate_attachment_presence_matcher.rb
-- lib/paperclip/matchers/validate_attachment_presence_matcher.rbc
 - lib/paperclip/matchers/validate_attachment_size_matcher.rb
-- lib/paperclip/matchers/validate_attachment_size_matcher.rbc
 - lib/paperclip/matchers.rb
-- lib/paperclip/matchers.rbc
 - lib/paperclip/processor.rb
-- lib/paperclip/processor.rbc
 - lib/paperclip/railtie.rb
-- lib/paperclip/railtie.rbc
 - lib/paperclip/storage/filesystem.rb
-- lib/paperclip/storage/filesystem.rbc
+- lib/paperclip/storage/fog.rb
 - lib/paperclip/storage/s3.rb
-- lib/paperclip/storage/s3.rbc
 - lib/paperclip/storage.rb
-- lib/paperclip/storage.rbc
 - lib/paperclip/style.rb
-- lib/paperclip/style.rbc
 - lib/paperclip/thumbnail.rb
-- lib/paperclip/thumbnail.rbc
 - lib/paperclip/upfile.rb
-- lib/paperclip/upfile.rbc
 - lib/paperclip/version.rb
-- lib/paperclip/version.rbc
 - lib/paperclip.rb
-- lib/paperclip.rbc
 - lib/tasks/paperclip.rake
 - test/attachment_test.rb
-- test/attachment_test.rbc
 - test/command_line_test.rb
-- test/command_line_test.rbc
 - test/database.yml
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
@@ -188,42 +169,28 @@ files:
 - test/fixtures/s3.yml
 - test/fixtures/text.txt
 - test/fixtures/twopage.pdf
+- test/fixtures/uppercase.PNG
+- test/fog_test.rb
 - test/geometry_test.rb
-- test/geometry_test.rbc
 - test/helper.rb
-- test/helper.rbc
 - test/integration_test.rb
-- test/integration_test.rbc
 - test/interpolations_test.rb
-- test/interpolations_test.rbc
 - test/iostream_test.rb
-- test/iostream_test.rbc
 - test/matchers/have_attached_file_matcher_test.rb
-- test/matchers/have_attached_file_matcher_test.rbc
 - test/matchers/validate_attachment_content_type_matcher_test.rb
-- test/matchers/validate_attachment_content_type_matcher_test.rbc
 - test/matchers/validate_attachment_presence_matcher_test.rb
-- test/matchers/validate_attachment_presence_matcher_test.rbc
 - test/matchers/validate_attachment_size_matcher_test.rb
-- test/matchers/validate_attachment_size_matcher_test.rbc
 - test/paperclip_test.rb
-- test/paperclip_test.rbc
 - test/processor_test.rb
-- test/processor_test.rbc
 - test/storage_test.rb
-- test/storage_test.rbc
 - test/style_test.rb
-- test/style_test.rbc
 - test/thumbnail_test.rb
-- test/thumbnail_test.rbc
 - test/upfile_test.rb
-- test/upfile_test.rbc
 - rails/init.rb
 - generators/paperclip/paperclip_generator.rb
 - generators/paperclip/templates/paperclip_migration.rb.erb
 - generators/paperclip/USAGE
 - shoulda_macros/paperclip.rb
-- shoulda_macros/paperclip.rbc
 has_rdoc: true
 homepage: http://www.thoughtbot.com/projects/paperclip
 licenses: []