asset_sync 2.13.1 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c593c361046c4faf574342749aced526c101c823c60b7ab8be5e39c7d029efe7
-  data.tar.gz: 63d1361cfa79cfea245eb5cc63bf889cefa239fdf7ba863164414d48e861d444
+  metadata.gz: fb865a74b05c9a16ce39367906e4b4e98e95aa1ee6513cce217c84bea8a832b6
+  data.tar.gz: 4684411bd7bddcf9daf4e6e9c1ba0b92fbf85cf67f2c9a42825b3c910e151c49
 SHA512:
-  metadata.gz: 4be760845b518f72bdad531311817b2d449bcaaada2b3ea3feb316af17e6c77fe29c1d7c2b72a46c866ba3b3d94fe0c751fa6a8206936c6d19e935bb0cae93a3
-  data.tar.gz: 1a3bb12b3db320cd566d130eb0abce3a4209c7466324c12dc963822bb0edefb9f04926ece5379a6c74b392cfccc751a5097400ccf922f0ec2dcb9e1b620d43d8
+  metadata.gz: f02951393035ba6db862849187d74f41d49529206d6d8a13b84ccca91b7d7c533fee6f0ea2440ea4b4e35ed72967d2d7489cfb6118c9fb8895e201964f146f64
+  data.tar.gz: 51e1bd03d2acd5a528fa5960ff5986c29303bb8ec03ce643cb57bce30958fc5d1fab981de815459fc9b16eab176a1717ad1873a9b4f08a7659b94f5ed8b7bd5d

data/CHANGELOG.md

@@ -18,6 +18,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.14.0] - 2020-03-31
+
+### Added
+
+- Add support for fog option `google_json_key_string`
+  (https://github.com/AssetSync/asset_sync/pull/415)
+
+
 ## [2.13.1] - 2021-03-01
 
 ### Fixed
@@ -994,7 +1002,8 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.13.1...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.14.0...HEAD
+[2.14.0]: https://github.com/AssetSync/asset_sync/compare/v2.13.1...v2.14.0
 [2.13.1]: https://github.com/AssetSync/asset_sync/compare/v2.13.0...v2.13.1
 [2.13.0]: https://github.com/AssetSync/asset_sync/compare/v2.12.1...v2.13.0
 [2.12.1]: https://github.com/AssetSync/asset_sync/compare/v2.12.0...v2.12.1

data/lib/asset_sync/config.rb

@@ -49,6 +49,7 @@ module AssetSync
     # Google Storage
     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
     attr_accessor :google_project # when using service accounts
 
     # Azure Blob with Fog::AzureRM
@@ -71,8 +72,12 @@ 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_json_key_location,          :presence => true, :if => :google_service_account?
     validates :google_project,                    :presence => true, :if => :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')
+      end
+    end
     validates :concurrent_uploads,    :inclusion => { :in => [true, false] }
 
     def initialize
@@ -147,11 +152,11 @@ module AssetSync
     end
 
     def google_interop?
-      google? && google_json_key_location.nil?
+      google? && google_json_key_location.nil? && google_json_key_string.nil?
     end
 
     def google_service_account?
-      google? && google_json_key_location
+      google? && (google_json_key_location || google_json_key_string)
     end
 
     def azure_rm?
@@ -292,6 +297,8 @@ module AssetSync
       elsif google?
         if 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})
         else
           options.merge!({
             :google_storage_secret_access_key => google_storage_secret_access_key,

data/lib/asset_sync/version.rb

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

data/spec/unit/google_spec.rb

@@ -99,6 +99,28 @@ describe AssetSync do
       end
     end
 
+    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
 
   describe 'from yml' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.14.0
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and