bteitelb-paperclip 2.3.1.10 → 2.3.1.11

data/lib/paperclip.rb

@@ -94,7 +94,7 @@ module Paperclip
     # Paperclip.options[:log_command] is set to true (defaults to false). This
     # will only log if logging in general is set to true as well.
     def run cmd, params = "", expected_outcodes = 0
-      command = %Q[#{path_for_command(cmd)} #{params}].gsub(/\s+/, " ")
+      command = %Q["#{path_for_command(cmd)}" #{params}].gsub(/\s+/, " ")
       command = "#{command} 2>#{bit_bucket}" if Paperclip.options[:swallow_stderr]
       Paperclip.log(command) if Paperclip.options[:log_command]
       output = `#{command}`

data/lib/paperclip/attachment.rb

@@ -271,6 +271,15 @@ module Paperclip
     # Determines whether or not the attachment is an image based on the content_type
     def image?
       !content_type.nil? and !!content_type.match(%r{\Aimage/})
+      
+      # Fix content type when it's application/octet-stream
+      if content_type.to_s.strip == 'application/octet-stream'
+        mime_type = MIME::Types.type_for(uploaded_file.original_filename.strip).to_s
+      end
+      instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
+      instance_write(:file_size,       uploaded_file.size.to_i)
+      instance_write(:updated_at,      Time.now)
+      
     end
 
     # Writes the attachment-specific attribute on the instance. For example,
@@ -436,6 +445,11 @@ module Paperclip
       Paperclip::Interpolations.interpolate(pattern, self, style)
     end
 
+    def mime_type
+      uploaded_file.content_type = MIME::Types.type_for(instance_read(:file_name)).to_s
+      
+    end
+
     def dimensions style = default_style
       return [nil,nil] unless image?
       return @dimensions[style] unless @dimensions[style].nil?

data/lib/paperclip/geometry.rb

@@ -15,8 +15,13 @@ module Paperclip
     # File or path.
     def self.from_file file
       file = file.path if file.respond_to? "path"
+      if RUBY_PLATFORM =~ /mswin32/
+        args = %Q[-format ^%wx^%h "#{file}"[0]]
+      else
+        args = %Q[-format "%wx%h" "#{file}"[0]]
+      end
       geometry = begin
-                   Paperclip.run("identify", %Q[-format "%wx%h" "#{file}"[0]])
+                   Paperclip.run("identify", args)
                  rescue PaperclipCommandLineError
                    ""
                  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bteitelb-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.10
+  version: 2.3.1.11
 platform: ruby
 authors: 
 - Jon Yurek