paperclip 3.4.1 → 3.4.2

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - jruby-19mode
   - rbx-19mode
+  - 2.0.0
 
 before_script: "sudo ntpdate -ub ntp.ubuntu.com pool.ntp.org; true"
 script: "bundle exec rake clean test cucumber"
@@ -16,3 +17,4 @@ matrix:
   allow_failures:
     - rvm: jruby-19mode
     - rvm: rbx-19mode
+    - rvm: 2.0.0

data/Appraisals

@@ -1,7 +1,7 @@
-appraise "3.0" do
-  gem "rails", "~> 3.0.15"
-  gem "paperclip", :path => "../"
-end
+# appraise "3.0" do
+#   gem "rails", "~> 3.0.15"
+#   gem "paperclip", :path => "../"
+# end
 
 appraise "3.1" do
   gem "rails", "~> 3.1.6"

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 

data/NEWS

@@ -1,7 +1,17 @@
+New in 3.4.2:
+
+* Improvement: Use https for Gemfile urls
+* Improvement: Updated and more correct documentation
+* Improvement: Use the -optimize flag on animated GIFs
+* Improvement: Remove the Gemfile.lock
+* Improvement: Add #expiring_url as an alias for #url until the storage defines it
+* Improvement: Remove path clash checking, as it's unnecessary
+* Bug Fix: Do not rely on checking version numbers for aws-sdk
+
 New in 3.4.1:
 
 * Improvement: Various documentation fixes and improvements
-* Bug Fix: Clearing an attachment with `perserve_files` on should still clear the attachment
+* Bug Fix: Clearing an attachment with `preserve_files` on should still clear the attachment
 * Bug Fix: Instances are #changed? when a new file is assigned
 * Bug Fix: Correctly deal with S3 styles when using a lambda
 * Improvement: Accept and pass :credential_provider option to AWS-SDK

data/README.md

@@ -174,6 +174,9 @@ validation.
 More information about the options to `has_attached_file` is available in the
 documentation of [`Paperclip::ClassMethods`](http://rubydoc.info/gems/paperclip/Paperclip/ClassMethods).
 
+Validations
+-----------
+
 For validations, Paperclip introduces several validators to validate your attachment:
 
 * `AttachmentContentTypeValidator`
@@ -207,6 +210,49 @@ validates_attachment :avatar, :presence => true,
   :size => { :in => 0..10.kilobytes }
 ```
 
+_NOTE: Post processing will not even *start* if the attachment is not valid
+according to the validations. Your callbacks and processors will *only* be
+called with valid attachments._
+
+```ruby
+class Message < ActiveRecord::Base
+  has_attached_file :asset, styles: {thumb: "100x100#"}
+
+  before_post_process :skip_for_audio
+
+  def skip_for_audio
+    ! %w(audio/ogg application/ogg).include?(asset_content_type)
+  end
+end
+```
+
+If you have other validations that depend on assignment order, the recommended
+course of action is to prevent the assignment of the attachment until
+afterwards, then assign manually:
+
+```ruby
+class Book < ActiveRecord::Base
+  has_attached_file :document, styles: {thumbnail: "60x60#"}
+  validates_attachment :document, content_type: "application/pdf"
+  validates_something_else # Other validations that conflict with Paperclip's
+end
+
+class BooksController < ApplicationController
+  def create
+    @book = Book.new(book_params)
+    @book.document = params[:book][:document]
+    @book.save
+    respond_with @book
+  end
+
+  private
+
+  def book_params
+    params.require(:book).permit(:title, :author)
+  end
+end
+```
+
 Defaults
 --------
 Global defaults for all your paperclip attachments can be defined by changing the Paperclip::Attachment.default_options Hash, this can be useful for setting your default storage settings per example so you won't have to define them in every has_attached_file definition.
@@ -327,7 +373,7 @@ You may also choose to store your files using Amazon's S3 service. To do so, inc
 the `aws-sdk` gem in your Gemfile:
 
 ```ruby
-gem 'aws-sdk', '~> 1.3.4'
+gem 'aws-sdk', '~> 1.5.7'
 ```
 
 And then you can specify using S3 from `has_attached_file`.
@@ -532,6 +578,20 @@ class User < ActiveRecord::Base
 end
 ```
 
+Logging
+----------
+
+By default Paperclip outputs logging according to your logger level. If you want to disable logging (e.g. during testing) add this in to your environment's configuration:
+```ruby
+Your::Application.configure do
+...
+  Paperclip.options[:log] = false
+...
+end
+```
+
+More information in the [rdocs](http://rdoc.info/github/thoughtbot/paperclip/Paperclip.options)
+
 Deployment
 ----------
 

data/gemfiles/3.0.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "jruby-openssl", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby

data/gemfiles/3.1.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "jruby-openssl", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby

data/gemfiles/3.2.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "jruby-openssl", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby

data/lib/paperclip.rb

@@ -183,7 +183,6 @@ module Paperclip
 
       attachment_definitions[name] = Paperclip::AttachmentOptions.new(options)
       Paperclip.classes_with_attachments << self.name
-      Paperclip.check_for_path_clash(name,attachment_definitions[name][:path],self.name)
 
       after_save :save_attached_files
       before_destroy :prepare_for_destroy

data/lib/paperclip/attachment.rb

@@ -146,6 +146,13 @@ module Paperclip
       end
     end
 
+    # Alias to +url+ that allows using the expiring_url method provided by the cloud
+    # storage implementations, but keep using filesystem storage for development and
+    # testing.
+    def expiring_url(time = 3600, style_name = default_style)
+      url(style_name)
+    end
+
     # Returns the path of the attachment as defined by the :path option. If the
     # 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

data/lib/paperclip/content_type_detector.rb

@@ -8,9 +8,9 @@ module Paperclip
     end
 
     def detect
-      if blank?
+      if blank_name?
         SENSIBLE_DEFAULT
-      elsif empty?
+      elsif empty_file?
         EMPTY_TYPE
       elsif !match?
         type_from_file_command
@@ -23,11 +23,11 @@ module Paperclip
 
     private
 
-    def empty?
+    def empty_file?
       File.exists?(@filename) && File.size(@filename) == 0
     end
 
-    def blank?
+    def blank_name?
       @filename.nil? || @filename.empty?
     end
 

data/lib/paperclip/helpers.rb

@@ -49,15 +49,6 @@ module Paperclip
       end
     end
 
-    def check_for_path_clash(name,path,klass)
-      @names_path ||= {}
-      default_path = path || Attachment.default_options[:path]
-      if @names_path[name] && @names_path[name][:path] == default_path && @names_path[name][:class] != klass && @names_path[name][:path] !~ /:class/
-        log("Duplicate path for #{name} with #{default_path}. This will clash with attachment defined in #{@names_path[name][:class]} class")
-      end
-      @names_path[name] = {:path => default_path, :class => klass}
-    end
-
     def reset_duplicate_clash_check!
       @names_url = nil
     end

data/lib/paperclip/matchers.rb

@@ -15,7 +15,7 @@ module Paperclip
     #
     # And _include_ the module:
     #
-    #   Spec::Runner.configure do |config|
+    #   RSpec.configure do |config|
     #     config.include Paperclip::Shoulda::Matchers
     #   end
     #

data/lib/paperclip/storage/s3.rb

@@ -99,14 +99,14 @@ module Paperclip
           raise e
         end unless defined?(AWS::Core)
 
-        # Overriding AWS::Core::LogFormatter to make sure it return a UTF-8 string
-        if AWS::VERSION >= "1.3.9"
+        # Overriding log formatter to make sure it return a UTF-8 string
+        if defined?(AWS::Core::LogFormatter)
           AWS::Core::LogFormatter.class_eval do
             def summarize_hash(hash)
               hash.map { |key, value| ":#{key}=>#{summarize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
             end
           end
-        else
+        elsif defined?(AWS::Core::ClientLogging)
           AWS::Core::ClientLogging.class_eval do
             def sanitize_hash(hash)
               hash.map { |key, value| "#{sanitize_value(key)}=>#{sanitize_value(value)}".force_encoding('UTF-8') }.sort.join(',')

data/lib/paperclip/thumbnail.rb

@@ -96,6 +96,7 @@ module Paperclip
       trans << "-auto-orient" if auto_orient
       trans << "-resize" << %["#{scale}"] unless scale.nil? || scale.empty?
       trans << "-crop" << %["#{crop}"] << "+repage" if crop
+      trans << '-layers "optimize"' if animated?
       trans
     end
 

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "3.4.1" unless defined? Paperclip::VERSION
+  VERSION = "3.4.2" unless defined? Paperclip::VERSION
 end

data/test/attachment_test.rb

@@ -953,6 +953,10 @@ class AttachmentTest < Test::Unit::TestCase
       assert_match @attachment.to_s, @attachment.url
       assert_match @attachment.to_s(:small), @attachment.url(:small)
     end
+
+    should "have matching expiring_url and url methods when using the filesystem storage" do
+      assert_match @attachment.expiring_url, @attachment.url
+    end
   end
 
   context "An attachment" do

data/test/helper.rb

@@ -197,3 +197,11 @@ end
 def assert_file_not_exists(path)
   assert !File.exists?(path), %(Expect "#{path}" to not exists.)
 end
+
+def assert_frame_dimensions(range, frames)
+  frames.each_with_index do |frame, frame_index|
+    frame.split('x').each_with_index do |dimension, dimension_index |
+      assert range.include?(dimension.to_i), "Frame #{frame_index}[#{dimension_index}] should have been within #{range.inspect}, but was #{dimension}"
+    end
+  end
+end

data/test/paperclip_test.rb

@@ -107,45 +107,6 @@ class PaperclipTest < Test::Unit::TestCase
     end
   end
 
-  context "Attachments with clashing URLs should raise error" do
-    setup do
-      class Dummy2 < ActiveRecord::Base
-        include Paperclip::Glue
-      end
-    end
-
-    should "generate warning if attachment is redefined with the same path string" do
-      expected_log_msg = "Duplicate path for blah with /system/:id/:style/:filename. This will clash with attachment defined in Dummy class"
-      Paperclip.expects(:log).with(expected_log_msg)
-      Dummy.class_eval do
-        has_attached_file :blah, :path => '/system/:id/:style/:filename'
-      end
-      Dummy2.class_eval do
-        has_attached_file :blah, :path => '/system/:id/:style/:filename'
-      end
-    end
-
-    should "not generate warning if attachment is redefined with the same path string but has :class in it" do
-      Paperclip.expects(:log).never
-      Dummy.class_eval do
-        has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename"
-      end
-      Dummy2.class_eval do
-        has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename"
-      end
-    end
-
-    should "not generate warning if attachment is defined with the same URL string" do
-      Paperclip.expects(:log).never
-      Dummy.class_eval do
-        has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename", :url => ":s3_alias_url"
-      end
-      Dummy2.class_eval do
-        has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename", :url => ":s3_alias_url"
-      end
-    end
-  end
-
   context "An ActiveRecord model with an 'avatar' attachment" do
     setup do
       rebuild_model :path => "tmp/:class/omg/:style.:extension"

data/test/storage/fog_test.rb

@@ -309,7 +309,7 @@ class FogTest < Test::Unit::TestCase
 
       context "with a valid bucket name for a subdomain" do
         should "provide an url in subdomain style" do
-          assert_match @dummy.avatar.url, /^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/
+          assert_match /^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/, @dummy.avatar.url
         end
 
         should "provide an url that expires in subdomain style" do

data/test/thumbnail_test.rb

@@ -380,13 +380,19 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "create the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
-        assert_equal "50x50"*12, `#{cmd}`.chomp
+        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(',')
+        assert_equal 12, frames.size
+        assert_frame_dimensions (45..50), frames
       end
 
       should "use the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
+
+      should "use the -layers 'optimize' option" do
+        assert_equal @thumb.transformation_command.last, '-layers "optimize"'
+      end
     end
 
     context "with omitted output format" do
@@ -396,13 +402,19 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "create the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
-        assert_equal "50x50"*12, `#{cmd}`.chomp
+        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(',')
+        assert_equal 12, frames.size
+        assert_frame_dimensions (45..50), frames
       end
 
       should "use the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
+
+      should "use the -layers 'optimize' option" do
+        assert_equal @thumb.transformation_command.last, '-layers "optimize"'
+      end
     end
 
     context "with unidentified source format" do
@@ -413,13 +425,19 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "create the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
-        assert_equal "60x60"*12, `#{cmd}`.chomp
+        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(',')
+        assert_equal 12, frames.size
+        assert_frame_dimensions (55..60), frames
       end
 
       should "use the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
+
+      should "use the -layers 'optimize' option" do
+        assert_equal @thumb.transformation_command.last, '-layers "optimize"'
+      end
     end
 
     context "with no source format" do
@@ -430,13 +448,19 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "create the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
-        assert_equal "70x70"*12, `#{cmd}`.chomp
+        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(',')
+        assert_equal 12, frames.size
+        assert_frame_dimensions (60..70), frames
       end
 
       should "use the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
+
+      should "use the -layers 'optimize' option" do
+        assert_equal @thumb.transformation_command.last, '-layers "optimize"'
+      end
     end
 
     context "with animated option set to false" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -397,7 +397,6 @@ files:
 - Appraisals
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NEWS
 - README.md
@@ -654,4 +653,3 @@ test_files:
 - test/validators/attachment_presence_validator_test.rb
 - test/validators/attachment_size_validator_test.rb
 - test/validators_test.rb
-has_rdoc: