korobkov-paperclip 2.3.1.200909221741 → 2.3.1.200909222157

data/lib/paperclip.rb

@@ -347,7 +347,6 @@ module Paperclip
 end
 
 # Set it all up.
-if Object.const_defined?("ActiveRecord")
-  ActiveRecord::Base.send(:include, Paperclip)
-  File.send(:include, Paperclip::Upfile)
-end
+ActiveRecord::Base.send(:include, Paperclip) if Object.const_defined?("ActiveRecord")
+Tempfile.send(:include, Paperclip::Upfile)
+File.send(:include, Paperclip::Upfile)

data/lib/paperclip/attachment.rb

@@ -80,7 +80,7 @@ module Paperclip
 
       @queued_for_write[:original]   = uploaded_file.to_tempfile
       instance_write(:file_name,       uploaded_file.original_filename.strip.gsub(/[^A-Za-z\d\.\-_]+/, '_'))
-      instance_write(:content_type,    uploaded_file.content_type.strip)
+      instance_write(:content_type,    uploaded_file.content_type)
       instance_write(:file_size,       uploaded_file.size.to_i)
       instance_write(:file_hexdigest,  uploaded_file.hexdigest)
       instance_write(:updated_at,      Time.now)

data/lib/paperclip/upfile.rb

@@ -9,7 +9,11 @@ module Paperclip
 
     # Infer the MIME-type of the file from the magic.
     def content_type
-       MimeMagic.by_magic(self).type || "application/octet-stream"
+      unless MimeMagic.by_magic(self).nil?
+        MimeMagic.by_magic(self).type
+      else
+        "application/octet-stream"
+      end
     end
 
     # Returns the file's normal name.
@@ -40,8 +44,3 @@ if defined? StringIO
     end
   end
 end
-
-class File #:nodoc:
-  include Paperclip::Upfile
-end
-

data/tasks/paperclip_tasks.rake

@@ -54,7 +54,7 @@ namespace :paperclip do
       for_all_attachments do |instance, name|
         if file = instance.send(name).to_file
           instance.send("#{name}_file_name=", instance.send("#{name}_file_name").strip)
-          instance.send("#{name}_content_type=", file.content_type.strip)
+          instance.send("#{name}_content_type=", file.content_type)
           instance.send("#{name}_file_size=", file.size) if instance.respond_to?("#{name}_file_size")
           instance.send("#{name}_file_hexdigest=", file.hexdigest) if instance.respond_to?("#{name}_file_hexdigest")
           instance.save(false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: korobkov-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.200909221741
+  version: 2.3.1.200909222157
 platform: ruby
 authors: 
 - Jon Yurek