paperclip 2.2.2 → 2.2.3

data/README.rdoc

@@ -109,7 +109,7 @@ a set of styles for an attachment, by default it is expected that those
 "styles" are actually "thumbnails". However, you can do more than just
 thumbnail images. By defining a subclass of Paperclip::Processor, you can
 perform any processing you want on the files that are attached. Any file in
-your Rails app's lib/paperclip_processor directory is automatically loaded by
+your Rails app's lib/paperclip_processors directory is automatically loaded by
 paperclip, allowing you to easily define custom processors. You can specify a
 processor with the :processors option to has_attached_file:
 
@@ -152,7 +152,7 @@ are called before and after the processing of each attachment), and the
 attachment-specific "before_<attachment>_post_process" and
 "after_<attachment>_post_process". The callbacks are intended to be as close to
 normal ActiveRecord callbacks as possible, so if you return false (specifically
--- returning nil is not the same) in a before_ filter, the post processing step
+- returning nil is not the same) in a before_ filter, the post processing step
 will halt. Returning false in an after_ filter will not halt anything, but you
 can access the model and the attachment if necessary.
 

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'paperclip'
@@ -70,18 +69,6 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'mocha'
 end
  
-desc "Release new version"
-task :release => [:test, :sync_docs, :gem] do
-  require 'rubygems'
-  require 'rubyforge'
-  r = RubyForge.new
-  r.login
-  r.add_release spec.rubyforge_project,
-                spec.name,
-                spec.version,
-                File.join("pkg", "#{spec.name}-#{spec.version}.gem")
-end
-
 desc "Generate a gemspec file for GitHub"
 task :gemspec do
   File.open("#{spec.name}.gemspec", 'w') do |f|

data/lib/paperclip.rb

@@ -43,7 +43,7 @@ end
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:
@@ -60,20 +60,23 @@ module Paperclip
         :whiny_thumbnails  => true,
         :image_magick_path => nil,
         :command_path      => nil,
-        :log               => true
+        :log               => true,
+        :swallow_stderr    => true
       }
     end
 
     def path_for_command command #:nodoc:
       if options[:image_magick_path]
-        ActiveSupport::Deprecation.warn(":image_magick_path is deprecated and "+
-                                        "will be removed. Use :command_path "+
-                                        "instead")
+        warn("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
       end
-      path = [options[:image_magick_path] || options[:command_path], command].compact
+      path = [options[:command_path] || options[:image_magick_path], command].compact
       File.join(*path)
     end
 
+    def interpolates key, &block
+      Paperclip::Attachment.interpolations[key] = block
+    end
+
     # The run method takes a command to execute and a string of parameters
     # that get passed to it. The command is prefixed with the :command_path
     # option from Paperclip.options. If you have many commands to run and
@@ -84,7 +87,9 @@ module Paperclip
     # expected_outcodes, a PaperclipCommandLineError will be raised. Generally
     # a code of 0 is expected, but a list of codes may be passed if necessary.
     def run cmd, params = "", expected_outcodes = 0
-      output = `#{%Q[#{path_for_command(cmd)} #{params} 2>#{bit_bucket}].gsub(/\s+/, " ")}`
+      command = %Q<#{%Q[#{path_for_command(cmd)} #{params}].gsub(/\s+/, " ")}>
+      command = "#{command} 2>#{bit_bucket}" if Paperclip.options[:swallow_stderr]
+      output = `#{command}`
       unless [expected_outcodes].flatten.include?($?.exitstatus)
         raise PaperclipCommandLineError, "Error while running #{cmd}"
       end
@@ -204,7 +209,8 @@ module Paperclip
       end
 
       validates_each(name) do |record, attr, value|
-        value.send(:flush_errors) unless value.valid?
+        attachment = record.attachment_for(name)
+        attachment.send(:flush_errors) unless attachment.valid?
       end
     end
 
@@ -250,6 +256,9 @@ module Paperclip
     #   match.  Allows all by default.
     # * +message+: The message to display when the uploaded file has an invalid
     #   content type.
+    # NOTE: If you do not specify an [attachment]_content_type field on your
+    # model, content_type validation will work _ONLY upon assignment_ and
+    # re-validation after the instance has been reloaded will always succeed.
     def validates_attachment_content_type name, options = {}
       attachment_definitions[name][:validations][:content_type] = lambda do |attachment, instance|
         valid_types = [options[:content_type]].flatten
@@ -257,7 +266,7 @@ module Paperclip
         unless attachment.original_filename.blank?
           unless valid_types.blank?
             content_type = attachment.instance_read(:content_type)
-            unless valid_types.any?{|t| t === 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

data/lib/paperclip/attachment.rb

@@ -89,6 +89,7 @@ module Paperclip
 
       @dirty = true
 
+      solidify_style_definitions
       post_process if valid?
  
       # Reset the file size if the original file was reprocessed.
@@ -241,6 +242,7 @@ module Paperclip
     def instance_write(attr, value)
       setter = :"#{name}_#{attr}="
       responds = instance.respond_to?(setter)
+      self.instance_variable_set("@_#{setter.to_s.chop}", value)
       instance.send(setter, value) if responds || attr.to_s == "file_name"
     end
 
@@ -249,20 +251,22 @@ module Paperclip
     def instance_read(attr)
       getter = :"#{name}_#{attr}"
       responds = instance.respond_to?(getter)
+      cached = self.instance_variable_get("@_#{getter}")
+      return cached if cached
       instance.send(getter) if responds || attr.to_s == "file_name"
     end
 
     private
 
-    def logger
+    def logger #:nodoc:
       instance.logger
     end
 
-    def log message
+    def log message #:nodoc:
       logger.info("[paperclip] #{message}") if logging?
     end
 
-    def logging?
+    def logging? #:nodoc:
       Paperclip.options[:log]
     end
 
@@ -283,7 +287,7 @@ module Paperclip
       @validation_errors
     end
 
-    def normalize_style_definition
+    def normalize_style_definition #:nodoc:
       @styles.each do |name, args|
         unless args.is_a? Hash
           dimensions, format = [args, nil].flatten[0..1]
@@ -305,7 +309,15 @@ module Paperclip
       end
     end
 
-    def initialize_storage
+    def solidify_style_definitions #:nodoc:
+      @styles.each do |name, args|
+        if @styles[name][:geometry].respond_to?(:call)
+          @styles[name][:geometry] = @styles[name][:geometry].call(instance) 
+        end
+      end
+    end
+
+    def initialize_storage #:nodoc:
       @storage_module = Paperclip::Storage.const_get(@storage.to_s.capitalize)
       self.extend(@storage_module)
     end
@@ -321,8 +333,17 @@ module Paperclip
 
     def post_process #:nodoc:
       return if @queued_for_write[:original].nil?
-      return if callback(:before_post_process) == false
-      return if callback(:"before_#{name}_post_process") == false
+      return if fire_events(:before)
+      post_process_styles
+      return if fire_events(:after)
+    end
+
+    def fire_events(which)
+      return true if callback(:"#{which}_post_process") == false
+      return true if callback(:"#{which}_#{name}_post_process") == false
+    end
+
+    def post_process_styles
       log("Post-processing #{name}")
       @styles.each do |name, args|
         begin
@@ -336,11 +357,9 @@ module Paperclip
           (@errors[:processing] ||= []) << e.message if @whiny
         end
       end
-      callback(:"after_#{name}_post_process")
-      callback(:after_post_process)
     end
 
-    def callback which
+    def callback which #:nodoc:
       instance.run_callbacks(which, @queued_for_write){|result, obj| result == false }
     end
 

data/lib/paperclip/geometry.rb

@@ -16,7 +16,7 @@ module Paperclip
     def self.from_file file
       file = file.path if file.respond_to? "path"
       geometry = begin
-                   Paperclip.run("identify", %Q[-format "%wx%h" "#{file}"])
+                   Paperclip.run("identify", %Q[-format "%wx%h" "#{file}"[0]])
                  rescue PaperclipCommandLineError
                    ""
                  end

data/lib/paperclip/storage.rb

@@ -61,8 +61,11 @@ module Paperclip
               path = File.dirname(path)
               FileUtils.rmdir(path)
             end
-          rescue Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL
+          rescue Errno::EEXIST, Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR
             # Stop trying to remove parent directories
+          rescue SystemCallError => e
+            logger.info("[paperclip] There was an unexpected error while deleting directories: #{e.class}")
+            # Ignore it
           end
         end
         @queued_for_delete = []
@@ -118,11 +121,11 @@ module Paperclip
         require 'right_aws'
         base.instance_eval do
           @s3_credentials = parse_credentials(@options[:s3_credentials])
-          @bucket         = @options[:bucket] || @s3_credentials[:bucket]
-          @s3_options     = @options[:s3_options] || {}
+          @bucket         = @options[:bucket]         || @s3_credentials[:bucket]
+          @s3_options     = @options[:s3_options]     || {}
           @s3_permissions = @options[:s3_permissions] || 'public-read'
-          @s3_protocol    = @options[:s3_protocol] || (@s3_permissions == 'public-read' ? 'http' : 'https')
-          @s3_headers     = @options[:s3_headers] || {}
+          @s3_protocol    = @options[:s3_protocol]    || (@s3_permissions == 'public-read' ? 'http' : 'https')
+          @s3_headers     = @options[:s3_headers]     || {}
           @url            = ":s3_path_url" unless @url.to_s.match(/^:s3.*url$/)
         end
         base.class.interpolations[:s3_path_url] = lambda do |attachment, style|

data/shoulda_macros/matchers.rb

@@ -0,0 +1,4 @@
+require 'shoulda_macros/matchers/have_attached_file_matcher'
+require 'shoulda_macros/matchers/validate_attachment_presence_matcher'
+require 'shoulda_macros/matchers/validate_attachment_content_type_matcher'
+require 'shoulda_macros/matchers/validate_attachment_size_matcher'

data/shoulda_macros/matchers/have_attached_file_matcher.rb

@@ -0,0 +1,49 @@
+module Paperclip
+  module Shoulda
+    module Matchers
+      def have_attached_file name
+        HaveAttachedFileMatcher.new(name)
+      end
+
+      class HaveAttachedFileMatcher
+        def initialize attachment_name
+          @attachment_name = attachment_name
+        end
+
+        def matches? subject
+          @subject = subject
+          responds? && has_column? && included?
+        end
+
+        def failure_message
+          "Should have an attachment named #{@attachment_name}"
+        end
+
+        def negative_failure_message
+          "Should not have an attachment named #{@attachment_name}"
+        end
+
+        def description
+          "have an attachment named #{@attachment_name}"
+        end
+
+        protected
+
+        def responds?
+          methods = @subject.instance_methods
+          methods.include?("#{@attachment_name}") &&
+            methods.include?("#{@attachment_name}=") &&
+            methods.include?("#{@attachment_name}?")
+        end
+
+        def has_column?
+          @subject.column_names.include?("#{@attachment_name}_file_name")
+        end
+
+        def included?
+          @subject.ancestors.include?(Paperclip::InstanceMethods)
+        end
+      end
+    end
+  end
+end

data/shoulda_macros/matchers/validate_attachment_content_type_matcher.rb

@@ -0,0 +1,66 @@
+module Paperclip
+  module Shoulda
+    module Matchers
+      def validate_attachment_content_type name
+        ValidateAttachmentContentTypeMatcher.new(name)
+      end
+
+      class ValidateAttachmentContentTypeMatcher
+        def initialize attachment_name
+          @attachment_name = attachment_name
+        end
+
+        def allowing *types
+          @allowed_types = types.flatten
+          self
+        end
+
+        def rejecting *types
+          @rejected_types = types.flatten
+          self
+        end
+
+        def matches? subject
+          @subject = subject
+          @allowed_types && @rejected_types &&
+          allowed_types_allowed? && rejected_types_rejected?
+        end
+
+        def failure_message
+          "Content types #{@allowed_types.join(", ")} should be accepted" +
+          " and #{@rejected_types.join(", ")} rejected by #{@attachment_name}"
+        end
+
+        def negative_failure_message
+          "Content types #{@allowed_types.join(", ")} should be rejected" + 
+          " and #{@rejected_types.join(", ")} accepted by #{@attachment_name}"
+        end
+
+        def description
+          "validate the content types allowed on attachment #{@attachment_name}"
+        end
+
+        protected
+
+        def allow_types?(types)
+          types.all? do |type|
+            file = StringIO.new(".")
+            file.content_type = type
+            attachment = @subject.new.attachment_for(@attachment_name)
+            attachment.assign(file)
+            attachment.errors[:content_type].nil?
+          end
+        end
+
+        def allowed_types_allowed?
+          allow_types?(@allowed_types)
+        end
+
+        def rejected_types_rejected?
+          not allow_types?(@rejected_types)
+        end
+      end
+    end
+  end
+end
+

data/shoulda_macros/matchers/validate_attachment_presence_matcher.rb

@@ -0,0 +1,48 @@
+module Paperclip
+  module Shoulda
+    module Matchers
+      def validate_attachment_presence name
+        ValidateAttachmentPresenceMatcher.new(name)
+      end
+
+      class ValidateAttachmentPresenceMatcher
+        def initialize attachment_name
+          @attachment_name = attachment_name
+        end
+
+        def matches? subject
+          @subject = subject
+          error_when_not_valid? && no_error_when_valid?
+        end
+
+        def failure_message
+          "Attachment #{@attachment_name} should be required"
+        end
+
+        def negative_failure_message
+          "Attachment #{@attachment_name} should not be required"
+        end
+
+        def description
+          "require presence of attachment #{@attachment_name}"
+        end
+
+        protected
+
+        def error_when_not_valid?
+          @attachment = @subject.new.send(@attachment_name)
+          @attachment.assign(nil)
+          not @attachment.errors[:presence].nil?
+        end
+
+        def no_error_when_valid?
+          @file = StringIO.new(".")
+          @attachment = @subject.new.send(@attachment_name)
+          @attachment.assign(@file)
+          @attachment.errors[:presence].nil?
+        end
+      end
+    end
+  end
+end
+

data/shoulda_macros/matchers/validate_attachment_size_matcher.rb

@@ -0,0 +1,83 @@
+module Paperclip
+  module Shoulda
+    module Matchers
+      def validate_attachment_size name
+        ValidateAttachmentSizeMatcher.new(name)
+      end
+
+      class ValidateAttachmentSizeMatcher
+        def initialize attachment_name
+          @attachment_name = attachment_name
+          @low, @high = 0, (1.0/0)
+        end
+
+        def less_than size
+          @high = size
+          self
+        end
+
+        def greater_than size
+          @low = size
+          self
+        end
+
+        def in range
+          @low, @high = range.first, range.last
+          self
+        end
+
+        def matches? subject
+          @subject = subject
+          lower_than_low? && higher_than_low? && lower_than_high? && higher_than_high?
+        end
+
+        def failure_message
+          "Attachment #{@attachment_name} must be between #{@low} and #{@high} bytes"
+        end
+
+        def negative_failure_message
+          "Attachment #{@attachment_name} cannot be between #{@low} and #{@high} bytes"
+        end
+
+        def description
+          "validate the size of attachment #{@attachment_name}"
+        end
+
+        protected
+
+        def override_method object, method, &replacement
+          (class << object; self; end).class_eval do
+            define_method(method, &replacement)
+          end
+        end
+
+        def passes_validation_with_size(new_size)
+          file = StringIO.new(".")
+          override_method(file, :size){ new_size }
+          attachment = @subject.new.attachment_for(@attachment_name)
+          attachment.assign(file)
+          attachment.errors[:size].nil?
+        end
+
+        def lower_than_low?
+          not passes_validation_with_size(@low - 1)
+        end
+
+        def higher_than_low?
+          passes_validation_with_size(@low + 1)
+        end
+
+        def lower_than_high?
+          return true if @high == (1.0/0)
+          passes_validation_with_size(@high - 1)
+        end
+
+        def higher_than_high?
+          return true if @high == (1.0/0)
+          not passes_validation_with_size(@high + 1)
+        end
+      end
+    end
+  end
+end
+

data/shoulda_macros/paperclip.rb

@@ -1,3 +1,5 @@
+require 'shoulda_macros/matchers'
+
 module Paperclip
   # =Paperclip Shoulda Macros
   #
@@ -10,39 +12,20 @@ module Paperclip
     # This will test whether you have defined your attachment correctly by
     # checking for all the required fields exist after the definition of the
     # attachment.
-    def should_have_attached_file name, options = {}
-      klass = self.name.gsub(/Test$/, '').constantize
-      context "Class #{klass.name} with attachment #{name}" do
-        should "respond to all the right methods" do
-          ["#{name}", "#{name}=", "#{name}?"].each do |meth|
-            assert klass.instance_methods.include?(meth), "#{klass.name} does not respond to #{name}."
-          end
-        end
+    def should_have_attached_file name
+      klass   = self.name.gsub(/Test$/, '').constantize
+      matcher = have_attached_file name
+      should matcher.description do
+        assert_accepts(matcher, klass)
       end
     end
 
     # Tests for validations on the presence of the attachment.
     def should_validate_attachment_presence name
       klass   = self.name.gsub(/Test$/, '').constantize
-      context "Class #{klass.name} validating presence on #{name}" do
-        context "when the assignment is nil" do
-          setup do
-            @attachment = klass.new.send(name)
-            @attachment.assign(nil)
-          end
-          should "have a :presence validation error" do
-            assert @assignment.errors[:presence]
-          end
-        end
-        context "when the assignment is valid" do
-          setup do
-            @attachment = klass.new.send(name)
-            @attachment.assign(nil)
-          end
-          should "have a :presence validation error" do
-            assert ! @assignment.errors[:presence]
-          end
-        end
+      matcher = validate_attachment_presence name
+      should matcher.description do
+        assert_accepts(matcher, klass)
       end
     end
 
@@ -54,35 +37,9 @@ module Paperclip
       klass   = self.name.gsub(/Test$/, '').constantize
       valid   = [options[:valid]].flatten
       invalid = [options[:invalid]].flatten
-      context "Class #{klass.name} validating content_types on #{name}" do
-        valid.each do |type|
-          context "being assigned a file with a content_type of #{type}" do
-            setup do
-              @file = StringIO.new(".")
-              class << @file; attr_accessor :content_type; end
-              @file.content_type = type
-              @attachment = klass.new.send(name)
-              @attachment.assign(@file)
-            end
-            should "not have a :content_type validation error" do
-              assert ! @assignment.errors[:content_type]
-            end
-          end
-        end
-        invalid.each do |type|
-          context "being assigned a file with a content_type of #{type}" do
-            setup do
-              @file = StringIO.new(".")
-              class << @file; attr_accessor :content_type; end
-              @file.content_type = type
-              @attachment = klass.new.send(name)
-              @attachment.assign(@file)
-            end
-            should "have a :content_type validation error" do
-              assert @assignment.errors[:content_type]
-            end
-          end
-        end
+      matcher = validate_attachment_presence(name).allows(valid).rejects(invalid)
+      should matcher.description do
+        assert_accepts(matcher, klass)
       end
     end
 
@@ -97,57 +54,15 @@ module Paperclip
       min     = options[:greater_than] || (options[:in] && options[:in].first) || 0
       max     = options[:less_than]    || (options[:in] && options[:in].last)  || (1.0/0)
       range   = (min..max)
-      context "Class #{klass.name} validating file size on #{name}" do
-        context "with an attachment that is #{max+1} bytes" do
-          setup do
-            @file = StringIO.new("." * (max+1))
-            @attachment = klass.new.send(name)
-            @attachment.assign(@file)
-          end
-
-          should "have a :size validation error" do
-            assert @attachment.errors[:size]
-          end
-        end
-        context "with an attachment that us #{max-1} bytes" do
-          setup do
-            @file = StringIO.new("." * (max-1))
-            @attachment = klass.new.send(name)
-            @attachment.assign(@file)
-          end
-
-          should "not have a :size validation error" do
-            assert ! @attachment.errors[:size]
-          end
-        end
-
-        if min > 0
-          context "with an attachment that is #{min-1} bytes" do
-            setup do
-              @file = StringIO.new("." * (min-1))
-              @attachment = klass.new.send(name)
-              @attachment.assign(@file)
-            end
-
-            should "have a :size validation error" do
-              assert @attachment.errors[:size]
-            end
-          end
-          context "with an attachment that us #{min+1} bytes" do
-            setup do
-              @file = StringIO.new("." * (min+1))
-              @attachment = klass.new.send(name)
-              @attachment.assign(@file)
-            end
-
-            should "not have a :size validation error" do
-              assert ! @attachment.errors[:size]
-            end
-          end
-        end
+      matcher = validate_attachment_size(name).in(range)
+      should matcher.description do
+        assert_accepts(matcher, klass)
       end
     end
   end
 end
 
-Test::Unit::TestCase.extend(Paperclip::Shoulda)
+class Test::Unit::TestCase #:nodoc:
+ extend  Paperclip::Shoulda
+ include Paperclip::Shoulda::Matchers
+end

data/tasks/paperclip_tasks.rake

@@ -17,7 +17,7 @@ end
 def for_all_attachments
   klass = obtain_class
   names = obtain_attachments
-  ids   = klass.connection.select_values("SELECT #{klass.primary_key} FROM #{klass.table_name}")
+  ids   = klass.connection.select_values(klass.send(:construct_finder_sql, :select => 'id'))
 
   ids.each do |id|
     instance = klass.find(id)

data/test/attachment_test.rb

@@ -95,14 +95,10 @@ class AttachmentTest < Test::Unit::TestCase
       rebuild_model :path => ":rails_env/:id.png"
       @dummy = Dummy.new
       @dummy.stubs(:id).returns(@id)
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = StringIO.new(".")
       @dummy.avatar = @file
     end
 
-    teardown { @file.close }
-
     should "return the proper path" do
       temporary_rails_env(@rails_env) {
         assert_equal "#{@rails_env}/#{@id}.png", @dummy.avatar.path
@@ -170,6 +166,35 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  geometry_specs = [ 
+    [ lambda{|z| "50x50#" }, :png ],
+    lambda{|z| "50x50#" },
+    { :geometry => lambda{|z| "50x50#" } }
+  ]
+  geometry_specs.each do |geometry_spec|
+    context "An attachment geometry like #{geometry_spec}" do
+      setup do
+        rebuild_model :styles => { :normal => geometry_spec }
+        @attachment = Dummy.new.avatar
+      end
+
+      should "not run the procs immediately" do
+        assert_kind_of Proc, @attachment.styles[:normal][:geometry]
+      end
+
+      context "when assigned" do
+        setup do
+          @file = StringIO.new(".")
+          @attachment.assign(@file)
+        end
+
+        should "have the correct geometry" do
+          assert_equal "50x50#", @attachment.styles[:normal][:geometry]
+        end
+      end
+    end
+  end
+
   context "An attachment with both 'normal' and hash-style styles" do
     setup do
       rebuild_model :styles => {
@@ -234,7 +259,7 @@ class AttachmentTest < Test::Unit::TestCase
         def do_before_all; end
         def do_after_all; end
       end
-      @file  = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      @file  = StringIO.new(".")
       @file.stubs(:to_tempfile).returns(@file)
       @dummy = Dummy.new
       Paperclip::Thumbnail.stubs(:make).returns(@file)
@@ -281,7 +306,7 @@ class AttachmentTest < Test::Unit::TestCase
   context "Assigning an attachment" do
     setup do
       rebuild_model :styles => { :something => "100x100#" }
-      @file  = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      @file  = StringIO.new(".")
       @file.expects(:original_filename).returns("5k.png\n\n")
       @file.expects(:content_type).returns("image/png\n\n")
       @file.stubs(:to_tempfile).returns(@file)
@@ -521,8 +546,16 @@ class AttachmentTest < Test::Unit::TestCase
       assert_nothing_raised { @dummy.avatar = @file }
     end
 
-    should "return nil when sent #avatar_updated_at" do
+    should "return the time when sent #avatar_updated_at" do
+      now = Time.now
+      Time.stubs(:now).returns(now)
       @dummy.avatar = @file
+      assert now, @dummy.avatar.updated_at
+    end
+
+    should "return nil when reloaded and sent #avatar_updated_at" do
+      @dummy.save
+      @dummy.reload
       assert_nil @dummy.avatar.updated_at
     end
 

data/test/helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'test/unit'
+gem 'thoughtbot-shoulda', ">= 2.9.0"
 require 'shoulda'
 require 'mocha'
 require 'tempfile'
@@ -22,12 +23,31 @@ $LOAD_PATH << File.join(ROOT, 'lib', 'paperclip')
 
 require File.join(ROOT, 'lib', 'paperclip.rb')
 
+require 'shoulda_macros/paperclip'
+
 ENV['RAILS_ENV'] ||= 'test'
 
 FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config[ENV['RAILS_ENV'] || 'test'])
+ActiveRecord::Base.establish_connection(config['test'])
+
+def reset_class class_name
+  ActiveRecord::Base.send(:include, Paperclip)
+  Object.send(:remove_const, class_name) rescue nil
+  klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
+  klass.class_eval{ include Paperclip }
+  klass
+end
+
+def reset_table table_name, &block
+  block ||= lambda{ true }
+  ActiveRecord::Base.connection.create_table :dummies, {:force => true}, &block
+end
+
+def modify_table table_name, &block
+  ActiveRecord::Base.connection.change_table :dummies, &block
+end
 
 def rebuild_model options = {}
   ActiveRecord::Base.connection.create_table :dummies, :force => true do |table|

data/test/integration_test.rb

@@ -106,6 +106,10 @@ class IntegrationTest < Test::Unit::TestCase
           assert ! File.exists?(File.dirname(@saved_path))
           assert ! File.exists?(File.dirname(File.dirname(@saved_path)))
         end
+
+        before_should "not die if an unexpected SystemCallError happens" do
+          FileUtils.stubs(:rmdir).raises(Errno::EPIPE)
+        end
       end
     end
   end

data/test/matchers/have_attached_file_matcher_test.rb

@@ -0,0 +1,21 @@
+require 'test/helper'
+
+class HaveAttachedFileMatcherTest < Test::Unit::TestCase
+  context "have_attached_file" do
+    setup do
+      @dummy_class = reset_class "Dummy"
+      reset_table "dummies"
+      @matcher     = have_attached_file(:avatar)
+    end
+
+    should "reject a class with no attachment" do
+      assert_rejects @matcher, @dummy_class
+    end
+
+    should "accept a class with an attachment" do
+      modify_table("dummies"){|d| d.string :avatar_file_name }
+      @dummy_class.has_attached_file :avatar
+      assert_accepts @matcher, @dummy_class
+    end
+  end
+end

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -0,0 +1,30 @@
+require 'test/helper'
+
+class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
+  context "validate_attachment_content_type" do
+    setup do
+      reset_table("dummies") do |d|
+        d.string :avatar_file_name
+      end
+      @dummy_class = reset_class "Dummy"
+      @dummy_class.has_attached_file :avatar
+      @matcher     = validate_attachment_content_type(:avatar).
+                       allowing(%w(image/png image/jpeg)).
+                       rejecting(%w(audio/mp3 application/octet-stream))
+    end
+
+    should "reject a class with no validation" do
+      assert_rejects @matcher, @dummy_class
+    end
+
+    should "reject a class with a validation that doesn't match" do
+      @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
+      assert_rejects @matcher, @dummy_class
+    end
+
+    should "accept a class with a validation" do
+      @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
+      assert_accepts @matcher, @dummy_class
+    end
+  end
+end

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -0,0 +1,21 @@
+require 'test/helper'
+
+class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
+  context "validate_attachment_presence" do
+    setup do
+      reset_table("dummies"){|d| d.string :avatar_file_name }
+      @dummy_class = reset_class "Dummy"
+      @dummy_class.has_attached_file :avatar
+      @matcher     = validate_attachment_presence(:avatar)
+    end
+
+    should "reject a class with no validation" do
+      assert_rejects @matcher, @dummy_class
+    end
+
+    should "accept a class with a validation" do
+      @dummy_class.validates_attachment_presence :avatar
+      assert_accepts @matcher, @dummy_class
+    end
+  end
+end

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -0,0 +1,50 @@
+require 'test/helper'
+
+class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
+  context "validate_attachment_size" do
+    setup do
+      reset_table("dummies") do |d|
+        d.string :avatar_file_name
+      end
+      @dummy_class = reset_class "Dummy"
+      @dummy_class.has_attached_file :avatar
+    end
+
+    context "of limited size" do
+      setup{ @matcher = validate_attachment_size(:avatar).in(256..1024) }
+
+      should "reject a class with no validation" do
+        assert_rejects @matcher, @dummy_class
+      end
+
+      should "reject a class with a validation that's too high" do
+        @dummy_class.validates_attachment_size :avatar, :in => 256..2048
+        assert_rejects @matcher, @dummy_class
+      end
+
+      should "reject a class with a validation that's too low" do
+        @dummy_class.validates_attachment_size :avatar, :in => 0..1024
+        assert_rejects @matcher, @dummy_class
+      end
+
+      should "accept a class with a validation that matches" do
+        @dummy_class.validates_attachment_size :avatar, :in => 256..1024
+        assert_accepts @matcher, @dummy_class
+      end
+    end
+
+    context "validates_attachment_size with infinite range" do
+      setup{ @matcher = validate_attachment_size(:avatar) }
+
+      should "accept a class with an upper limit" do
+        @dummy_class.validates_attachment_size :avatar, :less_than => 1
+        assert_accepts @matcher, @dummy_class
+      end
+
+      should "accept a class with no upper limit" do
+        @dummy_class.validates_attachment_size :avatar, :greater_than => 1
+        assert_accepts @matcher, @dummy_class
+      end
+    end
+  end
+end

data/test/thumbnail_test.rb

@@ -141,4 +141,37 @@ class ThumbnailTest < Test::Unit::TestCase
       end      
     end
   end
+
+  context "A multipage PDF" do
+    setup do
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "twopage.pdf"), 'rb')
+    end
+
+    teardown { @file.close }
+
+    should "start with two pages with dimensions 612x792" do
+      cmd = %Q[identify -format "%wx%h" "#{@file.path}"] 
+      assert_equal "612x792"*2, `#{cmd}`.chomp
+    end
+
+    context "being thumbnailed at 100x100 with cropping" do
+      setup do
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x100#", :format => :png)
+      end
+
+      should "report its correct current and target geometries" do
+        assert_equal "100x100#", @thumb.target_geometry.to_s
+        assert_equal "612x792", @thumb.current_geometry.to_s
+      end
+
+      should "report its correct format" do
+        assert_equal :png, @thumb.format
+      end
+
+      should "create the thumbnail when sent #make" do
+        dst = @thumb.make
+        assert_match /100x100/, `identify "#{dst.path}"`
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 -05:00
+date: 2009-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,15 +76,25 @@ files:
 - test/fixtures/5k.png
 - test/fixtures/bad.png
 - test/fixtures/text.txt
+- test/fixtures/twopage.pdf
 - test/geometry_test.rb
 - test/helper.rb
 - test/integration_test.rb
 - test/iostream_test.rb
+- test/matchers/have_attached_file_matcher_test.rb
+- test/matchers/validate_attachment_content_type_matcher_test.rb
+- test/matchers/validate_attachment_presence_matcher_test.rb
+- test/matchers/validate_attachment_size_matcher_test.rb
 - test/paperclip_test.rb
 - test/processor_test.rb
 - test/s3.yml
 - test/storage_test.rb
 - test/thumbnail_test.rb
+- shoulda_macros/matchers/have_attached_file_matcher.rb
+- shoulda_macros/matchers/validate_attachment_content_type_matcher.rb
+- shoulda_macros/matchers/validate_attachment_presence_matcher.rb
+- shoulda_macros/matchers/validate_attachment_size_matcher.rb
+- shoulda_macros/matchers.rb
 - shoulda_macros/paperclip.rb
 has_rdoc: true
 homepage: http://www.thoughtbot.com/projects/paperclip