asset_sync 2.17.0 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30fcfd0667904cde532ba24578e9bbc15f33051d5bde3e345226915c7135ccde
-  data.tar.gz: 67cff250568d8473c940733f182e425b811550be1c95e940498508fe5d81e656
+  metadata.gz: 1fb2743cc1cc656c27c392c0a4f6cd5cc07e57ed8dad28fc1ed9f01b268d6d42
+  data.tar.gz: 13067af05b7e16f1a12c62db2583f56ec5e995414d86e193110339efde7f8e16
 SHA512:
-  metadata.gz: 6c2471c8dcad1fdd461fac5e7881723f012888e295e5f8bda6c13137ff1cb31f3aef2db669d71588a3a699dbd2d56366abacdf9ab0d0cae4b8e7b5dba2bff8f8
-  data.tar.gz: 1c5fb8a038bc21c0f8218a1dd74ec6cff47df3b43588e0b9599032559a639564341814f1576faa5b6a9f9378ca2e37de1c08f219748999f0e7a437f48e96fe22
+  metadata.gz: 57189c1fb4dbd6edab1f5cc262f6ef420f144631adf69d03fc504218018de8765ce15e9d8e38e19eacf4eb825d3ec46b1311cf492939fc537c30554ba26dbd99
+  data.tar.gz: 56eba25178ac8ee2a51222bfbd46342dc8836e67d52ea255000a710a341b158bee5043969574d111779c589f9223137a2c9a4ed9a1a259adb595ddaa9fd87b40

data/CHANGELOG.md

@@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-- Add `fog_options` configuration option.
+- Nothing
 
 ### Changed
 
@@ -18,6 +18,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.18.1] - 2023-08-02
+
+### Changed
+
+- Respect explicitly set `Rails.application.config.assets.manifest`
+  (https://github.com/AssetSync/asset_sync/pull/434)
+
+
+## [2.18.0] - 2023-01-30
+
+### Added
+
+- Add `google_auth` configuration option
+  (https://github.com/AssetSync/asset_sync/pull/432)
+
+
 ## [2.17.0] - 2023-01-13
 
 ### Added
@@ -1070,7 +1086,9 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.17.0...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.18.1...HEAD
+[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
 [2.17.0]: https://github.com/AssetSync/asset_sync/compare/v2.16.0...v2.17.0
 [2.16.0]: https://github.com/AssetSync/asset_sync/compare/v2.15.3...v2.16.0
 [2.15.3]: https://github.com/AssetSync/asset_sync/compare/v2.15.2...v2.15.3

data/README.md

@@ -1,6 +1,6 @@
 
 [![Gem Version](https://img.shields.io/gem/v/asset_sync.svg?style=flat-square)](http://badge.fury.io/rb/asset_sync)
-[![Tests](https://github.com/AssetSync/asset_sync/actions/workflows/tests.yaml/badge.svg)](https://github.com/AssetSync/asset_sync/actions/workflows/tests.yaml)
+[![GitHub Build Status](https://img.shields.io/github/actions/workflow/status/AssetSync/asset_sync/tests.yaml?branch=master&style=flat-square)](https://github.com/AssetSync/asset_sync/actions/workflows/tests.yaml)
 [![Coverage Status](http://img.shields.io/coveralls/AssetSync/asset_sync.svg?style=flat-square)](https://coveralls.io/r/AssetSync/asset_sync)
 
 

data/lib/asset_sync/config.rb

@@ -56,6 +56,7 @@ module AssetSync
     attr_accessor :rackspace_username, :rackspace_api_key, :rackspace_auth_url
 
     # Google Storage
+    attr_accessor :google_auth # when using generic auth (like access tokens)
     attr_accessor :google_storage_secret_access_key, :google_storage_access_key_id  # when using S3 interop
     attr_accessor :google_json_key_location # when using service accounts
     attr_accessor :google_json_key_string # when using service accounts
@@ -81,7 +82,7 @@ module AssetSync
     validates :rackspace_api_key,     :presence => true, :if => :rackspace?
     validates :google_storage_secret_access_key,  :presence => true, :if => :google_interop?
     validates :google_storage_access_key_id,      :presence => true, :if => :google_interop?
-    validates :google_project,                    :presence => true, :if => :google_service_account?
+    validates :google_project,                    :presence => true, :if => -> (c) { c.google_auth || c.google_service_account? }
     validate(:if => :google_service_account?) do
       unless google_json_key_location.present? || google_json_key_string.present?
         errors.add(:base, 'must provide either google_json_key_location or google_json_key_string if using Google service account')
@@ -116,9 +117,13 @@ module AssetSync
     end
 
     def manifest_path
-      directory =
+      if defined?(ActionView) && ActionView::Base.respond_to?(:assets_manifest)
+        ::Rails.application.config.assets.manifest
+      else
+        directory =
         ::Rails.application.config.assets.manifest || default_manifest_directory
-      File.join(directory, "manifest.yml")
+        File.join(directory, "manifest.yml")
+      end
     end
 
     def gzip?
@@ -162,7 +167,7 @@ module AssetSync
     end
 
     def google_interop?
-      google? && google_json_key_location.nil? && google_json_key_string.nil?
+      google? && google_auth.nil? && google_json_key_location.nil? && google_json_key_string.nil?
     end
 
     def google_service_account?
@@ -310,7 +315,9 @@ module AssetSync
         options.merge!({ :rackspace_region => fog_region }) if fog_region
         options.merge!({ :rackspace_auth_url => rackspace_auth_url }) if rackspace_auth_url
       elsif google?
-        if google_json_key_location
+        if google_auth
+          options.merge!({:google_auth => google_auth, :google_project => google_project})
+        elsif google_json_key_location
           options.merge!({:google_json_key_location => google_json_key_location, :google_project => google_project})
         elsif google_json_key_string
           options.merge!({:google_json_key_string => google_json_key_string, :google_project => google_project})

data/lib/asset_sync/storage.rb

@@ -59,7 +59,7 @@ module AssetSync
       return [] unless self.config.include_manifest
 
       if ActionView::Base.respond_to?(:assets_manifest)
-        manifest = Sprockets::Manifest.new(ActionView::Base.assets_manifest.environment, ActionView::Base.assets_manifest.dir)
+        manifest = Sprockets::Manifest.new(ActionView::Base.assets_manifest.environment, ActionView::Base.assets_manifest.dir, self.config.manifest_path)
         manifest_path = manifest.filename
       else
         manifest_path = self.config.manifest_path
@@ -139,7 +139,7 @@ module AssetSync
       if self.config.manifest
         if ActionView::Base.respond_to?(:assets_manifest)
           log "Using: Rails 4.0 manifest access"
-          manifest = Sprockets::Manifest.new(ActionView::Base.assets_manifest.environment, ActionView::Base.assets_manifest.dir)
+          manifest = Sprockets::Manifest.new(ActionView::Base.assets_manifest.environment, ActionView::Base.assets_manifest.dir, self.config.manifest_path)
           return manifest.assets.values.map { |f| File.join(self.config.assets_prefix, f) }
         elsif File.exist?(self.config.manifest_path)
           log "Using: Manifest #{self.config.manifest_path}"

data/lib/asset_sync/version.rb

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

data/spec/unit/asset_sync_spec.rb

@@ -258,6 +258,11 @@ describe AssetSync do
       Rails.application.config.assets.prefix = 'custom_assets'
       expect(AssetSync.config.manifest_path).to match(/public\/custom_assets\/manifest.yml/)
     end
+
+    it "config.manifest_path should point to explicit path" do
+      Rails.application.config.assets.manifest = 'config/manifest.json'
+      expect(AssetSync.config.manifest_path).to start_with('config/manifest.json')
+    end
   end
 
   describe 'with cache_asset_regexps' do

data/spec/unit/google_spec.rb

@@ -38,6 +38,30 @@ describe AssetSync do
       expect(AssetSync.config.manifest).to be_falsey
     end
 
+    describe "when using user-specified google credentials" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_auth = "access-token"
+          config.google_project = 'a-google-project-name'
+        end
+      end
+
+      it "should configure google_auth" do
+        expect(AssetSync.config.google_auth).to eq("access-token")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_auth: "access-token",
+                                google_project: 'a-google-project-name',
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+
+      it "should not require that other parameters be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
+    end
+
     describe "when using S3 interop API" do
       before(:each) do
         AssetSync.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.1
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and