backup_foundation 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c1dedfde54756382a8678d0fb8fdda1376a665f
-  data.tar.gz: 4e4381ee71169524edc990cd4e02d6c583e8dcde
+  metadata.gz: e551a2d3dc0da1b02e9aeac46bf78a2d1c8a4a9c
+  data.tar.gz: 20d5efee61d05ffc931bf90bb6ca2cd67b914d10
 SHA512:
-  metadata.gz: b03a254a1788bd5a6bdc016773597bbc65fedb017a0b281f8b83778c30313f937083fae5838fda0651ce229736515fa2c359f8cbdf25ef292145ad60e71c7e0e
-  data.tar.gz: 51d771eed61045cd7dfea260d24adf9d6048725b521e025ee2346b7c4da49babd48030f33b09fda42563fc0d14037cd0bfa016f83df78720c1451eda017d27df
+  metadata.gz: dac1c3cc89dc62c847758ff79531a04994e692d8b8c8e0aa62394da655f8c0134308784973dd9cd91aa95308b95014f8b4b54ea7374a3d98d770955f98404892
+  data.tar.gz: ffaf1f2ed65ff213fcaebff6b2dcf92c36818ecce7e15ad9f4833d5bf54274084518641051537c2dcbbc3a3860c11469f804d8bc3ea27f3c2ad4cf38c9c52a99

data/lib/backup_foundation/job.rb

@@ -65,23 +65,39 @@ module BackupFoundation
       end
     end
 
-    def download_db_dump(tmpdir, db)
+    def download_db_dump(tmpdir, db, limit = 10)
       file_path = nil
-      url = URI.parse "#{BackupFoundation::HOST}/api/file?key=#{@params[:key]}&name=#{db[:name] || db[:type]}"
-      http = Net::HTTP.new url.host, url.port
-      if url.is_a? URI::HTTPS
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      url = URI.parse case db
+        when Hash
+          "#{BackupFoundation::HOST}/api/file?key=#{@params[:key]}&name=#{db[:name] || db[:type]}"
+        when String
+          db
       end
-      http.request_get(url.request_uri) do |response|
-        file_path = "#{tmpdir}/#{response['Content-Disposition'][/"(.*)"/, 1]}"
-        File.open file_path, 'wb' do |file|
-          response.read_body do |str|
-            file.write str
-          end
+      http_download_request(url).request_get(url.request_uri) do |response|
+        case response
+          when Net::HTTPSuccess
+            file_path = "#{tmpdir}/#{(response['Content-Disposition'] || "\"#{url.path.split('/').last}\"")[/"(.*)"/, 1]}"
+            File.open file_path, 'wb' do |file|
+              response.read_body do |str|
+                file.write str
+              end
+            end
+          when Net::HTTPRedirection
+            file_path = download_db_dump(tmpdir, response['Location'], limit - 1)
+          else
+            response.error!
         end
       end
       file_path
     end
+
+    def http_download_request(url)
+      Net::HTTP.new(url.host, url.port).tap do |http|
+        if url.is_a? URI::HTTPS
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+      end
+    end
   end
 end

data/lib/backup_foundation/version.rb

@@ -1,3 +1,3 @@
 module BackupFoundation
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup_foundation
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Andrew Shaydurov