rails-uploader 0.2.4 → 0.2.5

data/app/controllers/uploader/attachments_controller.rb

@@ -47,10 +47,8 @@ module Uploader
       end
       
       def render_json(hash_or_object, status = 200)
-        ctype = env["HTTP_USER_AGENT"] && env["HTTP_USER_AGENT"].include?("Android") ? "text/plain" : "application/json"
-
         self.status = status
-        self.content_type = ctype
+        self.content_type = Uploader.content_type(env["HTTP_USER_AGENT"])
         self.response_body = hash_or_object.to_json(:root => false)
       end
   end

data/lib/uploader.rb

@@ -31,6 +31,19 @@ module Uploader
     return if klass.blank?
     klass.safe_constantize
   end
+
+  def self.content_type(user_agent)
+    return "application/json" if user_agent.blank?
+
+    ie_version = user_agent.scan(/(MSIE\s|rv:)([\d\.]+)/).flatten.last
+    
+    if user_agent.include?("Android") || (ie_version && ie_version.to_f <= 9.0) || (user_agent =~ /Trident\/[0-9\.]+\;/i)
+      "text/plain"
+    else
+      "application/json"
+    end
+  end
+
 end
 
 require 'uploader/engine'

data/lib/uploader/version.rb

@@ -1,3 +1,3 @@
 module Uploader
-  VERSION = "0.2.4".freeze
+  VERSION = "0.2.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails