mender_paperclip 2.4.3 → 2.4.3.1

data/lib/paperclip.rb

@@ -100,7 +100,6 @@ module Paperclip
       end
       command_path = options[:command_path] || options[:image_magick_path]
       Cocaine::CommandLine.path = ( Cocaine::CommandLine.path ? [Cocaine::CommandLine.path, command_path ].flatten : command_path )
-      Cocaine::CommandLine.logger = logger
       Cocaine::CommandLine.new(cmd, *params).run
     end
 

data/lib/paperclip/attachment.rb

@@ -103,22 +103,26 @@ module Paperclip
 
       return nil if uploaded_file.nil?
 
-      uploaded_filename            ||= uploaded_file.original_filename
-      uploaded_content_type          = extract_content_type(uploaded_file)
-      uploaded_filename              = rewrite_extension(uploaded_filename, uploaded_content_type)
-      @queued_for_write[:original]   = to_tempfile(uploaded_file)
-      instance_write(:file_name,       uploaded_filename.strip)
-      instance_write(:content_type,    uploaded_content_type)
-      instance_write(:file_size,       uploaded_file.size.to_i)
-      instance_write(:fingerprint,     generate_fingerprint(uploaded_file))
-      instance_write(:updated_at,      Time.now)
+      uploaded_filename          ||= uploaded_file.original_filename
+      @queued_for_write[:original] = to_tempfile(uploaded_file)
+      uploaded_content_type        = extract_content_type(@queued_for_write[:original])
+      instance_write(:file_name,     uploaded_filename.strip)
+      instance_write(:content_type,  uploaded_content_type)
+      instance_write(:file_size,     @queued_for_write[:original].size.to_i)
+      instance_write(:fingerprint,   generate_fingerprint(uploaded_file))
+      instance_write(:updated_at,    Time.now)
+
+      if valid_media_type?(format_content_type)
+        instance_write(:file_name,    real_filename)
+        instance_write(:content_type, format_content_type)
+      end
 
       @dirty = true
 
       post_process(*@options.only_process) if post_processing
 
       # Reset the file size if the original file was reprocessed.
-      instance_write(:file_size,   @queued_for_write[:original].size.to_i)
+      #instance_write(:file_size,   @queued_for_write[:original].size.to_i)
       instance_write(:fingerprint, generate_fingerprint(@queued_for_write[:original]))
     ensure
       uploaded_file.close if close_uploaded_file
@@ -253,9 +257,9 @@ module Paperclip
 
     def extract_content_type(source)
       if @options.use_file_command && source.respond_to?(:type_from_file_command)
-        source.type_from_file_command
+        source.type_from_file_command.to_s.strip
       elsif source.respond_to?(:content_type)
-        source.content_type
+        source.content_type.to_s.strip
       else
         nil
       end
@@ -329,29 +333,55 @@ module Paperclip
 
     private
 
-    def rewrite_extension(original_filename, content_type)
-      original_extension = File.extname(original_filename)
-      original_basename  = File.basename(original_filename, original_extension)
-      original_extension = original_extension.sub(/^\.+/, '')
-
-      mime_type     = MIME::Types[content_type]
-      extensions    = mime_type.empty? ? [] : mime_type.first.extensions
-      extension     = if extensions.include?(original_extension)
-        original_extension
-      elsif extensions.present?
-        extensions.first
+    def real_filename
+      original_filename     = self.original_filename or return
+      original_content_type = self.content_type      or return original_filename
+      original_extension    = File.extname(original_filename)
+      original_basename     = File.basename(original_filename, original_extension)
+      original_extension    = original_extension.sub(/^\.+/, '')
+
+      mime_type  = MIME::Types[original_content_type]
+      extensions = mime_type.empty? ? [] : mime_type.first.extensions
+
+      formats = ((style = styles[:original]) && style[:formats]) || []
+      if formats.present?
+        extension = (formats & extensions || []).first || formats.first
       else
-        %r{/([^/]*)$}.match(content_type)[1]
+        extension = if extensions.include?(original_extension)
+          original_extension
+        elsif extensions.present?
+          extensions.first
+        end
       end
-      puts "#{original_filename} #{content_type} #{extension}"
 
-      if extension.present? && original_extension != extension
+      if extension.present?
         original_basename + '.' + extension
       else
         original_filename
       end
     end
 
+    def format_content_type
+      content_type = self.content_type
+      filename     = self.original_filename or return content_type
+
+      if (types = MIME::Types.type_for(filename)).present?
+        types.first.content_type
+      else
+        content_type
+      end
+    end
+
+    def valid_media_type?(content_type)
+      original_content_type = self.content_type
+
+      original_content_type = MIME::Type.new(original_content_type) if original_content_type.is_a?(String)
+      content_type          = MIME::Type.new(content_type)          if content_type.is_a?(String)
+      return false unless content_type.respond_to?(:media_type)
+
+      original_content_type.blank? || (original_content_type.media_type == content_type.media_type)
+    end
+
     def ensure_required_accessors! #:nodoc:
       %w(file_name).each do |field|
         unless @instance.respond_to?("#{name}_#{field}") && @instance.respond_to?("#{name}_#{field}=")

data/lib/paperclip/interpolations.rb

@@ -93,18 +93,12 @@ module Paperclip
     # 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]
-      ext   = (style && style[:format]) || File.extname(attachment.original_filename).gsub(/^\.+/, "")
-
-      if style && (except_formats = style[:except_formats])
-        except_formats = except_formats.split(/\s+/) if except_formats.respond_to?(:split)
-        original_ext   = File.extname(attachment.original_filename).gsub(/^\.+/, "")
-        ext            = original_ext if except_formats.include?(original_ext)
+      if !attachment.instance.respond_to?(:created_at) || attachment.instance.created_at <= Time.utc(2011, 10, 17, 8, 30, 0)
+        return File.extname(attachment.original_filename).gsub(/^\.+/, "")
       end
 
-      ext
-      #((style = attachment.styles[style_name]) && style[:format]) ||
-      #  File.extname(attachment.original_filename).gsub(/^\.+/, "")
+      ((style = attachment.styles[style_name]) && style[:format]) ||
+        File.extname(attachment.original_filename).gsub(/^\.+/, "")
     end
 
     # Returns an extension based on the content type. e.g. "jpeg" for "image/jpeg".

data/lib/paperclip/style.rb

@@ -6,7 +6,7 @@ module Paperclip
 
   class Style
 
-    attr_reader :name, :attachment, :format
+    attr_reader :name, :attachment, :formats
 
     # Creates a Style object. +name+ is the name of the attachment,
     # +definition+ is the style definition from has_attached_file, which
@@ -16,7 +16,7 @@ module Paperclip
       @attachment = attachment
       if definition.is_a? Hash
         @geometry = definition.delete(:geometry)
-        @format = definition.delete(:format)
+        self.format = definition.delete(:format)
         @processors = definition.delete(:processors)
         @other_args = definition
       else
@@ -76,7 +76,7 @@ module Paperclip
     # Supports getting and setting style properties with hash notation to ensure backwards-compatibility
     # eg. @attachment.options.styles[:large][:geometry]@ will still work
     def [](key)
-      if [:name, :convert_options, :whiny, :processors, :geometry, :format, :animated, :source_file_options].include?(key)
+      if [:name, :convert_options, :whiny, :processors, :geometry, :format, :formats, :animated, :source_file_options].include?(key)
         send(key)
       elsif defined? @other_args[key]
         @other_args[key]
@@ -84,12 +84,26 @@ module Paperclip
     end
 
     def []=(key, value)
-      if [:name, :convert_options, :whiny, :processors, :geometry, :format, :animated, :source_file_options].include?(key)
+      if [:name, :convert_options, :whiny, :processors, :geometry, :format, :formats, :animated, :source_file_options].include?(key)
         send("#{key}=".intern, value)
       else
         @other_args[key] = value
       end
     end
 
+    def formats=(formats)
+      @formats = formats.respond_to?(:split) ? formats.split(/\s+/) : formats.flatten
+    end
+    alias_method :format=, :formats=
+
+    def format
+      if @formats.present? && (filename = attachment.original_filename)
+        ext = File.extname(filename)[1..-1]
+        @formats.include?(ext) ? ext : @formats.first
+      else
+        nil
+      end
+    end
+
   end
 end

data/lib/paperclip/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mender_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000 +06:00
+date: 2011-12-19 00:00:00.000000000 +06:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &83645350 !ruby/object:Gem::Requirement
+  requirement: &84797790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *83645350
+  version_requirements: *84797790
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &83644570 !ruby/object:Gem::Requirement
+  requirement: &84797030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *83644570
+  version_requirements: *84797030
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &83643880 !ruby/object:Gem::Requirement
+  requirement: &84796160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *83643880
+  version_requirements: *84796160
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &83643430 !ruby/object:Gem::Requirement
+  requirement: &84795650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83643430
+  version_requirements: *84795650
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &83642930 !ruby/object:Gem::Requirement
+  requirement: &84795140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83642930
+  version_requirements: *84795140
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &83642370 !ruby/object:Gem::Requirement
+  requirement: &84794770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83642370
+  version_requirements: *84794770
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &83641680 !ruby/object:Gem::Requirement
+  requirement: &84794290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83641680
+  version_requirements: *84794290
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &83607120 !ruby/object:Gem::Requirement
+  requirement: &84793410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83607120
+  version_requirements: *84793410
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &83606440 !ruby/object:Gem::Requirement
+  requirement: &84750510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83606440
+  version_requirements: *84750510
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &83605830 !ruby/object:Gem::Requirement
+  requirement: &84749860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83605830
+  version_requirements: *84749860
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &83605470 !ruby/object:Gem::Requirement
+  requirement: &84749390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +132,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83605470
+  version_requirements: *84749390
 description: Easy upload management for ActiveRecord
 email: jyurek@thoughtbot.com
 executables: []
@@ -226,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 948056321
+      hash: -483573327
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: