google-cloud-firestore 2.6.0 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3141b004673c1db562f162d9218ac680c0693e4d91a8eb48b7d17f444646e74a
-  data.tar.gz: 4ab2bb6f69da5f8ad2e53464ae3712647b3642d49a465dc5f75d1dbc923979f5
+  metadata.gz: 97eefcf8baff5191871034a5c72d3b1ab423717e87c8891d59c332c0c20c69f1
+  data.tar.gz: 9d96c0d2ecb8e40e3270b1f70a3e06450bbe58ac2d2978f1ae111a170ffec298
 SHA512:
-  metadata.gz: fd5dccbe067d6fea81556aae40b9fc9de2ca75fc389c919335217371d84578b68ad7c9854c84831bb368dd58982849c06f044cef0c864be586cdace0ea48994a
-  data.tar.gz: 7a7f0ee2a3259f2a65119b0b31dbf781d7336f7c530301f4c7f0a7fdf95fea8a7773caa4ed172c9ce8c5ff9f9fe80dab830f37ef1e6d204ae7d770fdf9c066c0
+  metadata.gz: f653a12215f410fbcc43aef9b51d4790a696967661b6e5e51f122ea1f86f840d5384ffec6e69753a936c65a06691d673c7c2ab7317b7124339f0856aab97ad3f
+  data.tar.gz: 94d54e1fc6a4fbbeba256bd8397d6544cbeb4585e14510a58230979f5cb4fe74f591fd66a1abe8806b8ea0497cf564e328c91617a7a011804d29c2b53109934d

data/AUTHENTICATION.md

@@ -95,7 +95,8 @@ client = Google::Cloud::Firestore.new
 
 ### Configuration
 
-The **Project ID** and **Credentials JSON** can be configured instead of placing them in environment variables or providing them as arguments.
+The **Project ID** and the path to the **Credentials JSON** file can be configured
+instead of placing them in environment variables or providing them as arguments.
 
 ```ruby
 require "google/cloud/firestore"

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Release History
 
+### 2.6.4 / 2021-08-26
+
+#### Bug Fixes
+
+* Fix google-cloud-resource-prefix header
+
+### 2.6.3 / 2021-08-24
+
+#### Bug Fixes
+
+* Fix transaction retry behavior
+
+### 2.6.2 / 2021-07-26
+
+#### Bug Fixes
+
+* Update FieldPath#formatted_string to correctly escape non-simple characters
+
+### 2.6.1 / 2021-07-08
+
+#### Documentation
+
+* Update AUTHENTICATION.md in handwritten packages
+
 ### 2.6.0 / 2021-06-15
 
 #### Features

data/lib/google/cloud/firestore/client.rb

@@ -628,7 +628,24 @@ module Google
             commit_return = transaction.commit
             # Conditional return value, depending on truthy commit_response
             commit_response ? commit_return : transaction_return
-          rescue Google::Cloud::UnavailableError => e
+          rescue Google::Cloud::AbortedError,
+                 Google::Cloud::CanceledError,
+                 Google::Cloud::UnknownError,
+                 Google::Cloud::DeadlineExceededError,
+                 Google::Cloud::InternalError,
+                 Google::Cloud::UnauthenticatedError,
+                 Google::Cloud::ResourceExhaustedError,
+                 Google::Cloud::UnavailableError,
+                 Google::Cloud::InvalidArgumentError => e
+
+            if e.instance_of? Google::Cloud::InvalidArgumentError
+              # Return if a previous call was retried but ultimately succeeded
+              return nil if backoff[:current].positive?
+              # The Firestore backend uses "INVALID_ARGUMENT" for transaction IDs that have expired.
+              # While INVALID_ARGUMENT is generally not retryable, we retry this specific case.
+              raise e unless e.message =~ /transaction has expired/
+            end
+
             # Re-raise if retried more than the max
             raise e if backoff[:current] > backoff[:max]
 
@@ -643,12 +660,6 @@ module Google
             transaction = Transaction.from_client \
               self, previous_transaction: transaction.transaction_id
             retry
-          rescue Google::Cloud::InvalidArgumentError => e
-            # Return if a previous call was retried but ultimately succeeded
-            return nil if backoff[:current].positive?
-
-            # Re-raise error.
-            raise e
           rescue StandardError => e
             # Rollback transaction when handling unexpected error
             transaction.rollback rescue nil

data/lib/google/cloud/firestore/field_path.rb

@@ -209,19 +209,15 @@ module Google
 
         protected
 
-        START_FIELD_PATH_CHARS = /\A[a-zA-Z_]/.freeze
         INVALID_FIELD_PATH_CHARS = %r{[~*/\[\]]}.freeze
+        SIMPLE_FIELD_PATH_CHARS = /\A[_a-zA-Z][_a-zA-Z0-9]*\Z/.freeze
 
         def escape_field_for_path field
           field = String field
 
-          if INVALID_FIELD_PATH_CHARS.match(field) ||
-             field["."] || field["`"] || field["\\"]
-            escaped_field = field.gsub(/[`\\]/, "`" => "\\\`", "\\" => "\\\\")
-            return "`#{escaped_field}`"
-          end
+          return field if SIMPLE_FIELD_PATH_CHARS.match field
 
-          return field if START_FIELD_PATH_CHARS.match field
+          field = field.gsub(/[`\\]/, "`" => "\\`", "\\" => "\\\\")
 
           "`#{field}`"
         end

data/lib/google/cloud/firestore/service.rb

@@ -48,7 +48,7 @@ module Google
               config.endpoint = host if host
               config.lib_name = "gccl"
               config.lib_version = Google::Cloud::Firestore::VERSION
-              config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+              config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}/databases/(default)" }
             end
         end
 

data/lib/google/cloud/firestore/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Firestore
-      VERSION = "2.6.0".freeze
+      VERSION = "2.6.4".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-firestore
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.4
 platform: ruby
 authors:
 - Google Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core