google-cloud-firestore 2.1.0 → 2.5.0

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

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

data/lib/google/cloud/firestore/watch/inventory.rb

@@ -33,7 +33,8 @@ module Google
         # make inserting and removing objects much more efficent.
         class Inventory
           attr_accessor :current
-          attr_reader :resume_token, :read_time
+          attr_reader :resume_token
+          attr_reader :read_time
 
           def initialize client, query
             @client = client
@@ -155,24 +156,24 @@ module Google
 
           protected
 
-          def query_comparison_proc a, b
+          def query_comparison_proc left, right
             # TODO: Remove this when done benchmarking
             @comp_proc_counter += 1
 
-            return Order.compare_field_values a.ref, b.ref if @query.nil?
+            return Order.compare_field_values left.ref, right.ref if @query.nil?
 
             @directions ||= @query.query.order_by.map(&:direction)
 
-            a_comps = a.query_comparisons_for @query.query
-            b_comps = b.query_comparisons_for @query.query
-            @directions.zip(a_comps, b_comps).each do |dir, a_comp, b_comp|
-              comp = a_comp <=> b_comp
+            left_comps = left.query_comparisons_for @query.query
+            right_comps = right.query_comparisons_for @query.query
+            @directions.zip(left_comps, right_comps).each do |dir, left_comp, right_comp|
+              comp = left_comp <=> right_comp
               comp = 0 - comp if dir == :DESCENDING
               return comp unless comp.zero?
             end
 
             # Compare paths when everything else is equal
-            ref_comp = Order.compare_field_values a.ref, b.ref
+            ref_comp = Order.compare_field_values left.ref, right.ref
             ref_comp = 0 - ref_comp if @directions.last == :DESCENDING
             ref_comp
           end

data/lib/google/cloud/firestore/watch/listener.rb

@@ -30,7 +30,7 @@ module Google
         class Listener
           include MonitorMixin
 
-          def self.for_doc_ref doc_ref, &callback
+          def self.for_doc_ref parent, doc_ref, &callback
             raise ArgumentError if doc_ref.nil?
             raise ArgumentError if callback.nil?
 
@@ -44,10 +44,10 @@ module Google
               )
             )
 
-            new nil, doc_ref, doc_ref.client, init_listen_req, &callback
+            new parent, nil, doc_ref, doc_ref.client, init_listen_req, &callback
           end
 
-          def self.for_query query, &callback
+          def self.for_query parent, query, &callback
             raise ArgumentError if query.nil?
             raise ArgumentError if callback.nil?
 
@@ -61,12 +61,13 @@ module Google
               )
             )
 
-            new query, nil, query.client, init_listen_req, &callback
+            new parent, query, nil, query.client, init_listen_req, &callback
           end
 
-          def initialize query, doc_ref, client, init_listen_req, &callback
+          def initialize parent, query, doc_ref, client, init_listen_req, &callback
             super() # to init MonitorMixin
 
+            @parent = parent
             @query = query
             @doc_ref = doc_ref
             @client = client
@@ -82,7 +83,7 @@ module Google
           def stop
             synchronize do
               @stopped = true
-              @request_queue.push self if @request_queue
+              @request_queue&.push self
             end
           end
 
@@ -119,6 +120,8 @@ module Google
 
           def send_callback query_snp
             @callback.call query_snp
+          rescue StandardError => e
+            @parent.error! e
           end
 
           def start_listening!
@@ -270,25 +273,29 @@ module Google
             @request_queue.push self
           rescue GRPC::Cancelled, GRPC::DeadlineExceeded, GRPC::Internal,
                  GRPC::ResourceExhausted, GRPC::Unauthenticated,
-                 GRPC::Unavailable, GRPC::Core::CallError
+                 GRPC::Unavailable, GRPC::Core::CallError => e
             # Restart the stream with an incremental back for a retriable error.
             # Also when GRPC raises the internal CallError.
 
-            # Re-raise if retried more than the max
-            raise err if @backoff[:current] > @backoff[:max]
-
-            # Sleep with incremental backoff before restarting
-            sleep @backoff[:delay]
+            # Raise if retried more than the max
+            if @backoff[:current] > @backoff[:max]
+              @parent.error! e
+              raise e
+            else
+              # Sleep with incremental backoff before restarting
+              sleep @backoff[:delay]
 
-            # Update increment backoff delay and retry counter
-            @backoff[:delay] *= @backoff[:mod]
-            @backoff[:current] += 1
+              # Update increment backoff delay and retry counter
+              @backoff[:delay] *= @backoff[:mod]
+              @backoff[:current] += 1
 
-            retry
+              retry
+            end
           rescue RestartStream
             retry
           rescue StandardError => e
-            raise Google::Cloud::Error.from_error(e)
+            @parent.error! e
+            raise e
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-firestore
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Google Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -262,14 +262,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.13
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Firestore API