asset_sync 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe1b25680b5ffe0564794f00e56e46d6f25fb1880b23f6887d653aa8e6ccdbd
-  data.tar.gz: 3d3b3847e385485bf86ba3752aa7a73e87418866cf475312844c5bd50130060f
+  metadata.gz: 5897684db35a90b21d8b5e24a262a3d5e38685e0e38df3cbc0f1ba745bff118c
+  data.tar.gz: 5f82d80aa6ca05cd26cc7f8548c8bd1306ee2686a959565879ce2a731e80b0a3
 SHA512:
-  metadata.gz: d4b805b6cac2e2f7c0a1e15d1225aa52c263a9c38036871e5e34807ba51fd7fa568ac1d49d2da629f5132e0d41c9cce45c020a0439aace9809b1f5f6b6cb9f16
-  data.tar.gz: 8bf270ecef14d5b3a1e1bc760d05aacd5009e5b69d5b927f731571380c008894adf33b7c9c554b39981b22c17f65afbab5b84b492c687c39b5828549a3504cde
+  metadata.gz: 73ac0a4ab2a64cd398783cb3b2b3dd67581e1e09b825453a9284472364161b4035dc98bba8b94bd114fe14ab513e9b73bd306482f1a5c4a73d1281b41e791fd7
+  data.tar.gz: 05a0c3b718aabf16aa1b355fc249cfbcedc60736a69a80270e2a80546f3cda2ccb1417cc35789bd1af8e6faef9d9aaf622ac89b106341ad11718add86207cdcd

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
   - jruby
   - jruby-head
@@ -21,7 +22,7 @@ gemfile:
 before_install:
   # Cannot use bundler 2.x due to dependency (mainly rails 4.2)
   # Solution from https://github.com/rails/rails/blob/4-2-stable/.travis.yml
-  - "travis_retry gem update --system 2.7.8 --no-doc || travis_retry gem update --system 2.7.8 --no-rdoc --no-ri"
+  - "travis_retry gem update --system --no-doc || travis_retry gem update --system --no-rdoc --no-ri"
   - "travis_retry gem install bundler -v '<2'"
 env:
   global:

data/CHANGELOG.md

@@ -18,6 +18,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.8.2] - 2019-12-27
+
+### Changed
+
+- Use `delete_multiple_objects` when storage is `aws`
+  (https://github.com/AssetSync/asset_sync/pull/392)
+
+
 ## [2.8.1] - 2019-07-25
 
 ### Changed
@@ -922,7 +930,8 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.8.1...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.8.2...HEAD
+[2.8.2]: https://github.com/AssetSync/asset_sync/compare/v2.8.1...v2.8.2
 [2.8.1]: https://github.com/AssetSync/asset_sync/compare/v2.8.0...v2.8.1
 [2.8.0]: https://github.com/AssetSync/asset_sync/compare/v2.7.0...v2.8.0
 [2.7.0]: https://github.com/AssetSync/asset_sync/compare/v2.6.0...v2.7.0

data/lib/asset_sync/storage.rb

@@ -132,9 +132,15 @@ module AssetSync
       from_remote_files_to_delete = remote_files - local_files - ignored_files - always_upload_files
 
       log "Flagging #{from_remote_files_to_delete.size} file(s) for deletion"
-      # Delete unneeded remote files
-      bucket.files.each do |f|
-        delete_file(f, from_remote_files_to_delete)
+      # Delete unneeded remote files, if we are on aws delete in bulk else use sequential delete
+      if self.config.aws? && connection.respond_to?(:delete_multiple_objects)
+        from_remote_files_to_delete.each_slice(500) do |slice|
+          connection.delete_multiple_objects(config.fog_directory, slice)
+        end
+      else
+        bucket.files.each do |f|
+          delete_file(f, from_remote_files_to_delete)
+        end
       end
     end
 

data/lib/asset_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AssetSync
-  VERSION = "2.8.1".freeze
+  VERSION = "2.8.2"
 end

data/spec/unit/storage_spec.rb

@@ -307,4 +307,59 @@ describe AssetSync::Storage do
       storage.upload_file('assets/some_longer_path/local_image2.jpg')
     end
   end
+
+  describe '#delete_extra_remote_files' do
+    it 'should delete the files in bulk' do
+      remote_files = ['public/image.png']
+      connection = double
+      config = double
+
+      storage = AssetSync::Storage.new(@config)
+
+      [:local_files, :ignored_files, :always_upload_files].each do |method|
+        expect(storage).to receive(method).and_return([])
+      end
+
+      allow(storage).to receive(:get_remote_files).and_return(remote_files)
+      allow(storage).to receive(:connection).and_return(connection).twice
+      allow(storage).to receive(:config).and_return(config).twice
+      allow(config).to receive(:aws?).and_return(true)
+      allow(config).to receive(:fog_directory).and_return('foo')
+      expect(connection).to receive(:delete_multiple_objects).with('foo', remote_files)
+
+      storage.delete_extra_remote_files
+    end
+
+    context 'when not aws' do
+      it 'deletes files sequentially' do
+        remote_files = ['public/image.png']
+        connection = double
+        config = double
+        directories = double
+        directory = double
+        file = double
+
+        storage = AssetSync::Storage.new(@config)
+
+        [:local_files, :ignored_files, :always_upload_files].each do |method|
+          expect(storage).to receive(method).and_return([])
+        end
+
+        allow(storage).to receive(:get_remote_files).and_return(remote_files)
+        allow(storage).to receive(:connection).and_return(connection).twice
+        allow(storage).to receive(:config).and_return(config)
+        allow(config).to receive(:aws?).and_return(false)
+        allow(config).to receive(:fog_directory).and_return('foo')
+        allow(config).to receive(:assets_prefix).and_return('foo')
+        allow(directories).to receive(:get).and_return(directory)
+        allow(directory).to receive(:files).and_return([file])
+        allow(file).to receive(:key).and_return('public/image.png')
+        allow(connection).to receive(:directories).and_return(directories)
+        expect(connection).not_to receive(:delete_multiple_objects)
+        expect(file).to receive(:destroy)
+
+        storage.delete_extra_remote_files
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and