asset_sync 2.4.0 → 2.15.2

data/spec/unit/google_spec.rb

@@ -8,8 +8,6 @@ describe AssetSync do
       AssetSync.config = AssetSync::Config.new
       AssetSync.configure do |config|
         config.fog_provider = 'Google'
-        config.google_storage_access_key_id = 'aaaa'
-        config.google_storage_secret_access_key = 'bbbb'
         config.fog_directory = 'mybucket'
         config.existing_remote_files = "keep"
       end
@@ -24,14 +22,6 @@ describe AssetSync do
       expect(AssetSync.config.existing_remote_files?).to eq(true)
     end
 
-    it "should configure google_storage_access_key_id" do
-      expect(AssetSync.config.google_storage_access_key_id).to eq("aaaa")
-    end
-
-    it "should configure google_storage_secret_access_key" do
-      expect(AssetSync.config.google_storage_secret_access_key).to eq("bbbb")
-    end
-
     it "should configure fog_directory" do
       expect(AssetSync.config.fog_directory).to eq("mybucket")
     end
@@ -47,36 +37,141 @@ describe AssetSync do
     it "should default manifest to false" do
       expect(AssetSync.config.manifest).to be_falsey
     end
-  end
 
-  describe 'from yml' do
-    before(:each) do
-      set_rails_root('google_with_yml')
-      AssetSync.config = AssetSync::Config.new
-    end
+    describe "when using S3 interop API" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_storage_access_key_id = 'aaaa'
+          config.google_storage_secret_access_key = 'bbbb'
+        end
+      end
 
-    it "should configure google_storage_access_key_id" do
-      expect(AssetSync.config.google_storage_access_key_id).to eq("xxxx")
-    end
+      it "should configure google_storage_access_key_id" do
+        expect(AssetSync.config.google_storage_access_key_id).to eq("aaaa")
+      end
+
+      it "should configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq("bbbb")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_storage_access_key_id: "aaaa",
+                                google_storage_secret_access_key: "bbbb",
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+
+      it "should not require that google_json_key_location be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
+
+      it "should require that google_storage_secret_access_key or access_key_id be set" do
 
-    it "should configure google_storage_secret_access_key" do
-      expect(AssetSync.config.google_storage_secret_access_key).to eq("zzzz")
+        AssetSync.configure do |config|
+          config.google_storage_access_key_id = nil
+          config.google_storage_secret_access_key = nil
+        end
+
+        expect(AssetSync.config.valid?).to eq(false)
+      end
     end
 
-    it "should configure google_storage_access_key" do
-      expect(AssetSync.config.fog_directory).to eq("rails_app_test")
+    describe "when using service account" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_json_key_location = '/path/to.json'
+          config.google_project = 'a-google-project-name'
+        end
+      end
+
+      it "should configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq("/path/to.json")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_json_key_location: "/path/to.json",
+                                 google_project: 'a-google-project-name',
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+      it "should not require that google_storage_secret_access_key or access_key_id be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
     end
 
-    it "should configure google_storage_access_key" do
-      expect(AssetSync.config.existing_remote_files).to eq("keep")
+    describe "when using service account with JSON key string" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_json_key_string = 'a-google-json-key-string'
+          config.google_project = 'a-google-project-name'
+        end
+      end
+
+      it "should configure google_json_key_string" do
+        expect(AssetSync.config.google_json_key_string).to eq("a-google-json-key-string")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_json_key_string: "a-google-json-key-string",
+                                 google_project: 'a-google-project-name',
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+      it "should not require that google_storage_secret_access_key or access_key_id be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
     end
+  end
 
-    it "should default gzip_compression to false" do
-      expect(AssetSync.config.gzip_compression).to be_falsey
+  describe 'from yml' do
+    describe 'when using S3 interop API' do
+      before(:each) do
+        set_rails_root('google_with_yml')
+        AssetSync.config = AssetSync::Config.new
+      end
+
+      it "should configure google_storage_access_key_id" do
+        expect(AssetSync.config.google_storage_access_key_id).to eq("xxxx")
+      end
+
+      it "should configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq("zzzz")
+      end
+
+      it "should not configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq(nil)
+      end
+
+      it "should configure fog_directory" do
+        expect(AssetSync.config.fog_directory).to eq("rails_app_test")
+      end
+
+      it "should configure existing_remote_files" do
+        expect(AssetSync.config.existing_remote_files).to eq("keep")
+      end
+
+      it "should default gzip_compression to false" do
+        expect(AssetSync.config.gzip_compression).to be_falsey
+      end
+
+      it "should default manifest to false" do
+        expect(AssetSync.config.manifest).to be_falsey
+      end
     end
 
-    it "should default manifest to false" do
-      expect(AssetSync.config.manifest).to be_falsey
+    describe 'when using service account API' do
+      before(:each) do
+        set_rails_root('google_with_service_account_yml')
+        AssetSync.config = AssetSync::Config.new
+      end
+
+      it "should configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq("gcs.json")
+      end
+
+      it "should not configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq(nil)
+      end
     end
   end
 

data/spec/unit/multi_mime_spec.rb

@@ -36,6 +36,8 @@ describe AssetSync::MultiMime do
     $".grep(/mime\//).each do |file_path|
       $".delete(file_path)
     end
+
+    AssetSync.config = AssetSync::Config.new
   end
 
   after(:all) do
@@ -69,4 +71,49 @@ describe AssetSync::MultiMime do
 
   end
 
+  describe "use of option file_ext_to_mime_type_overrides" do
+    before(:each) do
+      require 'mime/types'
+    end
+
+    context "with default value" do
+      it "should return default value set by gem" do
+        expect(
+          AssetSync::MultiMime.lookup("js").to_s,
+        ).to eq("application/javascript")
+      end
+    end
+    context "with empty value" do
+      before(:each) do
+        AssetSync.config = AssetSync::Config.new
+        AssetSync.configure do |config|
+          config.file_ext_to_mime_type_overrides.clear
+        end
+      end
+
+      it "should return value from mime-types gem" do
+        expect(
+          AssetSync::MultiMime.lookup("js").to_s,
+        ).to eq(::MIME::Types.type_for("js").first.to_s)
+      end
+    end
+    context "with custom value" do
+      before(:each) do
+        AssetSync.config = AssetSync::Config.new
+        AssetSync.configure do |config|
+          config.file_ext_to_mime_type_overrides.add(
+            :js,
+            :"application/x-javascript",
+          )
+        end
+      end
+
+      it "should return custom value" do
+        expect(
+          AssetSync::MultiMime.lookup("js").to_s,
+        ).to eq("application/x-javascript")
+      end
+    end
+  end
+
 end

data/spec/unit/railsless_spec.rb

@@ -14,7 +14,7 @@ describe AssetSync do
         config.fog_region = 'eu-west-1'
         config.existing_remote_files = "keep"
         config.prefix = "assets"
-        config.public_path = Pathname("./public")
+        config.public_path = "./public"
       end
     end
 
@@ -22,8 +22,9 @@ describe AssetSync do
       expect(AssetSync.config.prefix).to eq("assets")
     end
 
-    it "should have prefix of assets" do
-      expect(AssetSync.config.public_path.to_s).to eq("./public")
+    it "should have public_path" do
+      expect(AssetSync.config.public_path.to_s).to be_end_with("/public")
+      expect(AssetSync.config.public_path).to be_absolute
     end
 
     it "should default AssetSync to enabled" do

data/spec/unit/storage_spec.rb

@@ -54,19 +54,105 @@ describe AssetSync::Storage do
       storage.upload_files
     end
 
+    it 'should upload files concurrently if enabled' do
+      @config.concurrent_uploads = true
+      storage = AssetSync::Storage.new(@config)
+
+      allow(storage).to receive(:get_local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
+
+      expect(Thread).to receive(:new).exactly(3).times.and_call_original
+      (@local_files - @remote_files + storage.always_upload_files).each do |file|
+        expect(storage).to receive(:upload_file).with(file)
+      end
+
+      storage.upload_files
+    end
+
+    it 'should allow custom number of threads' do
+      @config.concurrent_uploads = true
+      @config.concurrent_uploads_max_threads = 2
+      storage = AssetSync::Storage.new(@config)
+
+      allow(storage).to receive(:get_local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
+
+      expect(Thread).to receive(:new).exactly(2).times.and_call_original
+      (@local_files - @remote_files + storage.always_upload_files).each do |file|
+        expect(storage).to receive(:upload_file).with(file)
+      end
+
+      storage.upload_files
+    end
+
+    it 'should allow remote_file_list_cache_file_path configuration' do
+      file_path = './foo.json'
+      @config.remote_file_list_cache_file_path = file_path
+      storage = AssetSync::Storage.new(@config)
+
+      allow(storage).to receive(:get_local_files).and_return(@local_files)
+      File.write(file_path, @remote_files.to_json)
+      expect(storage).not_to receive(:get_remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
+
+      (@local_files - @remote_files + storage.always_upload_files).each do |file|
+        expect(storage).to receive(:upload_file).with(file)
+      end
+
+      expect(storage).not_to receive(:warn)
+      storage.upload_files
+
+      # update remote_file_list_cache corretly
+      updated = JSON.parse(File.read(file_path))
+      expect(updated.sort.uniq).to eq (@remote_files + @local_files + storage.always_upload_files).sort.uniq
+
+      File.delete(file_path)
+    end
+
+    it 'should work with broken cache' do
+      file_path = './foo.json'
+      @config.remote_file_list_cache_file_path = file_path
+
+      storage = AssetSync::Storage.new(@config)
+
+      File.write(file_path, 'some non-json text file content')
+
+      allow(storage).to receive(:get_local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
+
+      (@local_files - @remote_files + storage.always_upload_files).each do |file|
+        expect(storage).to receive(:upload_file).with(file)
+      end
+
+      # when broken, warning message should be prompted
+      expect(storage).to receive(:warn)
+
+      storage.upload_files
+
+      File.delete(file_path)
+    end
+
     it 'should upload updated non-fingerprinted files' do
       @local_files = [
-        'public/image.png',
-        'public/image-82389298328.png',
-        'public/image-a8389f9h324.png',
+        'public/great-image.png',
+        'public/great-image-82389298328.png',
+        'public/great-image-a8389f9h324.png',
+        "public/new\nline.js",
+        "public/new\nline-aaaaaaaaaaa.js",
+        "public/new\nline-bbbbbbbbbbb.js",
         'public/application.js',
         'public/application-b3389d983k1.js',
         'public/application-ac387d53f31.js',
         'public',
       ]
       @remote_files = [
-        'public/image.png',
-        'public/image-a8389f9h324.png',
+        'public/great-image.png',
+        'public/great-image-a8389f9h324.png',
+        "public/new\nline.js",
+        "public/new\nline-aaaaaaaaaaa.js",
         'public/application.js',
         'public/application-b3389d983k1.js',
       ]
@@ -77,7 +163,8 @@ describe AssetSync::Storage do
       allow(File).to receive(:file?).and_return(true) # Pretend they all exist
 
       updated_nonfingerprinted_files = [
-        'public/image.png',
+        'public/great-image.png',
+        "public/new\nline.js",
         'public/application.js',
       ]
       (@local_files - @remote_files + updated_nonfingerprinted_files).each do |file|
@@ -125,7 +212,7 @@ describe AssetSync::Storage do
       end
     end
 
-    it 'should upload additonal  files' do
+    it 'should upload additonal files' do
       @local_files = [
         'public/image.png',
         'public/image-82389298328.png',
@@ -307,4 +394,60 @@ 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)
+        allow(config).to receive(:backblaze?).and_return(false)
+        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.4.0
+  version: 2.15.2
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -98,7 +98,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog-aws
+  name: gitlab-fog-azure-rm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,7 +154,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog-azure-rm
+  name: fog-backblaze
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -167,6 +195,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: After you run assets:precompile your compiled assets will be synchronised
   with your S3 bucket.
 email:
@@ -179,6 +221,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/tests.yaml"
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
@@ -189,10 +232,9 @@ files:
 - UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
-- gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -209,14 +251,18 @@ files:
 - spec/dummy_app/app/assets/javascripts/application.js
 - spec/fixtures/aws_with_yml/config/asset_sync.yml
 - spec/fixtures/azure_rm_with_yml/config/asset_sync.yml
+- spec/fixtures/backblaze_with_yml/config/asset_sync.yml
+- spec/fixtures/google_with_service_account_yml/config/asset_sync.yml
 - spec/fixtures/google_with_yml/config/asset_sync.yml
 - spec/fixtures/rackspace_with_yml/config/asset_sync.yml
 - spec/fixtures/with_invalid_yml/config/asset_sync.yml
 - spec/integration/aws_integration_spec.rb
 - spec/integration/azure_rm_integration_spec.rb
+- spec/integration/backblaze_intergration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/asset_sync_spec.rb
 - spec/unit/azure_rm_spec.rb
+- spec/unit/backblaze_spec.rb
 - spec/unit/google_spec.rb
 - spec/unit/multi_mime_spec.rb
 - spec/unit/rackspace_spec.rb
@@ -241,8 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: asset_sync
-rubygems_version: 2.7.3
+rubygems_version: 3.3.15
 signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
@@ -252,14 +297,18 @@ test_files:
 - spec/dummy_app/app/assets/javascripts/application.js
 - spec/fixtures/aws_with_yml/config/asset_sync.yml
 - spec/fixtures/azure_rm_with_yml/config/asset_sync.yml
+- spec/fixtures/backblaze_with_yml/config/asset_sync.yml
+- spec/fixtures/google_with_service_account_yml/config/asset_sync.yml
 - spec/fixtures/google_with_yml/config/asset_sync.yml
 - spec/fixtures/rackspace_with_yml/config/asset_sync.yml
 - spec/fixtures/with_invalid_yml/config/asset_sync.yml
 - spec/integration/aws_integration_spec.rb
 - spec/integration/azure_rm_integration_spec.rb
+- spec/integration/backblaze_intergration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/asset_sync_spec.rb
 - spec/unit/azure_rm_spec.rb
+- spec/unit/backblaze_spec.rb
 - spec/unit/google_spec.rb
 - spec/unit/multi_mime_spec.rb
 - spec/unit/rackspace_spec.rb

data/gemfiles/rails_5_1.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rcov", platforms: :mri_18, group: [:development, :test]
-gem "simplecov", platforms: [:jruby, :mri_19, :ruby_19, :mri_20, :rbx], group: [:development, :test], require: false
-gem "jruby-openssl", platform: :jruby
-gem "rails", "~> 5.1.0"
-
-gemspec path: "../"