paperclip 4.1.1 → 4.2.0

data/features/support/rails.rb

@@ -6,7 +6,8 @@ ORIGINAL_BUNDLE_VARS = Hash[ENV.select{ |key,value| BUNDLE_ENV_VARS.include?(key
 ENV['RAILS_ENV'] = 'test'
 
 Before do
-  ENV['BUNDLE_GEMFILE'] = File.join(Dir.pwd, ENV['BUNDLE_GEMFILE']) unless ENV['BUNDLE_GEMFILE'].start_with?(Dir.pwd)
+  gemfile = ENV['BUNDLE_GEMFILE'].to_s
+  ENV['BUNDLE_GEMFILE'] = File.join(Dir.pwd, gemfile) unless gemfile.start_with?(Dir.pwd)
   @framework_version = nil
 end
 

data/gemfiles/3.2.gemfile

@@ -2,9 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "jruby-openssl", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
-gem "pry", :platform=>:ruby
+gem "sqlite3", "1.3.8", :platforms=>:ruby
+gem "jruby-openssl", :platforms=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "rubysl", :platforms=>:rbx
+gem "racc", :platforms=>:rbx
 gem "rails", "~> 3.2.15"
 gem "paperclip", :path=>"../"
 

data/gemfiles/4.0.gemfile

@@ -2,9 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "jruby-openssl", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
-gem "pry", :platform=>:ruby
+gem "sqlite3", "1.3.8", :platforms=>:ruby
+gem "jruby-openssl", :platforms=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "rubysl", :platforms=>:rbx
+gem "racc", :platforms=>:rbx
 gem "rails", "~> 4.0.0"
 gem "paperclip", :path=>"../"
 

data/gemfiles/4.1.gemfile

@@ -2,9 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "jruby-openssl", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
-gem "sqlite3", :platform=>:ruby
+gem "sqlite3", "1.3.8", :platforms=>:ruby
+gem "jruby-openssl", :platforms=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "rubysl", :platforms=>:rbx
+gem "racc", :platforms=>:rbx
 gem "rails", "~> 4.1.0.beta"
 gem "paperclip", :path=>"../"
 

data/lib/generators/paperclip/paperclip_generator.rb

@@ -16,8 +16,6 @@ class PaperclipGenerator < ActiveRecord::Generators::Base
     migration_template "paperclip_migration.rb.erb", "db/migrate/#{migration_file_name}"
   end
 
-  protected
-
   def migration_name
     "add_attachment_#{attachment_names.join("_")}_to_#{name.underscore.pluralize}"
   end

data/lib/generators/paperclip/templates/paperclip_migration.rb.erb

@@ -9,7 +9,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 
   def self.down
 <% attachment_names.each do |attachment| -%>
-    drop_attached_file :<%= table_name %>, :<%= attachment %>
+    remove_attachment :<%= table_name %>, :<%= attachment %>
 <% end -%>
   end
 end

data/lib/paperclip.rb

@@ -75,6 +75,8 @@ module Paperclip
   # * command_path: Defines the path at which to find the command line
   #   programs if they are not visible to Rails the system's search path. Defaults to
   #   nil, which uses the first executable found in the user's search path.
+  # * use_exif_orientation: Whether to inspect EXIF data to determine an
+  #   image's orientation. Defaults to true.
   def self.options
     @options ||= {
       :whiny => true,
@@ -83,7 +85,8 @@ module Paperclip
       :log => true,
       :log_command => true,
       :swallow_stderr => true,
-      :content_type_mappings => {}
+      :content_type_mappings => {},
+      :use_exif_orientation => true
     }
   end
 

data/lib/paperclip/attachment.rb

@@ -87,37 +87,29 @@ module Paperclip
     end
 
     # What gets called when you call instance.attachment = File. It clears
-    # errors, assigns attributes, and processes the file. 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:
+    # errors, assigns attributes, and processes the file. 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
-    def assign uploaded_file
+    def assign(uploaded_file)
+      @file = Paperclip.io_adapters.for(uploaded_file)
       ensure_required_accessors!
       ensure_required_validations!
-      file = Paperclip.io_adapters.for(uploaded_file)
 
-      return nil if not file.assignment?
-      self.clear(*only_process)
-      return nil if file.nil?
+      if @file.assignment?
+        clear(*only_process)
 
-      @queued_for_write[:original]   = file
-      instance_write(:file_name,       cleanup_filename(file.original_filename))
-      instance_write(:content_type,    file.content_type.to_s.strip)
-      instance_write(:file_size,       file.size)
-      instance_write(:fingerprint,     file.fingerprint) if instance_respond_to?(:fingerprint)
-      instance_write(:created_at,      Time.now) if has_enabled_but_unset_created_at?
-      instance_write(:updated_at,      Time.now)
-
-      @dirty = true
-
-      post_process(*only_process) if post_processing
-
-      # Reset the file size if the original file was reprocessed.
-      instance_write(:file_size,   @queued_for_write[:original].size)
-      instance_write(:fingerprint, @queued_for_write[:original].fingerprint) if instance_respond_to?(:fingerprint)
-      updater = :"#{name}_file_name_will_change!"
-      instance.send updater if instance.respond_to? updater
+        if @file.nil?
+          nil
+        else
+          assign_attributes
+          post_process_file
+          reset_file_if_original_reprocessed
+        end
+      else
+        nil
+      end
     end
 
     # Returns the public URL of the attachment with a given style. This does
@@ -142,9 +134,8 @@ module Paperclip
     #
     # +#new(Paperclip::Attachment, options_hash)+
     # +#for(style_name, options_hash)+
-    def url(style_name = default_style, options = {})
-      default_options = {:timestamp => @options[:use_timestamp], :escape => @options[:escape_url]}
 
+    def url(style_name = default_style, options = {})
       if options == true || options == false # Backwards compatibility.
         @url_generator.for(style_name, default_options.merge(:timestamp => options))
       else
@@ -152,6 +143,13 @@ module Paperclip
       end
     end
 
+    def default_options
+      {
+        :timestamp => @options[:use_timestamp],
+        :escape => @options[:escape_url]
+      }
+    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.
@@ -391,8 +389,16 @@ module Paperclip
       @instance.class.validators.map(&:class)
     end
 
+    def required_validator_classes
+      Paperclip::REQUIRED_VALIDATORS + Paperclip::REQUIRED_VALIDATORS.flat_map(&:descendants)
+    end
+
+    def missing_required_validator?
+      (active_validator_classes & required_validator_classes).empty?
+    end
+
     def ensure_required_validations!
-      if (active_validator_classes & Paperclip::REQUIRED_VALIDATORS).empty?
+      if missing_required_validator?
         raise Paperclip::Errors::MissingRequiredValidatorError
       end
     end
@@ -419,6 +425,61 @@ module Paperclip
       self.extend(storage_module)
     end
 
+    def assign_attributes
+      @queued_for_write[:original] = @file
+      assign_file_information
+      assign_fingerprint(@file.fingerprint)
+      assign_timestamps
+    end
+
+    def assign_file_information
+      instance_write(:file_name, cleanup_filename(@file.original_filename))
+      instance_write(:content_type, @file.content_type.to_s.strip)
+      instance_write(:file_size, @file.size)
+    end
+
+    def assign_fingerprint(fingerprint)
+      if instance_respond_to?(:fingerprint)
+        instance_write(:fingerprint, fingerprint)
+      end
+    end
+
+    def assign_timestamps
+      if has_enabled_but_unset_created_at?
+        instance_write(:created_at, Time.now)
+      end
+
+      instance_write(:updated_at, Time.now)
+    end
+
+    def post_process_file
+      dirty!
+
+      if post_processing
+        post_process(*only_process)
+      end
+    end
+
+    def dirty!
+      @dirty = true
+    end
+
+    def reset_file_if_original_reprocessed
+      instance_write(:file_size, @queued_for_write[:original].size)
+      assign_fingerprint(@queued_for_write[:original].fingerprint)
+      reset_updater
+    end
+
+    def reset_updater
+      if instance.respond_to?(updater)
+        instance.send(updater)
+      end
+    end
+
+    def updater
+      :"#{name}_file_name_will_change!"
+    end
+
     def extra_options_for(style) #:nodoc:
       process_options(:convert_options, style)
     end

data/lib/paperclip/content_type_detector.rb

@@ -40,7 +40,7 @@ module Paperclip
     private
 
     def empty_file?
-      File.exists?(@filename) && File.size(@filename) == 0
+      File.exist?(@filename) && File.size(@filename) == 0
     end
 
     alias :empty? :empty_file?

data/lib/paperclip/geometry_detector_factory.rb

@@ -14,9 +14,11 @@ module Paperclip
 
     def geometry_string
       begin
+        orientation = Paperclip.options[:use_exif_orientation] ?
+          "%[exif:orientation]" : "1"
         Paperclip.run(
           "identify",
-          "-format '%wx%h,%[exif:orientation]' :file", {
+          "-format '%wx%h,#{orientation}' :file", {
             :file => "#{path}[0]"
           }, {
             :swallow_stderr => true

data/lib/paperclip/has_attached_file.rb

@@ -80,7 +80,8 @@ module Paperclip
 
     def add_required_validations
       name = @name
-      @klass.validates_media_type_spoof_detection name, :if => ->{ send(name).dirty? }
+      @klass.validates_media_type_spoof_detection name,
+        :if => ->(instance){ instance.send(name).dirty? }
     end
 
     def add_active_record_callbacks

data/lib/paperclip/interpolations.rb

@@ -101,6 +101,14 @@ module Paperclip
         File.extname(attachment.original_filename).gsub(/\A\.+/, "")
     end
 
+    # Returns the dot+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. If the extension is empty, no dot is added.
+    def dotextension attachment, style_name
+      ext = extension(attachment, style_name)
+      ext.empty? ? "" : ".#{ext}"
+    end
+
     # Returns an extension based on the content type. e.g. "jpeg" for
     # "image/jpeg". If the style has a specified format, it will override the
     # content-type detection.

data/lib/paperclip/io_adapters/abstract_adapter.rb

@@ -34,7 +34,7 @@ module Paperclip
     private
 
     def destination
-      @destination ||= TempfileFactory.new.generate
+      @destination ||= TempfileFactory.new.generate(@original_filename.to_s)
     end
 
     def copy_to_tempfile(src)

data/lib/paperclip/io_adapters/data_uri_adapter.rb

@@ -1,7 +1,7 @@
 module Paperclip
   class DataUriAdapter < StringioAdapter
 
-    REGEXP = /\Adata:([-\w]+\/[-\w\+]+)?;base64,(.*)/m
+    REGEXP = /\Adata:([-\w]+\/[-\w\+\.]+)?;base64,(.*)/m
 
     def initialize(target_uri)
       super(extract_target(target_uri))

data/lib/paperclip/io_adapters/stringio_adapter.rb

@@ -2,7 +2,6 @@ module Paperclip
   class StringioAdapter < AbstractAdapter
     def initialize(target)
       @target = target
-      @tempfile = copy_to_tempfile
       cache_current_values
     end
 
@@ -11,26 +10,21 @@ module Paperclip
     private
 
     def cache_current_values
+      self.original_filename = @target.original_filename if @target.respond_to?(:original_filename)
+      self.original_filename ||= "data"
+      @tempfile = copy_to_tempfile(@target)
       @content_type = ContentTypeDetector.new(@tempfile.path).detect
-      original_filename = @target.original_filename if @target.respond_to?(:original_filename)
-      original_filename ||= "data.#{extension_for(@content_type)}"
-      self.original_filename = original_filename.strip
       @size = @target.size
     end
 
-    def copy_to_tempfile
-      while data = @target.read(16*1024)
+    def copy_to_tempfile(source)
+      while data = source.read(16*1024)
         destination.write(data)
       end
       destination.rewind
       destination
     end
 
-    def extension_for(content_type)
-      type = MIME::Types[content_type].first
-      type && type.extensions.first
-    end
-
   end
 end
 

data/lib/paperclip/locales/de.yml

@@ -0,0 +1,18 @@
+de:
+  errors:
+    messages:
+      in_between: "muss zwischen %{min} und %{max} sein"
+      spoofed_media_type: "trägt eine Dateiendung, die nicht mit dem Inhalt der Datei übereinstimmt"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/locales/es.yml

@@ -0,0 +1,18 @@
+es:
+  errors:
+    messages:
+      in_between: "debe estar entre %{min} y %{max}"
+      spoofed_media_type: "tiene una extensión que no coincide con su contenido"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/matchers/have_attached_file_matcher.rb

@@ -27,9 +27,10 @@ module Paperclip
           "Should have an attachment named #{@attachment_name}"
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "Should not have an attachment named #{@attachment_name}"
         end
+        alias negative_failure_message failure_message_when_negated
 
         def description
           "have an attachment named #{@attachment_name}"

data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb

@@ -26,9 +26,10 @@ module Paperclip
           "Attachment #{@attachment_name} should be required"
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "Attachment #{@attachment_name} should not be required"
         end
+        alias negative_failure_message failure_message_when_negated
 
         def description
           "require presence of attachment #{@attachment_name}"

data/lib/paperclip/matchers/validate_attachment_size_matcher.rb

@@ -45,9 +45,10 @@ module Paperclip
           "Attachment #{@attachment_name} must be between #{@low} and #{@high} bytes"
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "Attachment #{@attachment_name} cannot be between #{@low} and #{@high} bytes"
         end
+        alias negative_failure_message failure_message_when_negated
 
         def description
           "validate the size of attachment #{@attachment_name}"

data/lib/paperclip/media_type_spoof_detector.rb

@@ -10,7 +10,7 @@ module Paperclip
     end
 
     def spoofed?
-      if @name.present? && media_type_mismatch? && mapping_override_mismatch?
+      if has_name? && has_extension? && media_type_mismatch? && mapping_override_mismatch?
         Paperclip.log("Content Type Spoof: Filename #{File.basename(@name)} (#{supplied_file_content_types}), content type discovered from file command: #{calculated_content_type}. See documentation to allow this combination.")
         true
       end
@@ -18,6 +18,14 @@ module Paperclip
 
     private
 
+    def has_name?
+      @name.present?
+    end
+
+    def has_extension?
+      File.extname(@name).present?
+    end
+
     def media_type_mismatch?
       ! supplied_file_media_types.include?(calculated_media_type)
     end
@@ -52,7 +60,7 @@ module Paperclip
 
     def type_from_file_command
       begin
-        Paperclip.run("file", "-b --mime-type :file", :file => @file.path)
+        Paperclip.run("file", "-b --mime :file", :file => @file.path).split(/[:;]\s+/).first
       rescue Cocaine::CommandLineError
         ""
       end