Updating GCLOUD_KEYFILE_JSON to work with googleauth/v1.10.0 and higher.

Author: bmclean

.rubocop.yml

@@ -30,6 +30,9 @@ Layout/SpaceAroundMethodCallOperator:
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: false
 
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: false
+
 ##################### Lint ###########################
 
 Lint/SendWithMixinArgument:
@@ -73,6 +76,9 @@ Style/DocumentDynamicEvalDefinition:
   Exclude:
     - "lib/active_model/datastore/carrier_wave_uploader.rb"
 
+Style/FetchEnvVar:
+  Enabled: false
+
 #################### Metrics #########################
 
 Metrics/ModuleLength:
@@ -88,6 +94,8 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   CountComments: false
   Max: 20
+  Exclude:
+    - 'lib/active_model/datastore/carrier_wave_uploader.rb'
 
 Metrics/BlockLength:
   Exclude:

.ruby-version

@@ -1 +1 @@
-3.0.2
+3.3.0

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.8.0 / 2024-03-05
+* updating GCLOUD_KEYFILE_JSON to work with the latest version of GoogleAuth
+
 ### 0.7.0 / 2021-11-04
 * adding support for Ruby 3
 

lib/active_model/datastore/connection.rb

@@ -21,8 +21,12 @@ module CloudDatastore
       ENV['GCLOUD_PROJECT'] ||= 'test-datastore'
     elsif ENV['SERVICE_ACCOUNT_PRIVATE_KEY'].present? &&
           ENV['SERVICE_ACCOUNT_CLIENT_EMAIL'].present?
-      ENV['GCLOUD_KEYFILE_JSON'] ||= '{"private_key": "' + ENV['SERVICE_ACCOUNT_PRIVATE_KEY'] + '",
-      "client_email": "' + ENV['SERVICE_ACCOUNT_CLIENT_EMAIL'] + '"}'
+      ENV['GCLOUD_KEYFILE_JSON'] ||=
+        '{' \
+        '"private_key": "' + ENV['SERVICE_ACCOUNT_PRIVATE_KEY'] + '",' \
+        '"client_email": "' + ENV['SERVICE_ACCOUNT_CLIENT_EMAIL'] + '",' \
+        '"type": "service_account"' \
+        '}'
     end
   end
 

lib/active_model/datastore/track_changes.rb

@@ -88,7 +88,7 @@ def remove_unmodified_children
         with_changes = Array(send(attr.to_sym)).select(&:values_changed?)
         send("#{attr}=", with_changes)
       end
-      nested_attributes.delete_if { |attr| Array(send(attr.to_sym)).size.zero? }
+      nested_attributes.delete_if { |attr| Array(send(attr.to_sym)).empty? }
     end
 
     module ClassMethods

lib/active_model/datastore/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   module Datastore
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

test/support/datastore_example_rails_app/.ruby-version

@@ -1 +1 @@
-3.0.2
+3.3.0

test/support/datastore_example_rails_app/Gemfile

@@ -1,10 +1,8 @@
 source 'https://rubygems.org'
+ruby File.read('.ruby-version').strip
 
 ###########################################################################################
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
-  "https://github.com/#{repo_name}.git"
-end
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 # gem 'foo_bar', :github => 'foo/bar'
 # Bundler would attempt to download the gem from https://github.com/foo/bar.git.
 ###########################################################################################