Send gzipped json as download

diaspora · Jan 12, 2015 · e24431f · e24431f
1 parent 8013100
commit e24431f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -142,7 +142,7 @@ def export_profile
   end
 
   def download_profile
-    send_data decompressed_export, type: :json, filename: current_user.export.filename
+    send_data File.open(current_user.export.path).read, type: :json, filename: current_user.export.filename
   end
 
   def export_photos
@@ -171,10 +171,6 @@ def confirm_email
 
   private
 
-  def decompressed_export
-    ActiveSupport::Gzip.decompress(File.open(current_user.export.path).read)
-  end
-
   def user_params
     params.fetch(:user).permit(
       :email,

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -300,7 +300,7 @@ def queue_export
   end
 
   def perform_export!
-    export = Tempfile.new([username, '.json'], encoding: 'ascii-8bit')
+    export = Tempfile.new([username, '.json.gz'], encoding: 'ascii-8bit')
     export.write(compressed_export) && export.close
     if export.present?
       update exporting: false, export: export, exported_at: Time.zone.now

diff --git a/app/uploaders/exported_user.rb b/app/uploaders/exported_user.rb
@@ -9,11 +9,11 @@ def store_dir
   end
 
   def extension_white_list
-    %w(json)
+    %w(gz)
   end
 
   def filename
-    "#{model.username}_diaspora_data.json"
+    "#{model.username}_diaspora_data.json.gz"
   end
 
 end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
@@ -24,7 +24,8 @@
     it "downloads a user's export file" do
       @user.perform_export!
       get :download_profile
-      expect(JSON.parse(response.body)['user']['username']).to eq @user.username
+      parsed = JSON.parse(ActiveSupport::Gzip.decompress(response.body))
+      expect(parsed['user']['username']).to eq @user.username
     end
   end