bteitelb-paperclip 2.3.1.13 → 2.3.1.14

data/Rakefile

@@ -75,8 +75,8 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files  = FileList["README*"].to_a
   s.rdoc_options << '--line-numbers' << '--inline-source'
   s.requirements << "ImageMagick"
-  s.add_development_dependency 'shoulda'
-  s.add_development_dependency 'jferris-mocha', '>= 0.9.5.0.1241126838'
+  s.add_development_dependency 'thoughtbot-shoulda'
+  s.add_development_dependency 'jferris-mocha', '= 0.9.5.0.1241126838'
   s.add_development_dependency 'aws-s3'
   s.add_development_dependency 'sqlite3-ruby'
   s.add_development_dependency 'activerecord'

data/lib/paperclip.rb

@@ -34,7 +34,6 @@ require 'paperclip/processor'
 require 'paperclip/thumbnail'
 require 'paperclip/storage'
 require 'paperclip/interpolations'
-require 'paperclip/style'
 require 'paperclip/attachment'
 if defined? RAILS_ROOT
   Dir.glob(File.join(File.expand_path(RAILS_ROOT), "lib", "paperclip_processors", "*.rb")).each do |processor|
@@ -240,7 +239,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
 
@@ -258,13 +257,13 @@ module Paperclip
       max     = options[:less_than]    || (options[:in] && options[:in].last)  || (1.0/0)
       range   = (min..max)
       message = options[:message] || "file size must be between :min and :max bytes."
-      message = message.gsub(/:min/, min.to_s).gsub(/:max/, max.to_s)
 
-      validates_inclusion_of :"#{name}_file_size",
-                             :in      => range,
-                             :message => message,
-                             :if      => options[:if],
-                             :unless  => options[:unless]
+      attachment_definitions[name][:validations] << [:size, {:min     => min,
+                                                             :max     => max,
+                                                             :range   => range,
+                                                             :message => message,
+                                                             :if      => options[:if],
+                                                             :unless  => options[:unless]}]
     end
 
     # Adds errors if thumbnail creation fails. The same as specifying :whiny_thumbnails => true.
@@ -282,10 +281,9 @@ module Paperclip
     # * +unless+: Same as +if+ but validates if lambda or method returns false.
     def validates_attachment_presence name, options = {}
       message = options[:message] || "must be set."
-      validates_presence_of :"#{name}_file_name", 
-                            :message => message,
-                            :if      => options[:if],
-                            :unless  => options[:unless]
+      attachment_definitions[name][:validations] << [:presence, {:message => message,
+                                                                 :if      => options[:if],
+                                                                 :unless  => options[:unless]}]
     end
     
     # Places ActiveRecord-style validations on the content type of the file
@@ -305,12 +303,10 @@ module Paperclip
     # 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 = {}
-      types = [options.delete(:content_type)].flatten
-      validates_each(:"#{name}_content_type", options) do |record, attr, value|
-        unless types.any?{|t| t === value }
-          record.errors.add(:"#{name}_content_type", :inclusion, :default => options[:message], :value => value)
-        end
-      end
+      attachment_definitions[name][:validations] << [:content_type, {:content_type => options[:content_type],
+                                                                     :message      => options[:message],
+                                                                     :if           => options[:if],
+                                                                     :unless       => options[:unless]}]
     end
 
     # Returns the attachment definitions defined by each call to

data/lib/paperclip/attachment.rb

@@ -9,19 +9,18 @@ module Paperclip
     
     def self.default_options
       @default_options ||= {
-        :url               => "/system/:attachment/:id/:style/:filename",
-        :path              => ":rails_root/public:url",
-        :styles            => {},
-        :processors        => [:thumbnail],
-        :convert_options   => {},
-        :default_url       => "/:attachment/:style/missing.png",
-        :default_style     => :original,
-        :storage           => :filesystem,
-        :whiny             => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails]
+        :url           => "/system/:attachment/:id/:style/:filename",
+        :path          => ":rails_root/public:url",
+        :styles        => {},
+        :default_url   => "/:attachment/:style/missing.png",
+        :default_style => :original,
+        :validations   => [],
+        :storage       => :filesystem,
+        :whiny         => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails]
       }
     end
 
-    attr_reader :name, :instance, :default_style, :convert_options, :queued_for_write, :whiny, :options
+    attr_reader :name, :instance, :styles, :default_style, :convert_options, :queued_for_write, :options
 
     # Creates an Attachment object. +name+ is the name of the attachment,
     # +instance+ is the ActiveRecord object instance it's attached to, and
@@ -37,13 +36,14 @@ module Paperclip
       @path              = options[:path]
       @path              = @path.call(self) if @path.is_a?(Proc)
       @styles            = options[:styles]
-      @normalized_styles = nil
+      @styles            = @styles.call(self) if @styles.is_a?(Proc)
       @default_url       = options[:default_url]
+      @validations       = options[:validations]
       @default_style     = options[:default_style]
       @storage           = options[:storage]
       @whiny             = options[:whiny_thumbnails] || options[:whiny]
-      @convert_options   = options[:convert_options]
-      @processors        = options[:processors]
+      @convert_options   = options[:convert_options] || {}
+      @processors        = options[:processors] || [:thumbnail]
       @options           = options
       @queued_for_delete = []
       @queued_for_write  = {}
@@ -52,29 +52,18 @@ module Paperclip
       @validation_errors = nil
       @dirty             = false
 
+      normalize_style_definition
       initialize_storage
     end
-    
-    def styles
-      unless @normalized_styles
-        @normalized_styles = {}
-        (@styles.respond_to?(:call) ? @styles.call(self) : @styles).each do |name, args|
-          @normalized_styles[name] = Paperclip::Style.new(name, args, self)
-        end
-      end
-      @normalized_styles
-    end
-    
-    def processors
-      @processors.respond_to?(:call) ? @processors.call(instance) : @processors
-    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!
 
@@ -104,7 +93,7 @@ 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)
@@ -126,6 +115,7 @@ module Paperclip
       end
     ensure
       uploaded_file.close if close_uploaded_file
+      validate
     end
 
     # Returns the public URL of the attachment, with a given style. Note that
@@ -135,8 +125,8 @@ module Paperclip
     # security, however, for performance reasons.  set
     # include_updated_timestamp to false if you want to stop the attachment
     # update time appended to the url
-    def url style_name = default_style, include_updated_timestamp = true
-      url = original_filename.nil? ? interpolate(@default_url, style_name) : interpolate(@url, style_name)
+    def url style = default_style, include_updated_timestamp = true
+      url = original_filename.nil? ? interpolate(@default_url, style) : interpolate(@url, style)
       include_updated_timestamp && updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url
     end
 
@@ -144,13 +134,19 @@ module Paperclip
     # file is stored in the filesystem the path refers to the path of the file
     # on disk. If the file is stored in S3, the path is the "key" part of the
     # URL, and the :bucket option refers to the S3 bucket.
-    def path style_name = default_style
-      original_filename.nil? ? nil : interpolate(@path, style_name)
+    def path style = default_style
+      original_filename.nil? ? nil : interpolate(@path, style)
     end
 
     # Alias to +url+
-    def to_s style_name = nil
-      url(style_name)
+    def to_s style = nil
+      url(style)
+    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.
@@ -166,10 +162,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
@@ -178,6 +179,7 @@ module Paperclip
     def clear
       queue_existing_for_delete
       @errors            = {}
+      @validation_errors = nil
     end
 
     # Destroys the attachment. Has the same effect as previously assigning
@@ -309,6 +311,82 @@ 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 normalize_style_definition #:nodoc:
+      @styles.each do |name, args|
+        unless args.is_a? Hash
+          dimensions, format = [args, nil].flatten[0..1]
+          format             = nil if format.blank?
+          @styles[name]      = {
+            :processors      => @processors,
+            :geometry        => dimensions,
+            :format          => format,
+            :whiny           => @whiny,
+            :convert_options => extra_options_for(name)
+          }
+        else
+          @styles[name] = {
+            :processors => @processors,
+            :whiny => @whiny,
+            :convert_options => extra_options_for(name)
+          }.merge(@styles[name])
+        end
+      end
+    end
+
+    def solidify_style_definitions #:nodoc:
+      @styles.each do |name, args|
+        @styles[name][:geometry] = @styles[name][:geometry].call(instance) if @styles[name][:geometry].respond_to?(:call)
+        @styles[name][:processors] = @styles[name][:processors].call(instance) if @styles[name][:processors].respond_to?(:call)
+      end
+    end
+
     def initialize_storage #:nodoc:
       @storage_module = Paperclip::Storage.const_get(@storage.to_s.capitalize)
       self.extend(@storage_module)
@@ -325,6 +403,7 @@ module Paperclip
 
     def post_process #:nodoc:
       return if @queued_for_write[:original].nil?
+      solidify_style_definitions
       return if fire_events(:before)
       post_process_styles
       return if fire_events(:after)
@@ -340,11 +419,11 @@ module Paperclip
     end
 
     def post_process_styles #:nodoc:
-      styles.each do |name, style|
+      @styles.each do |name, args|
         begin
-          raise RuntimeError.new("Style #{name} has no processors defined.") if style.processors.blank?
-          @queued_for_write[name] = style.processors.inject(@queued_for_write[:original]) do |file, processor|
-            Paperclip.processor(processor).make(file, style.processor_options, self)
+          raise RuntimeError.new("Style #{name} has no processors defined.") if args[:processors].blank?
+          @queued_for_write[name] = args[:processors].inject(@queued_for_write[:original]) do |file, processor|
+            Paperclip.processor(processor).make(file, args, self)
           end
         rescue PaperclipError => e
           log("An error was received while processing: #{e.inspect}")
@@ -353,8 +432,8 @@ module Paperclip
       end
     end
 
-    def interpolate pattern, style_name = default_style #:nodoc:
-      Paperclip::Interpolations.interpolate(pattern, self, style_name)
+    def interpolate pattern, style = default_style #:nodoc:
+      Paperclip::Interpolations.interpolate(pattern, self, style)
     end
 
     def mime_type
@@ -381,7 +460,7 @@ module Paperclip
 
     def queue_existing_for_delete #:nodoc:
       return unless file?
-      @queued_for_delete += [:original, *styles.keys].uniq.map do |style|
+      @queued_for_delete += [:original, *@styles.keys].uniq.map do |style|
         path(style) if exists?(style)
       end.compact
       instance_write(:file_name, nil)

data/lib/paperclip/interpolations.rb

@@ -34,30 +34,30 @@ module Paperclip
     end
 
     # Returns the filename, the same way as ":basename.:extension" would.
-    def filename attachment, style_name
-      "#{basename(attachment, style_name)}.#{extension(attachment, style_name)}"
+    def filename attachment, style
+      "#{basename(attachment, style)}.#{extension(attachment, style)}"
     end
 
     # Returns the interpolated URL. Will raise an error if the url itself
     # contains ":url" to prevent infinite recursion. This interpolation
     # is used in the default :path to ease default specifications.
-    def url attachment, style_name
+    def url attachment, style
       raise InfiniteInterpolationError if attachment.options[:url].include?(":url")
-      attachment.url(style_name, false)
+      attachment.url(style, false)
     end
 
     # Returns the timestamp as defined by the <attachment>_updated_at field
-    def timestamp attachment, style_name
+    def timestamp attachment, style
       attachment.instance_read(:updated_at).to_s
     end
 
     # Returns the RAILS_ROOT constant.
-    def rails_root attachment, style_name
+    def rails_root attachment, style
       RAILS_ROOT
     end
 
     # Returns the RAILS_ENV constant.
-    def rails_env attachment, style_name
+    def rails_env attachment, style
       RAILS_ENV
     end
 
@@ -65,44 +65,44 @@ module Paperclip
     # e.g. "users" for the User class.
     # NOTE: The arguments need to be optional, because some tools fetch
     # all class names. Calling #class will return the expected class.
-    def class attachment = nil, style_name = nil
-      return super() if attachment.nil? && style_name.nil?
+    def class attachment = nil, style = nil
+      return super() if attachment.nil? && style.nil?
       attachment.instance.class.to_s.underscore.pluralize
     end
 
     # Returns the basename of the file. e.g. "file" for "file.jpg"
-    def basename attachment, style_name
+    def basename attachment, style
       attachment.original_filename.gsub(/#{File.extname(attachment.original_filename)}$/, "")
     end
 
     # Returns the extension of the file. e.g. "jpg" for "file.jpg"
     # If the style has a format defined, it will return the format instead
     # of the actual extension.
-    def extension attachment, style_name 
-      ((style = attachment.styles[style_name]) && style[:format]) ||
+    def extension attachment, style 
+      ((style = attachment.styles[style]) && style[:format]) ||
         File.extname(attachment.original_filename).gsub(/^\.+/, "")
     end
 
     # Returns the id of the instance.
-    def id attachment, style_name
+    def id attachment, style
       attachment.instance.id
     end
 
     # Returns the id of the instance in a split path form. e.g. returns
     # 000/001/234 for an id of 1234.
-    def id_partition attachment, style_name
+    def id_partition attachment, style
       ("%09d" % attachment.instance.id).scan(/\d{3}/).join("/")
     end
 
     # Returns the pluralized form of the attachment name. e.g.
     # "avatars" for an attachment of :avatar
-    def attachment attachment, style_name
+    def attachment attachment, style
       attachment.name.to_s.downcase.pluralize
     end
 
     # Returns the style, or the default style if nil is supplied.
-    def style attachment, style_name
-      style_name || attachment.default_style
+    def style attachment, style
+      style || attachment.default_style
     end
   end
 end

data/lib/paperclip/iostream.rb

@@ -4,8 +4,7 @@ module IOStream
 
   # Returns a Tempfile containing the contents of the readable object.
   def to_tempfile
-    name = respond_to?(:original_filename) ? original_filename : (respond_to?(:path) ? path : "stream")
-    tempfile = Paperclip::Tempfile.new(File.basename(name))
+    tempfile = Tempfile.new("stream")
     tempfile.binmode
     self.stream_to(tempfile)
   end

data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb

@@ -46,8 +46,9 @@ module Paperclip
           types.all? do |type|
             file = StringIO.new(".")
             file.content_type = type
-            (subject = @subject.new).attachment_for(@attachment_name).assign(file)
-            subject.valid? && subject.errors.on(:"#{@attachment_name}_content_type").blank?
+            attachment = @subject.new.attachment_for(@attachment_name)
+            attachment.assign(file)
+            attachment.errors[:content_type].nil?
           end
         end
 

data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb

@@ -30,16 +30,16 @@ module Paperclip
         protected
 
         def error_when_not_valid?
-          (subject = @subject.new).send(@attachment_name).assign(nil)
-          subject.valid?
-          not subject.errors.on(:"#{@attachment_name}_file_name").blank?
+          @attachment = @subject.new.send(@attachment_name)
+          @attachment.assign(nil)
+          not @attachment.errors[:presence].nil?
         end
 
         def no_error_when_valid?
           @file = StringIO.new(".")
-          (subject = @subject.new).send(@attachment_name).assign(@file)
-          subject.valid?
-          subject.errors.on(:"#{@attachment_name}_file_name").blank?
+          @attachment = @subject.new.send(@attachment_name)
+          @attachment.assign(@file)
+          @attachment.errors[:presence].nil?
         end
       end
     end

data/lib/paperclip/matchers/validate_attachment_size_matcher.rb

@@ -54,11 +54,9 @@ module Paperclip
         def passes_validation_with_size(new_size)
           file = StringIO.new(".")
           override_method(file, :size){ new_size }
-          override_method(file, :to_tempfile){ file }
-
-          (subject = @subject.new).send(@attachment_name).assign(file)
-          subject.valid?
-          subject.errors.on(:"#{@attachment_name}_file_size").blank?
+          attachment = @subject.new.attachment_for(@attachment_name)
+          attachment.assign(file)
+          attachment.errors[:size].nil?
         end
 
         def lower_than_low?

data/lib/paperclip/storage.rb

@@ -20,9 +20,9 @@ module Paperclip
       def self.extended base
       end
       
-      def exists?(style_name = default_style)
+      def exists?(style = default_style)
         if original_filename
-          File.exist?(path(style_name))
+          File.exist?(path(style))
         else
           false
         end
@@ -30,17 +30,17 @@ module Paperclip
 
       # Returns representation of the data of the file assigned to the given
       # style, in the format most representative of the current storage.
-      def to_file style_name = default_style
-        @queued_for_write[style_name] || (File.new(path(style_name), 'rb') if exists?(style_name))
+      def to_file style = default_style
+        @queued_for_write[style] || (File.new(path(style), 'rb') if exists?(style))
       end
 
       def flush_writes #:nodoc:
-        @queued_for_write.each do |style_name, file|
+        @queued_for_write.each do |style, file|
           file.close
-          FileUtils.mkdir_p(File.dirname(path(style_name)))
-          log("saving #{path(style_name)}")
-          FileUtils.mv(file.path, path(style_name))
-          FileUtils.chmod(0644, path(style_name))
+          FileUtils.mkdir_p(File.dirname(path(style)))
+          log("saving #{path(style)}")
+          FileUtils.mv(file.path, path(style))
+          FileUtils.chmod(0644, path(style))
         end
         @queued_for_write = {}
       end
@@ -159,10 +159,6 @@ module Paperclip
           "#{attachment.s3_protocol}://#{attachment.bucket_name}.s3.amazonaws.com/#{attachment.path(style).gsub(%r{^/}, "")}"
         end
       end
-      
-      def expiring_url(time = 3600)
-        AWS::S3::S3Object.url_for(path, bucket_name, :expires_in => time )
-      end
 
       def bucket_name
         @bucket

data/lib/paperclip/thumbnail.rb

@@ -12,7 +12,6 @@ module Paperclip
     # set, the options will be appended to the convert command upon image conversion 
     def initialize file, options = {}, attachment = nil
       super
-      
       geometry             = options[:geometry]
       @file                = file
       @crop                = geometry[-1,1] == '#'
@@ -25,7 +24,6 @@ module Paperclip
 
       @current_format      = File.extname(@file.path)
       @basename            = File.basename(@file.path, @current_format)
-      
     end
 
     # Returns true if the +target_geometry+ is meant to crop.

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
@@ -121,7 +133,7 @@ class AttachmentTest < Test::Unit::TestCase
                                :styles => { :default => ["100x100", :png] },
                                :default_style => :default
       @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
+      @file.expects(:original_filename).returns("file.jpg")
     end
     should "return the right extension for the path" do
       @attachment.assign(@file)
@@ -150,6 +162,11 @@ class AttachmentTest < Test::Unit::TestCase
     should "report the correct options when sent #extra_options_for(:large)" do
       assert_equal "-do_stuff", @dummy.avatar.send(:extra_options_for, :large)
     end
+
+    before_should "call extra_options_for(:thumb/:large)" do
+      Paperclip::Attachment.any_instance.expects(:extra_options_for).with(:thumb)
+      Paperclip::Attachment.any_instance.expects(:extra_options_for).with(:large)
+    end
   end
 
   context "An attachment with :convert_options that is a proc" do
@@ -177,6 +194,11 @@ class AttachmentTest < Test::Unit::TestCase
     should "report the correct options when sent #extra_options_for(:large)" do
       assert_equal "-all", @dummy.avatar.send(:extra_options_for, :large)
     end
+
+    before_should "call extra_options_for(:thumb/:large)" do
+      Paperclip::Attachment.any_instance.expects(:extra_options_for).with(:thumb)
+      Paperclip::Attachment.any_instance.expects(:extra_options_for).with(:large)
+    end
   end
   
   context "An attachment with :path that is a proc" do
@@ -245,6 +267,10 @@ class AttachmentTest < Test::Unit::TestCase
         @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(".")
@@ -281,6 +307,10 @@ class AttachmentTest < Test::Unit::TestCase
       @attachment = Dummy.new.avatar
     end
 
+    should "not run the proc immediately" do
+      assert_kind_of Proc, @attachment.styles[:normal][:processors]
+    end
+
     context "when assigned" do
       setup do
         @attachment.assign(StringIO.new("."))
@@ -324,22 +354,19 @@ class AttachmentTest < Test::Unit::TestCase
       setup { @dummy.avatar = @file }
 
       before_should "call #make on all specified processors" do
-        Paperclip::Thumbnail.expects(:make).with(any_parameters).returns(@file)
-        Paperclip::Test.expects(:make).with(any_parameters).returns(@file)
-      end
-      
-      before_should "call #make with the right parameters passed as second argument" do
         expected_params = @style_params[:once].merge({:processors => [:thumbnail, :test], :whiny => true, :convert_options => ""})
-        Paperclip::Thumbnail.expects(:make).with(anything, expected_params, anything).returns(@file)
+        Paperclip::Thumbnail.expects(:make).with(@file, expected_params, @dummy.avatar).returns(@file)
+        Paperclip::Test.expects(:make).with(@file, expected_params, @dummy.avatar).returns(@file)
       end
       
       before_should "call #make with attachment passed as third argument" do
-        Paperclip::Test.expects(:make).with(anything, anything, @dummy.avatar).returns(@file)
+        expected_params = @style_params[:once].merge({:processors => [:thumbnail, :test], :whiny => true, :convert_options => ""})
+        Paperclip::Test.expects(:make).with(@file, expected_params, @dummy.avatar).returns(@file)
       end
     end
   end
 
-  context "An attachment with styles but no processors defined" do
+  context "An attachment with no processors defined" do
     setup do
       rebuild_model :processors => [], :styles => {:something => 1}
       @dummy = Dummy.new
@@ -350,17 +377,6 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
-  context "An attachment without styles and with no processors defined" do
-    setup do
-      rebuild_model :processors => [], :styles => {}
-      @dummy = Dummy.new
-      @file = StringIO.new("...")
-    end
-    should "not raise when assigned to" do
-      @dummy.avatar = @file
-    end
-  end
-
   context "Assigning an attachment with post_process hooks" do
     setup do
       rebuild_model :styles => { :something => "100x100#" }
@@ -462,6 +478,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
     
@@ -480,7 +498,6 @@ class AttachmentTest < Test::Unit::TestCase
       FileUtils.rm_rf("tmp")
       rebuild_model
       @instance = Dummy.new
-      @instance.stubs(:id).returns 123
       @attachment = Paperclip::Attachment.new(:avatar, @instance)
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
     end
@@ -589,7 +606,6 @@ class AttachmentTest < Test::Unit::TestCase
             should "commit the files to disk" do
               [:large, :medium, :small].each do |style|
                 io = @attachment.to_file(style)
-                # p "in commit to disk test, io is #{io.inspect} and @instance.id is #{@instance.id}"
                 assert File.exists?(io)
                 assert ! io.is_a?(::Tempfile)
                 io.close

data/test/helper.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 require 'shoulda'
 require 'tempfile'
 
-gem 'jferris-mocha'
+gem 'jferris-mocha', '0.9.5.0.1241126838'
 require 'mocha'
 
 gem 'sqlite3-ruby'

data/test/iostream_test.rb

@@ -58,15 +58,8 @@ class IOStreamTest < Test::Unit::TestCase
         assert @tempfile = @file.to_tempfile
       end
 
-      should "convert it to a Paperclip Tempfile" do
-        assert @tempfile.is_a?(Paperclip::Tempfile)
-      end
-
-      should "have the name be based on the original_filename" do
-        name = File.basename(@file.path)
-        extension = File.extname(name)
-        basename = File.basename(name, extension)
-        assert_match %r[^#{Regexp.quote(basename)}.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
+      should "convert it to a Tempfile" do
+        assert @tempfile.is_a?(Tempfile)
       end
 
       should "have the Tempfile contain the same data as the file" do

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -5,7 +5,6 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
     setup do
       reset_table("dummies") do |d|
         d.string :avatar_file_name
-        d.string :avatar_content_type
       end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -3,9 +3,7 @@ require 'test/helper'
 class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
   context "validate_attachment_presence" do
     setup do
-      reset_table("dummies") do |d|
-        d.string :avatar_file_name
-      end
+      reset_table("dummies"){|d| d.string :avatar_file_name }
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar
       @matcher     = self.class.validate_attachment_presence(:avatar)

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -5,7 +5,6 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
     setup do
       reset_table("dummies") do |d|
         d.string :avatar_file_name
-        d.integer :avatar_file_size
       end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar

data/test/paperclip_test.rb

@@ -185,23 +185,45 @@ 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
       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?
+        @dummy.avatar.expects(:validate_presence).returns(nil)
+        @dummy.valid?
       end
 
       should "not attempt validation if the guard returns false" do
         @dummy.expects(:foo).returns(false)
-        assert @dummy.valid?
+        @dummy.avatar.expects(:validate_presence).never
+        @dummy.valid?
       end
     end
 
@@ -209,17 +231,18 @@ class PaperclipTest < Test::Unit::TestCase
       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?
+        @dummy.avatar.expects(:validate_presence).returns(nil)
+        @dummy.valid?
       end
 
       should "not attempt validation if the guard returns false" do
         @dummy.expects(:foo).returns(true)
-        assert @dummy.valid?
+        @dummy.avatar.expects(:validate_presence).never
+        @dummy.valid?
       end
     end
 
@@ -236,11 +259,11 @@ class PaperclipTest < Test::Unit::TestCase
           end
           if validation == :presence
             should "have an error on the attachment" do
-              assert @dummy.errors.on(:avatar_file_name)
+              assert @dummy.errors.on(:avatar)
             end
           else
             should "not have an error on the attachment" do
-              assert_nil @dummy.errors.on(:avatar_file_name), @dummy.errors.full_messages.join(", ")
+              assert_nil @dummy.errors.on(:avatar)
             end
           end
         end
@@ -250,7 +273,10 @@ class PaperclipTest < Test::Unit::TestCase
             @dummy.valid?
           end
           should "not have an error when assigned a valid file" do
-            assert_equal 0, @dummy.errors.length, @dummy.errors.full_messages.join(", ")
+            assert ! @dummy.avatar.errors.key?(validation)
+          end
+          should "not have an error on the attachment" do
+            assert_nil @dummy.errors.on(:avatar)
           end
         end
         context "and assigned an invalid file" do
@@ -259,14 +285,17 @@ class PaperclipTest < Test::Unit::TestCase
             @dummy.valid?
           end
           should "have an error when assigned a valid file" do
-            assert @dummy.errors.length > 0
+            assert_not_nil @dummy.avatar.errors[validation]
+          end
+          should "have an error on the attachment" do
+            assert @dummy.errors.on(:avatar)
           end
         end
       end
     end
 
     [[:presence,      {},                              "5k.png",   nil],
-     [:size,          {:in => 1..10240},               "5k.png",   "12k.png"],
+     [:size,          {:in => 1..10240},               nil,        "12k.png"],
      [:size,          {:less_than => 10240},           "5k.png",   "12k.png"],
      [:size,          {:greater_than => 8096},         "12k.png",  "5k.png"],
      [:content_type,  {:content_type => "image/png"},  "5k.png",   "text.txt"],
@@ -289,7 +318,7 @@ class PaperclipTest < Test::Unit::TestCase
         end
         
         should "have a file size min/max error message" do
-          assert_match %r/between 0 and 10240 bytes/, @dummy.errors.on(:avatar_file_size)
+          assert_match /between 0 and 10240 bytes/, @dummy.errors.on(:avatar)
         end
       end
     end

data/test/storage_test.rb

@@ -96,33 +96,6 @@ class StorageTest < Test::Unit::TestCase
       assert_match %r{^http://something.something.com/avatars/stringio.txt}, @dummy.avatar.url
     end
   end
-  
-  context "Generating a url with an expiration" do
-    setup do
-      AWS::S3::Base.stubs(:establish_connection!)
-      rebuild_model :storage => :s3,
-                    :s3_credentials => {
-                      :production   => { :bucket => "prod_bucket" },
-                      :development  => { :bucket => "dev_bucket" }
-                    },
-                    :s3_host_alias => "something.something.com",
-                    :path => ":attachment/:basename.:extension",
-                    :url => ":s3_alias_url"
-                    
-      rails_env("production")
-      
-      @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
-      
-      AWS::S3::S3Object.expects(:url_for).with("avatars/stringio.txt", "prod_bucket", { :expires_in => 3600 })
-      
-      @dummy.avatar.expiring_url
-    end
-    
-    should "should succeed" do
-      assert true
-    end
-  end
 
   context "Parsing S3 credentials with a bucket in them" do
     setup do

data/test/thumbnail_test.rb

@@ -200,7 +200,7 @@ class ThumbnailTest < Test::Unit::TestCase
     teardown { @file.close }
 
     should "start with two pages with dimensions 612x792" do
-      cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
+      cmd = %Q[identify -format "%wx%h" "#{@file.path}"] 
       assert_equal "612x792"*2, `#{cmd}`.chomp
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bteitelb-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.13
+  version: 2.3.1.14
 platform: ruby
 authors: 
 - Jon Yurek
@@ -100,7 +100,6 @@ files:
 - lib/paperclip/matchers.rb
 - lib/paperclip/processor.rb
 - lib/paperclip/storage.rb
-- lib/paperclip/style.rb
 - lib/paperclip/thumbnail.rb
 - lib/paperclip/upfile.rb
 - lib/paperclip.rb

data/lib/paperclip/style.rb

@@ -1,90 +0,0 @@
-# encoding: utf-8
-module Paperclip
-  # The Style class holds the definition of a thumbnail style,  applying
-  # whatever processing is required to normalize the definition and delaying
-  # the evaluation of block parameters until useful context is available.
-  
-  class Style
-
-    attr_reader :name, :attachment, :format
-
-    # Creates a Style object. +name+ is the name of the attachment,
-    # +definition+ is the style definition from has_attached_file, which
-    # can be string, array or hash
-    def initialize name, definition, attachment
-      @name = name
-      @attachment = attachment
-      if definition.is_a? Hash
-        @geometry = definition.delete(:geometry)
-        @format = definition.delete(:format)
-        @processors = definition.delete(:processors)
-        @other_args = definition
-      else
-        @geometry, @format = [definition, nil].flatten[0..1]
-        @other_args = {}
-      end
-      @format  = nil if @format.blank?
-    end
-    
-    # retrieves from the attachment the processors defined in the has_attached_file call
-    # (which method (in the attachment) will call any supplied procs)
-    # There is an important change of interface here: a style rule can set its own processors
-    # by default we behave as before, though.
-    def processors
-      @processors || attachment.processors
-    end
-    
-    # retrieves from the attachment the whiny setting
-    def whiny
-      attachment.whiny
-    end
-    
-    # returns true if we're inclined to grumble
-    def whiny?
-      !!whiny
-    end
-    
-    def convert_options
-      attachment.send(:extra_options_for, name)
-    end
-
-    # returns the geometry string for this style
-    # if a proc has been supplied, we call it here
-    def geometry
-      @geometry.respond_to?(:call) ? @geometry.call(attachment.instance) : @geometry
-    end
-
-    # Supplies the hash of options that processors expect to receive as their second argument
-    # Arguments other than the standard geometry, format etc are just passed through from 
-    # initialization and any procs are called here, just before post-processing.
-    def processor_options
-      args = {}
-      @other_args.each do |k,v|
-        args[k] = v.respond_to?(:call) ? v.call(attachment) : v
-      end
-      [:processors, :geometry, :format, :whiny, :convert_options].each do |k|
-        (arg = send(k)) && args[k] = arg 
-      end
-      args
-    end
-
-    # Supports getting and setting style properties with hash notation to ensure backwards-compatibility
-    # eg. @attachment.styles[:large][:geometry]@ will still work
-    def [](key)
-      if [:name, :convert_options, :whiny, :processors, :geometry, :format].include?(key) 
-        send(key)
-      elsif defined? @other_args[key]
-        @other_args[key]
-      end
-    end
-    
-    def []=(key, value)
-      if [:name, :convert_options, :whiny, :processors, :geometry, :format].include?(key)
-        send("#{key}=".intern, value)
-      else
-        @other_args[key] = value
-      end
-    end
-    
-  end
-end