paperclip-cloudfiles 2.3.1.1.1 → 2.3.1.1.2

data/lib/paperclip.rb

@@ -46,7 +46,7 @@ end
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.3.1.1.1"
+  VERSION = "2.3.1.1.2"
 
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:
@@ -240,7 +240,7 @@ module Paperclip
 
       validates_each(name) do |record, attr, value|
         attachment = record.attachment_for(name)
-        attachment.send(:flush_errors)
+        attachment.send(:flush_errors) unless attachment.valid?
       end
     end
 

data/lib/paperclip/attachment.rb

@@ -14,6 +14,7 @@ module Paperclip
         :convert_options   => {},
         :default_url       => "/:attachment/:style/missing.png",
         :default_style     => :original,
+        :validations       => [],
         :storage           => :filesystem,
         :whiny             => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails]
       }
@@ -37,6 +38,7 @@ module Paperclip
       @styles            = options[:styles]
       @normalized_styles = nil
       @default_url       = options[:default_url]
+      @validations       = options[:validations]
       @default_style     = options[:default_style]
       @storage           = options[:storage]
       @whiny             = options[:whiny_thumbnails] || options[:whiny]
@@ -46,6 +48,7 @@ module Paperclip
       @queued_for_delete = []
       @queued_for_write  = {}
       @errors            = {}
+      @validation_errors = nil
       @dirty             = false
 
       initialize_storage
@@ -66,11 +69,13 @@ module Paperclip
     end
 
     # What gets called when you call instance.attachment = File. It clears
-    # errors, assigns attributes, and processes the file. It
+    # errors, assigns attributes, processes the file, and runs validations. It
     # also queues up the previous file for deletion, to be flushed away on
     # #save of its host.  In addition to form uploads, you can also assign
     # another Paperclip attachment: 
     #   new_user.avatar = old_user.avatar
+    # If the file that is assigned is not valid, the processing (i.e.
+    # thumbnailing, etc) will NOT be run.
     def assign uploaded_file
       ensure_required_accessors!
 
@@ -94,12 +99,13 @@ module Paperclip
 
       @dirty = true
 
-      post_process
+      post_process if valid?
  
       # Reset the file size if the original file was reprocessed.
       instance_write(:file_size, @queued_for_write[:original].size.to_i)
     ensure
       uploaded_file.close if close_uploaded_file
+      validate
     end
 
     # Returns the public URL of the attachment, with a given style. Note that
@@ -127,6 +133,12 @@ module Paperclip
       url(style_name)
     end
 
+    # Returns true if there are no errors on this attachment.
+    def valid?
+      validate
+      errors.empty?
+    end
+
     # Returns an array containing the errors on this attachment.
     def errors
       @errors
@@ -140,10 +152,15 @@ module Paperclip
     # Saves the file, if there are no errors. If there are, it flushes them to
     # the instance's errors and returns false, cancelling the save.
     def save
-      flush_deletes
-      flush_writes
-      @dirty = false
-      true
+      if valid?
+        flush_deletes
+        flush_writes
+        @dirty = false
+        true
+      else
+        flush_errors
+        false
+      end
     end
 
     # Clears out the attachment. Has the same effect as previously assigning
@@ -152,6 +169,7 @@ module Paperclip
     def clear
       queue_existing_for_delete
       @errors            = {}
+      @validation_errors = nil
     end
 
     # Destroys the attachment. Has the same effect as previously assigning
@@ -264,6 +282,53 @@ module Paperclip
       file.nil? || (file.respond_to?(:original_filename) && file.respond_to?(:content_type))
     end
 
+    def validate #:nodoc:
+      unless @validation_errors
+        @validation_errors = @validations.inject({}) do |errors, validation|
+          name, options = validation
+          errors[name] = send(:"validate_#{name}", options) if allow_validation?(options)
+          errors
+        end
+        @validation_errors.reject!{|k,v| v == nil }
+        @errors.merge!(@validation_errors)
+      end
+      @validation_errors
+    end
+
+    def allow_validation? options #:nodoc:
+      (options[:if].nil? || check_guard(options[:if])) && (options[:unless].nil? || !check_guard(options[:unless]))
+    end
+
+    def check_guard guard #:nodoc:
+      if guard.respond_to? :call
+        guard.call(instance)
+      elsif ! guard.blank?
+        instance.send(guard.to_s)
+      end
+    end
+
+    def validate_size options #:nodoc:
+      if file? && !options[:range].include?(size.to_i)
+        options[:message].gsub(/:min/, options[:min].to_s).gsub(/:max/, options[:max].to_s)
+      end
+    end
+
+    def validate_presence options #:nodoc:
+      options[:message] unless file?
+    end
+
+    def validate_content_type options #:nodoc:
+      valid_types = [options[:content_type]].flatten
+      unless original_filename.blank?
+        unless valid_types.blank?
+          content_type = instance_read(:content_type)
+          unless valid_types.any?{|t| content_type.nil? || t === content_type }
+            options[:message] || "is not one of the allowed file types."
+          end
+        end
+      end
+    end
+
     def initialize_storage #:nodoc:
       @storage_module = Paperclip::Storage.const_get(@storage.to_s.classify)
       self.extend(@storage_module)

data/test/attachment_test.rb

@@ -14,6 +14,18 @@ class AttachmentTest < Test::Unit::TestCase
     assert_equal "#{RAILS_ROOT}/public/fake_models/1234/fake", @attachment.path
   end
 
+  should "call a proc sent to check_guard" do
+    @dummy = Dummy.new
+    @dummy.expects(:one).returns(:one)
+    assert_equal :one, @dummy.avatar.send(:check_guard, lambda{|x| x.one })
+  end
+
+  should "call a method name sent to check_guard" do
+    @dummy = Dummy.new
+    @dummy.expects(:one).returns(:one)
+    assert_equal :one, @dummy.avatar.send(:check_guard, :one)
+  end
+
   context "Attachment default_options" do
     setup do
       rebuild_model
@@ -462,6 +474,8 @@ class AttachmentTest < Test::Unit::TestCase
       @attachment.expects(:valid_assignment?).with(@not_file).returns(true)
       @attachment.expects(:queue_existing_for_delete)
       @attachment.expects(:post_process)
+      @attachment.expects(:valid?).returns(true)
+      @attachment.expects(:validate)
       @dummy.avatar = @not_file
     end
     

data/test/paperclip_test.rb

@@ -185,6 +185,27 @@ class PaperclipTest < Test::Unit::TestCase
       should "be valid" do
         assert @dummy.valid?
       end
+
+      context "then has a validation added that makes it invalid" do
+        setup do
+          assert @dummy.save
+          Dummy.class_eval do
+            validates_attachment_content_type :avatar, :content_type => ["text/plain"]
+          end
+          @dummy2 = Dummy.find(@dummy.id)
+        end
+
+        should "be invalid when reloaded" do
+          assert ! @dummy2.valid?, @dummy2.errors.inspect
+        end
+
+        should "be able to call #valid? twice without having duplicate errors" do
+          @dummy2.avatar.valid?
+          first_errors = @dummy2.avatar.errors
+          @dummy2.avatar.valid?
+          assert_equal first_errors, @dummy2.avatar.errors
+        end
+      end
     end
 
     context "a validation with an if guard clause" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip-cloudfiles
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.1.1
+  version: 2.3.1.1.2
 platform: ruby
 authors: 
 - Jon Yurek
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -06:00
+date: 2010-01-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency