bteitelb-paperclip 2.3.1.6 → 2.3.1.7

data/Rakefile

@@ -76,7 +76,11 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options << '--line-numbers' << '--inline-source'
   s.requirements << "ImageMagick"
   s.add_development_dependency 'thoughtbot-shoulda'
-  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'jferris-mocha', '= 0.9.5.0.1241126838'
+  s.add_development_dependency 'aws-s3'
+  s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'activesupport'
 end
 
 desc "Print a list of the files to be put into the gem"

data/lib/paperclip.rb

@@ -45,7 +45,7 @@ end
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.3.1"
+  VERSION = "2.3.1.1"
 
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:

data/lib/paperclip/attachment.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 module Paperclip
+  require 'mime/types'
+
   # The Attachment class manages the files for a given attachment. It saves
   # when the model saves, deletes when the model is destroyed, and processes
   # the file upon assignment.
@@ -79,6 +81,12 @@ module Paperclip
 
       @queued_for_write[:original]   = uploaded_file.to_tempfile
       instance_write(:file_name,       uploaded_file.original_filename.strip.gsub(/[^A-Za-z\d\.\-_]+/, '_'))
+      
+      # Fix content type when it's application/octet-stream
+      # Useful for SWFUpload which resets all content types to this
+      if uploaded_file.content_type.to_s.strip == 'application/octet-stream'
+        uploaded_file.content_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)

data/lib/paperclip/upfile.rb

@@ -8,12 +8,13 @@ module Paperclip
     def content_type
       type = (self.path.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
       case type
-      when %r"jpe?g"                 then "image/jpeg"
+      when %r"jp(e|g|eg)"            then "image/jpeg"
       when %r"tiff?"                 then "image/tiff"
       when %r"png", "gif", "bmp"     then "image/#{type}"
       when "txt"                     then "text/plain"
       when %r"html?"                 then "text/html"
-      when "csv", "xml", "css", "js" then "text/#{type}"
+      when "js"                      then "application/js"
+      when "csv", "xml", "css"       then "text/#{type}"
       else "application/x-#{type}"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bteitelb-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.6
+  version: 2.3.1.7
 platform: ruby
 authors: 
 - Jon Yurek
@@ -23,7 +23,47 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: jferris-mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.5.0.1241126838
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement