Merge remote branch 'tilsammans/master'

README.rdoc

@@ -15,7 +15,7 @@ useful defaults.
 See the documentation for +has_attached_file+ in Paperclip::ClassMethods for
 See the documentation for +has_attached_file+ in Paperclip::ClassMethods for
 more detailed options.
 more detailed options.
 
 
-The complete RDoc[http://rdoc.info/projects/thoughtbot/paperclip] is online.
+The complete RDoc[http://rdoc.info/gems/paperclip] is online.
 
 
 ==Installation
 ==Installation
 
 
@@ -23,6 +23,12 @@ Include the gem in your Gemfile:
 
 
   gem "paperclip", "~> 2.3"
   gem "paperclip", "~> 2.3"
 
 
+==Installation
+
+As a plugin:
+
+  ruby script/plugin install git://github.com/thoughtbot/paperclip.git
+
 ==Quick Start
 ==Quick Start
 
 
 In your model:
 In your model:

lib/paperclip/attachment.rb

@@ -235,6 +235,9 @@ module Paperclip
       else
       else
         true
         true
       end
       end
+    rescue Errno::EACCES => e
+      warn "#{e} - skipping file"
+      false
     end
     end
 
 
     # Returns true if a file has been assigned.
     # Returns true if a file has been assigned.

test/integration_test.rb

@@ -34,6 +34,22 @@ class IntegrationTest < Test::Unit::TestCase
     should "create its thumbnails properly" do
     should "create its thumbnails properly" do
       assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
       assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
     end
     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
     context "redefining its attachment styles" do
       setup do
       setup do

test/storage_test.rb

@@ -7,6 +7,29 @@ class StorageTest < Test::Unit::TestCase
       Object.const_set(:Rails, stub('Rails', :env => env))
       Object.const_set(:Rails, stub('Rails', :env => env))
     end
     end
   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
   context "Parsing S3 credentials" do
     setup do
     setup do