asset_sync 2.19.0 → 2.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cdf3c86a21ba63d0de80b07420b5c4f1833f25dbbcefbc92a740599d2d166da
-  data.tar.gz: a4c394ecc38feadf42e70643c7485a9dc68d6cccb9e86d8c9d00b99f41e5064f
+  metadata.gz: f70e24d97f3b4f93b46abf1fc3548542c68459068488f77345c2372a2469eb69
+  data.tar.gz: 1b56251e0bf37a3a9ba87c2686489c0f28651a8869d0b218dcf8f523c98e9588
 SHA512:
-  metadata.gz: 1cf38f1aa03aa20864cd1b6afadffff78bb032cfe7f15bea92c3f196c034c603d2a1d79e4393ace6f9fda35b8759b2ac5108efb86c9fdf260b898478fc0c3a2f
-  data.tar.gz: b26de287f9164b653e7404723672bd746cf899c57df8ed2b7100ba5a1470f0ca6619d6e7ed9b3bbb1c12f6af358e30665e449f4cfc235ff9db55b2b52c179c1a
+  metadata.gz: f3610b941614fbb44286c170fa4c5c6868207c67e18979ae25e520db158d66c4f343164b4c4c8f920fa1b33d5056166e53cf1e9782601aa11deb0ddf6e2a8a15
+  data.tar.gz: c7682095497be9206f92e4cddfcee6c1da9046a4445b99031ca1c89814c53c952d05ff73cc52a04f2c4e920d18e9f0874df7dbb5d7680d63f4898edf6e2347a7

data/.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

data/.github/workflows/tests.yaml

@@ -26,33 +26,27 @@ jobs:
         os:
           - ubuntu
         ruby:
-          - 2.7
           - 3.0
           - 3.1
           - 3.2
+          - 3.3
           - jruby
         gemfile:
-          - gemfiles/rails_6_0.gemfile
           - gemfiles/rails_6_1.gemfile
           - gemfiles/rails_7_0.gemfile
+          - gemfiles/rails_7_1.gemfile
+          - gemfiles/rails_7_2.gemfile
         allow_failures:
           - false
         include:
           - os: ubuntu
             ruby: ruby-head
-            gemfile: gemfiles/rails_7_0.gemfile
+            gemfile: gemfiles/rails_7_2.gemfile
             allow_failures: true
           - os: ubuntu
             ruby: jruby-head
-            gemfile: gemfiles/rails_7_0.gemfile
+            gemfile: gemfiles/rails_7_2.gemfile
             allow_failures: true
-        exclude:
-          - os: ubuntu
-            ruby: jruby
-            # Rails 7 requires Ruby 2.7
-            # `jruby-9.3.7.0` only supports 2.6.x
-            gemfile: gemfiles/rails_7_0.gemfile
-            allow_failures: false
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
       ALLOW_FAILURES: "${{ matrix.allow_failures }}"
@@ -60,7 +54,7 @@ jobs:
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:

data/Appraisals

@@ -1,8 +1,4 @@
 
-appraise "rails_6_0" do
-  gem "rails", "~> 6.0.0"
-end
-
 appraise "rails_6_1" do
   gem "rails", "~> 6.1.0"
 end
@@ -10,3 +6,11 @@ end
 appraise "rails_7_0" do
   gem "rails", "~> 7.0.0"
 end
+
+appraise "rails_7_1" do
+  gem "rails", "~> 7.1.0"
+end
+
+appraise "rails_7_2" do
+  gem "rails", "~> 7.2.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.19.2] - 2024-08-29
+
+### Fixed
+
+- Avoid duplicate files in remote files list cache
+  (https://github.com/AssetSync/asset_sync/pull/439)
+- Drop trailing slash of prefix in #get_local_files
+  (https://github.com/AssetSync/asset_sync/pull/425)
+
+
+## [2.19.1] - 2023-08-17
+
+### Fixed
+
+- Fix issues from https://github.com/AssetSync/asset_sync/pull/435
+  - https://github.com/AssetSync/asset_sync/commit/35bef657e9c65268e4888d489950184b238ba13f
+  - https://github.com/AssetSync/asset_sync/pull/437
+
+
 ## [2.19.0] - 2023-08-15
 
 ### Added
@@ -1094,7 +1113,8 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.19.0...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.19.1...HEAD
+[2.19.1]: https://github.com/AssetSync/asset_sync/compare/v2.19.0...v2.19.1
 [2.19.0]: https://github.com/AssetSync/asset_sync/compare/v2.18.1...v2.19.0
 [2.18.1]: https://github.com/AssetSync/asset_sync/compare/v2.18.0...v2.18.1
 [2.18.0]: https://github.com/AssetSync/asset_sync/compare/v2.17.0...v2.18.0

data/gemfiles/{rails_6_0.gemfile → rails_7_1.gemfile}

@@ -5,6 +5,6 @@ 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", "~> 6.0.0"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/rails_7_2.gemfile

@@ -0,0 +1,10 @@
+# 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", "~> 7.2.0"
+
+gemspec path: "../"

data/lib/asset_sync/storage.rb

@@ -108,7 +108,7 @@ module AssetSync
       return if ignore_existing_remote_files?
 
       File.open(self.remote_file_list_cache_file_path, 'w') do |file|
-        uploaded = local_files_to_upload + remote_files
+        uploaded = (local_files_to_upload + remote_files).uniq.sort
         file.write(uploaded.to_json)
       end
     end
@@ -171,7 +171,7 @@ module AssetSync
 
       log "Using: Directory Search of #{path}/#{self.config.assets_prefix}"
       Dir.chdir(path) do
-        to_load = self.config.assets_prefix.present? ? "#{self.config.assets_prefix}/**/**" : '**/**'
+        to_load = self.config.assets_prefix.present? ? File.join(self.config.assets_prefix, '/**/**') : '**/**'
         Dir[to_load]
       end
     end
@@ -264,12 +264,13 @@ module AssetSync
       if config.compression
         compressed_name = "#{path}/#{f}.#{config.compression}"
 
-        if File.extname(f) == config.compression
+        # `File.extname` returns value with `.` prefix, `config.compression` contains value without `.`
+        if File.extname(f)[1..-1] == config.compression
           # Don't bother uploading compressed assets if we are in compression mode
           # as we will overwrite file.css with file.css.gz if it exists.
           log "Ignoring: #{f}"
           ignore = true
-        elsif File.exist?(compressed)
+        elsif File.exist?(compressed_name)
           original_size = File.size("#{path}/#{f}")
           compressed_size = File.size(compressed_name)
 

data/lib/asset_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AssetSync
-  VERSION = "2.19.0"
+  VERSION = "2.19.2"
 end

data/spec/unit/storage_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require 'fileutils'
 
 describe AssetSync::Storage do
   include_context "mock Rails without_yml"
@@ -393,6 +394,46 @@ describe AssetSync::Storage do
       end
       storage.upload_file('assets/some_longer_path/local_image2.jpg')
     end
+
+    context 'config.gzip_compression is enabled' do
+      context 'when the file is a css file' do
+        it 'should upload the file' do
+          @config.gzip_compression = 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)
+          # Pretend they all exist
+          allow(File).to receive(:open).and_return(file_like_object)
+          bucket = double
+          files = double
+          allow(storage).to receive(:bucket).and_return(bucket)
+          allow(bucket).to receive(:files).and_return(files)
+
+          expect(files).to receive(:create).with({ body: file_like_object, content_type: "text/css", key: "assets/local.css", public: true }).once
+          storage.upload_file('assets/local.css')
+        end
+      end
+
+      context 'when the file is a gz file' do
+        it 'should not upload the file' do
+          @config.gzip_compression = 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)
+          # Pretend they all exist
+          allow(File).to receive(:open).and_return(file_like_object)
+          bucket = double
+          files = double
+          allow(storage).to receive(:bucket).and_return(bucket)
+          allow(bucket).to receive(:files).and_return(files)
+
+          expect(files).to_not receive(:create)
+          storage.upload_file('assets/local.css.gz')
+        end
+      end
+    end
   end
 
   describe '#delete_extra_remote_files' do
@@ -450,4 +491,52 @@ describe AssetSync::Storage do
       end
     end
   end
+
+  describe '#get_local_files' do
+    around(:each) do |example|
+      Dir.mktmpdir do |public_path|
+        @public_path = public_path
+        example.call
+      end
+    end
+
+    before(:each) do
+      @config = AssetSync::Config.new
+      @config.public_path = @public_path
+      @config.prefix = 'assets'
+      @storage = AssetSync::Storage.new(@config)
+
+      Dir.mkdir("#{@public_path}/assets")
+    end
+
+    context 'with empty directory' do
+      it 'has no files' do
+        expect(@storage.get_local_files).to eq([])
+      end
+    end
+
+    context 'with non-empty directory' do
+      before(:each) do
+        FileUtils.touch("#{@public_path}/assets/application.js")
+      end
+
+      it 'lists available files' do
+        expect(@storage.get_local_files).to eq([
+          'assets/application.js'
+        ])
+      end
+
+      context 'with trailing slash on asset prefix' do
+        before(:each) do
+          @config.prefix = 'assets/'
+        end
+
+        it 'lists available files with single slashes' do
+          expect(@storage.get_local_files).to eq([
+            'assets/application.js'
+          ])
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.19.2
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -233,9 +233,10 @@ files:
 - UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
-- gemfiles/rails_6_0.gemfile
 - gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -288,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and